Commit 16455da3 by 王悦

fix

parent 90b73b1a
......@@ -5,7 +5,7 @@ let settings = require("../../../../config/settings");
const CtlBase = require("../../ctl.base");
const logCtl = system.getObject("web.common.oplogCtl");
const tmtransactionPath = "/api/action/tmQuery/springBoard";
const tmurl = settings.channelApiUrl() + tmtransactionPath;
const tmurl = settings.centerChannelUrl() + tmtransactionPath;
//标源检索
class searchCtl extends CtlBase {
constructor() {
......
const system = require("../../../system");
const settings = require("../../../../config/settings");
const appconfig = system.getSysConfig();
module.exports = (db, DataTypes) => {
return db.define("excel", {
status: DataTypes.INTEGER,
}, {
paranoid: true,//假的删除
underscored: true,
version: true,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'excel_upload',
validate: {
},
indexes: [
]
});
};
......@@ -5,6 +5,7 @@ module.exports = (db, DataTypes) => {
return db.define("trademark", {
user_id: DataTypes.INTEGER, //平台用户id
company_id: DataTypes.INTEGER, //平台公司id
upload_id: DataTypes.INTEGER, //上传id
trademark_id: DataTypes.INTEGER, //标源id
tm_code: DataTypes.STRING, //商标申请号
opath: DataTypes.STRING, //用户路径
......
......@@ -45,7 +45,7 @@ var settings = {
if (this.env == "dev") {
return "http://alitm.qifu-dev.gongsibao.com";
} else {
return "http://alitm.qifu.gongsibao.com";
return "http://zcapi-service.chaolai";
}
},
centerChannelUrl: function () {//---------center-channel
......@@ -53,7 +53,7 @@ var settings = {
// return "http://gsbweb.qifu-dev.gongsibao.com";//localsettings.reqEsDevUrl;
return "http://gsbweb.qifu-dev.gongsibao.com";
} else {
return "http://gsbweb.qifu.gongsibao.com";
return "http://center-channel-service.chaolai";
}
},
uploadfileossurl: function () {
......
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