From 2604490a7e49acb16a96f2606126747f35b908fe Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 23 二月 2020 00:06:24 +0800
Subject: [PATCH] 加入 HC掌上物业 登录接口
---
AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java | 83 ++++++-----------------------------------
1 files changed, 12 insertions(+), 71 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..5477562 100644
--- a/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java
+++ b/AppFrontService/src/main/java/com/java110/app/controller/WxLoginController.java
@@ -7,6 +7,7 @@
import com.java110.core.context.PageData;
import com.java110.dto.wxLogin.UserInfo;
import com.java110.dto.wxLogin.WxLoginInfo;
+import com.java110.utils.constant.CommonConstant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@
* 寰俊灏忕▼搴忕櫥褰曞鐞嗙被
*/
@RestController
+@RequestMapping(path = "/app")
public class WxLoginController extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(WxLoginController.class);
@@ -33,88 +35,27 @@
/**
* 寰俊鐧诲綍鎺ュ彛
*
- * @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;
-// try {
-// /*WxMaJscode2SessionResult result = this.wxMaService.getUserService().getSessionInfo(code);
-// sessionKey = result.getSessionKey();
-// openId = result.getOpenid();*/
-// } catch (Exception e) {
-// logger.error("login fail by wx", e);
-// e.printStackTrace();
-// }
- IPageData pd = PageData.newInstance().builder("","", JSONObject.toJSONString(wxLoginInfo),"","","","");
+ /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+ IPageData pd = PageData.newInstance().builder("", "","", postInfo,
+ "", "", "", "",
+ request.getHeader("APP_ID"));
- return wxLoginSMOImpl.doLogin(pd);
-
- //login first
- /*User user = userService.queryByOpenid(openId);
- if (user == null) {
- user = new User();
- user.setUsername(openId);
- //Md5Hash md5Hash = new Md5Hash(openId, openId,1024);
- user.setPassword(openId); //瀵嗙爜淇濆瓨鍔犲瘑鐨刼penid
- user.setWeixinOpenid(openId);
- user.setAvatar(userInfo.getAvatarUrl());
- user.setNickname(userInfo.getNickName());
- user.setGender(userInfo.getGender());
- user.setUserLevel((byte) 0); //鏅�氱敤鎴�
- user.setStatus((byte) 0); //0鍙敤 1绂佺敤 2娉ㄩ攢
- user.setLastLoginTime(LocalDateTime.now());
- user.setLastLoginIp(IpUtil.getIpAddr(request));
- user.setSessionKey(sessionKey);
- //user.setRoleid("2"); //榛樿鏅�氱敤鎴�
- userService.add(user);
- } else {
- user.setLastLoginTime(LocalDateTime.now());
- user.setLastLoginIp(IpUtil.getIpAddr(request));
- user.setSessionKey(sessionKey);
- //LogUtil.info("鐧诲綍 " + user.toString());
- if (userService.updateById(user) == 0) {
- //LogUtil.error("update login user error");
- return ResponseUtil.updatedDataFailed();
- }
- }
- String token = UserTokenManager.generateToken(user.getId());
- JSONObject jsonObject = new JSONObject();
- //鐢熸垚token
- jsonObject.put("errno", "0");
- jsonObject.put("token", token);
- jsonObject.put("userInfo", userInfo);
- LOGGER.info(jsonObject);
- //LogUtil.info("login success");
- //LogUtil.info(jsonObject);
- return ResponseUtil.ok(jsonObject);*/
-
- //return new ResponseEntity<>("",HttpStatus.OK);
-
-
+ return wxLoginSMOImpl.doLogin(pd);
}
-
- /**
- * 寰俊鐧诲嚭
- *
- * @return
- */
- /* @RequestMapping("/logout")
- public JSONObject logoutWx() {
- Subject subject = SecurityUtils.getSubject();
- subject.logout();
- return ResponseUtil.ok();
- }*/
}
--
Gitblit v1.8.0