From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 service-front/src/main/java/com/java110/front/controller/mina/WxLoginController.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/controller/mina/WxLoginController.java b/service-front/src/main/java/com/java110/front/controller/mina/WxLoginController.java
index 115fb82..5874ee5 100644
--- a/service-front/src/main/java/com/java110/front/controller/mina/WxLoginController.java
+++ b/service-front/src/main/java/com/java110/front/controller/mina/WxLoginController.java
@@ -1,11 +1,14 @@
 package com.java110.front.controller.mina;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.front.smo.wxLogin.IWxLoginSMO;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
+import com.java110.core.factory.WechatFactory;
+import com.java110.front.smo.wxLogin.IWxLoginSMO;
+import com.java110.utils.cache.CommonCache;
 import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,14 +53,27 @@
 
         /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
         String appId = request.getHeader("APP_ID");
-        if(StringUtil.isEmpty(appId)){
+        if (StringUtil.isEmpty(appId)) {
             appId = request.getHeader("APP-ID");
         }
-        IPageData pd = PageData.newInstance().builder("", "","", postInfo,
+        IPageData pd = PageData.newInstance().builder("", "", "", postInfo,
                 "", "", "", "",
                 appId);
 
         return wxLoginSMOImpl.doLogin(pd);
     }
 
+
+    @RequestMapping(path = "/getWxPhoto", method = RequestMethod.POST)
+    public ResponseEntity<String> getWxPhoto(@RequestBody String postInfo) {
+        JSONObject postObj = JSONObject.parseObject(postInfo);
+
+
+        String photoInfo = WechatFactory.getPhoneNumberBeanS5(postObj.getString("decryptData"),
+                postObj.getString("key"), postObj.getString("iv"));
+        JSONObject photoObj = JSONObject.parseObject(photoInfo);
+        CommonCache.setValue(postObj.getString("key"), photoObj.getString("phoneNumber"), CommonCache.defaultExpireTime);
+        return ResultVo.createResponseEntity(photoObj);
+
+    }
 }

--
Gitblit v1.8.0