Skip to content

Z
zhichan
Commit cd6b2d69 by linboxuan
Options

Merge branch 'center-channel' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-channel

parents e6772323 3d27cb99
Showing with 483 additions and 219 deletions
center-channel/app/base/api/api.base.js
......@@ -5,6 +5,7 @@ const sha256 = require('sha256');
const md5 = require("MD5");
class APIBase {
constructor() {
this.execClientNew = system.getObject("util.execClientNew");
this.restClient = system.getObject("util.restClient");
this.redisClient = system.getObject("util.redisClient");
this.cacheManager = system.getObject("db.common.cacheManager");
......@@ -31,26 +32,29 @@ class APIBase {
if (cacheRes) {
return JSON.parse(cacheRes);
}
var rtn = await this[methodname](pobj, query, req);
var result = await this[methodname](pobj, query, req);
this.logCtl.createDb({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId,
op: req.classname + "/" + methodname,
content: JSON.stringify(pobj),
resultInfo: JSON.stringify(rtn),
resultInfo: JSON.stringify(result),
clientIp: req.clientIp,
agent: req.uagent,
opTitle: "api服务提供方appKey:" + settings.appKey,
});
rtn.requestId = req.requestId;
if(this.cacheMethodList.indexOf(methodname)>=0 && rtn.status && rtn.status==0){
result.requestId = req.requestId;
if (this.cacheMethodList.indexOf(methodname) >= 0 && result.status && result.status == 0) {
//保存缓存
await this.redisClient.setWithEx(shaStr, JSON.stringify(rtn), 3600);
await this.redisClient.setWithEx(shaStr, JSON.stringify(result), 3600);
}
return rtn;
result.requestId = pobj.RequestId ? pobj.RequestId : pobj.requestId || this.getUUID();
var tmpResult = pobj.actionType && pobj.actionType.indexOf("List") < 0 ? result : { status: result.status, message: result.message, requestId: result.requestId };
this.execClientNew.execLogs("reqPath:" + req.path, pobj, "center-channel-doexecMethod", tmpResult, null);
return result;
} catch (e) {
console.log(e.stack, "api调用出现异常，请联系管理员..........")
console.log(e.stack, "api调用出现异常，请联系管理员..........");
this.logCtl.createDb({
appid: req.app.id,
appkey: req.app.uappKey,
......@@ -62,16 +66,17 @@ class APIBase {
agent: req.uagent,
opTitle: "api调用出现异常，请联系管理员error，appKey:" + settings.appKey,
});
this.logCtl.error({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId,
op: req.classname + "/" + methodname,
content: e.stack,
clientIp: pobj.clientIp,
agent: req.uagent,
optitle: "api调用出现异常，请联系管理员",
});
// this.logCtl.error({
// appid: req.app.id,
// appkey: req.app.uappKey,
// requestId: req.requestId,
// op: req.classname + "/" + methodname,
// content: e.stack,
// clientIp: pobj.clientIp,
// agent: req.uagent,
// optitle: "api调用出现异常，请联系管理员",
// });
this.execClientNew.execLogs("reqPath异常:" + req.path, pobj, "center-channel-doexecMethod", tmpResult, null);
var rtnerror = system.getResultFail(-200, "出现异常，error：" + e.stack);
rtnerror.requestId = req.requestId;
return rtnerror;
......@@ -83,10 +88,23 @@ class APIBase {
async restPostUrl(pobj, url) {
var rtn = await this.restClient.execPost(pobj, url);
if (!rtn || !rtn.stdout) {
return system.getResult(null, "restPost data is empty");
return system.getResult(null, "restPost data is empty");
}
var result = JSON.parse(rtn.stdout);
return result;
}
}
/**
* 带超时时间的post请求
* @param {*} req 请求信息
* @param {*} params 请求数据-json格式
* @param {*} url 请求地址
* @param {*} ContentType 请求头类型，默认application/json
* @param {*} headData 请求头内容-json格式，如：请求头中传递token,格式：{token:"9098902q849q0434q09439"}
* @param {*} timeOut 超时时间
*/
async execPostByTimeOut(req, params, url, ContentType, headData, timeOut = 60) {
const result = await this.execClientNew.execPostTimeOutByBusiness('sve.base', params, url, ContentType, headData, timeOut, req);
return result;
}
}
module.exports = APIBase;
center-channel/app/base/api/impl/action/newName.js
......@@ -23,7 +23,7 @@ class ProductAPI extends WEBBase {
var opResult = null;
switch (action_type) {
case "getIndustryInfo":// 获取行业信息
opResult = await this.utilsUcommuneSve.getUserInfo(pobj, pobj.actionBody);
opResult = await this.utilsUcommuneSve.getUserInfo(req, pobj, pobj.actionBody);
break;
case "placeOrder":// 提交订单
opResult = await this.utilsUcommuneSve.getOrderList(pobj, pobj.actionBody);
......
center-channel/app/base/api/impl/action/patentQuery.js
......@@ -47,6 +47,7 @@ class PatentQueryAPI extends WEBBase {
case "CommomSearchbyFilingno"://根据申请号查询聚合
case "CommomSearchbyPubno"://根据公开号查询聚合
case "AffairsearchbyFilingno"://根据申请号查询并根据法律状态日期排序
case "paDataOrderByPubno"://查询所有专利，按公开日倒序排列
opResult = await this.patentSve.opReqResult(pobj, req);
break;
default:
......
center-channel/app/base/api/impl/action/ucommune.js
......@@ -23,7 +23,7 @@ class ProductAPI extends WEBBase {
var opResult = null;
switch (action_type) {
case "getUserInfo":// 根据优客token获取用户信息，生成userPin返回前端 actionBody
opResult = await this.utilsUcommuneSve.getUserInfo(pobj, pobj.actionBody);
opResult = await this.utilsUcommuneSve.getUserInfo(req, pobj, pobj.actionBody);
break;
case "orderTotalSum":// addOrder后进入支付页面获取支付金额
opResult = await this.utilsUcommuneSve.orderTotalSum(pobj, pobj.actionBody);
......
center-channel/app/base/api/impl/auth/accessAuth.js
......@@ -29,18 +29,17 @@ class AccessAuthAPI extends WEBBase {
switch (action_type) {
// sy
case "test"://测试
var rpcParam = {
accessKeyId: "LTAI4Fgz1uoUpfHpa79iq3XV",
accessKeySecret: "up8vlX0wzwCVtRAjKRXsCrFta6CHOY",
endpoint: "https://trademark.aliyuncs.com",
apiVersion: "2019-09-02"
};
opResult = await this.utilsTmAliyunSve.getAliOssInfo(null, "ATTORNEY", rpcParam);
// var rpcParam = {
// accessKeyId: "LTAI4Fgz1uoUpfHpa79iq3XV",
// accessKeySecret: "up8vlX0wzwCVtRAjKRXsCrFta6CHOY",
// endpoint: "https://trademark.aliyuncs.com",
// apiVersion: "2019-09-02"
// };
// opResult = await this.utilsTmAliyunSve.getAliOssInfo(null, "ATTORNEY", rpcParam);
// opResult = system.getResultSuccess(null, "测试成功");
opResult = system.getResultSuccess(null, "测试成功");
break;
case "getTokenInfo"://渠道通过账户进行登录，有则返回用户信息，没有则创建用户
opResult = system.getResultSuccess({
app_code: pobj.appInfo.app_code,
app_hosts: pobj.appInfo.app_hosts,
......@@ -48,17 +47,11 @@ class AccessAuthAPI extends WEBBase {
uapp_key: pobj.appInfo.uapp_key,
id: pobj.appInfo.id
})
break;
case "getNeedUserPinByChannelUserId"://渠道通过账户进行登录，有则返回用户信息，没有则创建用户
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(pobj, pobj.actionBody);
if (tmpOpResult.status != 0 && tmpOpResult.status != 2060) {
return tmpOpResult;
}
opResult = system.getResultSuccess({ userpin: pobj.actionBody.userpin })
if (tmpOpResult.status == 2060) {
opResult.msg = tmpOpResult.msg;
opResult.data.userpin = tmpOpResult.data.userpin;
opResult = await this.utilsAuthSve.getLoginByUserName(req, pobj, pobj.actionBody);
if (opResult.status != 0) {
return opResult;
}
//获取需求信息
pobj.actionType = "getItemByChannelNeedNo";
......@@ -70,26 +63,18 @@ class AccessAuthAPI extends WEBBase {
opResult.data.typeCode = needResult.data.typeCode
break;
case "getLoginByUserName"://渠道通过账户进行登录，有则返回用户信息，没有则创建用户
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(pobj, pobj.actionBody);
if (tmpOpResult.status != 0 && tmpOpResult.status != 2060) {
return tmpOpResult;
}
opResult = system.getResultSuccess({ userpin: pobj.actionBody.userpin })
if (tmpOpResult.status == 2060) {
opResult.msg = tmpOpResult.msg;
opResult.data.userpin = tmpOpResult.data.userpin;
}
opResult = await this.utilsAuthSve.getLoginByUserName(req, pobj, pobj.actionBody);
break;
case "getVerifyCode"://获取默认模板的手机验证码
opResult = await this.utilsAuthSve.getVerifyCodeByMoblie(pobj, pobj.actionBody);
case "getVerifyCode"://获取默认模板的手机验证码---已优化
opResult = await this.utilsAuthSve.getVerifyCodeByMoblie(req, pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess()
}
break;
case "userPinByLgoin"://通过账户和密码登录
opResult = await this.utilsAuthSve.getReqUserPinByLgoin(pobj, pobj.actionBody);
case "userPinByLgoin"://通过账户和密码登录---已优化
opResult = await this.utilsAuthSve.getReqUserPinByLgoin(req, pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
return opResult;
}
break;
case "userTestLogin": // 假登陆
......@@ -98,30 +83,33 @@ class AccessAuthAPI extends WEBBase {
} else {
return system.getResultFail(-1, '用户名或密码错误')
}
case "userPinByLgoinVcode"://通过短信登录信息
case "userPinByLgoinVcode"://通过短信登录信息---已优化
pobj.actionBody.reqType = "login";
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
}
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(req, pobj, pobj.actionBody);
// if (opResult.status == 0) {
// return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
// }
break;
case "userPinByRegister"://通过短信注册信息
case "userPinByRegister"://通过短信注册信息---已优化
pobj.actionBody.reqType = "reg";
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
}
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(req, pobj, pobj.actionBody);
// if (opResult.status == 0) {
// return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
// }
break;
case "putUserPwdByMobile"://通过手机验证码修改用户密码
case "putUserPwdByMobile"://通过手机验证码修改用户密码---已优化
opResult = await this.utilsAuthSve.putUserPwdByMobile(pobj, pobj.actionBody);
break;
case "getLoginInfo"://通过userpin获取用户登录信息
case "putUserMobileByVcode"://通过手机验证码修改手机号，邮箱
opResult = await this.utilsAuthSve.putUserMobileByVcode(pobj, pobj.actionBody);
break;
case "getLoginInfo"://通过userpin获取用户登录信息--已经废弃，在路由中处理了
opResult = await this.utilsAuthSve.getLoginInfo(pobj, pobj.actionBody);
break;
case "channelUserLogin":
opResult = await this.utilsAuthSve.channelUserLogin(pobj,pobj.actionBody,req);
opResult = await this.utilsAuthSve.channelUserLogin(pobj, pobj.actionBody, req);
break;
case "logout"://用户退出
case "logout"://用户退出--已经废弃，前端自己进行移除userpin信息
opResult = await this.utilsAuthSve.userLogout(pobj, pobj.actionBody);
break;
default:
......@@ -140,10 +128,7 @@ class AccessAuthAPI extends WEBBase {
var token = this.getUUID();
pobj.actionBody.reqType = "hosts";
var opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
if (opResult.status != 0) {
return opResult;
}
return system.getResultSuccess({ token: token })
return opResult;
}
/**
* 接口跳转-POST请求
......@@ -153,10 +138,7 @@ class AccessAuthAPI extends WEBBase {
var token = this.getUUID();
pobj.actionBody.reqType = "appkey";
var opResult = await this.utilsAuthSve.getReqTokenByHosts(pobj.actionBody, token);
if (opResult.status != 0) {
return opResult;
}
return system.getResultSuccess({ token: token })
return opResult;
}
}
module.exports = AccessAuthAPI;
\ No newline at end of file
center-channel/app/base/api/impl/auth/channelAccessAuth.js
......@@ -42,15 +42,7 @@ class ChannelAccessAuthAPI extends WEBBase {
pobj.actionBody.channelUserId = aliUserResult.data.channelUserId;
pobj.actionBody.isAdmin = aliUserResult.data.isAdmin;
pobj.actionBody.isSuper = aliUserResult.data.isSuper;
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(pobj, pobj.actionBody);
if (tmpOpResult.status != 0 && tmpOpResult.status != 2060) {
return tmpOpResult;
}
opResult = system.getResultSuccess({ userpin: pobj.actionBody.userpin })
if (tmpOpResult.status == 2060) {
opResult.msg = tmpOpResult.msg;
opResult.data.userpin = tmpOpResult.data.userpin;
}
opResult = await this.utilsAuthSve.getLoginByUserName(req, pobj, pobj.actionBody);
break;
case "getDingJsApiAuthInfo"://获取钉钉鉴权信息
opResult = await this.utilsChannelAuthSve.getDingJsApiAuthInfo(pobj, pobj.actionBody);
......
center-channel/app/base/api/impl/opreceive/accessAuth.js
......@@ -32,41 +32,33 @@ class AccessAuthAPI extends APIBase {
opResult = system.getResultSuccess(null, "测试成功");
break;
case "getLoginByUserName"://渠道通过账户进行登录，有则返回用户信息，没有则创建用户
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(pobj, pobj.actionBody);
if (tmpOpResult.status != 0 && tmpOpResult.status != 2060) {
return tmpOpResult;
}
opResult = system.getResultSuccess({ userpin: pobj.actionBody.userpin })
if (tmpOpResult.status == 2060) {
opResult.msg = tmpOpResult.msg;
opResult.data.userpin = tmpOpResult.data.userpin;
}
opResult = await this.utilsAuthSve.getLoginByUserName(req, pobj, pobj.actionBody);
break;
case "getVerifyCode"://获取默认模板的手机验证码
opResult = await this.utilsAuthSve.getVerifyCodeByMoblie(pobj, pobj.actionBody);
opResult = await this.utilsAuthSve.getVerifyCodeByMoblie(req, pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess()
}
break;
case "userPinByLgoin"://通过账户和密码登录
opResult = await this.utilsAuthSve.getReqUserPinByLgoin(pobj, pobj.actionBody);
opResult = await this.utilsAuthSve.getReqUserPinByLgoin(req, pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
return opResult;
}
break;
case "userPinByLgoinVcode"://通过短信登录信息
pobj.actionBody.reqType = "login";
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
}
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(req, pobj, pobj.actionBody);
// if (opResult.status == 0) {
// return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
// }
break;
case "userPinByRegister"://通过短信注册信息
pobj.actionBody.reqType = "reg";
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(pobj, pobj.actionBody);
if (opResult.status == 0) {
return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
}
opResult = await this.utilsAuthSve.getReqUserPinByLgoinVcode(req, pobj, pobj.actionBody);
// if (opResult.status == 0) {
// return system.getResultSuccess({ userpin: pobj.actionBody.userpin })
// }
break;
case "putUserPwdByMobile"://通过手机验证码修改用户密码
opResult = await this.utilsAuthSve.putUserPwdByMobile(pobj, pobj.actionBody);
......
center-channel/app/base/api/impl/opreceive/edi.js
......@@ -2,53 +2,53 @@ var APIBase = require("../../api.base");
var system = require("../../../system");
var settings = require("../../../../config/settings");
class edi extends APIBase {
constructor() {
super();
this.centerorderSve = system.getObject("service.common.centerorderSve");
this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
}
constructor() {
super();
this.centerorderSve = system.getObject("service.common.centerorderSve");
this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
}
/**
* 接口跳转-POST请求
* action_process 执行的流程
* action_type 执行的类型
* action_body 执行的参数
*/
async springBoard(pobj, qobj, req) {
if (!pobj.actionType) {
return system.getResult(null, "actionType参数不能为空");
}
var result = await this.opActionProcess(pobj, pobj.actionType, pobj.actionBody, req);
return result;
/**
* 接口跳转-POST请求
* action_process 执行的流程
* action_type 执行的类型
* action_body 执行的参数
*/
async springBoard(pobj, qobj, req) {
if (!pobj.actionType) {
return system.getResult(null, "actionType参数不能为空");
}
async opActionProcess(pobj, action_type, action_body, req) {
var opResult = null;
switch (action_type) {
case "submitNeedAliEsp":
opResult = await this.utilsNeedSve.submitNeedAliEsp(pobj,pobj.actionBody);
break;
case "needCloseAliEsp":
opResult = await this.utilsNeedSve.needCloseAliEsp(pobj,pobj.actionBody);
break;
case "produceNoticeAliEsp":
opResult = await this.utilsNeedSve.ediNotify(pobj, pobj.actionBody);
if (opResult.status == 0) {
opResult = await this.utilsNeedSve.produceNoticeAliEsp(pobj,pobj.actionBody);
}
break;
case "soulutionFeebackAliEsp":
// opResult = await this.utilsNeedSve.ediNotify(pobj, pobj.actionBody);
// opResult = await this.utilsNeedSve.soulutionFeebackAliEsp(pobj,pobj.actionBody);
pobj.actionType = "receiveFeedback"
opResult = await this.centerorderSve.reqCenterOrderApi(pobj);
break;
default:
opResult = system.getResult(null, "action_type参数错误");
break;
var result = await this.opActionProcess(pobj, pobj.actionType, pobj.actionBody, req);
return result;
}
async opActionProcess(pobj, action_type, action_body, req) {
var opResult = null;
switch (action_type) {
case "submitNeedAliEsp":
opResult = await this.utilsNeedSve.submitNeedAliEsp(pobj, pobj.actionBody);
break;
case "needCloseAliEsp":
opResult = await this.utilsNeedSve.needCloseAliEsp(pobj, pobj.actionBody);
break;
case "produceNoticeAliEsp":
opResult = await this.utilsNeedSve.ediNotify(pobj, pobj.actionBody);
if (opResult.status == 0) {
opResult = await this.utilsNeedSve.produceNoticeAliEsp(req, pobj, pobj.actionBody);
}
return opResult;
break;
case "soulutionFeebackAliEsp":
// opResult = await this.utilsNeedSve.ediNotify(pobj, pobj.actionBody);
// opResult = await this.utilsNeedSve.soulutionFeebackAliEsp(pobj,pobj.actionBody);
pobj.actionType = "receiveFeedback"
opResult = await this.centerorderSve.reqCenterOrderApi(pobj);
break;
default:
opResult = system.getResult(null, "action_type参数错误");
break;
}
return opResult;
}
}
module.exports = edi;
\ No newline at end of file
center-channel/app/base/db/cache/appTokenByHostsCache.js
const CacheBase = require("../cache.base");
const system = require("../../system");
const settings = require("../../../config/settings");
class AppTokenByHostsCache extends CacheBase {
class AppTokenByHostsCache extends CacheBase {//----废弃--sy-2020-10-21
constructor() {
super();
this.restClient = system.getObject("util.restClient");
......@@ -16,7 +16,7 @@ class AppTokenByHostsCache extends CacheBase {
var actionBody = val;
var acckapp = await this.restClient.execPost(actionBody, settings.centerAppUrl() + "auth/accessAuth/getTokenByHosts");
var result = acckapp.stdout;
console.log(acckapp.stdout, "AppTokenByHostsCache............. acckapp.stdout..........");
// console.log(acckapp.stdout, "AppTokenByHostsCache............. acckapp.stdout..........");
if (result) {
var tmp = JSON.parse(result);
return tmp;
......
center-channel/app/base/service/app.base.js
......@@ -3,10 +3,13 @@ const moment = require('moment')
const settings = require("../../config/settings");
const md5 = require("MD5");
const uuidv4 = require('uuid/v4');
const cryptoJS = require('crypto-js');
class AppServiceBase {
constructor() {
this.restClient = system.getObject("util.restClient");
this.execClient = system.getObject("util.execClient");
this.execClientNew = system.getObject("util.execClientNew");
this.execClient = system.getObject('util.execClient');
this.cacheManager = system.getObject("db.common.cacheManager");
this.pushlogSve = system.getObject("service.common.pushlogSve");
this.pushlogFailType = { OLDRPC: 1, NEWRPC: 2, FAILLOG: 3, FQ: 4 };
......@@ -365,7 +368,7 @@ class AppServiceBase {
返回20位业务订单号
prefix：业务前缀
*/
async getBusUid(prefix) {
async getBusUid(prefix) {
prefix = (prefix || "");
if (prefix) {
prefix = prefix.toUpperCase();
......@@ -383,7 +386,7 @@ class AppServiceBase {
len：返回长度
radix：参与计算的长度，最大为62
*/
async getUidInfo(len, radix) {
async getUidInfo(len, radix) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');//长度62，到yz长度为长36
var uuid = [], i;
radix = radix || chars.length;
......@@ -407,5 +410,58 @@ class AppServiceBase {
var u = uuid.replace(/\-/g, "");
return u;
}
/**
* 加密信息
* @param {*} encrypt_key
* @param {*} encrypt_secret
* @param {*} opStr
*/
async encryptStr(encrypt_key, encrypt_secret, opStr) {
if (!opStr) {
return system.getResult(null, "opStr is empty");
}
let keyHex = cryptoJS.enc.Utf8.parse(encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(encrypt_secret.substring(0, 8));
var cipherStr = cryptoJS.TripleDES.encrypt(opStr, keyHex, { iv: ivHex }).toString();
return cipherStr;
}
/**
* 解密信息
* @param {*} encrypt_key
* @param {*} encrypt_secret
* @param {*} opStr
*/
async decryptStr(encrypt_key, encrypt_secret, opStr) {
if (!opStr) {
return system.getResult(null, "opStr is empty");
}
try {
let keyHex = cryptoJS.enc.Utf8.parse(encrypt_key);
let ivHex = cryptoJS.enc.Utf8.parse(encrypt_secret.substring(0, 8));
var bytes = cryptoJS.TripleDES.decrypt(opStr, keyHex, {
iv: ivHex
});
var plaintext = bytes.toString(cryptoJS.enc.Utf8);
if (!plaintext) {
return system.getResult(null, "解密失败" + opStr);
}
return system.getResultSuccess(plaintext);
} catch (error) {
return system.getResultFail(-200, "解密异常：" + opStr);
}
}
/**
* 带超时时间的post请求
* @param {*} req 请求信息
* @param {*} params 请求数据-json格式
* @param {*} url 请求地址
* @param {*} ContentType 请求头类型，默认application/json
* @param {*} headData 请求头内容-json格式，如：请求头中传递token,格式：{token:"9098902q849q0434q09439"}
* @param {*} timeOut 超时时间
*/
async execPostByTimeOut(req, params, url, ContentType, headData, timeOut = 60) {
const result = await this.execClientNew.execPostTimeOutByBusiness('sve.base', params, url, ContentType, headData, timeOut, req);
return result;
}
}
module.exports = AppServiceBase;
center-channel/app/base/service/impl/common/centerorderSve.js
......@@ -581,7 +581,7 @@ class CenterorderService extends AppServiceBase {
}
pobj.actionBody.channelSolutionNo = pobj.actionBody.bizId;
pobj.actionType = "receiveSolutionPayInfo";
pobj.actionType = "receiveSolutionPayInfoNew";
var url = settings.centerOrderUrl() + "action/icapi/springBoard";
var solutionrtn = await this.execClient.execPost(pobj, url);
if (!solutionrtn || !solutionrtn.stdout) {
......
center-channel/app/base/service/impl/common/qcCenterOrderSve.js
......@@ -60,7 +60,8 @@ class QcCenterOrderService extends AppServiceBase {
IntentionBizId: needinfo.channelNeedNo,
CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
Area: solution.Area, Note: solution.Note,
//ActionType:solution.ActionType
ActionType:solution.actionType,
Source:"官网"
};
if (needsolution.channelSolutionNo) {
pushObj["BizId"] = needsolution.channelSolutionNo;
......
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
......@@ -49,9 +49,9 @@ class UtilsOrderService extends AppServiceBase {
}
console.log("buyTotalSum", buyTotalSum)
console.log("totalSum", totalSum)
if (buyTotalSum < totalSum) {
return system.getResult(null, "订单金额有误，100060");
}
// if (buyTotalSum < totalSum) {
// return system.getResult(null, "订单金额有误，100060");
// }
pobj.actionBody.product_info.price_item = price_list[productIndex];
if (additionsIndex >= 0) {
pobj.actionBody.product_info.price_additions_item = price_list[additionsIndex];
......@@ -944,15 +944,109 @@ class UtilsOrderService extends AppServiceBase {
}
// 推送
this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
if(['icpsq','edisq'].includes(opOrderResult.data.product_info.channel_item_code)){
this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder");
}
opOrderResult.data = null;
return opOrderResult;
} catch (e) {
// await this.cacheManager["TlPayLocker"].release(params.orderNo);
this.logCtl.error({
optitle: "回调处理订单---error异常",
op: "center-app/app/base/service/impl/utilsSve/utilsOrderSve.js/channelPayNotify",
content: "参数=" + JSON.stringify(params) + "，error：" + e.stack,
clientIp: client_ip || ""
});
return system.getResultFail(-200, e.stack);
}
}
async channelPayNotify360(params, client_ip) {//渠道订单支付通知
try {
this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "渠道订单支付回调参数信息",
op: "service/impl/utilsSve/utilsOrderSve.js/channelPayNotify",
content: JSON.stringify(params),
clientIp: client_ip || ""
});
if (!params.appkey) {
return system.getResult(null, 'appKey can be not null')
}
if (!params.orderNo) {
return system.getResult(null, 'orderNo can be not null')
}
if (!params.payTotalSum) {
return system.getResult(null, 'payTotalSum can be not null')
}
if (!params.signature) {
return system.getResult(null, 'signature can be not null')
}
if (!params.payType) {
return system.getResult(null, 'payType can be not null')
}
if (!params.payOrderNo) {
return system.getResult(null, 'payOrderNo can be not null')
}
let url = this.centerAppUrl + 'payment/paymentApi/getAppInfoByAppKey';
let appInfoRt = await this.restPostUrl({ appKey: params.appkey }, url);
if (appInfoRt.status != 0) {
appInfoRt.msg = appInfoRt.msg + "，100270";
return appInfoRt;
}
let singStr = params.appkey + params.orderNo + params.payTotalSum + appInfoRt.data.uapp_secret
let sign = md5(singStr).toUpperCase();
if (sign != params.signature) {
return system.getResultFail(-1, '验证签名失败')
}
var appInfo = appInfoRt.data;
params.appInfo = { uapp_id: appInfo.uapp_id };
params.pay_type = params.payType;
params.time_end = params.payTime;
//修改并返回订单支付状态，创建收款单
// 这里修改了order_info的状态（status/paytime等）
var orderUrl = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotifyByChannel";
var opOrderResult = await this.restPostUrl(params, orderUrl);
if (opOrderResult.status != 0) {
opOrderResult.data = null;
return opOrderResult;
}
if(!opOrderResult.data){
return opOrderResult;
}
opOrderResult.data.appInfo = {
uapp_id: appInfo.uapp_id,
uapp_key: appInfo.uapp_key,
app_code: appInfo.app_code,
app_name: appInfo.app_name
};
opOrderResult.data.userInfo = {
channel_userid: opOrderResult.data.order_info.channelUserId,
channel_username: opOrderResult.data.order_info.channelUserId,
channel_nickname: opOrderResult.data.order_info.channelUserId
};
opOrderResult.data.orderNo = params.orderNo;
opOrderResult.data.order_info.pay_flow_no = params.trade_no || "";// 2020 0704 lin 新增 推送fq必填字段
opOrderResult.data.order_info.pay_channel = params.payType ||"";//付款方式
opOrderResult.data.order_info.pay_time = params.payTime;//付款时间
opOrderResult.data.order_info.pay_payer_bank_no = params.buyer_email || "";//付款账号
opOrderResult.data.order_contact = opOrderResult.data.delivery_content.orderContact;
var pobj = {
appInfo: opOrderResult.data.appInfo,
actionBody: opOrderResult.data
}
// 推送
this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
if(['icpsq','edisq'].includes(opOrderResult.data.product_info.channel_item_code)){
this.utilsPushSve.aliBusiness2Delivery(pobj, "pushDeliveryOrder");
}else{
this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
}
opOrderResult.data = null;
return opOrderResult;
} catch (e) {
await this.cacheManager["TlPayLocker"].release(params.orderNo);
// await this.cacheManager["TlPayLocker"].release(params.orderNo);
this.logCtl.error({
optitle: "回调处理订单---error异常",
op: "center-app/app/base/service/impl/utilsSve/utilsOrderSve.js/channelPayNotify",
......
center-channel/app/base/service/impl/utilsSve/utilsUcommuneSve.js
......@@ -22,10 +22,11 @@ class UtilsUcommuneService extends AppServiceBase {
/**
* 根据优客token获取用户信息，生成userPin返回前端
* @param {*} req
* @param {*} pobj
* @param {*} actionBody userToken 为优客工厂的userToken
*/
async getUserInfo(pobj, actionBody) {
async getUserInfo(req, pobj, actionBody) {
this.logCtl.info({
optitle: "优客免登接口",
op: "center-app/app/base/service/impl/utilsSve/utilsUcommuneSve.js/getUserInfo",
......@@ -45,9 +46,9 @@ class UtilsUcommuneService extends AppServiceBase {
pobj.actionBody.nickName = result.data.name;
pobj.actionBody.mobile = result.data.mobile;
pobj.actionBody.headUrl = result.data.headImg;
pobj.actionBody.userpin = pobj.actionBody.userpin || this.getUUID();
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(pobj, pobj.actionBody);
if (tmpOpResult.status != 0 && tmpOpResult.status != 2060) {
// pobj.actionBody.userpin = pobj.actionBody.userpin || this.getUUID();//采用jwt方式封装userpin
var tmpOpResult = await this.utilsAuthSve.getLoginByUserName(req, pobj, pobj.actionBody);
if (tmpOpResult.status != 0) {
return tmpOpResult;
}
this.logCtl.info({
......
center-channel/app/config/businessConfig.js 0 → 100644
module.exports = {
PDICT: {
encrypt_key: "202006242013DDD90880",
encrypt_secret: "25455136E3BCA24335C3142C72D90990",
secret_prefix: "CENTERAPP",
token_secret_dev: "1E15FB63A004635A9BFB66BFA0637E99",//dev
token_secret_prod: "25455136E3BCA24335C3142C72D88990",//prod
webMustUserpinList: ["serviceProviderSubmitMaterial", "closeOrderDelivery", "serviceProviderNotification", "tmConfirm", "getNeedSolutionDetailByUser",
"getProgrammeInfoByChannelNeedNo", "submitIcpProgramme", "submitIcpMaterial", "acceptIcpPartnerNotification", "abolishIcpProgramme",
"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder", "submitProgramme",
"getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo", "getPaidLogoListByUser", "getCollectibleLogoListByUser",
"collectLogo", "getLogoMaterial", "cancelCollectLogo", "icpNotify", "createName", "getNameDetail", "orderConfirm",
"orderTotalSum", "collect", "reg", "orderCheck", "getReOrderList", "getOfficalList", "addReviewList", "opSubmitNeed", "opNeedClose", "opNeedList",
"getItemByNeedNo", "opNeedDetailByChannelNo", "getNeedListUser", "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo", "diagnosisDetail",
"submitIcpIntention", "queryIntentionList", "confirmIcpIntention", "tmAccept", "tmStatus", "needBatchUpload",
"serviceSubmitOption", "submitWangwenSolution", "closeNeed", "recordLog", "recordLogList", "foodServiceSubmitOption", "submitFoodSolution",
"foodCloseNeed", "foodRecordLog", "foodRecordLogList", "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo","putUserMobileByVcode",
"putUserPwdByMobile"
],
apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo"]
}
}
center-channel/app/config/localsettings.js
......@@ -3,7 +3,7 @@ var settings = {
host: "121.36.3.35",
port: 8967,
password: "Gongsibao2018",
db: 5,
db: 4,
},
database: {
dbname: "igirl_api",
......
center-channel/app/config/settings.js
......@@ -22,7 +22,14 @@ var settings = {
cacheprefix: "centerChannel",
usertimeout: 3600,//单位秒
basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 4012,
port: process.env.NODE_PORT || 4012,
//记录日志地址
opNewLogUrl() {
if (this.env == 'dev') {
return 'http://192.168.18.101:4019/api/queueAction/producer/springBoard';
}
return 'http://logs-sytxpublic-msgq-service/api/queueAction/producer/springBoard';
},
fbQueryUrl: function () {
if (this.env == 'dev' || this.env == 'test') {
return 'http://43.247.184.92:15505'
......@@ -36,7 +43,7 @@ var settings = {
} else {
return "http://sytxpublic-msgq-service/api/queueAction/producer/springBoard";
}
},
},
entProfileUrl: function () {
if (this.env == "dev") {
return "https://entprofile.gongsibao.com/";
......@@ -57,7 +64,7 @@ var settings = {
} else {
return "http://aliossjava-service/getNames";
}
},
tmtransactionUrl: function () {
if (this.env == "dev") {
......@@ -66,7 +73,7 @@ var settings = {
return "http://center-tmtransaction-service";
}
},
qifuPayAfterH5JumpUrl: function () {
if (this.env == "dev") {
return "http://tm.qifu.gongsibao.com:4012/#/home/indent_list";
......@@ -80,22 +87,22 @@ var settings = {
} else {
return "http://tm.qifu.gongsibao.com/#/home/indent_list";
}
},
},
qifuH5PayNotifyUrl: function () {
if (this.env == "dev") {
// return "http://gsb.qifu.gongsibao.com:4012/tlpay/notify";
return "http://gsb.qifu-dev.gongsibao.com/tlpay/notify"// 2020 0804 lin 修改测试环境tl回调地址
// return "http://gsb.qifu.gongsibao.com:4012/tlpay/notify";
return "http://gsb.qifu-dev.gongsibao.com/tlpay/notify"// 2020 0804 lin 修改测试环境tl回调地址
} else {
return "http://gsb.qifu.gongsibao.com/tlpay/notify";
}
},
},
qifubaoUrl: function () {//企服宝（交付系统）
if (this.env == "dev") {
return "http://xxxx:xxxx/";
} else {
return "";
}
},
},
paasUrl: function () {
if (this.env == "dev") {
return "http://p.apps.com:4001/";
......@@ -142,12 +149,12 @@ var settings = {
}
},
centerChannelUrl: function () {
if (this.env == "dev") {
return "http://60.205.209.94:4012/"
} else {
// return "channel的正式环境" 6.30修改目前只用作生成alipay/wx的通知回调地址
return "http://youke.qifu.gongsibao.com/"
}
if (this.env == "dev") {
return "http://60.205.209.94:4012/"
} else {
// return "channel的正式环境" 6.30修改目前只用作生成alipay/wx的通知回调地址
return "http://youke.qifu.gongsibao.com/"
}
},
gatewayUrl: function () {
if (this.env == "dev") {
......@@ -163,24 +170,24 @@ var settings = {
return "http://center-order-service/";
}
},
igirlWeburl: function(){
igirlWeburl: function () {
if (this.env == "dev") {
return "http://127.0.0.1:3000/";
} else {
return "http://igirl-service/";
}
},
centerCacheUrl:function(){
if(this.env=='dev'){
centerCacheUrl: function () {
if (this.env == 'dev') {
return "http://123.57.217.203:30005/";
}else{
} else {
return "http://specialprofile-service/"
}
},
fileDealUrl:function(){
if(this.env=='dev'){
fileDealUrl: function () {
if (this.env == 'dev') {
return "http://43.247.184.92:15503";
}else{
} else {
return "http://43.247.184.92:15503"
}
},
......@@ -199,7 +206,7 @@ var settings = {
return "http://43.247.184.94:7200/";
}
},
certificationUrl:function () {
certificationUrl: function () {
if (this.env == "dev") {
return "http://43.247.184.92:15506/";//
} else {
......@@ -224,7 +231,7 @@ var settings = {
if (this.env == "dev") {
return "https://m-dev.ucommune.com/"// 优客测试环境
} else {
// return "https://m.ucommune.com/"// 优客正式环境
// return "https://m.ucommune.com/"// 优客正式环境
return "https://m.ucommune.com/"// 6.29lin修改为测试环境。原因优客 目前还没有正式环境
}
},
......@@ -307,25 +314,25 @@ var settings = {
};
}
},
alipay: function() {// 没有在使用 确定不需要后会去掉
return new AlipaySdk({
alipay: function () {// 没有在使用 确定不需要后会去掉
return new AlipaySdk({
// appId: payConfig.ali.appId,
// privateKey: payConfig.ali.privateKey,
// alipayPublicKey: payConfig.ali.publicKey,
// appId: payConfig.ali.appId,
// privateKey: payConfig.ali.privateKey,
// alipayPublicKey: payConfig.ali.publicKey,
});
},
wxpay: function() {// 没有在使用 确定不需要后会去掉
return WXPay({
appid: 'wx6f3ebe44defe336a',
mch_id: '1232813602',
partner_key: 'sinotone2014sinotone2014sinotone', //微信商户平台API密钥
//pfx: fs.readFileSync('./wxpay_cert.p12'), //微信商户平台证书
//pfx: "sinotone2014sinotone2014sinotone"
})
wxpay: function () {// 没有在使用 确定不需要后会去掉
return WXPay({
appid: 'wx6f3ebe44defe336a',
mch_id: '1232813602',
partner_key: 'sinotone2014sinotone2014sinotone', //微信商户平台API密钥
//pfx: fs.readFileSync('./wxpay_cert.p12'), //微信商户平台证书
//pfx: "sinotone2014sinotone2014sinotone"
})
// const config = {
// appid: 'wx6f3ebe44defe336a',
// mchid: '1232813602',
......@@ -333,15 +340,15 @@ var settings = {
// };
// return new tenpay(config);
},
paySecret: function() {
paySecret: function () {
if (this.env == "dev") {
// return "ab53dfb909e4c32a";
// return "ab53dfb909e4c32a";
return "34cdecaac35b1d8d"// 7.1之前测试环境的secret无法使用，测试/正式全部使用同一个secret
} else {
return "34cdecaac35b1d8d";// 6.29lin新增 小黑给的secret
}
},
ucommuneOperatorPhone: function() {
ucommuneOperatorPhone: function () {
if (this.env == "dev") {
return "13911391996"// 7.7修改测试环境优客 辅助/担保订单推送业务员手机号
} else {
......
center-channel/app/front/entry/public/apidoc/patentDesc/patent.md
......@@ -15,6 +15,7 @@
1. [根据公开号查询聚合](#CommomSearchbyPubno)
1. [根据发明人查询聚合](#CommomSearchbyInventor)
1. [根据申请号查询并根据法律状态日期排序](#AffairsearchbyFilingno)
1. [查询所有专利，按公开日倒序排列](#paDataOrderByPubno)
## **<a name="CommomSearchbyApplicant"> 根据申请人查询聚合接口</a>**
......@@ -1143,4 +1144,51 @@
"bizmsg": "empty"
}
```
## **<a name="paDataOrderByPubno"> 查询所有专利，按公开日倒序排列</a>**
[返回到目录](#menu)
##### URL
[/action/patentQuery/paDataOrderByPubno]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：paDataOrderByPubno
```javascript
{
"page_size":10//需要返回的最大条数，可不传，默认20
"current_page":0//需要返回的当前页。可不传，默认0
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"total": 3,
"data": [
{
"abstr_text": "本申请提供了一种任务调度管理方法、装置及电子设备,其中,该任务调度管理方法包括:使用目标监测组件对容器编排平台中的目标工作进行监控;当目标监测组件监控到目标工作的工作状态发生变化时,则通过目标监测组件将目标工作的当前工作状态发送给任务记录组件;通过任务记录组件,根据目标工作的当前工作状态对目标工作对应的目标任务的任务状态进行更新。",
"filing_name": "任务调度管理方法、装置及电子设备",
"filing_no": "202010458650",
"pub_no": "CN111597032A"
},
{
"abstr_text": "本发明的一种基于WB芯片的双面挖腔陶瓷封装工艺,在陶瓷基板两侧面的芯片贴装位置进行预先挖腔,封装时将WB芯片分别沉到相应的陶瓷腔里并与陶瓷基板连接,连接后进行底面封帽和顶面封帽,在陶瓷基板底面焊接引脚并弯曲成型,完成封装。通过在陶瓷基板两侧面分别设置上挖腔和下挖腔,使得陶瓷基板的空间得到增大,且上挖腔和下挖腔内均设有WB芯片,使得陶瓷基板的封装空间变大,提高了陶瓷封装的空间利用率且降低了陶瓷封装的外形尺寸。",
"filing_name": "一种基于WB芯片的双面挖腔陶瓷封装工艺",
"filing_no": "202010458856",
"pub_no": "CN111599689A"
},
{
"abstr_text": "本发明公开了一种乐器打孔用定位装置,包括底板,所述底板的上表面上通过螺钉固定安装有伺服电缸,所述伺服电缸的输出端端头上通过螺钉固定安装有支撑板,所述支撑板的上表面上开设有圆槽,所述圆槽中通过至少四个连接机构转动安装有工作台,所述伺服电机的输出轴贯穿底板后与工作台固定连接,所述工作台的上表面左右边缘处均固定焊接有第一固定板,所述第一固定板上通过螺纹套管螺纹连接有手柄螺栓,所述手柄螺栓的端头上通过转动机构设置有活动夹块,所述第二固定板上固定焊接有固定夹块。本发明的高度可进行调节,可适应不同的打孔设备,可快速变换工作台的打孔工位,可实现连续性地打孔作业,提高了乐器加工效率。",
"filing_name": "一种乐器打孔用定位装置",
"filing_no": "202010459355",
"pub_no": "CN111589936A"
}
]
},
"bizmsg": "empty"
}
```
\ No newline at end of file
center-channel/app/front/entry/public/apidoc/platform/user.md
......@@ -4,6 +4,7 @@
1. [验证码登录](#userPinByLgoinVcode)
1. [用户注册](#userPinByRegister)
1. [按照手机号和验证码修改密码](#putUserPwdByMobile)
1. [按照验证码修改手机号、邮箱](#putUserMobileByVcode)
1. [获取用户登录信息](#getLoginInfo)
1. [退出](#logout)
1. [飞书登录](#feishuLogin)
......@@ -161,6 +162,36 @@
```
## **<a name="putUserMobileByVcode"> 根据验证码修改手机号、邮箱</a>**
[返回到目录](#menu)
##### URL
[/web/auth/accessAuth/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：putUserMobileByVcode
``` javascript
{
"newMobile":"15010929366", // N 手机号
"vcode":"593555", // Y 验证码
"email":"123456" // Y 邮箱
}
```
#### 返回结果
```javascript
{
"status": 0,// 0为成功，2030为验证码错误，否则失败
"msg": "success",
"data": null,
"requestId": "1b12b0e9c190436da000386ddf693c8f"
}
```
## **<a name="logout"> 退出</a>**
......
center-channel/package-lock.json
......@@ -417,6 +417,11 @@
"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.4.tgz",
"integrity": "sha512-RbY3UMcOcGhc3pOfQ6sliVjt3lqGib9lRjfH1UXJ8YfBFWbcWSJ8jr/VB2W6ulCzTSO/DSnCASqsHYuqa8O7yw=="
},
"async": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
"integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
},
"async-foreach": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
......@@ -1176,6 +1181,16 @@
"emitter-listener": "^1.1.1"
}
},
"convert-hex": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/convert-hex/-/convert-hex-0.1.0.tgz",
"integrity": "sha1-CMBFaJIsJ3drii6BqV05M2LqC2U="
},
"convert-string": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/convert-string/-/convert-string-0.1.0.tgz",
"integrity": "sha1-ec5BqbsNA7z3LNxqjzxW+7xkQQo="
},
"cookie": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
......@@ -3669,7 +3684,8 @@
"is-buffer": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
},
"is-builtin-module": {
"version": "1.0.0",
......@@ -4480,16 +4496,6 @@
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
},
"md5": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
"integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
"requires": {
"charenc": "~0.0.1",
"crypt": "~0.0.1",
"is-buffer": "~1.1.1"
}
},
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
......@@ -6681,6 +6687,15 @@
"crypt": ">= 0.0.1"
}
},
"sha256": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/sha256/-/sha256-0.2.0.tgz",
"integrity": "sha1-c6C0GNqrcDW/+G6EkeNjQS/CqwU=",
"requires": {
"convert-hex": "~0.1.0",
"convert-string": "~0.1.0"
}
},
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
......@@ -8107,7 +8122,6 @@
"resolved": "https://registry.npmjs.org/wx-pay/-/wx-pay-1.0.2.tgz",
"integrity": "sha1-rhQqFRQ0yjgKgDffgytl3f9JdQQ=",
"requires": {
"md5": "^2.0.0",
"request": "^2.54.0",
"xml2js": "^0.4.6"
}
......
center-channel/package.json
......@@ -36,6 +36,7 @@
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"jsonwebtoken": "^8.5.1",
"marked": "^0.7.0",
"method-override": "^2.3.10",
"mongoose": "^5.7.1",
......
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