用户修改

urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/utils/JwtTokenUtil.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.xyzh.common.core.domain.LoginDomain;
 import org.xyzh.common.dto.sys.TbSysUserDTO;
+import org.xyzh.common.dto.sys.TbSysUserInfoDTO;
 import org.xyzh.common.utils.IDUtils;
 
 import javax.crypto.SecretKey;
@@ -43,9 +44,10 @@ public class JwtTokenUtil {
     public String generateToken(LoginDomain loginDomain) {
         Map<String, Object> claims = new HashMap<>();
         TbSysUserDTO user = loginDomain.getUser();
+        TbSysUserInfoDTO userInfoDTO = loginDomain.getUserInfo();
         
         claims.put("userId", user.getUserId());
-        claims.put("username", user.getUsername());
+        claims.put("username", userInfoDTO.getUsername());
         claims.put("email", user.getEmail());
         claims.put("loginType", loginDomain.getLoginType());
         claims.put("ipAddress", loginDomain.getIpAddress());

urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserDTO.java

@@ -33,7 +33,7 @@ public class TbSysUserDTO extends BaseDTO {
     private String phone;
 
     @Schema(description = "手机号哈希")
-    private String phone_hash;
+    private String phoneHash;
 
     @Schema(description = "微信ID")
     private String wechatId;