diff --git a/health/src/main/java/com/ccsens/health/api/DebugController.java b/health/src/main/java/com/ccsens/health/api/DebugController.java index 2c7bbcb1..127ae971 100644 --- a/health/src/main/java/com/ccsens/health/api/DebugController.java +++ b/health/src/main/java/com/ccsens/health/api/DebugController.java @@ -36,7 +36,7 @@ public class DebugController { color.r = "243"; color.g = "139"; color.b = "0"; - WxXcxUtil.getWxCode("pages/usercode/usercode" + WxXcxUtil.getWxCode("pages/site/user-code" ,"d=1217647686598135808",color,"/home/cloud/tall/uploads/qrCode/2020-03-07/158357267174.png"); return JsonResponse.newInstance().ok("完成"); } diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java index 6d6bfb33..9a212308 100644 --- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java +++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java @@ -142,7 +142,6 @@ public class SpringConfig implements WebMvcConfigurer { .excludePathPatterns("/users/claims") .excludePathPatterns("/users/member") .excludePathPatterns("/users/allMemberAll") - .excludePathPatterns("/users/userInfo") .addPathPatterns("/plugins/**") .excludePathPatterns("/plugins/sign") .excludePathPatterns("/plugins/fuzzy") diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 6f2ca175..928f4289 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -25,6 +25,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; +import org.eclipse.jetty.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -1244,6 +1245,9 @@ public class UserService implements IUserService { public UserVo.WxInfo updateUserInfo(Long currentUserId, UserDto.WxInfo userInfo) { //通过userid查找到用户 SysUser user = userDao.selectByPrimaryKey(currentUserId); + if(ObjectUtil.isNull(user)){ + throw new BaseException(CodeEnum.NOT_LOGIN); + } if (StrUtil.isNotEmpty(userInfo.getNickname())) { user.setNickname(userInfo.getNickname()); diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 2f54227f..bb107377 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -97,7 +97,7 @@ public enum CodeEnum { NOT_EMPLOYEE(80,"未找到成员信息",true), NOT_SITE(81,"未找到该场所",true), ALREADY_REAL_AUTH(82,"您已经完成认证",true), - LACK_CONFIG(82,"缺少配置",true), + LACK_CONFIG(83,"缺少配置",true), ; public CodeEnum addMsg(String msg){