update

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

@@ -51,7 +51,7 @@ class TrademarkCtl extends CtlBase {
         }
         let rtn = await this.execClient.execPost(query, tmurl);
         let data = JSON.parse(rtn.stdout);
-        return system.getResultList(data.totalCount, data.data||[])
+        return system.getResultList(data.totalCount, data.data || [])
     }
 
     /**
@@ -89,26 +89,20 @@ class TrademarkCtl extends CtlBase {
      */
     async publish(p, q, req) {
         let body = {
-            "actionType": "tmBatchUpload",
-            "actionBody": {
             "tm": p
-            }
         };
-        let rtn = await this.execClient.execPost(body, tmurl);
-        let data = JSON.parse(rtn.stdout);
-        if (data.status == 1) {
         let upload = await this.uploadSve.create({
-                total: p.length,
-                success: data.data.successCount || 0,
-                fail: p.length - data.data.successCount || 0,
-                status: 1
+            total: p.length
         });
+        body.upload_id = upload.id;
+        let rtn = await pushClient(body);
+        if (rtn.status == 1) {
             let tradedb = [];
-            data.data.tm.map(db => tradedb.push({
+            p.map(db => tradedb.push({
                 opath: p.opath,
                 user_id: p.userid,
                 company_id: p.company_id,
-                trademark_id: db.id,
+                // trademark_id: db.id,
                 tm_code: db.code,
                 upload_id: upload.id
             }));
@@ -186,8 +180,9 @@ class TrademarkCtl extends CtlBase {
         let res = await this.service.dao.model.bulkCreate(tradedb, {updateOnDuplicate: ["tm_code"]});
         return system.getResult(res)
     }
-    async getidlist(p, q, req){
-        let list =  await  this.service.findAll({upload_id:p.upload_id});
+
+    async getidlist(p, q, req) {
+        let list = await  this.service.findAll({upload_id: p.upload_id});
         return system.getResult(list)
     }
 }

zhiquanquan/app/config/settings.js

@@ -72,9 +72,9 @@ var settings = {
   },
   serviceurl: function () {
   if (this.env == "dev") {
-    return "http://192.168.200.181:3003";
+    return "http://192.168.201.208:3003";
   } else {
-    return "http://jiaxiya.gongsibao.com";
+    return "http://jiaxiya-service.newtime";
   }
   },
   pmappid: 1,