Commit 6b675762 by 王昆

gsb

parent 0a443475
...@@ -11,10 +11,11 @@ class AuthCtl extends CtlBase { ...@@ -11,10 +11,11 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async addAuth(params, pobj2, req) { async addAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
var auth = { var auth = {
pid: Number(params.pid || 0), pid: Number(params.pid || 0),
saas_id: req.loginUser.saas_id, saas_id: params.saas_id,
menuType: Number(params.menuType || 0), menuType: Number(params.menuType || 0),
name: this.trim(params.name), name: this.trim(params.name),
icon: this.trim(params.icon), icon: this.trim(params.icon),
...@@ -32,10 +33,11 @@ class AuthCtl extends CtlBase { ...@@ -32,10 +33,11 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async updAuth(params, pobj2, req) { async updAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
var auth = { var auth = {
id: Number(params.id), id: Number(params.id),
pid: Number(params.pid || 0), pid: Number(params.pid || 0),
saas_id: req.loginUser.saas_id, saas_id: params.saas_id,
menuType: Number(params.menuType || 0), menuType: Number(params.menuType || 0),
name: this.trim(params.name), name: this.trim(params.name),
icon: this.trim(params.icon), icon: this.trim(params.icon),
...@@ -54,6 +56,8 @@ class AuthCtl extends CtlBase { ...@@ -54,6 +56,8 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async delAuth(params, pobj2, req) { async delAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.delAuth(params); return await this.authSve.delAuth(params);
} catch (error) { } catch (error) {
...@@ -66,6 +70,8 @@ class AuthCtl extends CtlBase { ...@@ -66,6 +70,8 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async queryById(params, pobj2, req) { async queryById(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.queryById(params); return await this.authSve.queryById(params);
} catch (error) { } catch (error) {
...@@ -78,6 +84,8 @@ class AuthCtl extends CtlBase { ...@@ -78,6 +84,8 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async byPid(params, pobj2, req) { async byPid(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.byPid(params); return await this.authSve.byPid(params);
} catch (error) { } catch (error) {
...@@ -90,6 +98,8 @@ class AuthCtl extends CtlBase { ...@@ -90,6 +98,8 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async tree(params, pobj2, req) { async tree(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.tree(params); return await this.authSve.tree(params);
} catch (error) { } catch (error) {
......
...@@ -11,9 +11,11 @@ class UserCtl extends CtlBase { ...@@ -11,9 +11,11 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async addUser(params, pobj2, req) { async addUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
var user = { var user = {
saas_id: req.loginUser.saas_id, saas_id: params.saas_id,
org_id: Number(params.org_id || 0), org_id: Number(params.org_id || 0),
ucname: this.trim(params.ucname), ucname: this.trim(params.ucname),
password: this.trim(params.password), password: this.trim(params.password),
...@@ -38,7 +40,7 @@ class UserCtl extends CtlBase { ...@@ -38,7 +40,7 @@ class UserCtl extends CtlBase {
return system.getResult(null, "请选择用户组织机构"); return system.getResult(null, "请选择用户组织机构");
} }
if(user.uctype != 1) { if (user.uctype != 1) {
user.org_id = null; user.org_id = null;
user.roles = []; user.roles = [];
} }
...@@ -53,9 +55,11 @@ class UserCtl extends CtlBase { ...@@ -53,9 +55,11 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async updUser(params, pobj2, req) { async updUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
var user = { var user = {
id: Number(params.id || 0), id: Number(params.id || 0),
saas_id: req.loginUser.saas_id, saas_id: params.saas_id,
org_id: Number(params.org_id || 0), org_id: Number(params.org_id || 0),
uctype: Number(params.uctype || 1), uctype: Number(params.uctype || 1),
mobile: this.trim(params.mobile), mobile: this.trim(params.mobile),
...@@ -79,7 +83,7 @@ class UserCtl extends CtlBase { ...@@ -79,7 +83,7 @@ class UserCtl extends CtlBase {
return system.getResult(null, "请选择用户组织机构"); return system.getResult(null, "请选择用户组织机构");
} }
if(user.uctype != 1) { if (user.uctype != 1) {
user.org_id = null; user.org_id = null;
user.roles = []; user.roles = [];
} }
...@@ -98,6 +102,7 @@ class UserCtl extends CtlBase { ...@@ -98,6 +102,7 @@ class UserCtl extends CtlBase {
* @param {*} req * @param {*} req
*/ */
async enabled(params, pobj2, req) { async enabled(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
params.id = Number(params.id || 0); params.id = Number(params.id || 0);
params.enabled = Number(params.enabled || 0); params.enabled = Number(params.enabled || 0);
...@@ -108,9 +113,10 @@ class UserCtl extends CtlBase { ...@@ -108,9 +113,10 @@ class UserCtl extends CtlBase {
} }
async delUser(params, pobj2, req) { async delUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return system.getResult(null, `暂未提供`); return await this.userSve.delUser(params);
// return await this.userSve.delUser(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
...@@ -121,6 +127,8 @@ class UserCtl extends CtlBase { ...@@ -121,6 +127,8 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async queryById(params, pobj2, req) { async queryById(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.userSve.queryById(params); return await this.userSve.queryById(params);
} catch (error) { } catch (error) {
...@@ -133,9 +141,11 @@ class UserCtl extends CtlBase { ...@@ -133,9 +141,11 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async page(params, pobj2, req) { async page(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.userSve.page(params); return await this.userSve.page(params);
} catch (error) { } catch (error) {
console.log(error);
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
......
...@@ -41,54 +41,39 @@ class UserService extends ServiceBase { ...@@ -41,54 +41,39 @@ class UserService extends ServiceBase {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
/**
* 删除
* @param {*} params
*/
async delUser(params) {
try {
return await this.callms("uc", "delUser", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
/** /**
* 查询明细
* @param {*} params * @param {*} params
*/ */
async queryById(params) { async page(params) {
try { try {
return await this.callms("uc", "userInfo", params); return await this.callms("uc", "userPage", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
/** /**
* 根据pid查出子 * 删除
* @param {*} params * @param {*} params
*/ */
async page(params) { async delUser(params) {
try { try {
return await this.callms("uc", "userPage", params); return await this.callms("uc", "delUser", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
/** /**
* 查询整个树结构 * 查询明细
* @param {*} params * @param {*} params
*/ */
async tree(params) { async queryById(params) {
try { try {
return await this.callms("uc", "authTree", params); return await this.callms("uc", "userInfo", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
} }
module.exports = UserService; module.exports = UserService;
\ No newline at end of file
...@@ -6,7 +6,7 @@ var marked = require("marked"); ...@@ -6,7 +6,7 @@ var marked = require("marked");
module.exports = function (app) { module.exports = function (app) {
app.get('/doc', function (req, res) { app.get('/doc', function (req, res) {
var path = process.cwd() + "/app/front/entry/public/apidoc/README.md"; var path = process.cwd() + "/xgg-admin/app/front/entry/public/apidoc/README.md";
fs.readFile(path, function(err, data){ fs.readFile(path, function(err, data){
if(err){ if(err){
console.log(err); console.log(err);
...@@ -20,7 +20,7 @@ module.exports = function (app) { ...@@ -20,7 +20,7 @@ module.exports = function (app) {
}); });
app.get('/doc/:forder', function (req, res) { app.get('/doc/:forder', function (req, res) {
var path = process.cwd() + "/app/front/entry/public/apidoc/README.md"; var path = process.cwd() + "/xgg-admin/app/front/entry/public/apidoc/README.md";
fs.readFile(path, function(err, data){ fs.readFile(path, function(err, data){
if(err){ if(err){
...@@ -37,7 +37,7 @@ module.exports = function (app) { ...@@ -37,7 +37,7 @@ module.exports = function (app) {
app.get('/doc/:forder/:fileName', function (req, res) { app.get('/doc/:forder/:fileName', function (req, res) {
var forder = req.params["forder"]; var forder = req.params["forder"];
var fileName = req.params["fileName"] || "README.md"; var fileName = req.params["fileName"] || "README.md";
var path = process.cwd() + "/app/front/entry/public/apidoc"; var path = process.cwd() + "/xgg-admin/app/front/entry/public/apidoc";
if(forder) { if(forder) {
path = path + "/" + forder + "/" + fileName; path = path + "/" + forder + "/" + fileName;
} else { } else {
......
...@@ -42,7 +42,7 @@ module.exports = function (app) { ...@@ -42,7 +42,7 @@ module.exports = function (app) {
} }
if(xggadminsid) { if(xggadminsid) {
redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60); redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60 * 60);
} }
req.loginUser = jsonUser; req.loginUser = jsonUser;
next(); next();
......
## index. 首页 ## index. 首页
  1 [首页1](doc/index/index1.md)   1 [首页1](/doc/index/index1.md)
  1 [发票数据概览](doc/index/index2.md)   1 [发票数据概览](/doc/index/index2.md)
  1 [发票业务汇总](/doc/index/index3.md)
1 [发票业务汇总](doc/index/index3.md) ## 公共服务
  1 [公共服务](/doc/common/common.md)
  2 [注册地](/doc/common/domicile.md)
  3 [经营范围](/doc/common/businessscope.md)
  4 [交付商](/doc/common/deliver.md)
  5 [开票内容](/doc/common/invoicecontent.md)
## 1. 公共服务 ## 登录相关
  1 [公共服务](doc/common/common.md)   1 [登录接口](/doc/user/user.md)
  2 [注册地](doc/common/domicile.md) ## 用户中心
  1 [租户saas](/doc/uc/saas.md)
  3 [经营范围](doc/common/businessscope.md)   2 [菜单](/doc/uc/auth.md)
  4 [交付商](doc/common/deliver.md)   3 [角色](/doc/uc/role.md)
  5 [开票内容](doc/common/invoicecontent.md)   4 [组织机构](/doc/uc/org.md)
## 2. 用户相关接口   5 [用户](/doc/uc/user.md)
  1 [用户中心](doc/user/user.md)
## 3. 商户相关接口 ## 商户相关接口
  1 [商户信息](doc/merchant/merchant.md)   1 [商户信息](/doc/merchant/merchant.md)
  2 [商户签约](doc/merchant/sign.md)   2 [商户签约](/doc/merchant/sign.md)
  3 [商户地址](doc/merchant/address.md)   3 [商户地址](/doc/merchant/address.md)
  4 [商户抬头](doc/merchant/title.md)   4 [商户抬头](/doc/merchant/title.md)
  5 [商户账户](doc/merchant/account.md)   5 [商户账户](/doc/merchant/account.md)
  6 [商户充值](doc/merchant/recharge.md)   6 [商户充值](/doc/merchant/recharge.md)
## 4. 订单相关接口 ## 订单相关接口
  1 [全部订单](doc/order/order.md)   1 [全部订单](/doc/order/order.md)
  2 [订单办理](doc/order/deliver.md)   2 [订单办理](/doc/order/deliver.md)
  3 [个体户+签约](doc/business/businessmen.md)   3 [个体户+签约](/doc/business/businessmen.md)
## 5. 发票接口 ## 发票接口
  1 [发票申请](doc/invoice/apply.md)   1 [发票申请](/doc/invoice/apply.md)
  2 [全部发票](doc/invoice/all.md)   2 [全部发票](/doc/invoice/all.md)
  3 [发票办理](doc/invoice/deliver.md)   3 [发票办理](/doc/invoice/deliver.md)
  4 [发票管理](doc/invoice/info.md)   4 [发票管理](/doc/invoice/info.md)
## 6. 其他 ## 其他
......
[返回主目录](/doc)
<a name="menu">目录</a>
1. [添加](#add)
1. [更新](#upd)
1. [删除](#del)
1. [菜单树](#tree)
1. [菜单树-子菜单模式](#byPid)
1. [明细](#queryById)
## **<a name="add"> 添加</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/addAuth]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"pid": 2, // 父节点id
"menuType": 1, // 菜单类型 1菜单, 2接口
"name": "个体户系统", // 菜单名称
"icon": "123", // 菜单icon 选填
"path": "/aaa/bbb" // 菜单路由 选填
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": null,
"requestid": "2dc587798f974902b06123ce34c39090"
}
```
## **<a name="upd"> 更新</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/updAuth]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 8, // 菜单id
"pid": 2, // 父节点id
"menuType": 1, // 菜单类型 1菜单, 2接口
"name": "个体户系统", // 菜单名称
"icon": "123", // 菜单icon 选填
"path": "/aaa/bbb" // 菜单路由 选填
}
```
## **<a name="del"> 删除</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/delAuth]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
}
```
## **<a name="tree"> 菜单树</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/tree]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
{
"id": 1, // 菜单id
"pid": 0, // 父节点id
"menuType": 1, // 菜单类型 1菜单, 2接口
"name": "个体户系统", // 菜单名称
"icon": "123", // 菜单icon
"path": "aaaaaaaaa", // 菜单路由
"childs": [...] // 子菜单
}
},
"requestid": "007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="byPid"> 菜单树-子菜单模式</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/byPid]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"pid": 1, // 必传
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": [
{
"id": 1, // 菜单id
"pid": 0, // 父节点id
"menuType": 1, // 菜单类型 1菜单, 2接口
"name": "个体户系统", // 菜单名称
"icon": "123", // 菜单icon
"path": "aaaaaaaaa", // 菜单路由
}
],
"requestid": "b340e352d57548d880540bcd05fbfee3"
}
```
## **<a name="queryById"> 明细</a>**
[返回到目录](#menu)
##### URL
[/web/uc/authCtl/queryById]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"id": 1, // 菜单id
"pid": 0, // 父节点id
"menuType": 1, // 菜单类型 1菜单, 2接口
"name": "个体户系统", // 菜单名称
"icon": "123", // 菜单icon
"path": "aaaaaaaaa", // 菜单路由
},
"requestid": "6b34ba91355f407ab0592d3d8e39544c"
}
```
\ No newline at end of file
[返回主目录](/doc)
<a name="menu">目录</a> <a name="menu">目录</a>
1. [添加](#addOrg) 1. [添加](#addOrg)
1. [更新(暂不提供)](#updOrg) 1. [更新(暂不提供)](#updOrg)
......
[返回主目录](/doc)
<a name="menu">目录</a> <a name="menu">目录</a>
1. [添加](#addRole) 1. [添加](#addRole)
1. [更新](#updRole) 1. [更新](#updRole)
......
[返回主目录](/doc)
<a name="menu">目录</a> <a name="menu">目录</a>
1. [添加](#addSaas) 1. [添加](#addSaas)
1. [更新](#updSaas) 1. [更新](#updSaas)
......
[返回主目录](/doc)
<a name="menu">目录</a>
1. [添加](#add)
1. [更新](#upd)
1. [启用禁用](#enabled)
1. [删除](#del)
1. [明细](#queryById)
1. [列表页](#page)
## **<a name="add"> 添加</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/addUser]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"org_id": 3, // 组织机构id
"isMain": 0, // 是否主管
"ucname": "guodegang10", // 用户名/登录名
"password": "123", // 密码
"uctype": "2", // 用户类型 1平台 2商户 3交付商 4个人
"mobile": "13811112222", // 手机号
"realName": "郭德纲10", // 姓名
"roles": [ // 角色列表
{
"role_id": 1 // 角色id
},
{
"role_id": 2
}...
]
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {},
"requestid": "2dc587798f974902b06123ce34c39090"
}
```
## **<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个人
"mobile": "13811112222", // 手机号
"realName": "郭德纲10", // 姓名
"roles": [ // 角色列表
{
"role_id": 1 // 角色id
},
{
"role_id": 2
}...
]
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {},
"requestid": "007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="enabled"> 启用禁用</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/enabled]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
"enabled": 0, // 0禁用 1启用
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {},
"requestid": "007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="del"> 删除</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/delAuth]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {},
"requestid": "007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="queryById"> 明细</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/queryById]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, //记录ID 必传
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"id": 17, // id
"ucname": "guodegang10", // 登录名
"uctype": 2, // 用户类型 1平台 2商户 3交付商 4个人
"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"
}
```
1. [](#)
## **<a name="page"> 列表页</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/page]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"xxx": "", // 查询字段回头再说
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"count": 8,
"rows": [
{
"id": 17, // id
"ucname": "guodegang10", // 登录名
"uctype": 2, // 用户类型 1平台 2商户 3交付商 4个人
"org_id": 3, // 组织机构id
"isMain": 0, // 是否主管
"isEnabled": 1, // 启用/禁用 0禁用 1启用
"created_at": "2019-11-29 10:43:32", // 创建时间
"mobile": "1381231332312", // 手机号
"realName": "郭德纲11", // 姓名
},
]
},
"requestid": "defbe7aa7b1045c4b644e1c9eb58fd88"
}
```
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment