diff --git a/src/main/java/com/guaiguailang/harmony/config/StpInterfaceImpl.java b/src/main/java/com/guaiguailang/harmony/config/StpInterfaceImpl.java index 1950eee..d705d5b 100644 --- a/src/main/java/com/guaiguailang/harmony/config/StpInterfaceImpl.java +++ b/src/main/java/com/guaiguailang/harmony/config/StpInterfaceImpl.java @@ -24,6 +24,7 @@ public class StpInterfaceImpl implements StpInterface { /** * 返回一个账号所拥有的权限码集合 + * */ @Override public List getPermissionList(Object loginId, String loginType) { diff --git a/src/main/java/com/guaiguailang/harmony/constant/FileUploadFolder.java b/src/main/java/com/guaiguailang/harmony/constant/FileUploadFolder.java index 3b0c7c2..8db76e0 100644 --- a/src/main/java/com/guaiguailang/harmony/constant/FileUploadFolder.java +++ b/src/main/java/com/guaiguailang/harmony/constant/FileUploadFolder.java @@ -1,6 +1,6 @@ package com.guaiguailang.harmony.constant; public class FileUploadFolder { - public static final String USER_AVATER_FOLDER = "usera_vatar"; + public static final String USER_AVATER_FOLDER = "userAvatar"; public static final String ACTIVITY_FOLDER = "activity"; } diff --git a/src/main/java/com/guaiguailang/harmony/domain/dto/ParamUserAdd.java b/src/main/java/com/guaiguailang/harmony/domain/dto/ParamUserAdd.java index 01c9e1b..b4a0fb2 100644 --- a/src/main/java/com/guaiguailang/harmony/domain/dto/ParamUserAdd.java +++ b/src/main/java/com/guaiguailang/harmony/domain/dto/ParamUserAdd.java @@ -12,7 +12,7 @@ public class ParamUserAdd { String username; String password; String email; - String telphone; + String telephone; String roleId; String avatar; int status; diff --git a/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java b/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java index 6b415b1..b775cc9 100644 --- a/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java +++ b/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java @@ -183,7 +183,7 @@ public class UserServiceImpl implements UserService { userAddParam.setStatus(1); // 其他信息配置 userAddParam.setEmail(userAddParam.getEmail()==null?"":userAddParam.getEmail()); - userAddParam.setTelphone(userAddParam.getTelphone()==null?"":userAddParam.getTelphone()); + userAddParam.setTelephone(userAddParam.getTelephone()==null?"":userAddParam.getTelephone()); userAddParam.setAvatar(userAddParam.getAvatar()==null?"":userAddParam.getAvatar()); userAddParam.setCode(userAddParam.getCode()==null?"":userAddParam.getCode()); int result = userMapper.addUser(userAddParam); @@ -294,7 +294,7 @@ return ResponseResult.error("删除失败"); if (StringUtils.isAnyBlank(userAddParam.getId().toString(),userAddParam.getName())) { return ResponseResult.error("请输入昵称"); } - Integer result = userMapper.selfUpdateUserInfo(userAddParam.getId(),userAddParam.getName(),userAddParam.getEmail(),userAddParam.getTelphone()); + Integer result = userMapper.selfUpdateUserInfo(userAddParam.getId(),userAddParam.getName(),userAddParam.getEmail(),userAddParam.getTelephone()); if (result==1){ return ResponseResult.success(); }else { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5a86cf1..6a50e09 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -32,7 +32,7 @@ mybatis.configuration.map-underscore-to-camel-case=true spring.data.redis.host=localhost spring.data.redis.port=6379 spring.data.redis.database=10 -spring.data.redis.password=123456 +spring.data.redis.password= spring.data.redis.lettuce.pool.max-active= 8 spring.data.redis.lettuce.pool.max-wait=-1 spring.data.redis.lettuce.pool.max-idle=8 diff --git a/src/main/resources/static/userAvatar/xrilang.jpg b/src/main/resources/static/userAvatar/xrilang.jpg new file mode 100644 index 0000000..ccf67e8 Binary files /dev/null and b/src/main/resources/static/userAvatar/xrilang.jpg differ diff --git a/src/main/resources/static/user_avatar/test.txt b/src/main/resources/static/user_avatar/test.txt deleted file mode 100644 index 58c9bdf..0000000 --- a/src/main/resources/static/user_avatar/test.txt +++ /dev/null @@ -1 +0,0 @@ -111 diff --git a/src/main/resources/static/user_avatar/xrilang.jpg b/src/main/resources/static/user_avatar/xrilang.jpg deleted file mode 100644 index f4f0dfe..0000000 Binary files a/src/main/resources/static/user_avatar/xrilang.jpg and /dev/null differ diff --git a/src/main/resources/static/usera_vatar/xrilang.jpg b/src/main/resources/static/usera_vatar/xrilang.jpg deleted file mode 100644 index 0354a1b..0000000 Binary files a/src/main/resources/static/usera_vatar/xrilang.jpg and /dev/null differ