diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java index d02c0e9..612c346 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java +++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java @@ -170,7 +170,10 @@ public class TokenController { if (StringUtils.isNotEmpty(ticket)) { LoginUser loginUser = new LoginUser(); if (form.getSysType()!=null && "1".equals(form.getSysType())){ - loginUser = sysLoginService.iwsH5Login(ticket,iwsH5AppId,iwsH5Url); + log.info("app端登录"); + //loginUser = sysLoginService.iwsH5Login(ticket,iwsH5AppId,iwsH5Url); + //h5和web端调用同一个接口 + loginUser = sysLoginService.iwsWebLogin(ticket,iwsH5AppId,iwsWebUrl); } else if (form.getSysType()!=null && "0".equals(form.getSysType())) { loginUser = sysLoginService.iwsWebLogin(ticket,iwsWebAppId,iwsWebUrl); }else { diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java b/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java index c01613a..bd1d8e5 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java @@ -249,7 +249,7 @@ public class SysLoginService { registerBody.setUsername(sysUser.getUserName()); registerBody.setNickName(sysUser.getNickName()); registerBody.setMobile(sysUser.getPhonenumber()); - registerBody.setDeptId(220L); + registerBody.setDeptId(1L); registerBody.setPassword("Bonus@Max2024"); //获取配置中的初始密码 AjaxResult result = configService.getConfigKey("sys.user.initPassword"); @@ -299,13 +299,15 @@ public class SysLoginService { RestTemplate restTemplate = new RestTemplate(); ResponseEntity authResponse = restTemplate.getForEntity(iwsH5Url, String.class, paramMap); log.info("authResponse:" + authResponse.toString()); - if ("200".equals(authResponse.getStatusCode())){ - // 根据ResponseEntity responseEntity对象,获取body部分,body为json格式字符串 - String content = authResponse.getBody(); - // 将json字符串转化为json对象 - JSONObject json = JSONObject.parseObject(content); - // 取出data部分对象 - JSONObject data = json.getJSONObject("data"); + // 根据ResponseEntity responseEntity对象,获取body部分,body为json格式字符串 + String content = authResponse.getBody(); + // 将json字符串转化为json对象 + JSONObject json = JSONObject.parseObject(content); + // 取出data部分对象 + JSONObject data = json.getJSONObject("data"); + log.info("返回的数据:" + data); + if ("200".equals(json.getInteger("code").toString())){ + JSONObject userInfo = data.getJSONObject("userInfo"); sysUser.setUserName(userInfo.get("userName").toString()); sysUser.setNickName(userInfo.get("name").toString());