Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
方斌
51business
Commits
6563a05a
Commit
6563a05a
authored
Oct 29, 2019
by
李尚科
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
aa10a1ae
Pipeline
#15533
passed with stage
in 1 minute 3 seconds
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
response.js
app/controller/response.js
+7
-6
device_init.js
app/middleware/device_init.js
+1
-1
No files found.
app/controller/response.js
View file @
6563a05a
...
...
@@ -38,13 +38,13 @@ class ResponseController extends Controller {
const
user_sid
=
ctx
.
cookies
.
get
(
'jianbing_customer_id'
,
{
signed
:
false
});
const
auth_token
=
ctx
.
cookies
.
get
(
'auth_token'
,
{
signed
:
false
});
ctx
.
logger
.
info
(
'target_user--'
+
new
Date
().
getTime
()
+
JSON
.
stringify
({
target_old_user
:
{
auth_token
,
user_sid
}
}));
//
ctx.logger.info('target_user--' + new Date().getTime() + JSON.stringify({ target_old_user: { auth_token, user_sid } }));
const
phone_info
=
await
ctx
.
service
.
user
.
get_phone_by_user_sid
({
user_sid
:
user_sid
,
token
:
auth_token
});
//获取用户手机号码
ctx
.
logger
.
info
(
'phone_info: '
+
JSON
.
stringify
(
phone_info
));
//
ctx.logger.info('phone_info: ' + JSON.stringify(phone_info));
const
phone
=
phone_info
.
phone
;
// const phone = '15968762898';
const
app_channel_info
=
await
ctx
.
blockModel
.
AppChannel
.
one
({
where
:
{
alias
:
channel_alias
}
});
//
ctx
.
logger
.
info
(
'app_channel_info: '
+
JSON
.
stringify
(
app_channel_info
));
//
ctx.logger.info('app_channel_info: ' + JSON.stringify(app_channel_info));
const
channel_id
=
(
app_channel_info
&&
app_channel_info
.
channel_id
)
?
app_channel_info
.
channel_id
:
false
;
const
app_id
=
(
app_channel_info
&&
app_channel_info
.
app_id
)
?
app_channel_info
.
app_id
:
false
;
...
...
@@ -57,17 +57,18 @@ class ResponseController extends Controller {
}
// ctx.logger.info('go_register_params: ' + JSON.stringify(go_register_params));
// console.info(this.config.NODE_URL + '/login/go_register');
const
result_go_register
=
await
ctx
.
helper
.
send_request
(
this
.
config
.
NODE_URL
+
'/login/
v2/
go_register'
,
go_register_params
,
{
method
:
'POST'
});
//通过手机号直接注册新用户中心
const
result_go_register
=
await
ctx
.
helper
.
send_request
(
this
.
config
.
NODE_URL
+
'/login/go_register'
,
go_register_params
,
{
method
:
'POST'
});
//通过手机号直接注册新用户中心
node_user_center_login_ret
=
result_go_register
.
data
;
ctx
.
logger
.
info
(
'target_user--'
+
new
Date
().
getTime
()
+
JSON
.
stringify
({
target_old_user
:
{
go_register_params
,
node_user_center_login_ret
}
}));
//
ctx.logger.info('target_user--' + new Date().getTime() + JSON.stringify({ target_old_user: { go_register_params, node_user_center_login_ret } }));
// ctx.logger.info('go_register_result: ' + JSON.stringify(node_user_center_login_ret));
ctx
.
logger
.
info
(
JSON
.
stringify
({
url
:
ctx
.
app
.
config
.
NODE_URL
+
'/login/go_register'
,
go_register_params
:
go_register_params
,
go_register_result
:
node_user_center_login_ret
}));
node_user_center_login_ret
.
user_id
=
node_user_center_login_ret
.
uid
;
node_user_center_login_ret
.
device_login_id
=
node_user_center_login_ret
.
device_login_logs_id
;
delete
(
node_user_center_login_ret
.
uid
);
delete
(
node_user_center_login_ret
.
device_login_logs_id
);
}
ctx
.
logger
.
info
(
'target_user--'
+
new
Date
().
getTime
()
+
JSON
.
stringify
({
target_old_user
:
{
channel_id
,
app_id
}
}));
//
ctx.logger.info('target_user--' + new Date().getTime() + JSON.stringify({ target_old_user: { channel_id, app_id } }));
if
(
!
phone
||
!
channel_id
||
!
app_id
||
!
node_user_center_login_ret
.
token
)
{
// 或渠道错误 或直接注册新用户中心失败时 使用设备登录
const
user_agent
=
header
.
user_agent
?
header
.
user_agent
:
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.103 Safari/537.36'
;
const
ip
=
ctx
.
helper
.
getClientIP
();
...
...
app/middleware/device_init.js
View file @
6563a05a
...
...
@@ -182,7 +182,7 @@ module.exports = () => {
app_id
,
channel_id
,
};
const
result_go_register
=
await
ctx
.
helper
.
send_request
(
ctx
.
app
.
config
.
NODE_URL
+
'/login/
v2/
go_register'
,
go_register_params
,
{
method
:
'POST'
});
// 通过手机号直接注册新用户中心
const
result_go_register
=
await
ctx
.
helper
.
send_request
(
ctx
.
app
.
config
.
NODE_URL
+
'/login/go_register'
,
go_register_params
,
{
method
:
'POST'
});
// 通过手机号直接注册新用户中心
const
node_user_center_login_ret
=
result_go_register
.
data
;
ctx
.
logger
.
info
(
JSON
.
stringify
({
url
:
ctx
.
app
.
config
.
NODE_URL
+
'/login/go_register'
,
middleware_go_register_params
:
go_register_params
,
middleware_result_go_register
:
result_go_register
}));
if
(
!
node_user_center_login_ret
.
token
||
!
node_user_center_login_ret
.
uid
||
!
node_user_center_login_ret
.
app_user_id
)
{
...
...
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