Commit bfdc7a81 by 蒋勇

d

parent eb6bf168
......@@ -6,7 +6,6 @@ var glob = require("glob");
class DbFactory{
constructor(){
const dbConfig=settings.database();
const dbConfighb=settings.databasehb();
this.db=new Sequelize(dbConfig.dbname,
dbConfig.user,
dbConfig.password,
......
const system=require("../../../system");
const settings=require("../../../../config/settings");
const ServiceBase=require("../../sve.base")
var WXPay = require('wx-pay');
const uuidv4 = require('uuid/v4');
class ApiTradeService extends ServiceBase{
constructor(){
......
......@@ -12,12 +12,7 @@ class RestClient{
this.cmdDownLoadFilePattern="curl -G -o {fileName} {url}";
this.cmdPostPattern2="curl -k -H 'Content-type: application/x-www-form-urlencoded' -d '{data}' {url}";
//云帐户
this.cmdPostPattern3="curl -k -H 'Content-type: application/x-www-form-urlencoded' -H 'dealer-id:"+settings.apiconfig.yunzhanghuDealer_id()+"' -H 'request-id:"+parseInt(Date.now() / 1000)+"_gsb"+"' -d '{data}' {url}";
this.cmdGetPattern3 = "curl {-G} -k {url} --header 'dealer-id:"+settings.apiconfig.yunzhanghuDealer_id()+"'";
//e签宝
this.cmdPostPattern4="curl -k -H 'Content-type: application/json' -H 'X-Tsign-Open-App-Id:"+settings.apiconfig.eSignBaoAppId()+"' -H 'X-Tsign-Open-App-Secret:"+settings.apiconfig.eSignBaoAppKey()+"' -d '{data}' {url}";
// form-data形式post data参数类型 md5=2&data=1
this.cmdPostPattern5="curl -k --data '{data}' {url}";
......
var settings={
redis:{
var settings = {
redis: {
host: "43.247.184.32",
port: 8967,
password: "Gongsibao2018",
db:10,
db: 9,
},
database:{
dbname : "pmmanage",
database: {
dbname: "pmmanage",
user: "write",
password: "write",
config: {
host: '43.247.184.35',
port: 8899,
host: '192.168.18.237',
port: 3306,
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug:false,
dialectOptions:{
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}
},
reqEsDevUrl:"http://192.168.4.249:9200/",
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug: false,
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}
},
reqEsDevUrl: "http://192.168.4.249:9200/",
};
module.exports = settings;
......@@ -7,6 +7,7 @@ var settings = {
//为了直接从应用客户端登录,需要查询出当前用户所在公司
//如果有这个配置,就表示支持从应用自己的客户端登录或注册
// companyKey:"af4dfb53282d4743866259e0b15b134e",
companyKey:"2a7aaedd15184e109891d9ecefd78bfc",
salt: "%iatpD1gcxz7iF#B",
basepath : path.normalize(path.join(__dirname, '../..')),
port : process.env.NODE_PORT || 3004,
......
......@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
<title id="idtitle"><%=app.name%></title>
<link rel="stylesheet" href="/css/ele/index_2.5.4.css">
<link rel="stylesheet" href="http://p.apps.com:3001/css/pagecom.css">
<link rel="stylesheet" href="http://open.gongsibao.com/css/pagecom.css">
<link rel="stylesheet" href="/css/pagecom.css">
<link rel="stylesheet" href="/css/fontawesome/css/font-awesome.min.css">
......
......@@ -57,17 +57,15 @@
<body>
<div id="app" v-loading="loading" class="app-main" style="visibility:hidden">
<div id="app-header" class="app-header">
<div id="appName">
<span><%=app?app.name:'应用未启用'%></span>
<span v-if="currentUser" style="font-size:14px"><span class="fa fa-home" ></span>{{currentUser.owner.name}}</span>
</div>
<div id="appName">
<span><%=app?app.name:'应用未启用'%></span>
<span v-if="currentUser" style="font-size:14px"><span class="fa fa-home" ></span>{{currentUser.owner.name}}</span>
</div>
<div id="login">
<span v-if="currentUser">欢迎您,{{currentUser.nickName}}
<el-button v-if="currentUser.isSelfLogin" @click="exitclick" type="text" icon="el-icon-setting">退出</el-button>
</span>
<gsb-button-group v-if="!currentUser" @select="onselect" ikey="login" :btns="logins"></gsb-button-group>
</div>
</div>
<transition name="slide-fade">
......
<div class="home">
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>补充信息</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
<div>&nbsp;</div>
......
......@@ -9,6 +9,7 @@
"author": "jy",
"license": "ISC",
"dependencies": {
"MD5": "^1.3.0",
"after": "^0.8.2",
"ali-oss": "^4.12.2",
"babel-polyfill": "^6.26.0",
......
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