Skip to content

Z
zhichan
Commit 124ba0d6 by 宋毅
Options

新接口修改

parent de0b900c
Showing with 140 additions and 126 deletions
center-order/app/base/service/impl/dbneed/needsolutionSve.js
...@@ -759,6 +759,10 @@ class NeedsolutionService extends ServiceBase { ...@@ -759,6 +759,10 @@ class NeedsolutionService extends ServiceBase {
needNo:ab.bizId,channelNeedNo:ab.bizId,status:"ywc" needNo:ab.bizId,channelNeedNo:ab.bizId,status:"ywc"
}; };
var newSolutionCount = { var newSolutionCount = {
"interface_param":{
push_channel_interface_path:ab.product_info.push_channel_interface_path || "",
push_channel_interface_method:ab.product_info.push_channel_interface_method || ""
},
"status": "PAID", "status": "PAID",
"bizType": ab.product_info && ab.product_info.item_code?ab.product_info.item_code:"", "bizType": ab.product_info && ab.product_info.item_code?ab.product_info.item_code:"",
"solution": { "solution": {
...@@ -826,7 +830,7 @@ class NeedsolutionService extends ServiceBase { ...@@ -826,7 +830,7 @@ class NeedsolutionService extends ServiceBase {
}); });
return system.getResultSuccess(ns); return system.getResultSuccess(ns);
} }
} }
// --------------庄冰2020.10.23-------百度Icp接入使用--------end------------------ // --------------庄冰2020.10.23-------百度Icp接入使用--------end------------------
......
center-order/app/config/settings.js
var path = require('path'); var path = require('path');
var ENVINPUT = { var ENVINPUT = {
DB_HOST: process.env.DB_HOST, DB_HOST: process.env.DB_HOST,
DB_PORT: process.env.DB_PORT, DB_PORT: process.env.DB_PORT,
DB_USER: process.env.DB_USER, DB_USER: process.env.DB_USER,
DB_PWD: process.env.DB_PWD, DB_PWD: process.env.DB_PWD,
DB_NAME: process.env.CENTER_ORDER_DB_NAME, DB_NAME: process.env.CENTER_ORDER_DB_NAME,
REDIS_HOST: process.env.REDIS_HOST, REDIS_HOST: process.env.REDIS_HOST,
REDIS_PORT: process.env.REDIS_PORT, REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD: process.env.REDIS_PWD, REDIS_PWD: process.env.REDIS_PWD,
REDIS_DB: process.env.CENTER_ORDER_REDIS_DB, REDIS_DB: process.env.CENTER_ORDER_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev" APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
}; };
var settings = { var settings = {
env: ENVINPUT.APP_ENV, env: ENVINPUT.APP_ENV,
appKey: "201911061250", appKey: "201911061250",
secret: "f99d413b767f09b5dff0b3610366cc46", secret: "f99d413b767f09b5dff0b3610366cc46",
salt: "%iatpD1gcxz7iF#B", salt: "%iatpD1gcxz7iF#B",
cacheprefix: "centerOrder", cacheprefix: "centerOrder",
usertimeout: 3600,//单位秒 usertimeout: 3600,//单位秒
basepath: path.normalize(path.join(__dirname, '../..')), basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 4011, port: process.env.NODE_PORT || 4011,
//记录日志地址 //记录日志地址
opNewLogUrl() { opNewLogUrl() {
if (this.env == 'dev') { if (this.env == 'dev') {
return "http://er.es.gongsibao.com:7200/center_order_req_log/_doc?pretty"; return "http://er.es.gongsibao.com:7200/center_order_req_log/_doc?pretty";
} }
return "http://er.es.gongsibao.com:7200/center_order_req_log/_doc?pretty"; return "http://er.es.gongsibao.com:7200/center_order_req_log/_doc?pretty";
},
reqTransferurl: function () {
if (this.env == "dev") {
return "http://192.168.18.61:3003/";
} else {
return "http://jiaxiya-service/";
}
},
reqEsAddr: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
return "http://er.es.gongsibao.com:7200/";//localsettings.reqEsDevUrl;
} else {
return "http://er.es.gongsibao.com:7200/";
}
},
centerChannelUrl: function () {
if (this.env == "dev") {
return "http://gsb.qifu.gongsibao.com:4012/";//localsettings.reqEsDevUrl;
} else {
return "http://gsb.qifu.gongsibao.com:4012/";
}
},
centerAppUrl: function () {
if (this.env == "dev") {
return "http://centerapp.apps.com:4010/";
} else {
return "http://center-app-service/";
}
},
push360Url: function () {
if (this.env == 'dev') {
return "http://180.163.239.98:38086/";
} else {
return "https://tobadminapi.e.360.cn/";
}
},
auth360Url: function () {
if (this.env == 'dev') {
return "https://oauth2.e.360.cn/site/token";
} else {
return "https://oauth2.e.360.cn/site/token";
}
},
apiconfig: {
opLogUrl: function () {
return settings.reqEsAddr() + "center_order_log/_doc?pretty";
}, },
opLogEsIsAdd: function () { reqTransferurl: function () {
return 1; if (this.env == "dev") {
return "http://192.168.18.61:3003/";
} else {
return "http://jiaxiya-service/";
}
}, },
}, reqEsAddr: function () {
if (this.env == "dev") {
homePage: function () { var localsettings = require("./localsettings");
if (this.env == "dev") { return "http://er.es.gongsibao.com:7200/";//localsettings.reqEsDevUrl;
var localsettings = require("./localsettings"); } else {
return localsettings.reqHomePageDevUrl; return "http://er.es.gongsibao.com:7200/";
} else { }
return "http://boss.gongsibao.com/"; },
} centerChannelUrl: function () {
}, if (this.env == "dev") {
redis: function () { return "http://gsb.qifu.gongsibao.com:4012/";//localsettings.reqEsDevUrl;
if (this.env == "dev") { } else {
var localsettings = require("./localsettings"); return "http://gsb.qifu.gongsibao.com:4012/";
return localsettings.redis; }
} else { },
return { centerAppUrl: function () {
host: ENVINPUT.REDIS_HOST, if (this.env == "dev") {
port: ENVINPUT.REDIS_PORT, return "http://centerapp.apps.com:4010/";
password: ENVINPUT.REDIS_PWD, } else {
db: ENVINPUT.REDIS_DB, return "http://center-app-service/";
}; }
} },
}, push360Url: function () {
database: function () { if (this.env == 'dev') {
if (this.env == "dev") { return "http://180.163.239.98:38086/";
var localsettings = require("./localsettings"); } else {
return localsettings.database; return "https://tobadminapi.e.360.cn/";
} else { }
return { },
dbname: ENVINPUT.DB_NAME, auth360Url: function () {
user: ENVINPUT.DB_USER, if (this.env == 'dev') {
password: ENVINPUT.DB_PWD, return "https://oauth2.e.360.cn/site/token";
config: { } else {
host: ENVINPUT.DB_HOST, return "https://oauth2.e.360.cn/site/token";
dialect: 'mysql', }
operatorsAliases: false, },
pool: { apiconfig: {
max: 5, opLogUrl: function () {
min: 0, return settings.reqEsAddr() + "center_order_log/_doc?pretty";
acquire: 90000000, },
idle: 1000000 opLogEsIsAdd: function () {
}, return 1;
debug: false,
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}, },
}; },
homePage: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
return localsettings.reqHomePageDevUrl;
} else {
return "http://boss.gongsibao.com/";
}
},
redis: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
return localsettings.redis;
} else {
return {
host: ENVINPUT.REDIS_HOST,
port: ENVINPUT.REDIS_PORT,
password: ENVINPUT.REDIS_PWD,
db: ENVINPUT.REDIS_DB,
};
}
},
database: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
return localsettings.database;
} else {
return {
dbname: ENVINPUT.DB_NAME,
user: ENVINPUT.DB_USER,
password: ENVINPUT.DB_PWD,
config: {
host: ENVINPUT.DB_HOST,
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug: false,
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
},
};
}
},
addArr: function () {
return ["南海诸岛", "北京", "天津", "上海", "重庆", "河北", "河南", "云南", "辽宁", "黑龙江", "湖南", "安徽", "山东", "新疆", "江苏", "浙江", "江西", "湖北", "广西", "甘肃", "山西", "内蒙古", "陕西", "吉林", "福建", "贵州", "广东", "青海", "西藏", "四川", "宁夏", "海南", "台湾", "香港", "澳门"]
},
icpDeliveryStatusReference: function () {
return {
507: {key: "ACCOUNT_REGISTERED", value: "完成账户注册"},
508: {key: "MATERIAL_SUBMITTED", value: "完成资料递交"},
509: {key: "GXB_ACCEPT", value: "⼯信部已受理"},
510: {key: "GXB_REFUSE", value: "⼯信部不予受理"},
511: {key: "GXB_FAIL", value: "⼯信部未通过"},
512: {key: "GXB_SUCCESS", value: "工信部通过"}
}
} }
},
addArr: function () {
return ["南海诸岛", "北京", "天津", "上海", "重庆", "河北", "河南", "云南", "辽宁", "黑龙江", "湖南", "安徽", "山东", "新疆", "江苏", "浙江", "江西", "湖北", "广西", "甘肃", "山西", "内蒙古", "陕西", "吉林", "福建", "贵州", "广东", "青海", "西藏", "四川", "宁夏", "海南", "台湾", "香港", "澳门"]
}
}; };
module.exports = settings; module.exports = settings;
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