From 10ce9783248b63bbd5bbaeb89912e21ec0c1486b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 8 Jul 2021 17:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/UserController.java | 54 ++++++++++++++++++- .../controllers/xcx/XcxInfoController.java | 2 + .../fangjia/open/model/weixin/UserModel.java | 9 ++++ .../src/main/webapp/user/reqLoginPage.ftl | 5 +- .../mongo/fangjia/XcxUserInfoService.java | 2 + .../mongo/fangjia/XcxUserInfoServiceImpl.java | 33 ++++++++++++ 6 files changed, 103 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index f8884877d..64077edde 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -10,6 +10,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.fangjia.dal.common.XcxKey; +import com.fangjia.dal.mongo.model.bkoff.XcxUserInfo; +import com.fangjia.service.mongo.fangjia.XcxUserInfoService; import com.fangjia.service.open.WeChatAuthService; import com.fangjia.service.open.WeChatAuthServiceImpl; import com.fangjia.service.util.CookieUtils; @@ -37,6 +40,7 @@ public class UserController { private UserCityService userCityService; private FjtUsersService fjtUsersService; private WeChatAuthService weChatAuthService; + private XcxUserInfoService xcxUserInfoService; public void setUserCityService(UserCityService userCityService) { this.userCityService = userCityService; @@ -58,7 +62,11 @@ public class UserController { public Object reqLoginPageAction(UserModel model) { return model; } - + + public void setXcxUserInfoService(XcxUserInfoService xcxUserInfoService) { + this.xcxUserInfoService = xcxUserInfoService; + } + public Object reqCityChoicePageAction(UserModel model, HttpServletResponse response, HttpServletRequest request) { String type = StringUtils.trimToNull(model.getType()); if(!StringUtils.isBlank(type)){ @@ -220,6 +228,8 @@ public class UserController { if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ System.out.println("小程序code:"+model.getCode()); + System.out.println("小程序AppId:"+model.getAppId()); + System.out.println("小程序AppSecret:"+model.getAppSecret()); WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); if(token != null) { weiXinId = token.getOpenid(); @@ -234,6 +244,24 @@ public class UserController { } System.out.println("小程序微信OPEN_ID:" + weiXinId); } + + if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getSid())){ + System.out.println("小程序code:"+model.getCode()); + System.out.println("小程序AppId:"+model.getAppId()); + System.out.println("小程序AppSecret:"+model.getAppSecret()); + System.out.println("sid:"+model.getSid()); + XcxKey sessionValue = getSessionValue(model.getCode(), null, model.getAppId(), model.getAppSecret()); + if(sessionValue!=null){ + weiXinId = sessionValue.getOpenId(); + } + if(weiXinId == null) { + weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); + } + if(weiXinId != null && !weiXinId.equals("")){ + CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); + } + System.out.println("[sid]小程序微信OPEN_ID:" + weiXinId); + } //测试时可以先去掉 if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); @@ -258,6 +286,30 @@ public class UserController { return resultModel; } } + + + public XcxKey getSessionValue(String code, String sid, String appId, String secret){ + XcxKey sessionValue = null; + if(StringUtils.isNotBlank(sid)){ + System.out.println(sid+"houqi"); + sessionValue = new XcxKey(); + sessionValue.setSid(sid); + sessionValue.setOpenId(sid); + } + //缓存中没有登陆信息 + if(sessionValue==null){ + //获取openid信息 + sessionValue = xcxUserInfoService.getOpenId(code, appId, secret); + XcxUserInfo user = null; + if(sessionValue!=null&&StringUtils.isNotBlank(sessionValue.getOpenId())){ + //根据是否是第一次使用,保存并查询除用户信息 + user = xcxUserInfoService.save(sessionValue.getOpenId(), null); + sessionValue.setSid(sessionValue.getOpenId()); + } + + } + return sessionValue; + } /** * 获取缓存的验证码 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java index 7553d1678..4d3772584 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/xcx/XcxInfoController.java @@ -191,6 +191,8 @@ public class XcxInfoController { } return sessionValue; } + + /** * 小程序估价接口 diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java index 8255c2800..1db056696 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/UserModel.java @@ -19,6 +19,7 @@ public class UserModel extends BaseModel { private String appId;//测试 private String appSecret;//测试 + private String sid;//测试 public List getCitys() { return citys; @@ -99,4 +100,12 @@ public class UserModel extends BaseModel { public void setAppSecret(String appSecret) { this.appSecret = appSecret; } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } } diff --git a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl index 536a5e44c..ce65f946a 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqLoginPage.ftl @@ -78,7 +78,10 @@ data : { "username" : username, "pass":pass, - "code":"${code!''}" + "code":"${code!''}", + "sid":"${sid!''}", + "appId":"${appId!''}", + "appSecret":"${appSecret!''}" }, success : function(result) { var re = $.parseJSON(result); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java index cb575be0a..f4c2041b8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoService.java @@ -34,6 +34,8 @@ public interface XcxUserInfoService { * @return */ public XcxKey getOpenId(String code); + + public XcxKey getOpenId(String code, String appId, String secret); /** * 获取有多少人查询过他们自己的故事 * @return diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java index 57b4bc854..572703130 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/XcxUserInfoServiceImpl.java @@ -101,6 +101,39 @@ public class XcxUserInfoServiceImpl implements XcxUserInfoService { return null; } + + @Override + public XcxKey getOpenId(String code, String appId, String secret) { + HttpRequest http = new HttpRequest(); + //获取openid + HashMap map = new HashMap(); + map.put("appid", appId); + map.put("secret", secret); + map.put("grant_type", XCXConstant.GRANT_TYPE); + map.put("js_code", code); + String result = null; + try { + result = http.get(XCXConstant.OPENID_URL, map, "utf-8"); + System.out.println(result); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + //解析result + if(StringUtils.isNotBlank(result)){ + JSONObject json = JSONObject.fromObject(result); + if(json!=null&&json.get("openid")!=null){ + String openId = (json.get("openid")!=null)?json.get("openid").toString():null; + String sessionKey = (json.get("session_key")!=null)?json.get("session_key").toString():null; + XcxKey xcxKey = new XcxKey(); + xcxKey.setOpenId(openId); + xcxKey.setSessionKey(sessionKey); + return xcxKey; + } + + } + return null; + } + @Override public int havaReviewStory() {