fin

rej-reex/app/base/controller/impl/rejreex/trademarkcaseCtl.js

@@ -11,15 +11,35 @@ class TrademarkcaseCtl extends CtlBase {
   }
   }
 
 
   async createOrUpdate (pobj, qobj, req) {
   async createOrUpdate (pobj, qobj, req) {
+    let q = false
     try {
     try {
-      console.log(pobj)
+      if (pobj.actionBody) {
+        q = true
+        pobj = pobj.actionBody
+      }
       let result = await this.service.createOrUpdate(pobj)
       let result = await this.service.createOrUpdate(pobj)
+      if (q) {
+        return {
+          status: 1,
+          msg: "测试成功",
+          data: null
+        }
+      } else {
         return system.getResultSuccess(result)
         return system.getResultSuccess(result)
+      }
     } catch (error) {
     } catch (error) {
       console.log('err: ', error)
       console.log('err: ', error)
+      if(q) {
+        return {
+          status: -1,
+          msg: "测试失败",
+          data: null
+        }
+      } else {
         return system.getResultFail(error.message)
         return system.getResultFail(error.message)
       }
       }
     }
     }
+  }
 
 
   async getCase (pobj, qobj, req) {
   async getCase (pobj, qobj, req) {
     try {
     try {
@@ -43,7 +63,7 @@ class TrademarkcaseCtl extends CtlBase {
     }
     }
   }
   }
 
 
-  async createOffical(pobj, qobj, req) {
+  async createOffical (pobj, qobj, req) {
     try {
     try {
       let result = await this.service.createOffical(pobj)
       let result = await this.service.createOffical(pobj)
       return system.getResultSuccess(result)
       return system.getResultSuccess(result)
@@ -52,8 +72,12 @@ class TrademarkcaseCtl extends CtlBase {
     }
     }
   }
   }
 
 
-  async pushQfTest(pobj, qobj, req) {
+  async pushQfTest (pobj, qobj, req) {
     return await this.service.pushQf(pobj.id)
     return await this.service.pushQf(pobj.id)
   }
   }
+
+  async pushQffTest(pobj, qobj, req) {
+    return await this.service.pushQff(pobj.id)
+  }
 }
 }
 module.exports = TrademarkcaseCtl;
 module.exports = TrademarkcaseCtl;

rej-reex/app/base/service/impl/rejreex/trademarkcaseSve.js

@@ -150,8 +150,6 @@ class TrademarkcaseService extends ServiceBase {
     tokenData = JSON.parse(tokenData.stdout)
     tokenData = JSON.parse(tokenData.stdout)
     if (tokenData.status == 0) {
     if (tokenData.status == 0) {
       let token = tokenData.data.token
       let token = tokenData.data.token
-      console.log(token)
-      let qfurl = this.qfurl
       req.actionType = "addOfficial"
       req.actionType = "addOfficial"
       req.actionBody = reqdata
       req.actionBody = reqdata
       let queuereq = {
       let queuereq = {
@@ -160,7 +158,7 @@ class TrademarkcaseService extends ServiceBase {
           pushUrl: this.qfurl,
           pushUrl: this.qfurl,
           actionType: req.actionType,
           actionType: req.actionType,
           notifyUrl: "",
           notifyUrl: "",
-          identifyCode: "tmReDeliver",
+          identifyCode: "tmReDeliverOffcial",
           messageBody: req.actionBody,
           messageBody: req.actionBody,
           headData: { token }
           headData: { token }
         }
         }

rej-reex/app/config/settings.js

@@ -28,6 +28,7 @@ var settings = {
   qifuurl: function () {
   qifuurl: function () {
     if (this.env == 'dev') {
     if (this.env == 'dev') {
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/opaction/tmReview/springBoard'
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/opaction/tmReview/springBoard'
+      // return 'http://192.168.201.235:4012/web/opaction/tmReview/springBoard'
     } else {
     } else {
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
       return 'http://gsbweb.qifu.gongsibao.com/web/opaction/tmReview/springBoard'
     }
     }
@@ -35,6 +36,7 @@ var settings = {
   qftkurl: function () {
   qftkurl: function () {
     if (this.env == 'dev') {
     if (this.env == 'dev') {
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
       return 'http://gsbweb.qifu-dev.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
+      // return 'http://gsbweb.qifu-dev.gongsibao.com:4012/web/auth/accessAuth/getAppTokenByHosts'
     } else {
     } else {
       return 'http://gsbweb.qifu.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
       return 'http://gsbweb.qifu.gongsibao.com/web/auth/accessAuth/getAppTokenByHosts'
     }
     }