d

scratch-web/app/base/db/impl/userDao.js

@@ -37,8 +37,14 @@ class UserDao extends Dao{
   }
   }
   async getUserByOpenId(popenid,appid,t){
   async getUserByOpenId(popenid,appid,t){
       //  var app=await this.appDao.findOne(appkey);
       //  var app=await this.appDao.findOne(appkey);
+      var querywhere=null;
+      if(!appid){
+        querywhere={openId:popenid};
+      }else{
+        querywhere={openId:popenid,app_id:appid};
+      }
        var tUser=await this.model.findOne({
        var tUser=await this.model.findOne({
-         where:{openId:popenid,app_id:appid},
+         where:querywhere,
          include:[{model:this.db.models.app,raw:true},
          include:[{model:this.db.models.app,raw:true},
                   // {model:this.db.models.partnerinfo,attributes:["id","user_id","app_id","userName","applyType","applyName","workPic","tagInfo","mobile","tel","applyProvince","applyCity",
                   // {model:this.db.models.partnerinfo,attributes:["id","user_id","app_id","userName","applyType","applyName","workPic","tagInfo","mobile","tel","applyProvince","applyCity",
                   //                                               "applyArea","applyAddr","identityCardPic","identityCard","businessLicensePic","businessLicenseNum","entName","cardNo","realName"]},
                   //                                               "applyArea","applyAddr","identityCardPic","identityCard","businessLicensePic","businessLicenseNum","entName","cardNo","realName"]},

scratch-web/app/config/localsettings.js

+var settings={
+  redis:{
+    host: "43.247.184.32",
+    port: 8967,
+    password: "Gongsibao2018",
+    db:10,
+  },
+  database:{
+    dbname : "zc",
+    user: "root",
+    password: "123456",
+    config: {
+      host: '192.168.4.119',
+      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/",
+};
+module.exports = settings;