Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/utilsSve/utilsFqAliyunSve.js

@@ -86,7 +86,15 @@ class UtilsFqAliyunService extends AppServiceBase {
     try {
       var rc = system.getObject("util.aliyunClient");
       var rtn = await rc.post(url, key, secret, params);
-      console.log(JSON.stringify(rtn), "-----------结果1--------");
+      this.logCtl.info({
+        appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
+        appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
+        requestId: pobj.requestId || "",
+        op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunClientPost",
+        content: rtn,
+        // clientIp: pobj.clientIp,
+        optitle: pobj.opType + "推送结果1->fq->opAliyunClientPost",
+      });
       // typeof element === 'string' || typeof element === 'number'
       if (typeof rtn.code === 'number' && rtn.code != 200 && rtn.success != true) {
         return system.getResult(null, "推送失败，失败原因11：" + JSON.stringify(rtn));
@@ -114,7 +122,15 @@ class UtilsFqAliyunService extends AppServiceBase {
     try {
       var rc = system.getObject("util.aliyunClient");
       var rtn = await rc.post(url, key, secret, params);
-      console.log(JSON.stringify(rtn), "-----------结果2--------");
+      this.logCtl.info({
+        appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
+        appkey: pobj.appInfo ? pobj.appInfo.uapp_key || "" : "",
+        requestId: pobj.requestId || "",
+        op: "service/impl/utilsSve/opAliyunClientPost.js/opAliyunClientPost",
+        content: rtn,
+        // clientIp: pobj.clientIp,
+        optitle: pobj.opType + "推送结果2->fq->opAliyunClientPost",
+      });
       if (typeof rtn.code === 'number' && rtn.code != 200 && rtn.success != true) {
         return system.getResult(null, "推送失败，失败原因21：" + JSON.stringify(rtn));
       }

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -50,7 +50,7 @@ class UtilsNeedService extends AppServiceBase {
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
-    pobj.actionBody.phone = pobj.actionBody.phone;
+    pobj.actionBody.phone = pobj.actionBody.phone || pobj.actionBody.mobile;
     pobj.actionBody.appName = pobj.appInfo.app_name;
     pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
     pobj.actionBody.idempotentSourceName = pobj.appInfo.app_name;
@@ -69,6 +69,12 @@ class UtilsNeedService extends AppServiceBase {
     }else if (pobj.actionBody.channel_type_code == 2) {
       pobj.actionBody.type = "ali.tm";
       pobj.actionBody.idempotentSource = "tm_ali";
+    }else if (pobj.actionBody.channel_type_code == 'esp.companyreg'){
+      pobj.actionBody.type = "ali.ic";
+      pobj.actionBody.idempotentSource = "ic_ali";
+    }else if (pobj.actionBody.channel_type_code == 'esp.companyreg_cloud'){
+      pobj.actionBody.type = "ali.ic";
+      pobj.actionBody.idempotentSource = "ic_ali";
     }
 
 
@@ -131,7 +137,7 @@ class UtilsNeedService extends AppServiceBase {
     }
     var rtn = await this.execClient.execPost(pobj, url);
     var data = JSON.parse(rtn.stdout);
-    if (data.data.channelTypeCode == 1||data.data.channelTypeCode == 2) {//商标
+    if (data.data && (data.data.channelTypeCode == 1||data.data.channelTypeCode == 2)) {//商标
       this.execPostUrl({
         "actionProcess": "AliTm",
         "appCode": "100099",