Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
6ebd6301
提交
6ebd6301
编写于
5月 28, 2020
作者:
Peijun.zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add log
上级
8ea73142
流水线
#25990
已失败 于阶段
in 0 second
变更
4
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
17 行增加
和
1 行删除
+17
-1
AccountController.java
.../account/account/server/controller/AccountController.java
+3
-0
AutoCodeController.java
...account/account/server/controller/AutoCodeController.java
+1
-1
LoginController.java
...ud/account/account/server/controller/LoginController.java
+7
-0
RegisterController.java
...account/account/server/controller/RegisterController.java
+6
-0
未找到文件。
server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java
浏览文件 @
6ebd6301
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.pica.cloud.account.account.server.constants.Constants
;
import
com.pica.cloud.account.account.server.entity.Account
;
import
com.pica.cloud.account.account.server.entity.EncryptEntity
;
...
...
@@ -110,6 +111,7 @@ public class AccountController extends AccountBaseController {
@ApiOperation
(
"微信登录"
)
@PostMapping
(
"/login/wechat"
)
public
PicaResponse
<
String
>
wechatLogin
(
@RequestBody
AccountReq
req
)
{
logger
.
info
(
"wechatLogin:{}"
,
JSONObject
.
toJSONString
(
req
));
//接入新旭事务一致性
String
batchNo
=
IntactUtils
.
getUUID
();
intactUtil
.
sendIntact
(
batchNo
,
"wechatLogin"
,
com
.
pica
.
cloud
.
foundation
.
completeness
.
contract
.
constants
.
CommonConstants
.
INTACT_CONTENT_LOG_STATUS_1
,
"req:"
+
JSON
.
toJSONString
(
req
));
...
...
@@ -136,6 +138,7 @@ public class AccountController extends AccountBaseController {
@PostMapping
(
"/login"
)
public
PicaResponse
<
String
>
login
(
@RequestBody
AccountReq
req
)
{
this
.
checkMobilePhone
(
req
.
getMobilePhone
());
logger
.
info
(
"login:{}"
,
JSONObject
.
toJSONString
(
req
));
//接入新旭事务一致性
String
batchNo
=
IntactUtils
.
getUUID
();
intactUtil
.
sendIntact
(
batchNo
,
"login"
,
com
.
pica
.
cloud
.
foundation
.
completeness
.
contract
.
constants
.
CommonConstants
.
INTACT_CONTENT_LOG_STATUS_1
,
"req:"
+
JSON
.
toJSONString
(
req
));
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java
浏览文件 @
6ebd6301
...
...
@@ -129,11 +129,11 @@ public class AutoCodeController extends AccountBaseController {
entity
.
setKey
(
authCodeReq
.
getKey
());
entity
.
setContent
(
authCodeReq
.
getContent
());
}
//added by joy end
BaseRequest
request
=
CryptoUtil
.
decrypt
(
entity
,
BaseRequest
.
class
);
request
.
setSourceType
(
super
.
getSourceType
());
logger
.
info
(
"authCode/getAuthCode:{}"
,
JSONObject
.
toJSONString
(
request
));
AccountUtils
.
checkMobilePhone
(
request
.
getMobile
());
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
浏览文件 @
6ebd6301
...
...
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
springfox.documentation.spring.web.json.Json
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -139,6 +140,7 @@ public class LoginController extends AccountBaseController {
}
//added by joy end
BaseRequest
request
=
CryptoUtil
.
decrypt
(
entity
,
BaseRequest
.
class
);
logger
.
info
(
"login-register:{}"
,
JSONObject
.
toJSONString
(
request
));
request
.
setProductType
(
super
.
getProductType
());
Integer
sourceType
=
super
.
getSourceType
();
request
.
setSourceType
(
sourceType
==
null
?
0
:
sourceType
);
...
...
@@ -173,6 +175,7 @@ public class LoginController extends AccountBaseController {
request
.
setSourceType
(
super
.
getSourceType
());
request
.
setLoginIp
(
super
.
getIpAddr
());
request
.
setUserTokenTourist
(
super
.
getUserTokenTourist
());
logger
.
info
(
"loginByWeChatStep:{}"
,
JSONObject
.
toJSONString
(
request
));
LoginResult
result
=
loginService
.
loginByWeChatStep
(
request
);
return
PicaResponse
.
toResponse
(
result
);
}
...
...
@@ -188,6 +191,7 @@ public class LoginController extends AccountBaseController {
@PostMapping
(
"/login/wechat/bind"
)
public
PicaResponse
bindWeChat
(
@RequestBody
EncryptEntity
entity
)
throws
Exception
{
BaseRequest
request
=
CryptoUtil
.
decrypt
(
entity
,
BaseRequest
.
class
);
logger
.
info
(
"bindWeChat:{}"
,
JSONObject
.
toJSONString
(
request
));
request
.
setUserTokenTourist
(
super
.
getUserTokenTourist
());
Long
result
=
cacheClient
.
setnx
(
cache_prifix
+
request
.
getWeChatCode
(),
request
.
getWeChatCode
());
if
(
result
==
1
)
{
...
...
@@ -292,6 +296,7 @@ public class LoginController extends AccountBaseController {
BaseRequest
request
=
CryptoUtil
.
decrypt
(
entity
,
BaseRequest
.
class
);
request
.
setSourceType
(
super
.
getSourceType
());
logger
.
info
(
"unifiedVerification:{}"
,
JSONObject
.
toJSONString
(
request
));
loginService
.
preLoginValidate
(
request
);
return
PicaResponse
.
toResponse
();
}
...
...
@@ -304,6 +309,7 @@ public class LoginController extends AccountBaseController {
request
.
setSourceType
(
super
.
getSourceType
());
request
.
setLoginIp
(
super
.
getIpAddr
());
request
.
setUserTokenTourist
(
super
.
getUserTokenTourist
());
logger
.
info
(
"appleAuth:{}"
,
JSONObject
.
toJSONString
(
request
));
return
PicaResponse
.
toResponse
(
loginService
.
loginByApple
(
request
));
}
...
...
@@ -315,6 +321,7 @@ public class LoginController extends AccountBaseController {
request
.
setSourceType
(
super
.
getSourceType
());
request
.
setLoginIp
(
super
.
getIpAddr
());
request
.
setUserTokenTourist
(
super
.
getUserTokenTourist
());
logger
.
info
(
"appleAuthBind:{}"
,
JSONObject
.
toJSONString
(
request
));
return
PicaResponse
.
toResponse
(
loginService
.
loginByAppleStep
(
request
));
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java
浏览文件 @
6ebd6301
package
com
.
pica
.
cloud
.
account
.
account
.
server
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.pica.cloud.account.account.common.req.OCINRequest
;
import
com.pica.cloud.account.account.server.entity.EncryptEntity
;
import
com.pica.cloud.account.account.server.entity.LoginResult
;
...
...
@@ -12,6 +13,8 @@ import com.pica.cloud.foundation.entity.PicaResponse;
import
com.pica.cloud.foundation.redis.ICacheClient
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -33,10 +36,13 @@ public class RegisterController extends AccountBaseController {
@Autowired
private
ICacheClient
redisClient
;
private
Logger
logger
=
LoggerFactory
.
getLogger
(
RegisterController
.
class
);
@ApiOperation
(
"PC端,移动端注册接口"
)
@PostMapping
(
value
=
""
)
public
PicaResponse
<
LoginResult
>
register
(
@RequestBody
EncryptEntity
entity
)
throws
Exception
{
BaseRequest
request
=
CryptoUtil
.
decrypt
(
entity
,
BaseRequest
.
class
);
logger
.
info
(
"register:{}"
,
JSONObject
.
toJSONString
(
request
));
String
mobile
=
request
.
getMobile
();
//接口幂等性处理(redis中没有就进行注册逻辑,如果已经存在,就不处理)
String
authCode
=
request
.
getAuthCode
();
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录