Gaokun Wang преди 1 месец
родител
ревизия
0769038d23

+ 7 - 0
eco-bom/pom.xml

@@ -152,6 +152,13 @@
                 <version>${sa-token.version}</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/cn.dev33/sa-token-jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${sa-token.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/LoginUser.java

@@ -97,7 +97,7 @@ public class LoginUser implements Serializable {
     /**
      * 用户名
      */
-    private String username;
+    private String userName;
     /**
      * 用户账号
      */

+ 5 - 0
eco-common/com-security/pom.xml

@@ -18,5 +18,10 @@
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot3-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+        </dependency>
     </dependencies>
 </project>

+ 20 - 0
eco-common/com-security/src/main/java/org/eco/vip/security/config/SaTokenConfig.java

@@ -6,8 +6,13 @@
 package org.eco.vip.security.config;
 
 
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
+import cn.dev33.satoken.stp.StpInterface;
+import cn.dev33.satoken.stp.StpLogic;
 import org.eco.vip.orm.factory.YmlPropertySourceFactory;
+import org.eco.vip.security.core.SaPermissionImpl;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
 
 /**
@@ -19,4 +24,19 @@ import org.springframework.context.annotation.PropertySource;
 @PropertySource(value = "classpath:satoken-common.yml", factory = YmlPropertySourceFactory.class)
 @AutoConfiguration
 public class SaTokenConfig {
+
+    @Bean
+    public StpLogic getStpLogicJwt() {
+        // Sa-Token 整合 jwt (简单模式)
+        return new StpLogicJwtForSimple();
+    }
+
+    /**
+     * 权限接口实现(使用bean注入方便用户替换)
+     */
+    @Bean
+    public StpInterface stpInterface() {
+        return new SaPermissionImpl();
+    }
+
 }

+ 1 - 1
eco-common/com-security/src/main/java/org/eco/vip/security/handler/AllUrlHandler.java

@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 @Data
 public class AllUrlHandler implements InitializingBean {
 
-    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
+    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)}");
 
     private List<String> urls = new ArrayList<>();
 

+ 1 - 1
eco-common/com-security/src/main/java/org/eco/vip/security/utils/LoginHelper.java

@@ -51,7 +51,7 @@ public class LoginHelper {
         StpUtil.login(loginUser.getLoginId(),
                 model.setExtra(TENANT_KEY, loginUser.getTenantId())
                         .setExtra(USER_KEY, loginUser.getUserId())
-                        .setExtra(USER_NAME_KEY, loginUser.getUsername())
+                        .setExtra(USER_NAME_KEY, loginUser.getUserName())
                         .setExtra(USER_ACCOUNT_KEY, loginUser.getAccount())
                         .setExtra(ORG_KEY, loginUser.getOrgId())
                         .setExtra(ORG_NAME_KEY, loginUser.getOrgName())

+ 1 - 1
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/LoginService.java

@@ -29,7 +29,7 @@ public class LoginService {
         loginUser.setTenantId(user.getTenantId());
         loginUser.setUserId(user.getId());
         loginUser.setOrgId(user.getOrgId());
-        loginUser.setUsername(user.getUserName());
+        loginUser.setUserName(user.getUserName());
         loginUser.setNickname(user.getNickName());
         loginUser.setUserType(user.getUserType());
 //        loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId()));