修改请求

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

@@ -4,8 +4,8 @@ const querystring = require('querystring');
 let settings = require("../../../../config/settings");
 let settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const CtlBase = require("../../ctl.base");
 const logCtl = system.getObject("web.common.oplogCtl");
 const logCtl = system.getObject("web.common.oplogCtl");
-const tmtransactionPath = "/api/action/tmQuery/springBoard";
-const tmurl = settings.channelApiUrl() + tmtransactionPath;
+// const tmtransactionPath = "/api/action/tmQuery/springBoard";
+// const tmurl = settings.channelApiUrl() + tmtransactionPath;
 //标源检索
 //标源检索
 class searchCtl extends CtlBase {
 class searchCtl extends CtlBase {
     constructor() {
     constructor() {
@@ -40,23 +40,31 @@ class searchCtl extends CtlBase {
                     "nclNum": [],//尼斯大类
                     "nclNum": [],//尼斯大类
                 }
                 }
             };
             };
+            var tmurl=settings.channelApiUrl();
             if (Object.keys(p.search).length > 0) {
             if (Object.keys(p.search).length > 0) {
                 if (p.search.sbzch) {//注册号查询
                 if (p.search.sbzch) {//注册号查询
-                    query.actionType = "findTrademarkzchAccurate";
+                    // query.actionType = "findTrademarkzchAccurate";
+                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzchAccurate";
                     query.actionBody.regNum = p.search.sbzch
                     query.actionBody.regNum = p.search.sbzch
                 } else if (p.search.zcren) {//申请人查询
                 } else if (p.search.zcren) {//申请人查询
-                    query.actionType = "findTrademarkzcr";
+                    // query.actionType = "findTrademarkzcr";
+                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzcr";
                     query.actionBody.regMan = p.search.zcren
                     query.actionBody.regMan = p.search.zcren
                 } else if (p.search.sbmc) {//商标名称查询
                 } else if (p.search.sbmc) {//商标名称查询
-                    query.actionType = "findTrademarkNameAccurate";
+                    // query.actionType = "findTrademarkNameAccurate";
+                    tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkNameAccurate";
                     query.actionBody.tmName = p.search.sbmc
                     query.actionBody.tmName = p.search.sbmc
                 }
                 }
-            } else return;
-            let tokenInfo = await this.service.getToken();
-            console.log("==========================>",tokenInfo)
-            console.log("==========================>",tokenInfo.data.token)
+            } else{
+                console.log("===============search====search=======>");
+                return;
+            } 
+            // let tokenInfo = await this.service.getToken();
+            // console.log("==========================>",tokenInfo)
+            // console.log("==========================>",tokenInfo.data.token)
         try {
         try {
-            let rtn = await this.execClient.execPostTK(query, tmurl, tokenInfo.data.token);
+            let rtn = await this.execClient.execPostTK(query, tmurl, "");
+            console.log(rtn,"============rtn==============>");
             let data = rtn.data;
             let data = rtn.data;
             let published = await this.service.findAll({company_id: p.company_id});
             let published = await this.service.findAll({company_id: p.company_id});
             data.rows.forEach(item => {
             data.rows.forEach(item => {