Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fzm-joying
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lei
fzm-joying
Commits
6b565204
Commit
6b565204
authored
Mar 23, 2022
by
33
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试环境区块链改为南京的测试链,用户登录时判断是否有钱包,没有则生成新钱包
parent
7ef7a979
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
42 deletions
+53
-42
application.yml
joying-admin/src/main/resources/application.yml
+8
-8
UserServiceImpl.java
...ain/java/com/fzm/common/service/impl/UserServiceImpl.java
+37
-20
WxPayServiceImpl.java
...in/java/com/fzm/common/service/impl/WxPayServiceImpl.java
+0
-6
application.yml
joying-portal/src/main/resources/application.yml
+8
-8
No files found.
joying-admin/src/main/resources/application.yml
View file @
6b565204
...
@@ -88,14 +88,14 @@ debug:
...
@@ -88,14 +88,14 @@ debug:
chain
:
chain
:
para
:
para
:
rpc-url
:
http://1
19.8.39.159:890
1
rpc-url
:
http://1
39.9.231.117:1202
1
withhold
:
withhold
:
1417K9fd5vt4zYW86xinWiCbAkNP794aNy
withhold-key
:
a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
withhold-key
:
19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
token-manager
:
token-manager
:
1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
token-manager-key
:
4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
token-manager-key
:
5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
title
:
user.p.
FILMCHAIN
.
title
:
user.p.
mall
.
cName
:
user.evm.0x
a038a372ab27d9038328932c98454e52390b94555a69ab9559e8ab14ff2e540f
cName
:
user.evm.0x
b3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
cAddr
:
1
Nhju8CgSUmkQQwc7ECk4bFxnv48iRLNRX
cAddr
:
1
5DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
copyright
:
copyright
:
...
...
joying-common/src/main/java/com/fzm/common/service/impl/UserServiceImpl.java
View file @
6b565204
...
@@ -92,6 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
...
@@ -92,6 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
param
.
getTelephone
()
:
param
.
getTelephone
()
:
param
.
getEmail
();
param
.
getEmail
();
User
user
=
loadUserByUsername
(
username
);
User
user
=
loadUserByUsername
(
username
);
if
(
user
==
null
)
{
if
(
user
==
null
)
{
// 当前手机号或者邮箱没有注册过,走注册逻辑
// 当前手机号或者邮箱没有注册过,走注册逻辑
User
registerUser
=
new
User
();
User
registerUser
=
new
User
();
...
@@ -116,30 +117,46 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
...
@@ -116,30 +117,46 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
save
(
registerUser
);
save
(
registerUser
);
redisUtil
.
delete
(
"user::statistic"
);
redisUtil
.
delete
(
"user::statistic"
);
return
getById
(
registerUser
.
getId
());
return
getById
(
registerUser
.
getId
());
}
// 登录逻辑
if
(
StringUtils
.
isNotBlank
(
param
.
getPassword
()))
{
// 密码登录流程
if
(!
passwordEncoder
.
matches
(
param
.
getPassword
(),
user
.
getPassword
()))
{
throw
GlobalException
.
newException
(
ResultCode
.
LOGIN_ERROR
,
"密码有误"
);
}
}
else
{
}
else
{
// 登录逻辑
// 验证码登录流程
if
(
StringUtils
.
isNotBlank
(
param
.
getPassword
()))
{
if
(!
smsUtil
.
validateCode
(
getLoginCodeType
(
param
.
getCodetype
()),
username
,
param
.
getVerificationCode
(),
param
.
getCodetype
()))
{
// 密码登录流程
throw
GlobalException
.
newException
(
ResultCode
.
VALIDATE_FAILED
,
"验证码校验失败"
);
if
(!
passwordEncoder
.
matches
(
param
.
getPassword
(),
user
.
getPassword
()))
{
throw
GlobalException
.
newException
(
ResultCode
.
LOGIN_ERROR
,
"密码有误"
);
}
}
else
{
// 验证码登录流程
if
(!
smsUtil
.
validateCode
(
getLoginCodeType
(
param
.
getCodetype
()),
username
,
param
.
getVerificationCode
(),
param
.
getCodetype
()))
{
throw
GlobalException
.
newException
(
ResultCode
.
VALIDATE_FAILED
,
"验证码校验失败"
);
}
}
}
// 认证成功的用户需要返回实名认证信息
}
if
(
AuthStatus
.
SUCCESS
.
getStatus
().
equals
(
user
.
getAuthStatus
()))
{
// 个人认证
String
wallet
=
user
.
getWallet
();
if
(
AuthType
.
PERSON
.
getType
().
equals
(
user
.
getAuthType
()))
{
if
(
StringUtils
.
isBlank
(
wallet
))
{
AuthPerson
authPerson
=
authPersonService
.
getByUserId
(
user
.
getId
());
// 生成钱包
user
.
setAuthPerson
(
authPerson
);
wallet
=
paraClient
.
walletCreateAccount
(
IdUtil
.
simpleUUID
());
}
if
(
StringUtils
.
isBlank
(
wallet
))
{
//TODO 企业认证
throw
GlobalException
.
newException
(
ResultCode
.
UNAUTHORIZED
,
"登录失败,生成区块链钱包异常,请稍后再试"
);
}
user
.
setWallet
(
wallet
);
User
updateUser
=
new
User
();
updateUser
.
setId
(
user
.
getId
());
updateUser
.
setWallet
(
wallet
);
updateById
(
updateUser
);
}
// 认证成功的用户需要返回实名认证信息
if
(
AuthStatus
.
SUCCESS
.
getStatus
().
equals
(
user
.
getAuthStatus
()))
{
// 个人认证
if
(
AuthType
.
PERSON
.
getType
().
equals
(
user
.
getAuthType
()))
{
AuthPerson
authPerson
=
authPersonService
.
getByUserId
(
user
.
getId
());
user
.
setAuthPerson
(
authPerson
);
}
}
return
user
;
//TODO 企业认证
}
}
return
user
;
}
}
@Override
@Override
...
...
joying-common/src/main/java/com/fzm/common/service/impl/WxPayServiceImpl.java
View file @
6b565204
...
@@ -357,10 +357,6 @@ public class WxPayServiceImpl implements WxPayService {
...
@@ -357,10 +357,6 @@ public class WxPayServiceImpl implements WxPayService {
/**
/**
* 解密
* 解密
*
* @param resource
* @return
* @throws GeneralSecurityException
*/
*/
private
String
decrypt
(
JSONObject
resource
)
throws
GeneralSecurityException
{
private
String
decrypt
(
JSONObject
resource
)
throws
GeneralSecurityException
{
AesUtil
aesUtil
=
new
AesUtil
(
wxPayProperties
.
getApiV3Key
().
getBytes
(
StandardCharsets
.
UTF_8
));
AesUtil
aesUtil
=
new
AesUtil
(
wxPayProperties
.
getApiV3Key
().
getBytes
(
StandardCharsets
.
UTF_8
));
...
@@ -376,8 +372,6 @@ public class WxPayServiceImpl implements WxPayService {
...
@@ -376,8 +372,6 @@ public class WxPayServiceImpl implements WxPayService {
/**
/**
* 获取request中body数据
* 获取request中body数据
*
* @throws IOException
*/
*/
private
String
getRequestBodyData
(
HttpServletRequest
request
)
throws
IOException
{
private
String
getRequestBodyData
(
HttpServletRequest
request
)
throws
IOException
{
BufferedReader
bufferReader
=
new
BufferedReader
(
request
.
getReader
());
BufferedReader
bufferReader
=
new
BufferedReader
(
request
.
getReader
());
...
...
joying-portal/src/main/resources/application.yml
View file @
6b565204
...
@@ -109,14 +109,14 @@ sms:
...
@@ -109,14 +109,14 @@ sms:
chain
:
chain
:
para
:
para
:
rpc-url
:
http://1
19.8.39.159:890
1
rpc-url
:
http://1
39.9.231.117:1202
1
withhold
:
withhold
:
1417K9fd5vt4zYW86xinWiCbAkNP794aNy
withhold-key
:
a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
withhold-key
:
19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
token-manager
:
token-manager
:
1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
token-manager-key
:
4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
token-manager-key
:
5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
title
:
user.p.
FILMCHAIN
.
title
:
user.p.
mall
.
cName
:
user.evm.0x
a038a372ab27d9038328932c98454e52390b94555a69ab9559e8ab14ff2e540f
cName
:
user.evm.0x
b3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
cAddr
:
1
Nhju8CgSUmkQQwc7ECk4bFxnv48iRLNRX
cAddr
:
1
5DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
huaweiyun
:
huaweiyun
:
...
...
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