Merge remote-tracking branch 'origin/center-app' into center-app

center-app/app/base/service/impl/dbproduct/productSve.js

@@ -331,7 +331,7 @@ class ProductService extends ServiceBase {
         break;
         // 2020-12-21新增 /REG/GSREG/ 询价方法
       case 'REG':
-        if(code2 == "GSREG"){
+        if(code2 == "GSREG" || code2 == "QYJYTC1" || code2 == "QYJYTC2"){
           if(actionBody.city && actionBody.taxpayerType ){
             let str = actionBody.city + actionBody.taxpayerType;
             producesql += ` AND pc.price_desc = '${str}'`;

center-app/app/base/utils/execClient.js

@@ -42,6 +42,19 @@ class ExecClient {
         return cmd;
     }
     async execPost(subData, url) {
+        //本机windows curl json格式
+        // if (settings.env == 'dev') {
+        //     const rs = await axios.post(url, subData, {
+        //         auth: {
+        //             username: "admines",
+        //             password: "adminGSBes"
+        //         }
+        //     });
+        //     const ret = {
+        //         stdout: JSON.stringify(rs.data)
+        //     }
+        //     return ret;
+        // }
         let cmd = this.FetchPostCmd(subData, url);
         var result = await this.exec(cmd);
         return result;

center-app/app/config/settings.js

@@ -37,9 +37,9 @@ var settings = {
   reqEsAddr: function () {
     if (this.env == "dev") {
       var localsettings = require("./localsettings");
-      return "http://43.247.184.94:7200/";//localsettings.reqEsDevUrl;
+      return "http://er.es.gongsibao.com:7200/";//localsettings.reqEsDevUrl;
     } else {
-      return "http://43.247.184.94:7200/";
+      return "http://er.es.gongsibao.com:7200/";
     }
   },
   reqZcApi: function () {