Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
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
head_group
xyqb-user2
Commits
25d2f315
Commit
25d2f315
authored
Jul 03, 2017
by
Java—红包—徐 然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加判断
parent
f9acb928
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
AppController.java
...antgroup/xyqb/controller/external/user/AppController.java
+3
-3
UserController.java
...ntgroup/xyqb/controller/internal/user/UserController.java
+2
-2
UserStatistics.java
src/main/java/cn/quantgroup/xyqb/model/UserStatistics.java
+3
-1
UserServiceImpl.java
...cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
+1
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java
View file @
25d2f315
...
@@ -108,7 +108,7 @@ public class AppController implements IBaseController {
...
@@ -108,7 +108,7 @@ public class AppController implements IBaseController {
bean
.
setPhoneNo
(
phoneNo
);
bean
.
setPhoneNo
(
phoneNo
);
LOGGER
.
info
(
"第三方用户登录成功, loginFrom:{}, phoneNo:{},appChannel:{}"
,
registerFrom
,
phoneNo
,
appChannel
);
LOGGER
.
info
(
"第三方用户登录成功, loginFrom:{}, phoneNo:{},appChannel:{}"
,
registerFrom
,
phoneNo
,
appChannel
);
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
return
new
JsonResult
(
bean
);
return
new
JsonResult
(
bean
);
}
}
...
@@ -163,7 +163,7 @@ public class AppController implements IBaseController {
...
@@ -163,7 +163,7 @@ public class AppController implements IBaseController {
LOGGER
.
info
(
"第三方用户获取信息登录成功, loginFrom:{}, phoneNo:{},appChannel:{}"
,
registerFrom
,
phoneNo
,
appChannel
);
LOGGER
.
info
(
"第三方用户获取信息登录成功, loginFrom:{}, phoneNo:{},appChannel:{}"
,
registerFrom
,
phoneNo
,
appChannel
);
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
return
JsonResult
.
buildSuccessResult
(
""
,
loginInfo
);
return
JsonResult
.
buildSuccessResult
(
""
,
loginInfo
);
...
@@ -250,7 +250,7 @@ public class AppController implements IBaseController {
...
@@ -250,7 +250,7 @@ public class AppController implements IBaseController {
}
}
}
}
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
4
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
return
user
;
return
user
;
}
}
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
View file @
25d2f315
...
@@ -119,7 +119,7 @@ public class UserController implements IBaseController {
...
@@ -119,7 +119,7 @@ public class UserController implements IBaseController {
}
}
}
}
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
3
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
3
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
return
new
JsonResult
(
sessionService
.
createSession
(
channelId
,
createdFrom
,
appChannel
,
user
,
merchant
));
return
new
JsonResult
(
sessionService
.
createSession
(
channelId
,
createdFrom
,
appChannel
,
user
,
merchant
));
// return createSession(channelId, createdFrom, appChannel, user);
// return createSession(channelId, createdFrom, appChannel, user);
...
@@ -452,7 +452,7 @@ public class UserController implements IBaseController {
...
@@ -452,7 +452,7 @@ public class UserController implements IBaseController {
//用户信息存在,更新session中的最后访问时间,重新写入缓存.
//用户信息存在,更新session中的最后访问时间,重新写入缓存.
if
(
null
!=
user
||
!
user
.
getEnable
())
{
if
(
null
!=
user
||
!
user
.
getEnable
())
{
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
dimension
,
1
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
dimension
,
1
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
return
new
JsonResult
(
sessionService
.
createSession
(
channelId
,
createdFrom
,
appChannel
,
user
,
merchant
));
return
new
JsonResult
(
sessionService
.
createSession
(
channelId
,
createdFrom
,
appChannel
,
user
,
merchant
));
}
else
{
}
else
{
...
...
src/main/java/cn/quantgroup/xyqb/model/UserStatistics.java
View file @
25d2f315
...
@@ -13,15 +13,17 @@ public class UserStatistics {
...
@@ -13,15 +13,17 @@ public class UserStatistics {
private
Long
registerFrom
;
private
Long
registerFrom
;
private
String
dimension
;
private
String
dimension
;
private
int
action
;
//登录0,注册1,快捷登录2,免密登录3
private
int
action
;
//登录0,注册1,快捷登录2,免密登录3
private
Long
channel
;
public
UserStatistics
()
{
public
UserStatistics
()
{
}
}
public
UserStatistics
(
User
user
,
String
dimension
,
int
action
)
{
public
UserStatistics
(
User
user
,
String
dimension
,
int
action
,
Long
channel
)
{
this
.
uuid
=
user
.
getUuid
();
this
.
uuid
=
user
.
getUuid
();
this
.
registerFrom
=
user
.
getRegisteredFrom
();
this
.
registerFrom
=
user
.
getRegisteredFrom
();
this
.
action
=
action
;
this
.
action
=
action
;
this
.
dimension
=
dimension
;
this
.
dimension
=
dimension
;
this
.
channel
=
channel
;
}
}
}
}
src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
View file @
25d2f315
...
@@ -185,7 +185,7 @@ public class UserServiceImpl implements IUserService {
...
@@ -185,7 +185,7 @@ public class UserServiceImpl implements IUserService {
if
(
registerSuccess
){
if
(
registerSuccess
){
//增加登陆统计发送
//增加登陆统计发送
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
3
);
UserStatistics
statistics
=
new
UserStatistics
(
user
,
null
,
3
,
channelId
);
MqUtils
.
sendLoanVest
(
statistics
);
MqUtils
.
sendLoanVest
(
statistics
);
}
}
...
...
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