Merge pull request #8 from admin4j/dev

v0.9.5

Author: andanyoung

admin4j-common-spring-web/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -11,6 +11,7 @@
 
     <groupId>com.admin4j.common</groupId>
     <artifactId>admin4j-common-spring-web</artifactId>
+    <version>0.9.5</version>
     <description>与业务无关的工具类库</description>
 
     <properties>
@@ -20,9 +21,16 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
@@ -71,5 +79,15 @@
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure-processor</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

admin4j-common-spring-web/src/main/java/com/admin4j/common/config/UserContextAutoConfiguration.java

@@ -0,0 +1,43 @@
+package com.admin4j.common.config;
+
+import com.admin4j.common.constant.WebConstant;
+import com.admin4j.common.service.IUserContextHolder;
+import com.admin4j.common.service.impl.SimpleUserContextHolder;
+import com.admin4j.common.util.UserContextUtil;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author andanyang
+ * @since 2023/9/15 9:19
+ */
+@Configuration
+@AutoConfigureOrder(WebConstant.IUserContextHolderOrder + 6)
+public class UserContextAutoConfiguration implements InitializingBean, ApplicationContextAware {
+
+    private ApplicationContext applicationContext;
+
+    @Bean
+    @ConditionalOnMissingBean(IUserContextHolder.class)
+    @ConditionalOnClass(name = "com.alibaba.ttl.TransmittableThreadLocal")
+    public IUserContextHolder userContextHolder() {
+        return new SimpleUserContextHolder();
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        UserContextUtil.userContextHolder = applicationContext.getBean(IUserContextHolder.class);
+    }
+}

admin4j-common-spring-web/src/main/java/com/admin4j/common/config/UserContextConfig.java

@@ -0,0 +1,13 @@
+package com.admin4j.common.constant;
+
+/**
+ * @author andanyang
+ * @since 2023/12/1 11:18
+ */
+public final class WebConstant {
+
+    /**
+     * IUserContextHolder 接口再spring中初始化顺序
+     */
+    public static final int IUserContextHolderOrder = -1;
+}

admin4j-common-spring-web/src/main/java/com/admin4j/common/constant/WebConstant.java

@@ -5,7 +5,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Set;
+import java.util.Collection;
 
 /**
  * UserContext 用户上下文
@@ -35,7 +35,7 @@ public class AuthenticationUser implements Serializable {
      * 权限列表
      */
     @ApiModelProperty("权限code列表")
-    private Set<String> permissions;
+    private Collection<String> permissions;
 
     // private String fromService;
 

admin4j-common-spring-web/src/main/java/com/admin4j/common/pojo/AuthenticationUser.java

@@ -1,4 +1,4 @@
-package com.admin4j.framework.web;
+package com.admin4j.common.service.impl;
 
 import com.admin4j.common.pojo.AuthenticationUser;
 import com.admin4j.common.pojo.ResponseEnum;
@@ -13,7 +13,6 @@
  * @author andanyang
  * @since 2021/7/27 10:56
  */
