Merge branch 'igirl-channel-gateway' of gitlab.gongsibao.com:jiangyong/zhichan…

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

igirl-channel-gateway/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -18,7 +18,7 @@ class UtilsNeedSve extends AppServiceBase {
 
 
   async getCenterToken() {
   async getCenterToken() {
     var self = this;
     var self = this;
-    var reqTokenUrl = this.centerChannelUrl + "/api/auth/accessAuth/getAppTokenByAppKey";
+    var reqTokenUrl = this.centerChannelUrl + "/api/opreceive/accessAuth/getAppTokenByAppKey";
     var reqParam = self.appInfo["aliyuntmtransfer"];
     var reqParam = self.appInfo["aliyuntmtransfer"];
     if (!reqParam.appkey || !reqParam.secret) {
     if (!reqParam.appkey || !reqParam.secret) {
       return system.getResult(null, "reqType类型有误，请求失败");
       return system.getResult(null, "reqType类型有误，请求失败");
@@ -72,7 +72,7 @@ class UtilsNeedSve extends AppServiceBase {
       };
       };
       // pobj.actionBody.channelUserId = pobj.mobile;//渠道用户id，没有则用手机号
       // pobj.actionBody.channelUserId = pobj.mobile;//渠道用户id，没有则用手机号
       // pobj.actionBody.mobile = pobj.mobile;//用户手机号
       // pobj.actionBody.mobile = pobj.mobile;//用户手机号
-      var url = settings.centerChannelUrl() + "/web/auth/accessAuth/springBoard";
+      var url = settings.centerChannelUrl() + "/api/opreceive/accessAuth/springBoard";
       var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
       var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
       if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
       if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
         return system.getResultFail(-99, "获取userpin失败");
         return system.getResultFail(-99, "获取userpin失败");

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

@@ -31,14 +31,14 @@ var settings = {
       return "http://43.247.184.94:7200/";
       return "http://43.247.184.94:7200/";
     }
     }
   },
   },
-  channelApiUrl: function () {
+  channelApiUrl: function () {//----igirl-channel
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://gsb.qifu.gongsibao.com:4003";
       return "http://gsb.qifu.gongsibao.com:4003";
     } else {
     } else {
       return "http://zc-channel-service";
       return "http://zc-channel-service";
     }
     }
   },
   },
-  centerChannelUrl: function () {
+  centerChannelUrl: function () {//---------center-channel
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://gsb.qifu.gongsibao.com:4012";//localsettings.reqEsDevUrl;
       return "http://gsb.qifu.gongsibao.com:4012";//localsettings.reqEsDevUrl;
     } else {
     } else {