Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
313559a9
Commit
313559a9
authored
Oct 08, 2023
by
muhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 注释
parent
8f975e21
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
58 additions
and
9 deletions
+58
-9
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
...pi/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
+6
-0
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
...pi/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
+12
-4
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/AlipayLoginManager.java
.../main/java/com/wwdz/ch/wx/manager/AlipayLoginManager.java
+6
-0
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/TikTokLoginManager.java
.../main/java/com/wwdz/ch/wx/manager/TikTokLoginManager.java
+2
-2
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/WxLoginManager.java
.../src/main/java/com/wwdz/ch/wx/manager/WxLoginManager.java
+32
-2
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java
...api/src/main/java/com/wwdz/ch/wx/service/UserService.java
+0
-1
No files found.
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @
313559a9
...
@@ -790,6 +790,7 @@ public class ItemServiceImpl implements ItemService {
...
@@ -790,6 +790,7 @@ public class ItemServiceImpl implements ItemService {
public
Result
getAcode
(
String
page
,
String
scene
,
Integer
loginType
,
HttpServletRequest
request
)
{
public
Result
getAcode
(
String
page
,
String
scene
,
Integer
loginType
,
HttpServletRequest
request
)
{
try
{
try
{
String
url
=
""
;
String
url
=
""
;
// 环境是微信小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
// 判断是否存储过该请求路径的微信小程序码图片
// 判断是否存储过该请求路径的微信小程序码图片
String
keyName
=
CommConsts
.
UPLOAD_PRE_WXACODE_DIRECTORY
+
page
+
"/"
+
scene
+
"."
+
MediaTypeEnum
.
IMAGE_JPG
.
getExt
();
String
keyName
=
CommConsts
.
UPLOAD_PRE_WXACODE_DIRECTORY
+
page
+
"/"
+
scene
+
"."
+
MediaTypeEnum
.
IMAGE_JPG
.
getExt
();
...
@@ -805,12 +806,14 @@ public class ItemServiceImpl implements ItemService {
...
@@ -805,12 +806,14 @@ public class ItemServiceImpl implements ItemService {
}
}
url
=
qiniuStorage
.
generateUrl
(
keyName
);
url
=
qiniuStorage
.
generateUrl
(
keyName
);
}
}
// 环境是支付宝小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
url
=
alipayLoginManager
.
getAcode
(
page
,
scene
);
url
=
alipayLoginManager
.
getAcode
(
page
,
scene
);
if
(
StringUtils
.
isBlank
(
url
))
{
if
(
StringUtils
.
isBlank
(
url
))
{
return
Result
.
failed
(
"获取支付宝小程序码失败"
);
return
Result
.
failed
(
"获取支付宝小程序码失败"
);
}
}
}
}
// 环境是抖音小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
String
clientToken
=
tikTokLoginManager
.
getClientToken
();
String
clientToken
=
tikTokLoginManager
.
getClientToken
();
if
(
StringUtils
.
isBlank
(
clientToken
))
{
if
(
StringUtils
.
isBlank
(
clientToken
))
{
...
@@ -836,18 +839,21 @@ public class ItemServiceImpl implements ItemService {
...
@@ -836,18 +839,21 @@ public class ItemServiceImpl implements ItemService {
public
Result
getLink
(
String
pageUrl
,
Integer
loginType
,
Integer
shareType
,
HttpServletRequest
request
)
{
public
Result
getLink
(
String
pageUrl
,
Integer
loginType
,
Integer
shareType
,
HttpServletRequest
request
)
{
try
{
try
{
String
link
=
""
;
String
link
=
""
;
// 环境是微信小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
link
=
wxLoginManager
.
getLink
(
pageUrl
);
link
=
wxLoginManager
.
getLink
(
pageUrl
);
if
(
StringUtils
.
isBlank
(
link
))
{
if
(
StringUtils
.
isBlank
(
link
))
{
return
Result
.
failed
(
"获取微信小程序链接失败"
);
return
Result
.
failed
(
"获取微信小程序链接失败"
);
}
}
}
}
// 环境是支付宝小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
link
=
alipayLoginManager
.
getLink
(
pageUrl
);
link
=
alipayLoginManager
.
getLink
(
pageUrl
);
if
(
StringUtils
.
isBlank
(
link
))
{
if
(
StringUtils
.
isBlank
(
link
))
{
return
Result
.
failed
(
"获取支付宝小程序链接失败"
);
return
Result
.
failed
(
"获取支付宝小程序链接失败"
);
}
}
}
}
// 环境是抖音小程序
if
(
loginType
.
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
if
(
loginType
.
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
String
clientToken
=
tikTokLoginManager
.
getClientToken
();
String
clientToken
=
tikTokLoginManager
.
getClientToken
();
if
(
StringUtils
.
isBlank
(
clientToken
))
{
if
(
StringUtils
.
isBlank
(
clientToken
))
{
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
View file @
313559a9
...
@@ -133,8 +133,9 @@ public class UserServiceImpl implements UserService {
...
@@ -133,8 +133,9 @@ public class UserServiceImpl implements UserService {
if
(!
StringUtils
.
equals
(
dto
.
getSmsCode
(),
object
.
toString
()))
{
if
(!
StringUtils
.
equals
(
dto
.
getSmsCode
(),
object
.
toString
()))
{
return
Result
.
failed
(
"验证码不正确"
);
return
Result
.
failed
(
"验证码不正确"
);
}
}
//
获取登录结果
//
进行登录
Map
<
String
,
Object
>
result
=
getLoginResult
(
dto
,
request
);
Map
<
String
,
Object
>
result
=
getLoginResult
(
dto
,
request
);
// 判断开关状态
Switch
switchh
=
switchService
.
findOnly
();
Switch
switchh
=
switchService
.
findOnly
();
boolean
isOpen
=
Objects
.
nonNull
(
switchh
)
&&
switchh
.
getState
()
==
1
;
boolean
isOpen
=
Objects
.
nonNull
(
switchh
)
&&
switchh
.
getState
()
==
1
;
result
.
put
(
"isInvited"
,
inviteRecordService
.
isExisted
(
dto
.
getMobile
()).
getData
());
result
.
put
(
"isInvited"
,
inviteRecordService
.
isExisted
(
dto
.
getMobile
()).
getData
());
...
@@ -157,7 +158,9 @@ public class UserServiceImpl implements UserService {
...
@@ -157,7 +158,9 @@ public class UserServiceImpl implements UserService {
public
Result
login
(
UserRequestDto
dto
,
HttpServletRequest
request
)
{
public
Result
login
(
UserRequestDto
dto
,
HttpServletRequest
request
)
{
try
{
try
{
String
mobile
=
""
;
String
mobile
=
""
;
// 根据小程序来源不同调用不同的处理逻辑获取手机号
try
{
try
{
// 来源是微信
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
WECHAT
.
getCode
()))
{
mobile
=
wxLoginManager
.
getPhone
(
dto
);
mobile
=
wxLoginManager
.
getPhone
(
dto
);
if
(
StringUtils
.
equals
(
"false"
,
mobile
))
{
if
(
StringUtils
.
equals
(
"false"
,
mobile
))
{
...
@@ -174,6 +177,7 @@ public class UserServiceImpl implements UserService {
...
@@ -174,6 +177,7 @@ public class UserServiceImpl implements UserService {
}
}
dto
.
setWxOpenId
(
wxLoginManager
.
getWxOpenId
(
dto
.
getLoginCode
()));
dto
.
setWxOpenId
(
wxLoginManager
.
getWxOpenId
(
dto
.
getLoginCode
()));
}
}
// 来源是支付宝
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
ALIPAY
.
getCode
()))
{
mobile
=
alipayLoginManager
.
getPhone
(
dto
.
getEncryptedData
());
mobile
=
alipayLoginManager
.
getPhone
(
dto
.
getEncryptedData
());
if
(
StringUtils
.
equals
(
"false"
,
mobile
))
{
if
(
StringUtils
.
equals
(
"false"
,
mobile
))
{
...
@@ -181,6 +185,7 @@ public class UserServiceImpl implements UserService {
...
@@ -181,6 +185,7 @@ public class UserServiceImpl implements UserService {
}
}
dto
.
setAlipayUserId
(
alipayLoginManager
.
getAlipayUserId
(
dto
.
getLoginCode
()));
dto
.
setAlipayUserId
(
alipayLoginManager
.
getAlipayUserId
(
dto
.
getLoginCode
()));
}
}
// 来源是抖音
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
if
(
dto
.
getLoginType
().
equals
(
LoginTypeEnum
.
TIKTOK
.
getCode
()))
{
String
sessionKey
=
tikTokLoginManager
.
getSessionKey
(
dto
.
getLoginCode
());
String
sessionKey
=
tikTokLoginManager
.
getSessionKey
(
dto
.
getLoginCode
());
if
(
StringUtils
.
isBlank
(
sessionKey
))
{
if
(
StringUtils
.
isBlank
(
sessionKey
))
{
...
@@ -195,9 +200,10 @@ public class UserServiceImpl implements UserService {
...
@@ -195,9 +200,10 @@ public class UserServiceImpl implements UserService {
logger
.
error
(
"获取用户手机号异常"
,
e
);
logger
.
error
(
"获取用户手机号异常"
,
e
);
return
Result
.
failed
(
"获取用户手机号失败"
);
return
Result
.
failed
(
"获取用户手机号失败"
);
}
}
// 获取登录结果
dto
.
setMobile
(
mobile
);
dto
.
setMobile
(
mobile
);
// 进行登录
Map
<
String
,
Object
>
result
=
getLoginResult
(
dto
,
request
);
Map
<
String
,
Object
>
result
=
getLoginResult
(
dto
,
request
);
// 判断开关状态
Switch
switchh
=
switchService
.
findOnly
();
Switch
switchh
=
switchService
.
findOnly
();
boolean
isOpen
=
Objects
.
nonNull
(
switchh
)
&&
switchh
.
getState
()
==
1
;
boolean
isOpen
=
Objects
.
nonNull
(
switchh
)
&&
switchh
.
getState
()
==
1
;
result
.
put
(
"isInvited"
,
inviteRecordService
.
isExisted
(
mobile
).
getData
());
result
.
put
(
"isInvited"
,
inviteRecordService
.
isExisted
(
mobile
).
getData
());
...
@@ -446,6 +452,7 @@ public class UserServiceImpl implements UserService {
...
@@ -446,6 +452,7 @@ public class UserServiceImpl implements UserService {
Date
now
=
new
Date
();
Date
now
=
new
Date
();
User
user
=
userDao
.
queryByMobile
(
dto
.
getMobile
());
User
user
=
userDao
.
queryByMobile
(
dto
.
getMobile
());
// 判断该手机号是否已经在系统内部注册过,没有则新增
if
(
Objects
.
isNull
(
user
))
{
if
(
Objects
.
isNull
(
user
))
{
user
=
new
User
();
user
=
new
User
();
user
.
setUsername
(
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
));
user
.
setUsername
(
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
));
...
@@ -477,6 +484,7 @@ public class UserServiceImpl implements UserService {
...
@@ -477,6 +484,7 @@ public class UserServiceImpl implements UserService {
user
.
setShareUserId
(
0L
);
user
.
setShareUserId
(
0L
);
userDao
.
insert
(
user
);
userDao
.
insert
(
user
);
}
else
{
}
else
{
// 注册过的用户修改最后登录的时间以及绑定微信openid和支付宝user_id
if
(
StringUtils
.
isNotBlank
(
dto
.
getWxOpenId
()))
{
if
(
StringUtils
.
isNotBlank
(
dto
.
getWxOpenId
()))
{
user
.
setWeixinOpenid
(
dto
.
getWxOpenId
());
user
.
setWeixinOpenid
(
dto
.
getWxOpenId
());
}
}
...
@@ -512,9 +520,9 @@ public class UserServiceImpl implements UserService {
...
@@ -512,9 +520,9 @@ public class UserServiceImpl implements UserService {
String
registerDate
=
simpleDateFormat
.
format
(
Objects
.
isNull
(
user
.
getAddTime
())
?
new
Date
()
:
user
.
getAddTime
());
String
registerDate
=
simpleDateFormat
.
format
(
Objects
.
isNull
(
user
.
getAddTime
())
?
new
Date
()
:
user
.
getAddTime
());
userInfo
.
setRegisterDate
(
registerDate
);
userInfo
.
setRegisterDate
(
registerDate
);
userInfo
.
setStatus
(
user
.
getStatus
());
userInfo
.
setStatus
(
user
.
getStatus
());
// 用户层级
// 用户层级
(不知道有啥用,保留)
userInfo
.
setUserLevel
(
user
.
getUserLevel
());
userInfo
.
setUserLevel
(
user
.
getUserLevel
());
// 用户层级描述
// 用户层级描述
(不知道有啥用,保留)
userInfo
.
setUserLevelDesc
(
UserTypeEnum
.
getInstance
(
user
.
getUserLevel
()).
getDesc
());
userInfo
.
setUserLevelDesc
(
UserTypeEnum
.
getInstance
(
user
.
getUserLevel
()).
getDesc
());
result
.
put
(
"userInfo"
,
userInfo
);
result
.
put
(
"userInfo"
,
userInfo
);
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/AlipayLoginManager.java
View file @
313559a9
...
@@ -93,6 +93,12 @@ public class AlipayLoginManager {
...
@@ -93,6 +93,12 @@ public class AlipayLoginManager {
return
JsonUtils
.
getValueByPath
(
plainData
,
"mobile"
);
return
JsonUtils
.
getValueByPath
(
plainData
,
"mobile"
);
}
}
/**
* 获取支付宝user_id
*
* @param loginCode
* @return
*/
public
String
getAlipayUserId
(
String
loginCode
)
{
public
String
getAlipayUserId
(
String
loginCode
)
{
logger
.
info
(
"开始解密获取支付宝小程序登录用户的access_token"
);
logger
.
info
(
"开始解密获取支付宝小程序登录用户的access_token"
);
AlipayConfig
alipayConfig
=
new
AlipayConfig
();
AlipayConfig
alipayConfig
=
new
AlipayConfig
();
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/TikTokLoginManager.java
View file @
313559a9
...
@@ -28,9 +28,9 @@ public class TikTokLoginManager {
...
@@ -28,9 +28,9 @@ public class TikTokLoginManager {
@Autowired
@Autowired
private
ApplicationContext
applicationContext
;
private
ApplicationContext
applicationContext
;
// appid
// appid
(需要替换)
private
static
final
String
appid
=
"ttc1fcb7415ec18f6f01"
;
private
static
final
String
appid
=
"ttc1fcb7415ec18f6f01"
;
// appSecret
// appSecret
(需要替换)
private
static
final
String
appSecret
=
"1a248c43d69c4bcba48779efac2c6f3ade573ec7"
;
private
static
final
String
appSecret
=
"1a248c43d69c4bcba48779efac2c6f3ade573ec7"
;
// 抖音小程序获取session_key的api正式环境
// 抖音小程序获取session_key的api正式环境
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/WxLoginManager.java
View file @
313559a9
...
@@ -24,10 +24,10 @@ import java.util.Map;
...
@@ -24,10 +24,10 @@ import java.util.Map;
public
class
WxLoginManager
{
public
class
WxLoginManager
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
WxLoginManager
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
WxLoginManager
.
class
);
// 微信小程序appid
// 微信小程序appid
(需要替换)
private
static
final
String
appid
=
"wx5b4409448bf2c72b"
;
private
static
final
String
appid
=
"wx5b4409448bf2c72b"
;
// private static final String appid = "wxb2bc9d1be2d6345c";
// private static final String appid = "wxb2bc9d1be2d6345c";
// 微信小程序secret
// 微信小程序secret
(需要替换)
private
static
final
String
secret
=
"6fee0d7b2197845fed0a3fe8f5a9bd66"
;
private
static
final
String
secret
=
"6fee0d7b2197845fed0a3fe8f5a9bd66"
;
// private static final String secret = "fade0a145eea51cfc89a9e8808f28f04";
// private static final String secret = "fade0a145eea51cfc89a9e8808f28f04";
// 微信小程序获取access_token地址
// 微信小程序获取access_token地址
...
@@ -42,6 +42,12 @@ public class WxLoginManager {
...
@@ -42,6 +42,12 @@ public class WxLoginManager {
@Autowired
@Autowired
private
WxMaService
wxMaService
;
private
WxMaService
wxMaService
;
/**
* 获取微信openid
*
* @param loginCode
* @return
*/
public
String
getWxOpenId
(
String
loginCode
)
{
public
String
getWxOpenId
(
String
loginCode
)
{
logger
.
info
(
"开始获取openId-----------------------"
);
logger
.
info
(
"开始获取openId-----------------------"
);
String
openId
=
""
;
String
openId
=
""
;
...
@@ -55,6 +61,12 @@ public class WxLoginManager {
...
@@ -55,6 +61,12 @@ public class WxLoginManager {
return
openId
;
return
openId
;
}
}
/**
* 获取手机号
*
* @param dto
* @return
*/
public
String
getPhone
(
UserRequestDto
dto
)
{
public
String
getPhone
(
UserRequestDto
dto
)
{
String
phone
=
""
;
String
phone
=
""
;
if
(
dto
.
getType
()
==
1
)
{
if
(
dto
.
getType
()
==
1
)
{
...
@@ -105,6 +117,11 @@ public class WxLoginManager {
...
@@ -105,6 +117,11 @@ public class WxLoginManager {
return
phone
;
return
phone
;
}
}
/**
* 获取调用凭证access_token
*
* @return
*/
public
String
getAccessToken
()
{
public
String
getAccessToken
()
{
logger
.
info
(
"开始获取access_token----------------"
);
logger
.
info
(
"开始获取access_token----------------"
);
try
{
try
{
...
@@ -123,6 +140,13 @@ public class WxLoginManager {
...
@@ -123,6 +140,13 @@ public class WxLoginManager {
}
}
}
}
/**
* 获取小程序码二进制流
*
* @param page
* @param scene
* @return
*/
public
InputStream
getWxacodeStream
(
String
page
,
String
scene
)
{
public
InputStream
getWxacodeStream
(
String
page
,
String
scene
)
{
try
{
try
{
String
accessToken
=
getAccessToken
();
String
accessToken
=
getAccessToken
();
...
@@ -139,6 +163,12 @@ public class WxLoginManager {
...
@@ -139,6 +163,12 @@ public class WxLoginManager {
}
}
}
}
/**
* 获取小程序短链接
*
* @param pageUrl
* @return
*/
public
String
getLink
(
String
pageUrl
)
{
public
String
getLink
(
String
pageUrl
)
{
try
{
try
{
String
accessToken
=
getAccessToken
();
String
accessToken
=
getAccessToken
();
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java
View file @
313559a9
...
@@ -75,7 +75,6 @@ public interface UserService {
...
@@ -75,7 +75,6 @@ public interface UserService {
/**
/**
* 查询用户信息
* 查询用户信息
*
*
* @param dto
* @param request
* @param request
* @return
* @return
*/
*/
...
...
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