gyq

center-manage/app/base/controller/impl/auth/userCtl.js

@@ -106,9 +106,9 @@ class UserCtl extends CtlBase {
   }
   async pmlogin (pobj, qobj, req) {
     //平台注册设置平台的应用ID
-    // let verifyres = await this.captchaSve.apiValidator({key:pobj.key,code:pobj.code});
-    //  if (verifyres.status !== 0)
-    //    return verifyres;
+    let verifyres = await this.captchaSve.apiValidator({key:pobj.key,code:pobj.code});
+     if (verifyres.status !== 0)
+       return verifyres;
     let rtn = await this.service.pmlogin(pobj, qobj, req);
     let msg = null
     if (!rtn) {//登录错误

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -617,67 +617,7 @@ class TxHandler {
         "data": null
       }
     }
-<<<<<<< HEAD
-
-    // 服务状态变更通知
-    async ServiceStatusNotify (datajson) {
-      try {
-  
-        let rc = system.getObject("util.execClient");
-        let requrl = this.queueUrl;
-
-        let ab = Object.assign({}, datajson);
-        ab.status = ab.status === 6 ? "inserivice" : "closed";
-        let params = {
-          "actionType": "produceData",
-          "actionBody": {
-            "pushUrl": this.icUrl + "/deliverybillCtl/notifyServiceStatusChange",
-            "actionType": "notifyServiceStatusChange",
-            "identifyCode": "book-manage",
-            "messageBody": ab,
-            "headData": {
-              'Authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTg0MzQ2ODcsImlzcyI6InJFRVN6TU5ZUlM2RnBWNnZlY09vdExPNWdPcUNXSmFQIiwiaWF0IjoxNTk4NDMxMDg3fQ.isQ40HqHHfJ-rTsUQOhRIdu4XCitZU-AfzeqSH4kPbQ',
-              'XAPPKEY': 'f6b59b74-f943-4735-bb86-e05d6b7fd78e'
-            }
-          }
-        };
-        
-        let rtn = await rc.execPost(params, requrl);
-        let j = JSON.parse(rtn.stdout);
-        if (j.status === 1) {
-          return this.getResult(datajson.requestId);
-        } else {
-          return this.getResult(datajson.requestId, rtn.stderr);
-        }
-  
-      } catch (err) {
-        return this.getResult(datajson.requestId, err);
-      }
-    }
-
-    async getResult (reqId, err = "not err") {
-      if (err === "not err") {
-        return {
-          "requestId": reqId,
-          "success": true,
-          "errorCode": 0,
-          "errorMsg": "ok",
-          "data": null
-        }
-      } else {
-        return {
-          "requestId": reqId,
-          "success": false,
-          "errorCode": -1,
-          "errorMsg": err,
-          "data": null
-        }
-      }
-    }
-
-=======
   }
->>>>>>> 6b34408d8443a74a5b97aaf995d52251e3124d04
 }
 
 module.exports = new TxHandler();