ソースを参照

Merge remote-tracking branch 'origin/master'

2507040827 13 時間 前
コミット
8edc22588a

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/dto/LoginRequestDto.java

@@ -22,5 +22,5 @@ public class LoginRequestDto {
 
     @NotBlank(message = "密码不能为空")
     @ApiModelProperty(value = "密码", required = true)
-    private String password;
+    private String pwd;
 }

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagApp.java

@@ -77,5 +77,5 @@ public class AitagApp implements Serializable {
     @Size(max = 100, message = "编码长度不能超过100")
     @ApiModelProperty(value = "状态:0启用;1禁用", example = "0")
     @Length(max = 100, message = "编码长度不能超过100")
-    private String state;
+    private String status;
 }

+ 2 - 2
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagUser.java

@@ -38,7 +38,7 @@ public class AitagUser implements Serializable {
     @Size(max= 100,message="编码长度不能超过100")
     @ApiModelProperty("登陆密码")
     @Length(max= 100,message="编码长度不能超过100")
-    private String password;
+    private String pwd;
     /**
     * 用户名称
     */
@@ -52,6 +52,6 @@ public class AitagUser implements Serializable {
     @Size(max= 100,message="编码长度不能超过100")
     @ApiModelProperty("角色权限(0客户经理,1标签管理人员,2业务管理员,3运维管理员,4测试管理员)")
     @Length(max= 100,message="编码长度不能超过100")
-    private String role;
+    private String userRole;
 
 }

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagAppServiceImpl.java

@@ -53,7 +53,7 @@ public class AitagAppServiceImpl implements AitagAppService {
         app.setAppSecret(appSecret);
         // 使用 DataUtil 截断时间精度
         app.setCreateTime(DataUtil.truncateToSeconds(new Date()));
-        app.setState("0");
+        app.setStatus("0");
 
         aiTagAppMapper.insertApp(app);
         return app;

+ 5 - 5
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AuthServiceImpl.java

@@ -41,7 +41,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public LoginResponseVo login(LoginRequestDto loginRequest) {
         String userId = loginRequest.getUserId();
-        String password = loginRequest.getPassword();
+        String password = loginRequest.getPwd();
 
         log.info("用户尝试登录: {}", userId);
 
@@ -59,18 +59,18 @@ public class AuthServiceImpl implements AuthService {
         }
 
         // 生成token
-        String token = jwtUtil.generateToken(userId, user.getRole());
+        String token = jwtUtil.generateToken(userId, user.getUserRole());
 
         // 记录在线用户
         onlineUsers.put(userId, token);
 
-        log.info("用户登录成功: {}, 角色: {}", userId, user.getRole());
+        log.info("用户登录成功: {}, 角色: {}", userId, user.getUserRole());
 
         return LoginResponseVo.success(
                 token,
                 user.getUserId(),
                 user.getUserName(),
-                user.getRole(),
+                user.getUserRole(),
                 expiration
         );
     }
@@ -93,7 +93,7 @@ public class AuthServiceImpl implements AuthService {
             return false;
         }
         // 简单的密码比较,实际项目中应该使用加密存储
-        return user.getPassword() != null && user.getPassword().equals(password);
+        return user.getPwd() != null && user.getPwd().equals(password);
     }
 
     /**

+ 4 - 4
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/util/JwtUtil.java

@@ -33,10 +33,10 @@ public class JwtUtil {
     /**
      * 生成JWT token
      */
-    public String generateToken(String userId, String role) {
+    public String generateToken(String userId, String userRole) {
         Map<String, Object> claims = new HashMap<>();
         claims.put("userId", userId);
-        claims.put("role", role);
+        claims.put("userRole", userRole);
         return createToken(claims, userId);
     }
 
@@ -90,7 +90,7 @@ public class JwtUtil {
     public String getRoleFromToken(String token) {
         try {
             Claims claims = getClaimsFromToken(token);
-            return claims.get("role", String.class);
+            return claims.get("userRole", String.class);
         } catch (Exception e) {
             log.warn("从token获取用户角色失败:{}", e.getMessage());
             return null;
@@ -116,7 +116,7 @@ public class JwtUtil {
         try {
             Claims claims = getClaimsFromToken(token);
             String userId = claims.getSubject();
-            String role = claims.get("role", String.class);
+            String role = claims.get("userRole", String.class);
             return generateToken(userId, role);
         } catch (Exception e) {
             log.warn("刷新token失败:{}", e.getMessage());

+ 7 - 7
server/yusp-tagging-core/src/main/resources/mapper/AitagAppMapper.xml

@@ -13,7 +13,7 @@
             create_time,
             creater_nm,
             creater_id,
-            state
+            status
         FROM aitag_app
         ORDER BY create_time DESC
             LIMIT #{limit} OFFSET #{offset}
@@ -36,7 +36,7 @@
             create_time,
             creater_nm,
             creater_id,
-            state
+            status
         ) VALUES (
                      #{id},
                      #{appName},
@@ -45,7 +45,7 @@
                      #{createTime, jdbcType=TIMESTAMP},
                      #{createrNm},
                      #{createrId},
-                     #{state}
+                     #{status}
                  )
     </insert>
 
@@ -70,10 +70,10 @@
         WHERE id = #{id}
     </update>
 
-    <!-- 7. 禁用应用:更新 state = '1' -->
+    <!-- 7. 禁用应用:更新 status = '1' -->
     <update id="disableApp" parameterType="string">
         UPDATE aitag_app
-        SET state = '1'
+        SET status = '1'
         WHERE id = #{id}
     </update>
 
@@ -92,7 +92,7 @@
             create_time,
             creater_nm,
             creater_id,
-            state
+            status
         FROM aitag_app
         WHERE app_name LIKE CONCAT('%', #{appName}, '%')
     </select>
@@ -106,7 +106,7 @@
             create_time,
             creater_nm,
             creater_id,
-            state
+            status
         FROM aitag_app
         WHERE app_name LIKE CONCAT('%', #{appName}, '%')
         ORDER BY create_time DESC