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

@@ -179,8 +179,7 @@ class tmqueryCtl extends CtlBase {
     var resultTmpSign = md5(resultSignStr).toUpperCase();
     var resultTmpSign = md5(resultSignStr).toUpperCase();
     return system.getResultSuccess(resultTmpSign);
     return system.getResultSuccess(resultTmpSign);
   }
   }
-
-  async getUserInfo(pobj, qobj, req) {
+  async getUserInfoTest(pobj, qobj, req) {
     try {
     try {
       var tokenInfo = await this.getToken(pobj.actionProcess);
       var tokenInfo = await this.getToken(pobj.actionProcess);
       if (tokenInfo.status != 0) {
       if (tokenInfo.status != 0) {
@@ -200,43 +199,47 @@ class tmqueryCtl extends CtlBase {
       }
       }
       req.session.userPinInfo = resultUser.data;
       req.session.userPinInfo = resultUser.data;
       return resultUser;
       return resultUser;
-
-
-
-      // var authUrl = pobj.authUrl;
-      // var authToken = pobj.authToken;
-      // var actionProcess = pobj.actionProcess;
-      // if (!authUrl) {
-      //   return system.getResult(null, "authUrl不能为空");
-      // }
-      // if (!authToken) {
-      //   return system.getResult(null, "authToken不能为空");
-      // }
-      // if (!actionProcess) {
-      //   return system.getResult(null, "actionProcess不能为空");
-      // }
-      // var result = await this.execClient.execPostJDTK("", authUrl, authToken);
-      // if (!result || !result.account) {
-      //   return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
-      // }
-      // var tokenInfo = await this.getToken(actionProcess);
-      // if (tokenInfo.status != 0) {
-      //   return tokenInfo;
-      // }
-      // //有返回用户信息进行用户ID加密
-      // var param = {
-      //   actionProcess: actionProcess,
-      //   actionType: "createChannelUser",
-      //   actionBody: { channelUserId: result.account },
-      //   isUser: "yes"
-      // };
-      // var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard";
-      // var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
-      // if (!resultUser) {
-      //   return system.getResult(null, "处理请求失败");
-      // }
-      // req.session.userPinInfo = resultUser.data;
-      // return resultUser;
+    } catch (error) {
+      console.log(error.stack, "操作error...................");
+      return system.getResultFail(-200, "操作error");
+    }
+  }
+  async getUserInfo(pobj, qobj, req) {
+    try {
+      var authUrl = pobj.authUrl;
+      var authToken = pobj.authToken;
+      var actionProcess = pobj.actionProcess;
+      if (!authUrl) {
+        return system.getResult(null, "authUrl不能为空");
+      }
+      if (!authToken) {
+        return system.getResult(null, "authToken不能为空");
+      }
+      if (!actionProcess) {
+        return system.getResult(null, "actionProcess不能为空");
+      }
+      var result = await this.execClient.execPostJDTK("", authUrl, authToken);
+      if (!result || !result.account) {
+        return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
+      }
+      var tokenInfo = await this.getToken(actionProcess);
+      if (tokenInfo.status != 0) {
+        return tokenInfo;
+      }
+      //有返回用户信息进行用户ID加密
+      var param = {
+        actionProcess: actionProcess,
+        actionType: "createChannelUser",
+        actionBody: { channelUserId: result.account },
+        isUser: "yes"
+      };
+      var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard";
+      var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
+      if (!resultUser) {
+        return system.getResult(null, "处理请求失败");
+      }
+      req.session.userPinInfo = resultUser.data;
+      return resultUser;
     } catch (error) {
     } catch (error) {
       console.log(error.stack, "操作error...................");
       console.log(error.stack, "操作error...................");
       return system.getResultFail(-200, "操作error");
       return system.getResultFail(-200, "操作error");

igirl-channel-jdweb/app/config/routes/web.js

@@ -24,6 +24,27 @@ module.exports = function (app) {
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
 	});
 	});
+	app.get("/jdtm/getUserTest", async function (req, res) {
+		console.log(req.query, "/jdtm/getUser....................");
+		var params = req.query;
+		if (!params.state) {
+			res.redirect("/#/jd/jdtrademark");
+			return;
+		}
+		var getUserparams = {
+			actionProcess: "jd",
+			authUrl: "https://oauth2.jdcloud.com/userinfo",
+			authToken: params.token_type + " " + params.access_token,
+			tmpchannelUserId: params.tmpchannelUserId
+		};
+		var userItemResult = await tmqueryCtl.getUserInfoTest(getUserparams, req.query, req);
+		if (userItemResult.status != 0) {
+			res.redirect("/#/jd/jdtrademark");
+			return;
+		}
+		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
+		res.redirect(skipUrl);
+	});	
 	app.get("/jd/orderNotify", async function (req, res) {
 	app.get("/jd/orderNotify", async function (req, res) {
 		// oplogCtl.info({
 		// oplogCtl.info({
 		// 	optitle: "########################################################.................orderNotify",
 		// 	optitle: "########################################################.................orderNotify",