tj

brg-queue-center/app/base/service/impl/utilsSve/utilsIcSve.js

@@ -33,7 +33,7 @@ class UtilsIcService extends AppServiceBase {
           "must": [
           "must": [
             {
             {
               "query_string": {
               "query_string": {
-                "default_field": "company_name",
+                "default_field": "company_name_standard",
                 "query": '\"' + actionBody.companyName + '\"'
                 "query": '\"' + actionBody.companyName + '\"'
               }
               }
             }
             }
@@ -77,7 +77,7 @@ class UtilsIcService extends AppServiceBase {
       resultData = await this.esUtils.execPostEs(settings.queuedName, params, esIndexName);
       resultData = await this.esUtils.execPostEs(settings.queuedName, params, esIndexName);
       var sources = [];
       var sources = [];
       var data = {
       var data = {
-        "totalCount": resultData.data.hits.total,
+        "totalCount": resultData.data && resultData.data.hits ? resultData.data.hits.total : 0,
         "pageSize": pageSize,
         "pageSize": pageSize,
         "currentPage": from === 0 ? from : (from - 1),
         "currentPage": from === 0 ? from : (from - 1),
         "list": sources
         "list": sources

brg-queue-center/app/base/utils/esUtils.js

@@ -40,7 +40,6 @@ class EsUtils {
     async execPostEs(queuedName, params, esIndexName) {
     async execPostEs(queuedName, params, esIndexName) {
         try {
         try {
             var configInfoResult = await this.configInfoDao.getList();
             var configInfoResult = await this.configInfoDao.getList();
-            configInfoResult.status = -1;
             if (configInfoResult.status != 1) {
             if (configInfoResult.status != 1) {
                 this.errorLogDao.addOpErrorLogs("publicLogsConsumer,configInfo list is empty", params, null, null, 1);
                 this.errorLogDao.addOpErrorLogs("publicLogsConsumer,configInfo list is empty", params, null, null, 1);
                 return system.getResultSuccess();
                 return system.getResultSuccess();

brg-queue-center/app/config/settings.js

@@ -9,7 +9,7 @@ var ENVINPUT = {
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_PWD: process.env.REDIS_PWD,
   REDIS_DB: process.env.QUEUE_REDIS_DB,
   REDIS_DB: process.env.QUEUE_REDIS_DB,
   DB_NAME: process.env.QUEUE_DB_NAME,
   DB_NAME: process.env.QUEUE_DB_NAME,
-  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev",//运行环境
+  APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "test",//运行环境
   CONSUMER_NAME: process.env.CONSUMER_NAME || "publicLogs.publicLogsConsumer",//消费者名称
   CONSUMER_NAME: process.env.CONSUMER_NAME || "publicLogs.publicLogsConsumer",//消费者名称
   QUEUED_NAME: process.env.QUEUED_NAME || "LOGS-SYTXPUBLIC-MSGQ",//队列名称，FAIL-失败队列（队列和失败队列一对存在进行部署）
   QUEUED_NAME: process.env.QUEUED_NAME || "LOGS-SYTXPUBLIC-MSGQ",//队列名称，FAIL-失败队列（队列和失败队列一对存在进行部署）
 };
 };