wdy

igirl-zcapi/app/base/api/impl/trademark/tmqueryApi.js

@@ -152,10 +152,12 @@ class tmqueryApi extends ApiBase{
     var currentPage=obj.currentPage;
     var ncl=obj.ncl;
     var nclcode=[];
+    if(ncl){
       for(var i=0;i<ncl.length;i++){
         var num = Number(ncl[i].slice(0,2))
         nclcode.push(num);
       };
+    }
     var nclNum=obj.nclNum;
     var nclNumcode=[];
     for(var i=0;i<nclNum.length;i++){

igirl-zcapi/app/base/api/impl/trademark/tmsearch.js

@@ -5079,5 +5079,42 @@ class ByTmSearchApi extends ApiBase {
       return rtn = System.getResult2(null, null);
     }
   };
+
+  // async opEsQuery(codeList) {
+  //   var params = {
+  //     "query": {
+  //       "terms": {
+  //         "tm_regist_num": codeList
+  //       }
+  //     },
+  //     "from": 0,
+  //     "size": 500,
+  //     "_source": [
+  //       "pic_url",
+  //       "tm_name",
+  //       "tm_name_en",
+  //       "tm_regist_num",
+  //       "ncl_one_codes",
+  //       "applicant_cn",
+  //       "original_regist_notice_day",
+  //       "tm_end_day",
+  //       "ncl_two_codes",
+  //       "cn_count",
+  //       "en_name_count",
+  //       "regist_notice_day"
+  //     ]
+  //   };
+  //   logCtl.info({
+  //     optitle: "往ES中插入数据查询ES-opEsQuery-info",
+  //     op: "/igirl-web/app/base/service/impl/utilstmtasktradeSve.js/opEsQuery",
+  //     content: JSON.stringify(params),
+  //     clientIp: ""
+  //   });
+  //   var esData = await self.returnResult(params, this.tmSearchUrl, "UtilsTmTaskTradeService", "opEsQuery");
+  //   if (esData.status == 0 && esData.data.length > 0) {
+  //     await self.addEsData(auditData, esData.data, self, rc);
+  //   }
+  // }
+
 }
 module.exports = ByTmSearchApi;

igirl-zcapi/app/base/service/impl/common/uploadSve.js

@@ -23,7 +23,6 @@ class UploadService extends ServiceBase{
     var b = new Buffer(JSON.stringify(policyText));
     var policyBase64 = b.toString('base64');
     var signature = crypto.createHmac('sha1', accesskey).update(policyBase64).digest().toString('base64'); //base64
-
     var data = {
       OSSAccessKeyId: accessKeyId,
       policy: policyBase64,