Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
0b66bb7e
Commit
0b66bb7e
authored
Dec 06, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
ca5784f2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
igirl-channel-jdweb/app/base/controller/impl/common/metaCtl.js
+2
-2
igirl-channel-jdweb/app/base/controller/impl/trademark/tmqueryCtl.js
+1
-0
igirl-channel-jdweb/app/config/routes/web.js
+1
-0
No files found.
igirl-channel-jdweb/app/base/controller/impl/common/metaCtl.js
View file @
0b66bb7e
...
...
@@ -176,7 +176,7 @@ class MetaCtl extends CtlBase {
}
}
console
.
log
(
".....................获取当前登录人的角色,进而获取权限,进而合并工具栏目.getRsConfig"
);
//
console.log(".....................获取当前登录人的角色,进而获取权限,进而合并工具栏目.getRsConfig");
//获取当前登录人的角色,进而获取权限,进而合并工具栏目
for
(
var
i
=
0
;
i
<
cfg
.
config
[
"rstree"
].
children
.
length
;
i
++
)
{
var
r
=
cfg
.
config
[
"rstree"
].
children
[
i
];
...
...
@@ -270,7 +270,7 @@ class MetaCtl extends CtlBase {
}
}
console
.
log
(
".....................获取当前登录人的角色,进而获取权限,进而合并工具栏目.getRsConfig"
);
//
console.log(".....................获取当前登录人的角色,进而获取权限,进而合并工具栏目.getRsConfig");
//获取当前登录人的角色,进而获取权限,进而合并工具栏目
for
(
var
i
=
0
;
i
<
cfg
.
config
[
"rstree"
].
children
.
length
;
i
++
)
{
var
r
=
cfg
.
config
[
"rstree"
].
children
[
i
];
...
...
igirl-channel-jdweb/app/base/controller/impl/trademark/tmqueryCtl.js
View file @
0b66bb7e
...
...
@@ -168,6 +168,7 @@ class tmqueryCtl extends CtlBase {
return
system
.
getResult
(
null
,
"authToken不能为空"
);
}
var
result
=
await
this
.
execClient
.
execPostJDTK
(
""
,
authUrl
,
authToken
);
console
.
log
(
result
,
"execPostJDTK............"
);
if
(
!
result
||
!
result
.
account
)
{
return
system
.
getResult
(
null
,
"处理用户请求失败,msg:"
+
result
.
error_description
);
}
...
...
igirl-channel-jdweb/app/config/routes/web.js
View file @
0b66bb7e
...
...
@@ -11,6 +11,7 @@ module.exports = function (app) {
return
;
}
var
getUserparams
=
{
actionProcess
:
"jd"
,
authUrl
:
"https://oauth2.jdcloud.com/userinfo"
,
authToken
:
params
.
token_type
+
" "
+
params
.
access_token
};
...
...
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