From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码
---
AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java b/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java
index edf79e6..e38dc56 100644
--- a/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java
+++ b/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java
@@ -23,6 +23,7 @@
* 寰俊灏忕▼搴忕櫥褰曞鐞嗙被
*/
@RestController
+@RequestMapping(path = "/app")
public class WxLoginController extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(WxLoginController.class);
@@ -33,21 +34,22 @@
/**
* 寰俊鐧诲綍鎺ュ彛
*
- * @param wxLoginInfo
+ * @param postInfo
* @param request
*/
@RequestMapping(path = "/loginWx", method = RequestMethod.POST)
- public ResponseEntity<String> loginWx(@RequestBody WxLoginInfo wxLoginInfo, HttpServletRequest request) {
+ public ResponseEntity<String> loginWx(@RequestBody String postInfo, HttpServletRequest request) {
ResponseEntity<String> responseEntity = null;
- String code = wxLoginInfo.getCode();
- UserInfo userInfo = wxLoginInfo.getUserInfo();
+ JSONObject postObj = JSONObject.parseObject(postInfo);
+ String code = JSONObject.parseObject(postInfo).getString("code");
+ JSONObject userInfo = postObj.getJSONObject("userInfo");
if (code == null || userInfo == null) {
logger.error("code is null");
responseEntity = new ResponseEntity<>("code is null", HttpStatus.BAD_REQUEST);
return responseEntity;
}
- String sessionKey = null;
- String openId = null;
+ /*String sessionKey = null;
+ String openId = null;*/
// try {
// /*WxMaJscode2SessionResult result = this.wxMaService.getUserService().getSessionInfo(code);
// sessionKey = result.getSessionKey();
@@ -57,9 +59,11 @@
// e.printStackTrace();
// }
- IPageData pd = PageData.newInstance().builder("","", JSONObject.toJSONString(wxLoginInfo),"","","","");
+ IPageData pd = PageData.newInstance().builder("", "","", postInfo,
+ "", "", "", "",
+ request.getHeader("APP_ID"));
- return wxLoginSMOImpl.doLogin(pd);
+ return wxLoginSMOImpl.doLogin(pd);
//login first
/*User user = userService.queryByOpenid(openId);
--
Gitblit v1.8.0