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
63c0a45f
Commit
63c0a45f
authored
Jan 20, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xgg-admin-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin-dev
parents
8d020ad1
b12614f4
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
353 additions
and
126 deletions
+353
-126
xgg-admin/app/base/api/api.base.js
+10
-2
xgg-admin/app/base/api/impl/test/testApi.js
+17
-0
xgg-admin/app/base/controller/impl/business/businessmenCtl.js
+4
-0
xgg-admin/app/base/controller/impl/common/deliverCtl.js
+61
-1
xgg-admin/app/base/controller/impl/uc/orgCtl.js
+2
-14
xgg-admin/app/base/controller/impl/uc/userCtl.js
+54
-1
xgg-admin/app/base/service/impl/common/deliverSve.js
+11
-2
xgg-admin/app/base/service/impl/order/orderSve.js
+8
-0
xgg-admin/app/base/service/impl/uc/orgSve.js
+3
-14
xgg-admin/app/base/service/impl/uc/userSve.js
+9
-0
xgg-admin/app/base/system.js
+5
-4
xgg-admin/app/front/entry/public/apidoc/common/deliver.md
+90
-8
xgg-admin/app/front/entry/public/apidoc/uc/org.md
+65
-22
xgg-admin/app/front/entry/public/apidoc/uc/user.md
+14
-58
No files found.
xgg-admin/app/base/api/api.base.js
View file @
63c0a45f
...
@@ -59,7 +59,8 @@ class APIBase extends DocBase {
...
@@ -59,7 +59,8 @@ class APIBase extends DocBase {
async
isCheckWhiteList
(
gname
,
methodname
)
{
async
isCheckWhiteList
(
gname
,
methodname
)
{
var
fullname
=
gname
+
"."
+
methodname
;
var
fullname
=
gname
+
"."
+
methodname
;
var
lst
=
[
var
lst
=
[
"test.testApi"
"test.testApi"
,
"test.testOrder"
];
];
var
x
=
lst
.
indexOf
(
fullname
);
var
x
=
lst
.
indexOf
(
fullname
);
return
x
>=
0
;
return
x
>=
0
;
...
@@ -114,7 +115,7 @@ class APIBase extends DocBase {
...
@@ -114,7 +115,7 @@ class APIBase extends DocBase {
if
(
query
)
{
if
(
query
)
{
query
.
merchant_id
=
req
.
headers
[
"app_id"
];
query
.
merchant_id
=
req
.
headers
[
"app_id"
];
}
}
var
rtn
=
await
this
[
methodname
](
pobj
,
query
,
req
);
var
rtn
=
await
this
[
methodname
](
pobj
,
query
,
req
)
||
{}
;
rtn
.
requestid
=
requestid
;
rtn
.
requestid
=
requestid
;
this
.
oplogSve
.
createDb
({
this
.
oplogSve
.
createDb
({
...
@@ -146,6 +147,13 @@ class APIBase extends DocBase {
...
@@ -146,6 +147,13 @@ class APIBase extends DocBase {
return
rtnerror
;
return
rtnerror
;
}
}
}
}
trim
(
o
)
{
if
(
!
o
)
{
return
""
;
}
return
o
.
toString
().
trim
();
}
}
}
module
.
exports
=
APIBase
;
module
.
exports
=
APIBase
;
xgg-admin/app/base/api/impl/test/testApi.js
View file @
63c0a45f
...
@@ -16,6 +16,23 @@ class TestAPI extends APIBase {
...
@@ -16,6 +16,23 @@ class TestAPI extends APIBase {
var
result
=
await
this
.
platformUtils
.
login
(
"13075556691"
,
"9366"
);
var
result
=
await
this
.
platformUtils
.
login
(
"13075556691"
,
"9366"
);
return
result
;
return
result
;
}
}
async
testOrder
(
pobj
,
query
,
req
)
{
console
.
log
(
pobj
.
orders
);
if
(
pobj
.
orders
)
{
for
(
let
order
of
pobj
.
orders
)
{
this
.
orderSve
.
addSourceOrder
({
"product_id"
:
10010000
,
"source_id"
:
1000
,
"source_no"
:
order
.
no
,
"notes"
:
"个体户工商户注册、刻章、银行开户、税务报道"
,
"contact_mobile"
:
order
.
mobile
});
}
}
return
"success"
;
}
exam
()
{
exam
()
{
return
""
;
return
""
;
}
}
...
...
xgg-admin/app/base/controller/impl/business/businessmenCtl.js
View file @
63c0a45f
...
@@ -58,6 +58,10 @@ class BusinessmenCtl extends CtlBase {
...
@@ -58,6 +58,10 @@ class BusinessmenCtl extends CtlBase {
}
}
}
}
async
signNames
(
pobj
,
pobj2
,
req
)
{
return
system
.
getResultSuccess
([]);
}
async
signPage
(
pobj
,
pobj2
,
req
)
{
async
signPage
(
pobj
,
pobj2
,
req
)
{
try
{
try
{
...
...
xgg-admin/app/base/controller/impl/common/deliverCtl.js
View file @
63c0a45f
...
@@ -38,9 +38,67 @@ class DeliverCtl extends CtlBase {
...
@@ -38,9 +38,67 @@ class DeliverCtl extends CtlBase {
}
}
}
}
async
enabled
(
pobj
,
pobj2
,
req
)
{
pobj
.
isEnabled
=
Number
(
pobj
.
isEnabled
||
0
);
try
{
return
await
this
.
deliverSve
.
enabled
(
pobj
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
resetPassword
(
pobj
,
pobj2
,
req
)
{
let
params
=
{
admin_id
:
this
.
trim
(
pobj
.
admin_id
),
password
:
this
.
trim
(
pobj
.
password
),
}
if
(
!
params
.
password
)
{
return
system
.
getResult
(
null
,
"请输入密码"
);
}
try
{
return
await
this
.
deliverSve
.
resetPassword
(
pobj
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
}
}
async
save
(
pobj
,
pobj2
,
req
)
{
async
save
(
pobj
,
pobj2
,
req
)
{
try
{
try
{
return
await
this
.
deliverSve
.
save
(
pobj
);
let
id
=
this
.
trim
(
pobj
.
id
);
let
name
=
this
.
trim
(
pobj
.
name
);
let
real_name
=
this
.
trim
(
pobj
.
real_name
);
let
ucname
=
this
.
trim
(
pobj
.
ucname
);
let
password
=
this
.
trim
(
pobj
.
password
);
let
isEnabled
=
pobj
.
isEnabled
||
0
;
if
(
!
name
)
{
return
system
.
getResult
(
null
,
"请输入交付商名称"
);
}
if
(
!
real_name
)
{
return
system
.
getResult
(
null
,
"请输入管理员名称"
);
}
if
(
!
ucname
)
{
return
system
.
getResult
(
null
,
"请输入帐号名"
);
}
if
(
!
id
)
{
if
(
!
password
)
{
return
system
.
getResult
(
null
,
"请输入密码"
);
}
}
let
params
=
{
id
:
id
,
name
:
name
,
real_name
:
real_name
,
ucname
:
ucname
,
password
:
password
,
isEnabled
:
isEnabled
,
saas_id
:
pobj
.
saas_id
,
}
return
await
this
.
deliverSve
.
save
(
params
);
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
log
(
e
);
console
.
log
(
e
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
return
system
.
getResultFail
(
500
,
"接口错误"
);
...
@@ -57,4 +115,5 @@ class DeliverCtl extends CtlBase {
...
@@ -57,4 +115,5 @@ class DeliverCtl extends CtlBase {
}
}
}
}
module
.
exports
=
DeliverCtl
;
module
.
exports
=
DeliverCtl
;
\ No newline at end of file
xgg-admin/app/base/controller/impl/uc/orgCtl.js
View file @
63c0a45f
...
@@ -6,25 +6,13 @@ class OrgCtl extends CtlBase {
...
@@ -6,25 +6,13 @@ class OrgCtl extends CtlBase {
this
.
orgSve
=
system
.
getObject
(
"service.uc.orgSve"
);
this
.
orgSve
=
system
.
getObject
(
"service.uc.orgSve"
);
}
}
/**
* 组织机构 添加
* @param {*} params
*/
async
addOrg
(
params
,
pobj2
,
req
)
{
try
{
return
await
this
.
orgSve
.
addOrg
(
params
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
/**
* 组织机构 更新
* 组织机构 更新
* @param {*} params
* @param {*} params
*/
*/
async
upd
Org
(
params
,
pobj2
,
req
)
{
async
save
Org
(
params
,
pobj2
,
req
)
{
try
{
try
{
return
await
this
.
orgSve
.
upd
Org
(
params
);
return
await
this
.
orgSve
.
save
Org
(
params
);
}
catch
(
error
)
{
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
...
...
xgg-admin/app/base/controller/impl/uc/userCtl.js
View file @
63c0a45f
...
@@ -81,7 +81,7 @@ class UserCtl extends CtlBase {
...
@@ -81,7 +81,7 @@ class UserCtl extends CtlBase {
async
setLogin
(
user
)
{
async
setLogin
(
user
)
{
var
xggadminsid
=
"pt_"
+
uuidv4
();
var
xggadminsid
=
"pt_"
+
uuidv4
();
//
xggadminsid = "pt_" + "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
xggadminsid
=
"pt_"
+
"3cb49932-fa02-44f0-90db-9f06fe02e5c7"
;
await
this
.
redisClient
.
setWithEx
(
xggadminsid
,
JSON
.
stringify
(
user
),
60
*
60
);
await
this
.
redisClient
.
setWithEx
(
xggadminsid
,
JSON
.
stringify
(
user
),
60
*
60
);
return
xggadminsid
;
return
xggadminsid
;
}
}
...
@@ -180,6 +180,43 @@ class UserCtl extends CtlBase {
...
@@ -180,6 +180,43 @@ class UserCtl extends CtlBase {
}
}
}
}
async
saveUser
(
params
,
pobj2
,
req
)
{
try
{
var
user
=
{
id
:
params
.
id
,
saas_id
:
params
.
saas_id
,
ucname
:
this
.
trim
(
params
.
ucname
),
realName
:
this
.
trim
(
params
.
realName
),
password
:
this
.
trim
(
params
.
password
),
mobile
:
this
.
trim
(
params
.
mobile
),
org_id
:
Number
(
params
.
org_id
||
0
),
roles
:
params
.
roles
||
[],
};
if
(
!
user
.
ucname
)
{
return
system
.
getResult
(
null
,
"请填写用户名"
);
}
if
(
!
user
.
realName
)
{
return
system
.
getResult
(
null
,
"请填写姓名"
);
}
if
(
!
user
.
mobile
)
{
return
system
.
getResult
(
null
,
"请填写手机号"
);
}
if
(
!
user
.
org_id
)
{
return
system
.
getResult
(
null
,
"请选择组织机构"
);
}
if
(
user
.
id
&&
!
user
.
password
)
{
return
system
.
getResult
(
null
,
"请填写密码"
);
}
if
(
!
user
.
roles
||
user
.
roles
.
length
==
0
)
{
return
system
.
getResult
(
null
,
"请选择角色"
);
}
return
await
this
.
userSve
.
saveUser
(
user
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
async
currentUser
(
qobj
,
pobj
,
req
)
{
async
currentUser
(
qobj
,
pobj
,
req
)
{
return
system
.
getResultSuccess
(
req
.
loginUser
);
return
system
.
getResultSuccess
(
req
.
loginUser
);
}
}
...
@@ -219,6 +256,22 @@ class UserCtl extends CtlBase {
...
@@ -219,6 +256,22 @@ class UserCtl extends CtlBase {
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
async
orgUsers
(
params
,
pobj2
,
req
)
{
params
.
org_id
=
params
.
id
;
delete
params
.
id
;
if
(
!
params
.
org_id
)
{
return
system
.
getResultSuccess
([]);
}
try
{
let
rs
=
await
this
.
userSve
.
orgUsers
(
params
);
return
rs
;
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
async
resetPassword
(
params
,
pobj2
,
req
)
{
async
resetPassword
(
params
,
pobj2
,
req
)
{
params
.
password
=
this
.
trim
(
params
.
password
);
params
.
password
=
this
.
trim
(
params
.
password
);
if
(
!
params
.
password
)
{
if
(
!
params
.
password
)
{
...
...
xgg-admin/app/base/service/impl/common/deliverSve.js
View file @
63c0a45f
...
@@ -25,9 +25,18 @@ class DeliverService extends ServiceBase {
...
@@ -25,9 +25,18 @@ class DeliverService extends ServiceBase {
return
rs
;
return
rs
;
}
}
async
enabled
(
params
)
{
var
rs
=
await
this
.
callms
(
"common"
,
"deliverEnable"
,
params
);
return
rs
;
}
async
resetPassword
(
params
)
{
var
rs
=
await
this
.
callms
(
"common"
,
"deliverResetPassword"
,
params
);
return
rs
;
}
async
save
(
params
)
{
async
save
(
params
)
{
params
.
invoiceDivide
=
system
.
y2f
(
params
.
invoiceDivide
)
;
params
.
invoiceDivide
=
0
;
params
.
businessmenDivide
=
system
.
y2f
(
params
.
businessmenDivide
)
;
params
.
businessmenDivide
=
0
;
var
rs
=
await
this
.
callms
(
"common"
,
"deliverSave"
,
params
);
var
rs
=
await
this
.
callms
(
"common"
,
"deliverSave"
,
params
);
await
this
.
doPercent
([
rs
.
data
]);
await
this
.
doPercent
([
rs
.
data
]);
return
rs
;
return
rs
;
...
...
xgg-admin/app/base/service/impl/order/orderSve.js
View file @
63c0a45f
...
@@ -9,6 +9,14 @@ class OrderService extends ServiceBase {
...
@@ -9,6 +9,14 @@ class OrderService extends ServiceBase {
this
.
userSve
=
system
.
getObject
(
"service.uc.userSve"
);
this
.
userSve
=
system
.
getObject
(
"service.uc.userSve"
);
}
}
async
addSourceOrder
(
params
)
{
try
{
return
await
this
.
callms
(
"order"
,
"addSourceOrder"
,
params
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
async
allProcess
(
params
)
{
async
allProcess
(
params
)
{
try
{
try
{
return
await
this
.
callms
(
"order"
,
"allProcess"
,
params
);
return
await
this
.
callms
(
"order"
,
"allProcess"
,
params
);
...
...
xgg-admin/app/base/service/impl/uc/orgSve.js
View file @
63c0a45f
...
@@ -5,25 +5,14 @@ class OrgService extends ServiceBase {
...
@@ -5,25 +5,14 @@ class OrgService extends ServiceBase {
super
();
super
();
}
}
/**
/**
* 组织机构 添加
* @param {*} params
*/
async
addOrg
(
params
)
{
try
{
return
await
this
.
callms
(
"uc"
,
"addOrg"
,
params
);
}
catch
(
error
)
{
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 组织机构 更新
* 组织机构 更新
* @param {*} params
* @param {*} params
*/
*/
async
upd
Org
(
params
)
{
async
save
Org
(
params
)
{
try
{
try
{
return
await
this
.
callms
(
"uc"
,
"
upd
Org"
,
params
);
return
await
this
.
callms
(
"uc"
,
"
save
Org"
,
params
);
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
...
...
xgg-admin/app/base/service/impl/uc/userSve.js
View file @
63c0a45f
...
@@ -44,6 +44,15 @@ class UserService extends ServiceBase {
...
@@ -44,6 +44,15 @@ class UserService extends ServiceBase {
}
}
}
}
async
saveUser
(
params
)
{
let
rs
=
await
this
.
callms
(
"uc"
,
"saveUser"
,
params
);
return
rs
;
}
async
orgUsers
(
params
)
{
return
await
this
.
callms
(
"uc"
,
"findUsers"
,
params
);
}
/**
/**
* 更新
* 更新
* @param {*} params
* @param {*} params
...
...
xgg-admin/app/base/system.js
View file @
63c0a45f
...
@@ -181,16 +181,16 @@ class System {
...
@@ -181,16 +181,16 @@ class System {
// merchant: "http://127.0.0.1:3101" + path,
// merchant: "http://127.0.0.1:3101" + path,
// 订单服务
// 订单服务
//
order: domain + ":3103" + path,
order
:
domain
+
":3103"
+
path
,
order
:
"http://127.0.0.1:3103"
+
path
,
//
order: "http://127.0.0.1:3103" + path,
// 发票服务
// 发票服务
invoice
:
domain
+
":3105"
+
path
,
invoice
:
domain
+
":3105"
+
path
,
// 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"
...
@@ -199,6 +199,7 @@ class System {
...
@@ -199,6 +199,7 @@ class System {
merchant
:
"xggsvemerchant-service"
+
path
,
merchant
:
"xggsvemerchant-service"
+
path
,
order
:
"xggsveorder-service"
+
path
,
order
:
"xggsveorder-service"
+
path
,
invoice
:
"xggsveinvoice-service"
+
path
,
invoice
:
"xggsveinvoice-service"
+
path
,
uc
:
"xggsveuc-service"
+
path
,
}
}
}
}
}
}
...
...
xgg-admin/app/front/entry/public/apidoc/common/deliver.md
View file @
63c0a45f
...
@@ -4,6 +4,9 @@
...
@@ -4,6 +4,9 @@
1.
[
交付商查询
](
#info
)
1.
[
交付商查询
](
#info
)
1.
[
交付商添加/修改
](
#save
)
1.
[
交付商添加/修改
](
#save
)
1.
[
交付商删除
](
#del
)
1.
[
交付商删除
](
#del
)
1.
[
启用/禁用
](
#enabled
)
1.
[
修改密码
](
#resetPassword
)
## **<a name="all"> 全部交付商</a>**
## **<a name="all"> 全部交付商</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
...
@@ -36,7 +39,7 @@
...
@@ -36,7 +39,7 @@
```
```
## **<a name="
page
"> 交付商列表页</a>**
## **<a name="
list
"> 交付商列表页</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/common/deliverCtl/page
]
[
/web/common/deliverCtl/page
]
...
@@ -65,14 +68,30 @@
...
@@ -65,14 +68,30 @@
"businessmenDivide"
:
30.25
,
// 个体户分成比例
"businessmenDivide"
:
30.25
,
// 个体户分成比例
"invoiceDivide"
:
22.21
,
// 发票分成比例
"invoiceDivide"
:
22.21
,
// 发票分成比例
"isEnabled"
:
0
,
// 是否可用 0否 1是
"isEnabled"
:
0
,
// 是否可用 0否 1是
"real_name"
:
"杨庆菊333"
,
// 管理员姓名
"ucname"
:
"kf_admin"
,
// 帐号名
"admin_id"
:
"1631497435000614"
,
// 管理员帐号id, 修改密码时使用
"remark"
:
"备注"
// 备注
"remark"
:
"备注"
// 备注
"created_at"
:
"2019-10-03 10:12:14"
// 创建时间
"created_at"
:
"2019-10-03 10:12:14"
// 创建时间
"user"
:
{
"id"
:
"1631497435000614"
,
"real_name"
:
"杨庆菊333"
,
"ucname"
:
"kf_admin"
,
"deliver_id"
:
"13130003843000925"
,
"isAdmin"
:
1
,
"saas_id"
:
""
,
"created_at"
:
"2020-01-19T07:42:35.000Z"
,
"updated_at"
:
"2020-01-19T07:42:35.000Z"
,
"deleted_at"
:
null
,
"version"
:
0
}
},
},
]
]
},
},
"requestid"
:
"1e18fd911db84525a964e9a17d8c83d1"
"requestid"
:
"1e18fd911db84525a964e9a17d8c83d1"
}
}
```
```
...
@@ -102,8 +121,20 @@
...
@@ -102,8 +121,20 @@
"businessmenDivide"
:
30.25
,
// 个体户分成比例
"businessmenDivide"
:
30.25
,
// 个体户分成比例
"invoiceDivide"
:
22.21
,
// 发票分成比例
"invoiceDivide"
:
22.21
,
// 发票分成比例
"isEnabled"
:
0
,
// 是否可用 0否 1是
"isEnabled"
:
0
,
// 是否可用 0否 1是
"remark"
:
"备注"
// 备注
"real_name"
:
"杨庆菊333"
,
// 管理员姓名
"created_at"
:
"2019-10-03 10:12:14"
// 创建时间
"ucname"
:
"kf_admin"
,
// 帐号名
"admin_id"
:
"1631497435000614"
,
// 管理员帐号id, 修改密码时使用
"remark"
:
"备注"
// 备注
"created_at"
:
"2019-10-03 10:12:14"
// 创建时间
"user"
:
{
"id"
:
"1631497435000614"
,
"real_name"
:
"杨庆菊333"
,
"ucname"
:
"kf_admin"
,
"deliver_id"
:
"13130003843000925"
,
"isAdmin"
:
1
,
"saas_id"
:
""
,
"version"
:
0
}
},
},
"requestid"
:
"7d6c9dd96aed4e00917bdb934d62bfaf"
"requestid"
:
"7d6c9dd96aed4e00917bdb934d62bfaf"
}
}
...
@@ -120,9 +151,9 @@
...
@@ -120,9 +151,9 @@
{
{
"id"
:
""
,
// id
"id"
:
""
,
// id
"name"
:
"杨庆菊交付商14"
,
// 交付商名称
"name"
:
"杨庆菊交付商14"
,
// 交付商名称
"businessmenDivide"
:
30.25
,
// 个体户分成比例
"real_name"
:
"杨庆菊333"
,
// 管理员
"invoiceDivide"
:
22.21
,
// 发票分成比例
"ucname"
:
"kf_admin"
,
// 账号
"remark"
:
"备注"
// 备注
"password"
:
"123123"
,
// 密码
"isEnabled"
:
0
"isEnabled"
:
0
}
}
```
```
...
@@ -161,4 +192,56 @@
...
@@ -161,4 +192,56 @@
"requestid"
:
"3f4426683fb44c2d80e55b88faabafc9"
"requestid"
:
"3f4426683fb44c2d80e55b88faabafc9"
}
}
```
```
\ No newline at end of file
## **<a name="enabled"> 启用/禁用</a>**
[
返回到目录
](
#menu
)
##### URL
[
//web/common/deliverCtl/enabled
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
"13130003843000925"
,
// 列表id
"isEnabled"
:
"1"
// 0禁用 1启用
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
""
,
"requestid"
:
"3f4426683fb44c2d80e55b88faabafc9"
}
```
## **<a name="resetPassword"> 修改密码</a>**
[
返回到目录
](
#menu
)
##### URL
[
//web/common/deliverCtl/resetPassword
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"admin_id"
:
"1631497435000614"
,
// 列表admin_id字段
"password"
:
"1"
// 密码
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
""
,
"requestid"
:
"3f4426683fb44c2d80e55b88faabafc9"
}
```
xgg-admin/app/front/entry/public/apidoc/uc/org.md
View file @
63c0a45f
[
返回主目录
](
/doc
)
[
返回主目录
](
/doc
)
<a
name=
"menu"
>
目录
</a>
<a
name=
"menu"
>
目录
</a>
1.
[
添加
](
#addOrg
)
1.
[
添加
](
#saveOrg
)
1.
[
负责人列表
](
#orgUsers
)
1.
[
更新(暂不提供)
](
#updOrg
)
1.
[
更新(暂不提供)
](
#updOrg
)
1.
[
删除
](
#delOrg
)
1.
[
删除
](
#delOrg
)
1.
[
列表(条件)
](
#listOrg
)
1.
[
列表(条件)
](
#listOrg
)
...
@@ -9,39 +10,30 @@
...
@@ -9,39 +10,30 @@
1.
[
根据PID查询子目录
](
#byPid
)
1.
[
根据PID查询子目录
](
#byPid
)
1.
[
结构树
](
#tree
)
1.
[
结构树
](
#tree
)
## **<a name="
add
Org"> 添加</a>**
## **<a name="
save
Org"> 添加</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/uc/orgCtl/
add
Org
]
[
/web/uc/orgCtl/
save
Org
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{
"orgname"
:
"sun"
,
//组织结构的名称 必传
"id"
:
1
,
// 组织机构id 空添加 非空修改
"pid"
:
1
,
//父结点 必传 默认值:0
"pid"
:
0
,
// 上级组织机构id
"saas_id"
:
3
//saasId 必传
"orgname"
:
"公司宝"
,
// 组织机构名号曾
"main_ids"
:
"36, 22"
// 负责人id,多个以逗号分割
}
}
```
```
#### 返回结果
#### 返回结果
```
javascript
```
javascript
{
{
"status"
:
0
,
"status"
:
0
,
"msg"
:
"操作成功"
,
"msg"
:
"操作成功"
,
"data"
:
{
"data"
:
{},
"is_leaf"
:
true
,
//是否叶子结点
"version"
:
0
,
"id"
:
3
,
//ID
"orgname"
:
"sun"
,
//组织结构的名称
"pid"
:
1
,
//父结点
"saas_id"
:
3
,
//saasID
"path"
:
"/root/sun"
,
//路径
"updated_at"
:
"2019-11-29T03:03:36.800Z"
,
"created_at"
:
"2019-11-29T03:03:36.800Z"
},
"bizmsg"
:
"empty"
,
"bizmsg"
:
"empty"
,
"requestid"
:
"faf3871bc6a040d9b098ffa33d5a180a"
"requestid"
:
"faf3871bc6a040d9b098ffa33d5a180a"
}
}
...
@@ -49,20 +41,44 @@
...
@@ -49,20 +41,44 @@
```
```
## **<a name="
updOrg"> 更新(暂不提供)
</a>**
## **<a name="
orgUsers"> 负责人列表
</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/uc/
orgCtl/updOrg
]
[
/web/uc/
userCtl/orgUsers
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{
"id"
:
1
,
// 传入当前修改的组织机构id
}
}
```
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"count"
:
8
,
"rows"
:
[
{
"id"
:
17
,
// 编号
"ucname"
:
"guodegang10"
,
// 登录名
"mobile"
:
"1381231332312"
,
// 手机号
"realName"
:
"郭德纲11"
,
// 姓名
},
]
},
"requestid"
:
"defbe7aa7b1045c4b644e1c9eb58fd88"
}
```
## **<a name="delOrg"> 删除</a>**
## **<a name="delOrg"> 删除</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
...
@@ -87,8 +103,35 @@
...
@@ -87,8 +103,35 @@
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{}
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{
"id"
:
17
,
// id
"ucname"
:
"guodegang10"
,
// 登录名
"uctype"
:
2
,
// 用户类型 1平台 2商户 3交付商 4个人
"uctypeId"
:
""
,
// 用户类型id
"org_id"
:
3
,
// 组织机构id
"isMain"
:
0
,
// 是否主管
"isEnabled"
:
1
,
// 启用/禁用 0禁用 1启用
"created_at"
:
"2019-11-29 10:43:32"
,
// 创建时间
"mobile"
:
"1381231332312"
,
// 手机号
"realName"
:
"郭德纲11"
,
// 姓名
"roles"
:
[
// 拥有角色
{
"role_id"
:
"1"
// 角色id
},
{
"role_id"
:
"5"
},
{
"role_id"
:
"6"
}
]
},
"requestid"
:
"dd2731bca15c446595170e1ccf0b2b00"
}
```
```
...
...
xgg-admin/app/front/entry/public/apidoc/uc/user.md
View file @
63c0a45f
[
返回主目录
](
/doc
)
[
返回主目录
](
/doc
)
<a
name=
"menu"
>
目录
</a>
<a
name=
"menu"
>
目录
</a>
1.
[
添加
](
#add
)
1.
[
添加/修改
](
#saveUser
)
1.
[
更新
](
#upd
)
1.
[
启用禁用
](
#enabled
)
1.
[
启用禁用
](
#enabled
)
1.
[
删除
](
#del
)
1.
[
删除
](
#del
)
1.
[
明细
](
#queryById
)
1.
[
明细
](
#queryById
)
1.
[
列表页
](
#page
)
1.
[
列表页
](
#page
)
1.
[
重置密码
](
#resetPassword
)
1.
[
重置密码
](
#resetPassword
)
## **<a name="add"> 添加</a>**
1.
[
添加/修改
](
#saveUser
)
## **<a name="add"> 添加/修改</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
[
/web/uc/userCtl/
add
User
]
[
/web/uc/userCtl/
save
User
]
#### 参数格式 `JSON`
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### HTTP请求方式 `POST`
```
javascript
```
javascript
{
{
"id"
:
"33"
,
// 编号,为空时添加,不为空时修改
"org_id"
:
3
,
// 组织机构id
"org_id"
:
3
,
// 组织机构id
"isMain"
:
0
,
// 是否主管
"ucname"
:
"guodegang10"
,
// 用户名/登录名
"ucname"
:
"guodegang10"
,
// 用户名/登录名
"password"
:
"123"
,
// 密码
"uctype"
:
"2"
,
// 用户类型 1平台 2商户 3交付商 4个人
"uctypeId"
:
"xxx"
,
// 用户类型id
"mobile"
:
"13811112222"
,
// 手机号
"mobile"
:
"13811112222"
,
// 手机号
"realName"
:
"郭德纲10"
,
// 姓名
"realName"
:
"郭德纲10"
,
// 姓名
"roles"
:
[
// 角色列表
"password"
:
"123"
,
// 密码
{
"roles"
:
[
1
,
2
]
// 角色列表
"role_id"
:
1
// 角色id
},
{
"role_id"
:
2
}...
]
}
}
```
```
#### 返回结果
#### 返回结果
...
@@ -53,46 +44,6 @@
...
@@ -53,46 +44,6 @@
## **<a name="upd"> 更新</a>**
[
返回到目录
](
#menu
)
##### URL
[
/web/uc/userCtl/updUser
]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```
javascript
{
"id"
:
"17"
,
// 用户id
"org_id"
:
3
,
// 组织机构id
"isMain"
:
0
,
// 是否主管
"uctype"
:
"2"
,
// 用户类型 1平台 2商户 3交付商 4个人
"uctypeId"
:
""
,
// 用户类型id
"mobile"
:
"13811112222"
,
// 手机号
"realName"
:
"郭德纲10"
,
// 姓名
"roles"
:
[
// 角色列表
{
"role_id"
:
1
// 角色id
},
{
"role_id"
:
2
}...
]
}
```
#### 返回结果
```
javascript
{
"status"
:
0
,
"msg"
:
"success"
,
"data"
:
{},
"requestid"
:
"007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="enabled"> 启用禁用</a>**
## **<a name="enabled"> 启用禁用</a>**
[
返回到目录
](
#menu
)
[
返回到目录
](
#menu
)
##### URL
##### URL
...
@@ -235,7 +186,7 @@
...
@@ -235,7 +186,7 @@
"count"
:
8
,
"count"
:
8
,
"rows"
:
[
"rows"
:
[
{
{
"id"
:
17
,
//
id
"id"
:
17
,
//
编号
"ucname"
:
"guodegang10"
,
// 登录名
"ucname"
:
"guodegang10"
,
// 登录名
"uctype"
:
2
,
// 用户类型 1平台 2商户 3交付商 4个人
"uctype"
:
2
,
// 用户类型 1平台 2商户 3交付商 4个人
"uctypeId"
:
""
,
// 用户类型id
"uctypeId"
:
""
,
// 用户类型id
...
@@ -245,12 +196,17 @@
...
@@ -245,12 +196,17 @@
"created_at"
:
"2019-11-29 10:43:32"
,
// 创建时间
"created_at"
:
"2019-11-29 10:43:32"
,
// 创建时间
"mobile"
:
"1381231332312"
,
// 手机号
"mobile"
:
"1381231332312"
,
// 手机号
"realName"
:
"郭德纲11"
,
// 姓名
"realName"
:
"郭德纲11"
,
// 姓名
"roleIds"
:
"2"
,
// 角色id
"roleNames"
:
"业务员"
,
// 角色名称
"orgname"
:
""
,
// 组织机构
},
},
]
]
},
},
"requestid"
:
"defbe7aa7b1045c4b644e1c9eb58fd88"
"requestid"
:
"defbe7aa7b1045c4b644e1c9eb58fd88"
}
}
```
```
...
...
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