Merge branch 'dev_jcet' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_jcet

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -77,7 +77,8 @@ 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());
+            userInfoFormDTO.setMobile(userInfo.getMobile());
             Result<UserDTO> userDTOResult = epmetUserOpenFeignClient.saveUserInfo(userInfoFormDTO);
             if (!userDTOResult.success()){
                 throw new RenException(SsoConstant.INSERT_UPDATE_USER_FAILURE);

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<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto tokenDto){
 		LatestGridInfoResultDTO latestGridInfoResultDTO=resiMineGridService.getLatestGridInfoH5(tokenDto);
 		return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -304,6 +304,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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);