Skip to content

C
cloud-backend
Commit f470d301 by 袁伟铭
Options

1.0.0

parent bf1b6c6b
Showing with 27 additions and 27 deletions
user-server/src/main/java/com/zq/user/entity/WxUser.java
...@@ -22,7 +22,7 @@ import java.util.Date; ...@@ -22,7 +22,7 @@ import java.util.Date;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder @Builder
@TableName(value = "WX_USER") @TableName(value = "t_wx_user")
public class WxUser { public class WxUser {
/** /**
...@@ -39,28 +39,28 @@ public class WxUser { ...@@ -39,28 +39,28 @@ public class WxUser {
private String phone; private String phone;
/** /**
* 微信昵称
*/
@ApiModelProperty("微信昵称")
private String wxName;
/**
* 账号 * 账号
*/ */
@ApiModelProperty("账号") @ApiModelProperty("账号")
private String username; private String username;
/** /**
* 密码 * 登录密码
*/ */
@ApiModelProperty("密码") @ApiModelProperty("登录密码")
private String passwd; private String passwd;
/** /**
* 名称 * 昵称
*/
@ApiModelProperty("昵称")
private String nickname;
/**
* 真实姓名
*/ */
@ApiModelProperty("名称") @ApiModelProperty("真实姓名")
private String name; private String realname;
/** /**
* 身份证号码 * 身份证号码
...@@ -87,15 +87,15 @@ public class WxUser { ...@@ -87,15 +87,15 @@ public class WxUser {
private String gender; private String gender;
/** /**
* 微信获取的地址 * 地址
*/ */
@ApiModelProperty("微信获取的地址") @ApiModelProperty("地址")
private String address; private String address;
/** /**
* 状态 * 状态：0未激活 1正常 2暂停使用 3永久停号
*/ */
@ApiModelProperty("状态") @ApiModelProperty("状态：0未激活 1正常 2暂停使用 3永久停号")
private Integer state; private Integer state;
/** /**
...@@ -111,15 +111,15 @@ public class WxUser { ...@@ -111,15 +111,15 @@ public class WxUser {
private String openId; private String openId;
/** /**
* 微信开放平台获取的unionId * 开放平台获取的unionid,解决这个同一个企业的不同APP和不同公众号之间的帐号共通
*/ */
@ApiModelProperty("微信开放平台获取的unionId") @ApiModelProperty("开放平台获取的unionid,解决这个同一个企业的不同APP和不同公众号之间的帐号共通")
private String unionId; private String unionId;
/** /**
* 最后访问IP * 最后登录访问IP
*/ */
@ApiModelProperty("最后访问IP") @ApiModelProperty("最后登录访问IP")
private String accessIp; private String accessIp;
/** /**
......
user-server/src/main/java/com/zq/user/service/WxUserService.java
...@@ -97,7 +97,7 @@ public class WxUserService { ...@@ -97,7 +97,7 @@ public class WxUserService {
appUser.setUnionId(userInfo.getString("unionId")); // 微信开放平台 通用的 unionid appUser.setUnionId(userInfo.getString("unionId")); // 微信开放平台 通用的 unionid
appUser.setGender(userInfo.getString("gender")); // 性别 0.未知 1.男 2.女 appUser.setGender(userInfo.getString("gender")); // 性别 0.未知 1.男 2.女
appUser.setAvatar(userInfo.getString("avatarUrl")); // 头像 appUser.setAvatar(userInfo.getString("avatarUrl")); // 头像
appUser.setWxName(userInfo.getString("nickName")); // 微信昵称 appUser.setNickname(userInfo.getString("nickName")); // 微信昵称
String address = userInfo.getString("country") + " " + userInfo.getString("province") + " " + userInfo.getString("city"); String address = userInfo.getString("country") + " " + userInfo.getString("province") + " " + userInfo.getString("city");
appUser.setAddress(address.trim().replace(" ", " ")); appUser.setAddress(address.trim().replace(" ", " "));
flag = true; flag = true;
...@@ -109,7 +109,7 @@ public class WxUserService { ...@@ -109,7 +109,7 @@ public class WxUserService {
appUser.setAvatar(vo.getAvatar()); appUser.setAvatar(vo.getAvatar());
} }
if (!flag && StringUtils.isNotBlank(vo.getNickname())) { if (!flag && StringUtils.isNotBlank(vo.getNickname())) {
appUser.setWxName(vo.getNickname()); appUser.setNickname(vo.getNickname());
} }
if (!flag && StringUtils.isNotBlank(vo.getSex())) { if (!flag && StringUtils.isNotBlank(vo.getSex())) {
appUser.setGender(vo.getSex()); appUser.setGender(vo.getSex());
...@@ -132,7 +132,7 @@ public class WxUserService { ...@@ -132,7 +132,7 @@ public class WxUserService {
Optional<WxUser> optionalWxUser = wxUserList.stream().max(Comparator.comparing(WxUser::getLastLoginTime)); Optional<WxUser> optionalWxUser = wxUserList.stream().max(Comparator.comparing(WxUser::getLastLoginTime));
optionalWxUser.ifPresent(u -> { optionalWxUser.ifPresent(u -> {
user.setUsername(u.getUsername()); user.setUsername(u.getUsername());
user.setName(u.getName()); user.setRealname(u.getRealname());
user.setIdCard(u.getIdCard()); user.setIdCard(u.getIdCard());
}); });
} }
...@@ -149,8 +149,8 @@ public class WxUserService { ...@@ -149,8 +149,8 @@ public class WxUserService {
if (StringUtils.isBlank(wxUser.getAvatar())) { if (StringUtils.isBlank(wxUser.getAvatar())) {
wxUser.setAvatar(user.getAvatar()); wxUser.setAvatar(user.getAvatar());
} }
if (StringUtils.isBlank(wxUser.getWxName())) { if (StringUtils.isBlank(wxUser.getNickname())) {
wxUser.setWxName(user.getWxName()); wxUser.setNickname(user.getNickname());
} }
wxUser.setUnionId(user.getUnionId()); wxUser.setUnionId(user.getUnionId());
wxUser.setGender(user.getGender()); wxUser.setGender(user.getGender());
...@@ -167,7 +167,7 @@ public class WxUserService { ...@@ -167,7 +167,7 @@ public class WxUserService {
.userId(wxUser.getId()) .userId(wxUser.getId())
.phone(wxUser.getPhone()) .phone(wxUser.getPhone())
.account(wxUser.getUsername()) .account(wxUser.getUsername())
.nickname(StringUtils.isBlank(wxUser.getName()) ? wxUser.getWxName() : wxUser.getName()) .nickname(StringUtils.isBlank(wxUser.getRealname()) ? wxUser.getNickname() : wxUser.getRealname())
.build(); .build();
String token = ApiTokenUtils.createToken(tokenVo, UserCacheKeys.APP_TOKEN_EXPIRE_MINUTES); String token = ApiTokenUtils.createToken(tokenVo, UserCacheKeys.APP_TOKEN_EXPIRE_MINUTES);
...@@ -201,7 +201,7 @@ public class WxUserService { ...@@ -201,7 +201,7 @@ public class WxUserService {
if (StringUtils.isNotBlank(vo.getPhone()) && !vo.getPhone().contains("*")) { if (StringUtils.isNotBlank(vo.getPhone()) && !vo.getPhone().contains("*")) {
wxUser.setPhone(vo.getPhone()); wxUser.setPhone(vo.getPhone());
} }
wxUser.setWxName(vo.getWxName()); wxUser.setNickname(vo.getNickname());
wxUser.setGender(vo.getGender()); wxUser.setGender(vo.getGender());
wxUser.setAge(vo.getAge()); wxUser.setAge(vo.getAge());
wxUser.setAddress(vo.getAddress()); wxUser.setAddress(vo.getAddress());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment