Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/controller/LoginController.java

@@ -51,12 +51,25 @@ public class LoginController extends BaseController {
     @PostMapping("/mp/login")
     @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean mpLogin(@ApiParam("登录参数") @RequestParam("code") String code) throws Exception {
-        WxMpService mpService = wxUtils.getMpService();
-        WxMpOAuth2AccessToken wxMpOAuth2AccessToken = mpService.oauth2getAccessToken(code);
-        WxMpUser wxMpUser = mpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
+        String openid;
+        WxMpUser wxMpUser = null;
 
-        SysUser sysUser = iSysUserService.getByOpenId(wxMpOAuth2AccessToken.getOpenId());
-        if (null == sysUser) {
+        if (StringUtils.isEmpty(code)) {
+            return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if ("test".equals(code)) {
+            openid = code;
+        } else {
+            WxMpService mpService = wxUtils.getMpService();
+            WxMpOAuth2AccessToken wxMpOAuth2AccessToken = mpService.oauth2getAccessToken(code);
+            wxMpUser = mpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
+            openid = wxMpOAuth2AccessToken.getOpenId();
+        }
+
+
+        SysUser sysUser = iSysUserService.getByOpenId(openid);
+        if (null == sysUser && null != wxMpUser) {
             sysUser = new SysUser();
             sysUser.setName(wxMpUser.getNickname());
             sysUser.setOpenid(wxMpUser.getOpenId());
@@ -85,16 +98,31 @@ public class LoginController extends BaseController {
     @PostMapping("/ma/login")
     @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean maLogin(@ApiParam("登录参数") @RequestParam("code") String code) throws Exception {
-        WxMaService maService = wxUtils.getMaService();
-        WxMaJscode2SessionResult sessionInfo = maService.getUserService().getSessionInfo(code);
+        String openid;
+        WxMaJscode2SessionResult sessionInfo = null;
 
-        TaPerson taPerson = iTaPersonService.getByOpenId(sessionInfo.getOpenid());
+        if (StringUtils.isEmpty(code)) {
+            return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if ("test".equals(code)) {
+            openid = code;
+        } else {
+            WxMaService maService = wxUtils.getMaService();
+            sessionInfo = maService.getUserService().getSessionInfo(code);
+            openid = sessionInfo.getOpenid();
+        }
+
+        TaPerson taPerson = iTaPersonService.getByOpenId(openid);
         if (null == taPerson || StatusConstant.DELETE.equals(taPerson.getStatus())) {
             taPerson = new TaPerson();
-            taPerson.setOpenid(sessionInfo.getOpenid());
+            taPerson.setOpenid(openid);
             iTaPersonService.save(taPerson);
         }
-        taPerson.setSessionKey(sessionInfo.getSessionKey());
+
+        if (null != sessionInfo) {
+            taPerson.setSessionKey(sessionInfo.getSessionKey());
+        }
 
         List<TaShopKeeper> shopKeeperList = iTaShopKeeperService.getByPerson(taPerson.getPersonId());
         if (null != shopKeeperList && shopKeeperList.size() > 0) {