-
 public class SimpleUserContextHolder implements IUserContextHolder {
 
     /**
@@ -29,6 +28,11 @@ public void loginOut() {
         clear();
     }
 
+    @Override
+    public AuthenticationUser getAuthenticationUser() {
+        return THREAD_LOCAL_USER.get();
+    }
+
     /**
      * 设置登录者信息
      *
@@ -39,11 +43,6 @@ public void setAuthenticationUser(AuthenticationUser authenticationUser) {
         THREAD_LOCAL_USER.set(authenticationUser);
     }
 
-    @Override
-    public AuthenticationUser getAuthenticationUser() {
-        return THREAD_LOCAL_USER.get();
-    }
-
     /**
      * 获取用户
      *
@@ -90,6 +89,20 @@ public void offTenant() {
         setTenantId(0L);
     }
 
+    /**
+     * get租户
+     */
+    @Override
+    public Long getTenantId() {
+        AuthenticationUser loginUserNoCheck = getLoginUserNoCheck();
+        // 小心三目表达式，NPE
+        if (loginUserNoCheck == null) {
+            return null;
+        } else {
+            return loginUserNoCheck.getTenantId();
+        }
+    }
+
     /**
      * 设置租户
      *
@@ -101,12 +114,11 @@ public void setTenantId(Long tenant) {
     }
 
     /**
-     * get租户
+     * get用户ID
      */
     @Override
-    public Long getTenantId() {
-        AuthenticationUser loginUserNoCheck = getLoginUserNoCheck();
-        return loginUserNoCheck == null ? 0L : loginUserNoCheck.getTenantId();
+    public Long getUserId() {
+        return getLoginUser().getUserId();
     }
 
     /**
@@ -118,12 +130,4 @@ public Long getTenantId() {
     public void setUserId(Long userId) {
         getLoginUser().setUserId(userId);
     }
-
-    /**
-     * get用户ID
-     */
-    @Override
-    public Long getUserId() {
-        return getLoginUser().getUserId();
-    }
 }

…amework/web/SimpleUserContextHolder.java …ervice/impl/SimpleUserContextHolder.javaweb-spring-boot-starter/src/main/java/com/admin4j/framework/web/SimpleUserContextHolder.java renamed to admin4j-common-spring-web/src/main/java/com/admin4j/common/service/impl/SimpleUserContextHolder.java web-spring-boot-starter/src/main/java/com/admin4j/framework/web/SimpleUserContextHolder.java renamed to admin4j-common-spring-web/src/main/java/com/admin4j/common/service/impl/SimpleUserContextHolder.java

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.admin4j.common.config.UserContextConfig
+  com.admin4j.common.config.UserContextAutoConfiguration

admin4j-common-spring-web/src/main/resources/META-INF/spring.factories

@@ -20,21 +20,34 @@
  */
 public class SpelUtil {
 
-    private SpelUtil() {
-    }
-
+    /**
+     * 是一种基于本地变量表的参数解析器，依赖于编译时的选项，可能无法在所有情况下获取参数名称
+     */
     private static final LocalVariableTableParameterNameDiscoverer U = new LocalVariableTableParameterNameDiscoverer();
-    //使用SPEL进行key的解析
+    // 使用SPEL进行key的解析
     private static final ExpressionParser EL_PARSER = new SpelExpressionParser();
 
+    private SpelUtil() {
+    }
 
+    /**
+     * el表达式解析
+     *
+     * @param spel   解析值
+     * @param method 方法
+     * @param args   参数
+     * @return
+     */
     public static String parse(String spel, Method method, Object[] args) {
-        //获取被拦截方法参数名列表(使用Spring支持类库)
+        if (StringUtils.isBlank(spel)) {
+            return null;
+        }
+        // 获取被拦截方法参数名列表(使用Spring支持类库)
         String[] paraNameArr = U.getParameterNames(method);
 
-        //SPEL上下文
+        // SPEL上下文
         StandardEvaluationContext context = new StandardEvaluationContext();
-        //把方法参数放入SPEL上下文中
+        // 把方法参数放入SPEL上下文中
         if (paraNameArr != null) {
             for (int i = 0; i < paraNameArr.length; i++) {
                 context.setVariable(paraNameArr[i], args[i]);
@@ -63,12 +76,12 @@ public static String parse(Object rootObject, String spel, Method method, Object
         } else if (!spel.contains("#")) {
             return parse(spel, method, args);
         }
-        //获取被拦截方法参数名列表(使用Spring支持类库)
+        // 获取被拦截方法参数名列表(使用Spring支持类库)
         String[] paraNameArr = U.getParameterNames(method);
 
-        //SPEL上下文
+        // SPEL上下文
         StandardEvaluationContext context = new MethodBasedEvaluationContext(rootObject, method, args, U);
-        //把方法参数放入SPEL上下文中
+        // 把方法参数放入SPEL上下文中
         if (paraNameArr != null) {
             for (int i = 0; i < paraNameArr.length; i++) {
                 context.setVariable(paraNameArr[i], args[i]);

admin4j-common-spring/src/main/java/com/admin4j/spring/util/SpelUtil.java

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -23,6 +23,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

admin4j-common/pom.xml

@@ -9,4 +9,8 @@ public class EncryptException extends SystemException {
     public EncryptException(String message, Throwable throwable) {
         super(message, throwable);
     }
+
+    public EncryptException(Throwable throwable) {
+        super(throwable);
+    }
 }