小程序secret更换

portal-service-common/src/main/java/com/hfln/portal/common/request/user/PhoneLoginParams.java

@@ -26,7 +26,7 @@ public class PhoneLoginParams extends BaseVO {
     @ApiModelProperty("unionId")
     private String unionId;
 
-    @ApiModelProperty("用户微信头像")
-    private String avatarUrl;
+//    @ApiModelProperty("用户微信头像")
+//    private String avatarUrl;
 
 }

portal-service-common/src/main/java/com/hfln/portal/common/response/user/UserTokenInfo.java

@@ -4,6 +4,7 @@ package com.hfln.portal.common.response.user;
 import com.hfln.portal.common.vo.BaseVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Token 信息 Model: 用来描述一个 Token 的常见参数。
@@ -30,6 +31,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.10.0
  */
 @ApiModel(description = "Token 信息 Model")
+@Data
 public class UserTokenInfo extends BaseVO {
 
     @ApiModelProperty("token 名称")
@@ -65,6 +67,9 @@ public class UserTokenInfo extends BaseVO {
     @ApiModelProperty("自定义数据（暂无意义，留作扩展）")
     public String tag;
 
+    @ApiModelProperty("用户手机号")
+    public String phone;
+
 
 
     /**

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/UserGateway.java

@@ -4,6 +4,7 @@ import com.hfln.portal.common.dto.data.oss.OssFileDTO;
 import com.hfln.portal.common.dto.data.user.UserDto;
 import com.hfln.portal.common.request.user.*;
 import com.hfln.portal.common.response.user.UserInfoWxRes;
+import com.hfln.portal.common.response.user.UserTokenInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -18,7 +19,7 @@ public interface UserGateway {
     UserInfoWxRes loginWx(String code);
 
 
-    Boolean loginByPhone(PhoneLoginParams params);
+    UserTokenInfo loginByPhone(PhoneLoginParams params);
 
 
     Boolean signup(UserSignupParams request);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -15,8 +15,10 @@ import com.hfln.portal.common.dto.data.oss.OssFileDTO;
 import com.hfln.portal.common.dto.data.user.UserDto;
 import com.hfln.portal.common.request.user.*;
 import com.hfln.portal.common.response.user.UserInfoWxRes;
+import com.hfln.portal.common.response.user.UserTokenInfo;
 import com.hfln.portal.domain.customer.DeviceType;
 import com.hfln.portal.domain.customer.OssBusiType;
+import com.hfln.portal.domain.customer.util.CopyUtils;
 import com.hfln.portal.domain.customer.util.PasswordUtil;
 import com.hfln.portal.domain.customer.util.WxOfficeAccountClient;
 import com.hfln.portal.domain.exception.ErrorEnum;
@@ -154,7 +156,7 @@ public class UserGatewayImpl implements UserGateway {
     }
 
     @Override
-    public Boolean loginByPhone(PhoneLoginParams params) {
+    public UserTokenInfo loginByPhone(PhoneLoginParams params) {
 
         // 1 校验当前用户是否已注册
         UserInfo userInfo = userService.queryByOpenId(params.getOpenId());
@@ -168,7 +170,7 @@ public class UserGatewayImpl implements UserGateway {
             userInfo.setOpenid(params.getOpenId());
             userInfo.setPhone(phone);
             userInfo.setUnionId(params.getUnionId());
-            userInfo.setAvatarUrl(params.getAvatarUrl());
+//            userInfo.setAvatarUrl(params.getAvatarUrl());
             userService.save(userInfo);
         } else {
             log.info("当前用户已注册：{}", params.getOpenId());
@@ -193,7 +195,12 @@ public class UserGatewayImpl implements UserGateway {
             log.info("当前用户已登录：{}",params.getOpenId());
         }
 
-        return true;
+        //3.获取token信息+用户手机号
+        SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
+        UserTokenInfo result = CopyUtils.copy(tokenInfo, UserTokenInfo.class);
+        result.setPhone(userInfo.getPhone());
+
+        return result;
     }
 
     @Override