Browse Source

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

yumeng 5 years ago
parent
commit
76d8ff77ee

+ 8 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -69,7 +69,7 @@ public class LoginController {
 
 
     @RequestMapping(value = "/wxlogin", method = RequestMethod.POST)
     @RequestMapping(value = "/wxlogin", method = RequestMethod.POST)
     @ApiOperation("企业微信登录接口")
     @ApiOperation("企业微信登录接口")
-    public Result<JSONObject> wxlogin(@RequestParam("code") String code) throws Exception {
+    public Result<JSONObject> wxlogin(@RequestParam(name="code") String code) throws Exception {
         Result<JSONObject> result = new Result<JSONObject>();
         Result<JSONObject> result = new Result<JSONObject>();
         val configStorage = new WxCpDefaultConfigImpl();
         val configStorage = new WxCpDefaultConfigImpl();
         configStorage.setCorpId("ww24b8a47826f5875f");
         configStorage.setCorpId("ww24b8a47826f5875f");
@@ -80,14 +80,18 @@ public class LoginController {
         val service = new WxCpServiceImpl();
         val service = new WxCpServiceImpl();
 
 
         service.setWxCpConfigStorage(configStorage);
         service.setWxCpConfigStorage(configStorage);
-        WxCpOAuth2Service wxCpOAuth2Service = new WxCpOAuth2ServiceImpl(service);
+        WxCpOAuth2Service wxCpOAuth2Service = service.getOauth2Service();;
         try {
         try {
             WxCpOauth2UserInfo userInfo = wxCpOAuth2Service.getUserInfo(1000002,code);
             WxCpOauth2UserInfo userInfo = wxCpOAuth2Service.getUserInfo(1000002,code);
             if (userInfo != null && userInfo.getUserId()!=null){
             if (userInfo != null && userInfo.getUserId()!=null){
                 WxCpUserService wxCpUserService = new WxCpUserServiceImpl(service);
                 WxCpUserService wxCpUserService = new WxCpUserServiceImpl(service);
                 WxCpUser user = wxCpUserService.getById(userInfo.getUserId());
                 WxCpUser user = wxCpUserService.getById(userInfo.getUserId());
                 String email = user.getEmail();
                 String email = user.getEmail();
-                SysUser sysUser = sysUserService.getUserByName(email);
+                SysUser sysUser = sysUserService.getUserByEmail(email);
+                if (sysUser == null) {
+                    result.error500("该用户未注册系统账户,请联系管理员");
+                    return result;
+                }
                 String departId = sysDepartService.selectIdByOrdCode(sysUser.getOrgCode());
                 String departId = sysDepartService.selectIdByOrdCode(sysUser.getOrgCode());
                 sysUser.setDepartId(departId);
                 sysUser.setDepartId(departId);
                 result = sysUserService.checkUserIsEffective(sysUser);
                 result = sysUserService.checkUserIsEffective(sysUser);
@@ -111,6 +115,7 @@ public class LoginController {
                 return result;
                 return result;
             }
             }
         } catch (WxErrorException e) {
         } catch (WxErrorException e) {
+            result.error500("企业微信授权错误");
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         return result;
         return result;