fix

更新头像错误

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/WxAppletUserController.java

@@ -93,15 +93,15 @@ public class WxAppletUserController {
     @PostMapping("/getUserPhoneNumber")
     @ApiOperation(value = "快速手机号验证",position = 6)
     public CommonResult<String> getUserPhoneNumber(@RequestBody@Validated BizWxAppletGetUserPhoneNumberDTO source) throws WxErrorException {
-        log.info("\n手机号快速验证：appid = [{}], accessToken = [{}]",
-                source.getAppid(), source.getAccessToken());
-        if (StringUtils.isAnyBlank(source.getAppid(), source.getAccessToken())) {
+        log.info("\n手机号快速验证：appid = [{}], code = [{}]",
+                source.getAppid(), source.getCode());
+        if (StringUtils.isAnyBlank(source.getAppid(), source.getCode())) {
             throw new IllegalArgumentException("请求参数非法，请核实!");
         }
         if (!wxMaService.switchover(source.getAppid())) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", source.getAppid()));
         }
-        WxMaPhoneNumberInfo phoneNumber = wxMaService.getUserService().getPhoneNumber(source.getAccessToken());
+        WxMaPhoneNumberInfo phoneNumber = wxMaService.getUserService().getPhoneNumber(source.getCode());
         //更新当前用户的手机号
         wxUserService.updatePhoneById(LoginUserStrategy.tr.getCurrentUserId(),phoneNumber);
         return CommonResult.success(phoneNumber.getPhoneNumber());

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxAppletGetUserPhoneNumberDTO.java

@@ -9,6 +9,6 @@ import javax.validation.constraints.NotBlank;
 public class BizWxAppletGetUserPhoneNumberDTO {
     @NotBlank(message = "appid不能为空")
     private String appid;
-    @NotBlank(message = "accessToken不能为空")
-    private String accessToken;
+    @NotBlank(message = "code不能为空")
+    private String code;
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswLoginInfoDTO.java

@@ -43,6 +43,9 @@ public class OAuth2PswLoginInfoDTO implements Serializable {
     private String lastLoginTenantId;
 
     public String getAvatar() {
-        return UserUtil.getAvatar(userId);
+        if(StrUtil.isBlank(avatar)){
+            return UserUtil.getAvatar(userId);
+        }
+        return avatar;
     }
 }