fix

zhiquanquan/app/base/controller/impl/trademark/searchCtl.js

@@ -25,51 +25,53 @@ class searchCtl extends CtlBase {
      * {"error": ""}
      */
     async findAndCountAll(p, q, req) {
-        let query = {
-            "actionType": "",
-            "actionBody": {
-                pageSize: p.pageInfo.pageSize,
-                currentPage: p.pageInfo.pageNo,
-                "tmName": "",//商标名称
-                "regMan": "",
-                "regNum": "",
-                "sqlbtabkey": "",//商标类别
-                "flzttabkey": "",//法律状态
-                "sqnftabkey": "",//申请年份
-                "ncl": [],//尼斯大类
-                "xcl": [],//尼斯群组
-                "nclNum": [],//尼斯大类
-            }
-        };
-        if (Object.keys(p.search).length > 0) {
-            if (p.search.sbzch) {//注册号查询
-                query.actionType = "findTrademarkzchAccurate";
-                query.actionBody.regNum = p.search.sbzch
-            } else if (p.search.zcren) {//申请人查询
-                query.actionType = "findTrademarkzcr";
-                query.actionBody.regMan = p.search.zcren
-            } else if (p.search.sbmc) {//商标名称查询
-                query.actionType = "findTrademarkNameAccurate";
-                query.actionBody.tmName = p.search.sbmc
-            }
-        } else return;
-        let tokenInfo = await this.service.getToken();
-        if (tokenInfo && tokenInfo.data && tokenInfo.data.token) {
-            try {
-                let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token);
-                let data = rtn.data;
-                let published = await this.service.findAll({company_id: p.company_id});
-                data.rows.forEach(item => {
-                    for (let t of published) {
-                        if (t.tm_code == item.sbzch)
-                            item._disabled = true;
-                    }
-                });
-            }catch (e) {
-                return system.getResultFail(-1,e)
-            }
+        try {
+            let query = {
+                "actionType": "",
+                "actionBody": {
+                    pageSize: p.pageInfo.pageSize,
+                    currentPage: p.pageInfo.pageNo,
+                    "tmName": "",//商标名称
+                    "regMan": "",
+                    "regNum": "",
+                    "sqlbtabkey": "",//商标类别
+                    "flzttabkey": "",//法律状态
+                    "sqnftabkey": "",//申请年份
+                    "ncl": [],//尼斯大类
+                    "xcl": [],//尼斯群组
+                    "nclNum": [],//尼斯大类
+                }
+            };
+            if (Object.keys(p.search).length > 0) {
+                if (p.search.sbzch) {//注册号查询
+                    query.actionType = "findTrademarkzchAccurate";
+                    query.actionBody.regNum = p.search.sbzch
+                } else if (p.search.zcren) {//申请人查询
+                    query.actionType = "findTrademarkzcr";
+                    query.actionBody.regMan = p.search.zcren
+                } else if (p.search.sbmc) {//商标名称查询
+                    query.actionType = "findTrademarkNameAccurate";
+                    query.actionBody.tmName = p.search.sbmc
+                }
+            } else return;
+        }catch (e) {
+            return system.getResultFail(-8,e)
+        }
+        try {
+            let tokenInfo = await this.service.getToken();
+            let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token);
+            let data = rtn.data;
+            let published = await this.service.findAll({company_id: p.company_id});
+            data.rows.forEach(item => {
+                for (let t of published) {
+                    if (t.tm_code == item.sbzch)
+                        item._disabled = true;
+                }
+            });
             return system.getResultList(data.count, data.rows)
-        } else return system.getResultFail(-1, "token获取失败")
+        }catch (e) {
+            return system.getResultFail(-9,e)
+        }
     }
 }
 

zhiquanquan/app/base/service/sve.base.js

@@ -13,14 +13,13 @@ class ServiceBase {
     this.restS = system.getObject("util.restClient");
     this.md5 = require("MD5");
     this.execClient = system.getObject("util.execClient");
-    this.channelApiUrl = settings.channelApiUrl();
     this.appInfo = {
         aliyuntmtransfer: { appkey: "202003231118", secret: "7cbb846246874167b5c7e01cd0016c99" }
     };
   }
     async getToken() {
         var self = this;
-        var reqTokenUrl = settings.channelApiUrl() + "/api/opreceive/accessAuth/getAppTokenByAppKey";
+        var reqTokenUrl = settings.centerChannelUrl() + "/api/opreceive/accessAuth/getAppTokenByAppKey";
         var reqParam = self.appInfo["aliyuntmtransfer"];
         if (!reqParam.appkey || !reqParam.secret) {
             return system.getResult(null, "reqType类型有误，请求失败");

zhiquanquan/app/config/settings.js

@@ -48,6 +48,14 @@ var settings = {
       return "http://zcapi-service.chaolai";
     }
   },
+  centerChannelUrl: function () {//---------center-channel
+      if (this.env == "dev") {
+          // return "http://gsbweb.qifu-dev.gongsibao.com";//localsettings.reqEsDevUrl;
+          return "http://gsbweb.qifu-dev.gongsibao.com:4012";
+      } else {
+          return "http://center-channel-service";
+      }
+  },
   uploadfileossurl: function () {
     if (this.env == "dev") {
       return "http://192.168.49.170:8080";