diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java index 71c8a1658..8811eeba4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java @@ -729,7 +729,7 @@ public class MemberServiceImpl extends ServiceImpl impleme // merchantId 可以不需要 MtUser user = mtUserMapper.queryMemberByOpenId2(openId); - String avatar = StringUtil.isNotEmpty(userInfo.getString("avatarUrl")) ? userInfo.getString("avatarUrl") : ""; + String avatar = Optional.ofNullable(userInfo.getString("avatarUrl")).orElse(""); String gender = StringUtil.isNotEmpty(userInfo.getString("gender")) ? userInfo.getString("gender") : GenderEnum.MAN.getKey().toString(); String country = StringUtil.isNotEmpty(userInfo.getString("country")) ? userInfo.getString("country") : ""; String province = StringUtil.isNotEmpty(userInfo.getString("province")) ? userInfo.getString("province") : ""; @@ -741,9 +741,6 @@ public class MemberServiceImpl extends ServiceImpl impleme String mobile = StringUtil.isNotEmpty(userInfo.getString("phone")) ? userInfo.getString("phone") : ""; String source = StringUtil.isNotEmpty(userInfo.getString("source")) ? userInfo.getString("source") : MemberSourceEnum.WECHAT_LOGIN.getKey(); - // todo - // 创建 根据 Storeid判断 - // openid没有时，使用手机号 @@ -755,7 +752,6 @@ public class MemberServiceImpl extends ServiceImpl impleme mtUser = mtUserMobile; } } - // 昵称为空，用手机号 if (StringUtil.isEmpty(nickName) && StringUtil.isNotEmpty(mobile)) { nickName = mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"); @@ -860,13 +856,6 @@ public class MemberServiceImpl extends ServiceImpl impleme mtInvitationMapper.insert(mtInvitation); } } - // 补充信息 - - // 补充会员号 -// if (StringUtil.isEmpty(user.getUserNo())) { -// user.setUserNo(CommonUtil.createUserNo()); -// updateById(user); -// } } return user; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/CommonFilter.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/CommonFilter.java index cf8a18968..c60189a22 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/CommonFilter.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/CommonFilter.java @@ -32,15 +32,20 @@ public class CommonFilter implements Filter { ObjectMapper objectMapper = new ObjectMapper(); AccountInfo nowAccountInfo = objectMapper.convertValue(loginInfo, AccountInfo.class); if (ObjectUtil.isNotEmpty(nowAccountInfo)) { - ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); - //判断机构的状态 - SysDept dept = deptService.getById(nowAccountInfo.getDeptId()); - if (dept.getStatus().equals("qy")){ + if (ObjectUtil.isEmpty(nowAccountInfo.getDeptId()) || -1L == nowAccountInfo.getDeptId()) { filterChain.doFilter(servletRequest, servletResponse); - }else { - ResponseObject responseObject = new ResponseObject(444, "机构禁用", ""); - returnJson(servletResponse, JSONObject.toJSONString(responseObject)); + } else { + ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); + //判断机构的状态 + SysDept dept = deptService.getById(nowAccountInfo.getDeptId()); + if (dept.getStatus().equals("qy")){ + filterChain.doFilter(servletRequest, servletResponse); + }else { + ResponseObject responseObject = new ResponseObject(444, "机构禁用", ""); + returnJson(servletResponse, JSONObject.toJSONString(responseObject)); + } } + }else { ResponseObject responseObject = new ResponseObject(401, "登录信息已失效，请重新登录", ""); returnJson(servletResponse, JSONObject.toJSONString(responseObject)); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java index 8263afeb6..d9e283fc8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java @@ -137,21 +137,37 @@ public class ClientSignController extends BaseController { } String userAgent = request.getHeader("user-agent"); - String token = TokenUtil.generateToken(userAgent, mtUser.getId()); - UserInfo userLoginInfo = new UserInfo(); - userLoginInfo.setId(mtUser.getId()); - userLoginInfo.setStoreId(storeId); +// String token = TokenUtil.generateToken(userAgent, mtUser.getId()); +// UserInfo userLoginInfo = new UserInfo(); +// userLoginInfo.setId(mtUser.getId()); +// userLoginInfo.setStoreId(storeId); +// +// userLoginInfo.setToken(token); +// TokenUtil.saveToken(userLoginInfo); +// +// Map result = new HashMap<>(); +// result.put("token", token); +// result.put("userId", mtUser.getId()); +// result.put("userName", mtUser.getName()); +// result.put("openId", mtUser.getOpenId()); - userLoginInfo.setToken(token); - TokenUtil.saveToken(userLoginInfo); + AccountInfo accountInfo = new AccountInfo(); + accountInfo.setId(mtUser.getId()); + accountInfo.setDeptId(-1L); + if (ObjectUtil.isNotEmpty(storeId) && storeId!= "") { + accountInfo.setStoreId(Integer.parseInt(storeId)); + } + String token1 = TokenUtil.generateToken(userAgent, mtUser.getId()); + accountInfo.setToken(token1); + TokenUtil.saveAccountToken(accountInfo); + LoginResponse response = new LoginResponse(); + response.setLogin(true); + response.setToken(token1); + response.setTokenCreatedTime(new Date()); +// return getSuccessResult(response); - Map result = new HashMap<>(); - result.put("token", token); - result.put("userId", mtUser.getId()); - result.put("userName", mtUser.getName()); - result.put("openId", mtUser.getOpenId()); - return getSuccessResult("登录成功", result); + return getSuccessResult("登录成功", response); } diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties index 88bd11856..702395dbe 100644 --- a/fuintBackend/fuint-application/src/main/resources/application.properties +++ b/fuintBackend/fuint-application/src/main/resources/application.properties @@ -1,7 +1,7 @@ # \u57FA\u672C\u914D\u7F6E -server.port=8080 +server.port=8008 env.profile=dev -env.properties.path=D:/office/proj/oilSystem/fuintBackend/configure/ +env.properties.path=D:/code/oilSystem/fuintBackend/configure/ # \u6570\u636E\u5E93\u914D\u7F6E diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml index 0ea2c6848..b257a7fc5 100644 --- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml +++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtUserMapper.xml @@ -28,12 +28,12 @@