ZF-107

README.md

 ##启动项：
--Denv=dev -Didc=k8s -Dserver.port=8099 -DNAMESPACE=test1
+-Denv=dev -Didc=k8s -Dserver.port=8099 -DNAMESPACE=test1 -Dlogging.config=classpath:logback-dev.xml
 
 
 ##登录头信息

change.log → change-log.md

-#KA-4/2021-06-30
-
-##apollo新增配置
+##KA-4/2021-06-30
+###apollo新增配置
+```
 user.auth.manager.Urora.properties.privateKey
     MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKxDkRtyB5CdWqnFpyCIbxiy7X9A9LSvjtCmiL4YpbxnwVOfbMH5c6e2qbk5egDoIUOPVgAOlCMcYRzlNyBgA9QBFJKSFBK8NnyTrpFe+I9d2I79Iab05LHMhahIjW/98rswBqQvwQE5FBm8ZX1AQcpRAm56xUTymNsSIEQY4+AvAgMBAAECgYA25MEU0d1/Q+VkPEvpnhBo+nucFYLlIRyNeMQSb6BAzX9Zum/Z0Df+tcKX96zdJRuUf9ST6BFkruJzZseOVYpiOlqRNxCwL6TbaL3wA5JqgKcW7vFjLnrKHzUnz+FcWIh6Y3houYHro+ctB1gAaUAkWz1Nvt0dIEJ7NuQmU1ggwQJBAOFK8Bg4GJtzbAKV5X+B6hlp5wzGVQws+nLu40E1NRyIQ4YzK9vUu47oyiADeZSGw0Rp34h3fWXeNZQSBwAgRakCQQDDvlA6Yzf0Rsc+Q3e7iqyuw8gtcpWf+lgnJKInWUHFW+r9MkwHGu/u4Oq4OIkfZF3xXMZ/oVTYZDVJ5H8y924XAkEArYdZ/V2f3oR9ylQIzDiVxvNiSt2s/k7arZJBKqW//fUbBY/+lTl7Ke02WogyqmtOljByQ5u906vfWuizya4R2QJACRqI0K5co9fG3HZ20xoX/ejNHo/9tXsHLordn8be8DbeLvhv4MS38/wx7m9ysSsR02/lK3ptX8MJV25xHAW18QJAeR5WtHzYlx2nm04PYwwlXckEahChAWKm3fPGcm2d3WWYj0HXucyFOh4zdvHCsa77hEYoGCHMS01pG9zUxtHpiQ==
     #极光私钥
@@ -19,4 +19,13 @@ spring.datasource.timeBetweenEvictionRunsMillis
 spring.thymeleaf.cache
     false
 user.auth.manager.Urora.target
-    cn.quantgroup.xyqb.urora.UroraAuthenticationManager
\ No newline at end of file
+    cn.quantgroup.xyqb.urora.UroraAuthenticationManager
+```
+
+##ZF-107/2021-08-17
+用户信息获取对象优化
+###代码
+```
+//添加UserBrief相应报文对象
+cn.quantgroup.xyqb.controller.external.UserController#userCenterIndex()
+```
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

 package cn.quantgroup.xyqb.controller.external;
 
 import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.security.AuthorizationPoint;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaFiniteValidator;
 import cn.quantgroup.xyqb.aspect.captcha.LoginInterceptor;
@@ -16,6 +15,7 @@ import cn.quantgroup.xyqb.exception.UserNotExistException;
 import cn.quantgroup.xyqb.exception.VerificationCodeErrorException;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.LoginProperties;
