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
2ca30e00
Commit
2ca30e00
authored
Jan 19, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
dcfdd33f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
xgg-admin/app/base/controller/impl/uc/userCtl.js
+4
-1
xgg-admin/app/base/service/impl/uc/userSve.js
+2
-1
xgg-admin/app/base/system.js
+4
-4
No files found.
xgg-admin/app/base/controller/impl/uc/userCtl.js
View file @
2ca30e00
...
@@ -258,11 +258,14 @@ class UserCtl extends CtlBase {
...
@@ -258,11 +258,14 @@ class UserCtl extends CtlBase {
}
}
async
orgUsers
(
params
,
pobj2
,
req
)
{
async
orgUsers
(
params
,
pobj2
,
req
)
{
params
.
org_id
=
params
.
id
;
delete
params
.
id
;
if
(
!
params
.
org_id
)
{
if
(
!
params
.
org_id
)
{
return
system
.
getResultSuccess
([]);
return
system
.
getResultSuccess
([]);
}
}
try
{
try
{
return
await
this
.
userSve
.
orgUsers
(
params
);
let
rs
=
await
this
.
userSve
.
orgUsers
(
params
);
return
rs
;
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
...
...
xgg-admin/app/base/service/impl/uc/userSve.js
View file @
2ca30e00
...
@@ -45,7 +45,8 @@ class UserService extends ServiceBase {
...
@@ -45,7 +45,8 @@ class UserService extends ServiceBase {
}
}
async
saveUser
(
params
)
{
async
saveUser
(
params
)
{
return
await
this
.
callms
(
"uc"
,
"saveUser"
,
params
);
let
rs
=
await
this
.
callms
(
"uc"
,
"saveUser"
,
params
);
return
rs
;
}
}
async
orgUsers
(
params
)
{
async
orgUsers
(
params
)
{
...
...
xgg-admin/app/base/system.js
View file @
2ca30e00
...
@@ -173,8 +173,8 @@ class System {
...
@@ -173,8 +173,8 @@ class System {
// var domain = "http://127.0.0.1";
// var domain = "http://127.0.0.1";
return
{
return
{
// 公共服务
// 公共服务
//
common: domain + ":3102" + path,
common
:
domain
+
":3102"
+
path
,
common
:
"http://127.0.0.1:3102"
+
path
,
//
common: "http://127.0.0.1:3102" + path,
// 商户服务
// 商户服务
merchant
:
domain
+
":3101"
+
path
,
merchant
:
domain
+
":3101"
+
path
,
...
@@ -189,8 +189,8 @@ class System {
...
@@ -189,8 +189,8 @@ class System {
// invoice: "http://127.0.0.1:3105" + path,
// invoice: "http://127.0.0.1:3105" + path,
// 用户中心
// 用户中心
uc
:
domain
+
":3106"
+
path
,
//
uc: domain + ":3106" + path ,
//
uc: "http://127.0.0.1:3106" + path,
uc
:
"http://127.0.0.1:3106"
+
path
,
}
}
}
else
{
}
else
{
var
odomain
=
"http://123.57.217.203"
var
odomain
=
"http://123.57.217.203"
...
...
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