From 1cb0bc2ec9d6a72c702cbe70078f37be0470e3bd Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 20 Jan 2021 13:44:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?/sso=20=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=80=E8=BF=91=E8=AE=BF=E9=97=AE=E7=9A=84=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/grid/controller/ResiMineGridController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index e025d6ccc3..7ea7b24f3d 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -70,7 +70,7 @@ public class ResiMineGridController { * @Description 获取用户最近访问网格 * @Date 2020/3/24 11:10 **/ - @GetMapping("sso/latestgridinfo") + @PostMapping("sso/latestgridinfo") public Result latestGridInfo(@LoginUser TokenDto tokenDto){ LatestGridInfoResultDTO latestGridInfoResultDTO=resiMineGridService.getLatestGridInfoH5(tokenDto); return new Result().ok(latestGridInfoResultDTO); From 9ae6528aaa19a80810528e9c15e0980e73b78165 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 20 Jan 2021 14:28:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?login=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/SsoServiceImpl.java | 2 +- .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java index 482738566f..268b1b2f07 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java @@ -75,7 +75,7 @@ public class SsoServiceImpl implements SsoService { UserInfoFormDTO userInfoFormDTO = ConvertUtils.sourceToTarget(userInfo, UserInfoFormDTO.class); userInfoFormDTO.setApp(formDTO.getApp()); userInfoFormDTO.setUid(userInfo.getId()); - userInfoFormDTO.setName(userInfo.getUserName()); + userInfoFormDTO.setName(userInfo.getName()); Result userDTOResult = epmetUserOpenFeignClient.saveUserInfo(userInfoFormDTO); if (!userDTOResult.success()){ throw new RenException(SsoConstant.INSERT_UPDATE_USER_FAILURE); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index fe21e876d8..f821ff27da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -304,6 +304,7 @@ public class UserServiceImpl extends BaseServiceImpl implem entity.setUserId(userEntity.getId()); entity.setNickname(formDTO.getName()); entity.setWxOpenId(formDTO.getUid()); + entity.setSex(NumConstant.ZERO); if (userWechatDao.insert(entity) < NumConstant.ONE) { log.error("小程序登陆，居民端user_wechat表新增数据失败"); throw new RenException(UserConstant.SAVE_USER_WECHAT); From cf4c1d02e76377ca56b634ffe2f85058245ec9f1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 20 Jan 2021 14:36:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?login=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/SsoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java index 268b1b2f07..c778d58498 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java @@ -76,6 +76,7 @@ public class SsoServiceImpl implements SsoService { userInfoFormDTO.setApp(formDTO.getApp()); userInfoFormDTO.setUid(userInfo.getId()); userInfoFormDTO.setName(userInfo.getName()); + userInfoFormDTO.setMobile(userInfo.getMobile()); Result userDTOResult = epmetUserOpenFeignClient.saveUserInfo(userInfoFormDTO); if (!userDTOResult.success()){ throw new RenException(SsoConstant.INSERT_UPDATE_USER_FAILURE);