+import cn.quantgroup.xyqb.model.UserBrief;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
@@ -85,8 +85,6 @@ public class UserController implements IBaseController {
     private IUserRegisterService userRegisterService;
 
 
-
-
     /**
      * 登录（账号 + 密码）
      * 密码错误达到限定次数时执行图形验证码校验
@@ -119,6 +117,7 @@ public class UserController implements IBaseController {
 
     /**
      * 慢速登陆
+     *
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/7310
      */
     @PasswordErrorFiniteValidator
@@ -172,6 +171,7 @@ public class UserController implements IBaseController {
 
     /**
      * 快速登陆 - 同h5login代码实现一致
+     *
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/2066
      */
     @LoginInterceptor
@@ -368,6 +368,7 @@ public class UserController implements IBaseController {
 
     /**
      * 重置密码
+     *
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/3263
      * @Deprecated 20210318, 仅有一次调用2021-03-15 00:38:57.752
      */
@@ -432,6 +433,7 @@ public class UserController implements IBaseController {
 
     /**
      * 获取 token 信息
+     *
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/9191
      */
     @RequestMapping("/token")
@@ -466,20 +468,22 @@ public class UserController implements IBaseController {
     @RequestMapping("/center/index")
     @ApiOperation(value = "用户中心首页", notes = "用户中心首页显示头像, 昵称, 姓名", httpMethod = "POST")
     public JsonResult userCenterIndex() {
+
+        UserBrief brief = new UserBrief();
+        //TODO:he 返回""，待解决
         Long userId = getCurrentUserFromRedis().getId();
         UserAttached userAttached = userCenterService.searchUserAttachedByUserId(userId);
-        Map<String, String> result = new HashMap<>();
         if (userAttached != null) {
-            result.put("avatar", userAttached.getAvatar());
-            result.put("nick", userAttached.getNick());
+            brief.setAvatar(userAttached.getAvatar());
+            brief.setNick(userAttached.getNick());
         }
         UserDetail userDetail = userDetailService.findSlaveByUserId(userId);
         if (userDetail != null) {
-            result.put("name", userDetail.getName());
-            result.put("sex", Optional.ofNullable(userDetail.getGender()).orElse(cn.quantgroup.xyqb.model.Gender.UNKNOWN).ordinal() + "");
-            result.put(Constants.PHONE_NO, userDetail.getPhoneNo().substring(0, 3) + "****" + userDetail.getPhoneNo().substring(7, 11));
+            brief.setName(userDetail.getName());
+            brief.setSex(Optional.ofNullable(userDetail.getGender()).orElse(cn.quantgroup.xyqb.model.Gender.UNKNOWN).ordinal() + "");
+            brief.setPhoneNo(userDetail.getPhoneNo().substring(0, 3) + "****" + userDetail.getPhoneNo().substring(7, 11));
         }
-        return JsonResult.buildSuccessResult(null, result);
+        return JsonResult.buildSuccessResult(null, brief);
     }
 
     /**
@@ -501,6 +505,7 @@ public class UserController implements IBaseController {
 
     /**
      * 登出接口
+     *
      * @yapi http://yapi.quantgroups.com/project/17/interface/api/23661
      */
     @RequestMapping(value = "/logout", method = RequestMethod.GET)
@@ -652,7 +657,7 @@ public class UserController implements IBaseController {
     private void verifyPhoneAndCodeForOnce(String phoneNo, String verificationCode) {
         if (!smsService.verifyPhoneAndCode(phoneNo, verificationCode)) {
             // 是否需要重新发送短信验证码
-            if (smsService.needResendCode(phoneNo, VERIFICATION_CODE_FINITE_COUNT_NEW,false)) {
+            if (smsService.needResendCode(phoneNo, VERIFICATION_CODE_FINITE_COUNT_NEW, false)) {
                 throw new VerificationCodeErrorException("验证码失效，请重新获取");
             }
 

src/main/java/cn/quantgroup/xyqb/model/UserBrief.java

+package cn.quantgroup.xyqb.model;
+
+/**
+ * Created by Administrator on 2021/8/17 0017.
+ */
+public class UserBrief {
+    private String sex;
+    private String name;
+    private String phoneNo;
+    private String avatar;
+    private String nick;
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("UserBrief{");
+        sb.append("sex='").append(sex).append('\'');
+        sb.append(", name='").append(name).append('\'');
+        sb.append(", phoneNo='").append(phoneNo).append('\'');
+        sb.append(", avatar='").append(avatar).append('\'');
+        sb.append(", nick='").append(nick).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}
+