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

igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -374,8 +374,8 @@ class tmqueryCtl extends CtlBase {
       ctx.headers.set('content-type', 'application/json');
       ctx.headers.set('content-type', 'application/json');
 
 
       let credentials = {
       let credentials = {
-        accessKeyId: 'C6D680733C19362B5DF478207D6A90A4', //替换自己的AK
-        secretAccessKey: 'EB9AFEE49CE41700CADD5F2EE3B2122C' //替换自己的SK--jd>>>>>>>
+        accessKeyId: '7CCB9D55C8DB52DD943CC5B00DDA6F44', //替换自己的AK
+        secretAccessKey: '1C83C868AD9FA00F6D56DBF2CAE5A8DF' //替换自己的SK--jd>>>>>>>
       }
       }
       //测试报文：
       //测试报文：
       //ctx.body = "pin=jcloud_pRiHQTd&serviceId=580010&itemCode=FW_GOODS-580010-1&platform=6"
       //ctx.body = "pin=jcloud_pRiHQTd&serviceId=580010&itemCode=FW_GOODS-580010-1&platform=6"
@@ -455,7 +455,7 @@ class tmqueryCtl extends CtlBase {
   }
   }
   async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息
   async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息
     try {
     try {
-      var signResult = await this.createSign(pushData, "6B876EB84731E166D76E1F73AD5764BA", true);
+      var signResult = await this.createSign(pushData, "698FC4A1CBA6F999F023DF5ECA982181", true);
       if (signResult.status != 0) {
       if (signResult.status != 0) {
         return signResult;
         return signResult;
       }
       }
@@ -467,7 +467,7 @@ class tmqueryCtl extends CtlBase {
         return tokenInfo;
         return tokenInfo;
       }
       }
       var param = {};
       var param = {};
-      if (pushData.skuId == "FW_GOODS-581976-1") {
+      if (pushData.skuId == "FW_GOODS-582064-1") {
         param = {
         param = {
           actionProcess: pushData.actionProcess,
           actionProcess: pushData.actionProcess,
           actionType: "updateOrderPayStatus",
           actionType: "updateOrderPayStatus",
@@ -627,7 +627,7 @@ class tmqueryCtl extends CtlBase {
         return tokenInfo;
         return tokenInfo;
       }
       }
       var param = {};
       var param = {};
-      if (pushData.skuId == "FW_GOODS-581976-1") {
+      if (pushData.skuId == "FW_GOODS-582064-1") {
         param = {
         param = {
           actionProcess: pushData.actionProcess,
           actionProcess: pushData.actionProcess,
           actionType: "updateOrderPayStatus",
           actionType: "updateOrderPayStatus",

igirl-channel-web/app/config/settings.js

@@ -21,14 +21,14 @@ var settings = {
   port: process.env.NODE_PORT || 4004,
   port: process.env.NODE_PORT || 4004,
   channelApiUrl: function () {
   channelApiUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://zcchannel.apps.com:4003";
+      return "http://zcchannel.gongsibao.com";
     } else {
     } else {
       return "http://zc-channel-service";
       return "http://zc-channel-service";
     }
     }
   },
   },
   paasUrl: function () {
   paasUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://p.apps.com:4001/";
+      return "https://open.gongsibao.com/";
     } else {
     } else {
       return "https://open.gongsibao.com/";
       return "https://open.gongsibao.com/";
     }
     }