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
4d173fee
Commit
4d173fee
authored
Sep 18, 2021
by
张宏至
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'event0827' into 'master'
add:addlog See merge request
!7
parents
54feff24
83c340d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
AppController.java
...antgroup/xyqb/controller/internal/user/AppController.java
+1
-2
UserServiceImpl.java
...cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
+1
-2
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java
View file @
4d173fee
...
@@ -236,13 +236,12 @@ public class AppController implements IBaseController {
...
@@ -236,13 +236,12 @@ public class AppController implements IBaseController {
try
{
try
{
String
scDeviceId
=
request
.
getHeader
(
"scDeviceId"
);
String
scDeviceId
=
request
.
getHeader
(
"scDeviceId"
);
log
.
info
(
"---------------scDeviceId{}"
,
scDeviceId
);
if
(!
StringUtils
.
isEmpty
(
scDeviceId
)){
if
(!
StringUtils
.
isEmpty
(
scDeviceId
)){
iSensorsAnalytics
.
trackSignUp
(
user
.
getUuid
(),
scDeviceId
);
iSensorsAnalytics
.
trackSignUp
(
user
.
getUuid
(),
scDeviceId
);
}
}
String
terminal
=
request
.
getHeader
(
"terminal"
);
String
terminal
=
request
.
getHeader
(
"terminal"
);
String
channel
=
request
.
getHeader
(
"channel"
);
String
channel
=
request
.
getHeader
(
"channel"
);
log
.
info
(
"--------
-------terminal{},channel{}"
,
terminal
,
channel
);
log
.
info
(
"--------
手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}"
,
phoneNo
,
scDeviceId
,
terminal
,
channel
,
isRegister
);
if
(!
StringUtils
.
isEmpty
(
terminal
)&&
"APP"
.
equals
(
terminal
)||!
StringUtils
.
isEmpty
(
channel
)&&(
"214"
.
equals
(
channel
)||
"217"
.
equals
(
channel
))){
if
(!
StringUtils
.
isEmpty
(
terminal
)&&
"APP"
.
equals
(
terminal
)||!
StringUtils
.
isEmpty
(
channel
)&&(
"214"
.
equals
(
channel
)||
"217"
.
equals
(
channel
))){
if
(
isRegister
){
if
(
isRegister
){
EventRecord
userRecord
=
EventRecord
.
builder
().
setDistinctId
(
user
.
getUuid
()).
isLoginId
(
Boolean
.
TRUE
)
EventRecord
userRecord
=
EventRecord
.
builder
().
setDistinctId
(
user
.
getUuid
()).
isLoginId
(
Boolean
.
TRUE
)
...
...
src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
View file @
4d173fee
...
@@ -357,13 +357,12 @@ public class UserServiceImpl implements IUserService, IBaseController {
...
@@ -357,13 +357,12 @@ public class UserServiceImpl implements IUserService, IBaseController {
}
}
try
{
try
{
String
scDeviceId
=
request
.
getHeader
(
"scDeviceId"
);
String
scDeviceId
=
request
.
getHeader
(
"scDeviceId"
);
log
.
info
(
"---------------scDeviceId{}"
,
scDeviceId
);
if
(!
StringUtils
.
isEmpty
(
scDeviceId
)){
if
(!
StringUtils
.
isEmpty
(
scDeviceId
)){
iSensorsAnalytics
.
trackSignUp
(
user
.
getUuid
(),
scDeviceId
);
iSensorsAnalytics
.
trackSignUp
(
user
.
getUuid
(),
scDeviceId
);
}
}
String
terminal
=
request
.
getHeader
(
"terminal"
);
String
terminal
=
request
.
getHeader
(
"terminal"
);
String
channel
=
request
.
getHeader
(
"channel"
);
String
channel
=
request
.
getHeader
(
"channel"
);
log
.
info
(
"--------
-------terminal{},channel{}"
,
terminal
,
channel
);
log
.
info
(
"--------
手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}"
,
phoneNo
,
scDeviceId
,
terminal
,
channel
,
register
);
if
(!
StringUtils
.
isEmpty
(
terminal
)&&
"APP"
.
equals
(
terminal
)||!
StringUtils
.
isEmpty
(
channel
)&&(
"214"
.
equals
(
channel
)||
"217"
.
equals
(
channel
))){
if
(!
StringUtils
.
isEmpty
(
terminal
)&&
"APP"
.
equals
(
terminal
)||!
StringUtils
.
isEmpty
(
channel
)&&(
"214"
.
equals
(
channel
)||
"217"
.
equals
(
channel
))){
if
(
register
){
if
(
register
){
EventRecord
userRecord
=
EventRecord
.
builder
().
setDistinctId
(
user
.
getUuid
()).
isLoginId
(
Boolean
.
TRUE
)
EventRecord
userRecord
=
EventRecord
.
builder
().
setDistinctId
(
user
.
getUuid
()).
isLoginId
(
Boolean
.
TRUE
)
...
...
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