tj

fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/alltrademark.js

 module.exports = {
   "list": {
     columnMetaData: [
-      { "width": "140", "label": "订单号", "prop": "channelOrderNum", "isShowTip": true, "isTmpl": false },
+      { "width": "140", "label": "服务单号", "prop": "channelOrderNum", "isShowTip": true, "isTmpl": false },
       { "width": "220", "label": "代理号", "prop": "proxyCode", "isShowTip": true, "isTmpl": false },
       { "width": "230", "label": "申请人", "prop": "applyName", "isShowTip": true, "isTmpl": false },
       { "width": "100", "label": "商标号", "prop": "tmRegistNum", "isShowTip": true, "isTmpl": false },

fqboss/app/base/utils/execClient.js

@@ -6,6 +6,7 @@ class ExecClient {
     constructor() {
         // this.cmdPostPattern = "curl -k -H 'Content-type: application/json'  -d '{data}' {url}";
         this.cmdPostPattern = "curl --user admines:adminGSBes. -k -H 'Content-type: application/json'  -d '{data}' {url}";
+        this.cmdPostAliPattern = "curl --user elastic:'w3OL+51eo*)c=^7' -k -H 'Content-type: application/json'  -d '{data}' {url}";
         this.cmdGetPattern = "curl -G -X GET '{url}'";
         this.cmdPostTK = "curl -k -H 'Content-type: application/json' -H 'token:{tk}' -H 'request-id:{requestId}' -d '{data}' {url}";
     }
@@ -34,7 +35,7 @@ class ExecClient {
             maxBuffer: 1024 * 1024 * 15
         });
         if (result.stdout) {
-            return typeof(result.stdout) == "string" ? JSON.parse(result.stdout) : result.stdout;
+            return typeof (result.stdout) == "string" ? JSON.parse(result.stdout) : result.stdout;
         } else {
             return null;
         }
@@ -51,8 +52,21 @@ class ExecClient {
             data).replace(/\{url\}/g, url).replace(/\{tk\}/g, token).replace(/\{requestId\}/g, requestId);
         return cmd;
     }
+    FetchPostAliCmd(subData, url) {
+        var data = JSON.stringify(subData);
+        var cmd = this.cmdPostAliPattern.replace(/\{data\}/g,
+            data).replace(/\{url\}/g, url);
+        console.log(cmd);
+        return cmd;
+    }
 
     async execPost(subData, url) {
+        //从成阿里尼斯数据        
+        if (url === "http://es-cn-zz11nl9y20001gczg.public.elasticsearch.aliyuncs.com:9200/bigdata_bdc_gsb_tm_ncl/_search") {
+            let cmd = this.FetchPostAliCmd(subData, url);
+            var result = await this.exec(cmd);
+            return result;
+        }//阿里查询尼斯
         let cmd = this.FetchPostCmd(subData, url);
         var result = await this.exec(cmd);
         return result;

fqboss/app/config/settings.js

@@ -173,7 +173,7 @@ var settings = {
       return settings.reqEsAddr() + "bigdata_business_gsb_tm_change_business/_search";
     },
     nclUrl: function () {
-      return settings.reqEsAddr() + "bigdata_bdc_gsb_tm_ncl/_search";
+      return "http://es-cn-zz11nl9y20001gczg.public.elasticsearch.aliyuncs.com:9200/" + "bigdata_bdc_gsb_tm_ncl/_search";
     },
     opLogUrl: function () {
       return settings.reqEsAddr() + "fqboss_op_log/_doc?pretty";