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

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

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

@@ -7,7 +7,7 @@ class tmqueryCtl extends CtlBase {
     super();
     super();
     this.channelApiUrl = settings.channelApiUrl();
     this.channelApiUrl = settings.channelApiUrl();
     this.appInfo = {
     this.appInfo = {
-      1688: { appkey: "201911131657", secret: "eeb18393aade40149287b024d8ba0850", selfRegistProduct: ["5743091"] }
+      jd: { appkey: "201911251551", secret: "56006077354d48858026c80c0e10bef6" }
     };
     };
     this.execClient = system.getObject("util.execClient");
     this.execClient = system.getObject("util.execClient");
   }
   }
@@ -94,35 +94,12 @@ class tmqueryCtl extends CtlBase {
       if (result.status && result.status != 0) {
       if (result.status && result.status != 0) {
         return result;
         return result;
       }
       }
-      // if (pobj.actionType == "getChannelOrderInfo") {
-      //   var tmpSkipUrl = await this.getPageSkipUrl(reqobj.actionProcess, reqobj.actionBody.itemCode);
-      //   if (!tmpSkipUrl) {
-      //     return system.getResult(null, "获取页面url失败");
-      //   }
-      //   result.skipUrl = tmpSkipUrl;
-      // }//获取渠道订单信息
       return result;
       return result;
     } catch (e) {
     } catch (e) {
       console.log(e.stack, "操作error...................");
       console.log(e.stack, "操作error...................");
       return system.getResult(null, "操作失败");
       return system.getResult(null, "操作失败");
     }
     }
   }
   }
-  // async getPageSkipUrl(reqType, itemCode) {
-  //   var self = this;
-  //   var skipUrl = "";
-  //   switch (reqType) {
-  //     case "1688":
-  //       if (self.appInfo["1688"].selfRegistProduct.indexOf(itemCode) < 0) {
-  //         skipUrl = "/#/1688/jdindentlist";
-  //       } else {
-  //         skipUrl = "/#/1688/selftmreg";
-  //       }
-  //       break;
-  //     default:
-  //       break;
-  //   }
-  //   return skipUrl;
-  // }
 
 
   async getToken(reqType) {
   async getToken(reqType) {
     var self = this;
     var self = this;
@@ -130,8 +107,8 @@ class tmqueryCtl extends CtlBase {
     var reqTokenUrl = this.channelApiUrl + "/auth/accessAuth/getToken";
     var reqTokenUrl = this.channelApiUrl + "/auth/accessAuth/getToken";
     var reqParam = {};
     var reqParam = {};
     switch (reqType) {
     switch (reqType) {
-      case "1688":
-        reqParam = self.appInfo["1688"];
+      case "jd":
+        reqParam = self.appInfo["jd"];
         break;
         break;
       default:
       default:
         break;
         break;

igirl-channel-jdweb/app/base/db/metadata/apps/platform.js

 module.exports = {
 module.exports = {
-    "appid": "201911061258",
+    "appid": "201911251551",
     "label": "知产渠道api web应用",
     "label": "知产渠道api web应用",
     "config": {
     "config": {
         "rstree": {
         "rstree": {

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

@@ -13,9 +13,9 @@ var ENVINPUT = {
 };
 };
 var settings = {
 var settings = {
   env: ENVINPUT.APP_ENV,
   env: ENVINPUT.APP_ENV,
-  appKey: "201911061258",
+  appKey: "201911251551",
   paasKey: "wx76a324c5d201d1a4",
   paasKey: "wx76a324c5d201d1a4",
-  secret: "1671ab5405fa49c8b5dd0b0c55c279b8",
+  secret: "56006077354d48858026c80c0e10bef6",
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
   port: process.env.NODE_PORT || 4004,
   port: process.env.NODE_PORT || 4004,