Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
framework
cloud-backend
Commits
f470d301
Commit
f470d301
authored
May 30, 2022
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.0.0
parent
bf1b6c6b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
27 deletions
+27
-27
user-server/src/main/java/com/zq/user/entity/WxUser.java
+20
-20
user-server/src/main/java/com/zq/user/service/WxUserService.java
+7
-7
No files found.
user-server/src/main/java/com/zq/user/entity/WxUser.java
View file @
f470d301
...
...
@@ -22,7 +22,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName
(
value
=
"
WX_USER
"
)
@TableName
(
value
=
"
t_wx_user
"
)
public
class
WxUser
{
/**
...
...
@@ -39,28 +39,28 @@ public class WxUser {
private
String
phone
;
/**
* 微信昵称
*/
@ApiModelProperty
(
"微信昵称"
)
private
String
wxName
;
/**
* 账号
*/
@ApiModelProperty
(
"账号"
)
private
String
username
;
/**
* 密码
*
登录
密码
*/
@ApiModelProperty
(
"密码"
)
@ApiModelProperty
(
"
登录
密码"
)
private
String
passwd
;
/**
* 名称
* 昵称
*/
@ApiModelProperty
(
"昵称"
)
private
String
nickname
;
/**
* 真实姓名
*/
@ApiModelProperty
(
"
名称
"
)
private
String
name
;
@ApiModelProperty
(
"
真实姓名
"
)
private
String
real
name
;
/**
* 身份证号码
...
...
@@ -87,15 +87,15 @@ public class WxUser {
private
String
gender
;
/**
*
微信获取的
地址
* 地址
*/
@ApiModelProperty
(
"
微信获取的
地址"
)
@ApiModelProperty
(
"地址"
)
private
String
address
;
/**
* 状态
* 状态
:0未激活 1正常 2暂停使用 3永久停号
*/
@ApiModelProperty
(
"状态"
)
@ApiModelProperty
(
"状态
:0未激活 1正常 2暂停使用 3永久停号
"
)
private
Integer
state
;
/**
...
...
@@ -111,15 +111,15 @@ public class WxUser {
private
String
openId
;
/**
*
微信开放平台获取的unionId
*
开放平台获取的unionid,解决这个同一个企业的不同APP和不同公众号之间的帐号共通
*/
@ApiModelProperty
(
"
微信开放平台获取的unionId
"
)
@ApiModelProperty
(
"
开放平台获取的unionid,解决这个同一个企业的不同APP和不同公众号之间的帐号共通
"
)
private
String
unionId
;
/**
* 最后访问IP
* 最后
登录
访问IP
*/
@ApiModelProperty
(
"最后访问IP"
)
@ApiModelProperty
(
"最后
登录
访问IP"
)
private
String
accessIp
;
/**
...
...
user-server/src/main/java/com/zq/user/service/WxUserService.java
View file @
f470d301
...
...
@@ -97,7 +97,7 @@ public class WxUserService {
appUser
.
setUnionId
(
userInfo
.
getString
(
"unionId"
));
// 微信开放平台 通用的 unionid
appUser
.
setGender
(
userInfo
.
getString
(
"gender"
));
// 性别 0.未知 1.男 2.女
appUser
.
setAvatar
(
userInfo
.
getString
(
"avatarUrl"
));
// 头像
appUser
.
set
WxN
ame
(
userInfo
.
getString
(
"nickName"
));
// 微信昵称
appUser
.
set
Nickn
ame
(
userInfo
.
getString
(
"nickName"
));
// 微信昵称
String
address
=
userInfo
.
getString
(
"country"
)
+
" "
+
userInfo
.
getString
(
"province"
)
+
" "
+
userInfo
.
getString
(
"city"
);
appUser
.
setAddress
(
address
.
trim
().
replace
(
" "
,
" "
));
flag
=
true
;
...
...
@@ -109,7 +109,7 @@ public class WxUserService {
appUser
.
setAvatar
(
vo
.
getAvatar
());
}
if
(!
flag
&&
StringUtils
.
isNotBlank
(
vo
.
getNickname
()))
{
appUser
.
set
WxN
ame
(
vo
.
getNickname
());
appUser
.
set
Nickn
ame
(
vo
.
getNickname
());
}
if
(!
flag
&&
StringUtils
.
isNotBlank
(
vo
.
getSex
()))
{
appUser
.
setGender
(
vo
.
getSex
());
...
...
@@ -132,7 +132,7 @@ public class WxUserService {
Optional
<
WxUser
>
optionalWxUser
=
wxUserList
.
stream
().
max
(
Comparator
.
comparing
(
WxUser:
:
getLastLoginTime
));
optionalWxUser
.
ifPresent
(
u
->
{
user
.
setUsername
(
u
.
getUsername
());
user
.
set
Name
(
u
.
getN
ame
());
user
.
set
Realname
(
u
.
getRealn
ame
());
user
.
setIdCard
(
u
.
getIdCard
());
});
}
...
...
@@ -149,8 +149,8 @@ public class WxUserService {
if
(
StringUtils
.
isBlank
(
wxUser
.
getAvatar
()))
{
wxUser
.
setAvatar
(
user
.
getAvatar
());
}
if
(
StringUtils
.
isBlank
(
wxUser
.
get
WxN
ame
()))
{
wxUser
.
set
WxName
(
user
.
getWxN
ame
());
if
(
StringUtils
.
isBlank
(
wxUser
.
get
Nickn
ame
()))
{
wxUser
.
set
Nickname
(
user
.
getNickn
ame
());
}
wxUser
.
setUnionId
(
user
.
getUnionId
());
wxUser
.
setGender
(
user
.
getGender
());
...
...
@@ -167,7 +167,7 @@ public class WxUserService {
.
userId
(
wxUser
.
getId
())
.
phone
(
wxUser
.
getPhone
())
.
account
(
wxUser
.
getUsername
())
.
nickname
(
StringUtils
.
isBlank
(
wxUser
.
get
Name
())
?
wxUser
.
getWxName
()
:
wxUser
.
getN
ame
())
.
nickname
(
StringUtils
.
isBlank
(
wxUser
.
get
Realname
())
?
wxUser
.
getNickname
()
:
wxUser
.
getRealn
ame
())
.
build
();
String
token
=
ApiTokenUtils
.
createToken
(
tokenVo
,
UserCacheKeys
.
APP_TOKEN_EXPIRE_MINUTES
);
...
...
@@ -201,7 +201,7 @@ public class WxUserService {
if
(
StringUtils
.
isNotBlank
(
vo
.
getPhone
())
&&
!
vo
.
getPhone
().
contains
(
"*"
))
{
wxUser
.
setPhone
(
vo
.
getPhone
());
}
wxUser
.
set
WxName
(
vo
.
getWxN
ame
());
wxUser
.
set
Nickname
(
vo
.
getNickn
ame
());
wxUser
.
setGender
(
vo
.
getGender
());
wxUser
.
setAge
(
vo
.
getAge
());
wxUser
.
setAddress
(
vo
.
getAddress
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment