diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/.gitignore b/luojia_island/.idea/.gitignore similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/.gitignore rename to luojia_island/.idea/.gitignore diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/compiler.xml b/luojia_island/.idea/compiler.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/compiler.xml rename to luojia_island/.idea/compiler.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/dataSources.xml b/luojia_island/.idea/dataSources.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/dataSources.xml rename to luojia_island/.idea/dataSources.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/encodings.xml b/luojia_island/.idea/encodings.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/encodings.xml rename to luojia_island/.idea/encodings.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/jarRepositories.xml b/luojia_island/.idea/jarRepositories.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/jarRepositories.xml rename to luojia_island/.idea/jarRepositories.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/misc.xml b/luojia_island/.idea/misc.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/misc.xml rename to luojia_island/.idea/misc.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/settings.json b/luojia_island/.idea/settings.json similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/settings.json rename to luojia_island/.idea/settings.json diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/sqldialects.xml b/luojia_island/.idea/sqldialects.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/sqldialects.xml rename to luojia_island/.idea/sqldialects.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/uiDesigner.xml b/luojia_island/.idea/uiDesigner.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/uiDesigner.xml rename to luojia_island/.idea/uiDesigner.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/vcs.xml b/luojia_island/.idea/vcs.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/.idea/vcs.xml rename to luojia_island/.idea/vcs.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/pom.xml b/luojia_island/common/pom.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/pom.xml rename to luojia_island/common/pom.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/advice/GlobalExceptionHandler.java b/luojia_island/common/src/main/java/com/luojia_channel/common/advice/GlobalExceptionHandler.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/advice/GlobalExceptionHandler.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/advice/GlobalExceptionHandler.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/MybatisConfig.java b/luojia_island/common/src/main/java/com/luojia_channel/common/config/MybatisConfig.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/MybatisConfig.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/config/MybatisConfig.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/RedisConfig.java b/luojia_island/common/src/main/java/com/luojia_channel/common/config/RedisConfig.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/RedisConfig.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/config/RedisConfig.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java b/luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java similarity index 69% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java index c1ea840..891e804 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java +++ b/luojia_island/common/src/main/java/com/luojia_channel/common/config/WebMvcConfig.java @@ -2,10 +2,7 @@ package com.luojia_channel.common.config; import com.luojia_channel.common.interceptor.AuthInterceptor; import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -15,16 +12,11 @@ public class WebMvcConfig implements WebMvcConfigurer { private final AuthInterceptor authInterceptor; @Override public void addInterceptors(InterceptorRegistry registry) { - // 登录拦截器 + // 拦截器 registry.addInterceptor(authInterceptor) .excludePathPatterns("/user/login", "/user/register" ); } - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } - } diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/constants/RedisConstant.java b/luojia_island/common/src/main/java/com/luojia_channel/common/constants/RedisConstant.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/constants/RedisConstant.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/constants/RedisConstant.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/domain/Result.java b/luojia_island/common/src/main/java/com/luojia_channel/common/domain/Result.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/domain/Result.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/domain/Result.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/domain/UserDTO.java b/luojia_island/common/src/main/java/com/luojia_channel/common/domain/UserDTO.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/domain/UserDTO.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/domain/UserDTO.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/exception/BaseException.java b/luojia_island/common/src/main/java/com/luojia_channel/common/exception/BaseException.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/exception/BaseException.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/exception/BaseException.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/exception/UserException.java b/luojia_island/common/src/main/java/com/luojia_channel/common/exception/UserException.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/exception/UserException.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/exception/UserException.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/interceptor/AuthInterceptor.java b/luojia_island/common/src/main/java/com/luojia_channel/common/interceptor/AuthInterceptor.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/interceptor/AuthInterceptor.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/interceptor/AuthInterceptor.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java b/luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java similarity index 97% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java index e3c134a..30330fb 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java +++ b/luojia_island/common/src/main/java/com/luojia_channel/common/utils/JWTUtil.java @@ -27,7 +27,7 @@ public final class JWTUtil { private static final long ACCESS_EXPIRATION = 60 * 60 * 1000; //一小时 private static final long REFRESH_EXPIRATION = 60 * 60 * 24 * 15 * 1000; //15天 - private static final Long NEED_REFRESH_TTL = 7L; + private static final long NEED_REFRESH_TTL = 60 * 60 * 24 * 7 * 1000; //7天 private static final String USER_ID_KEY = "userId"; private static final String USER_NAME_KEY = "username"; public static final String TOKEN_PREFIX = "Bearer "; @@ -144,7 +144,7 @@ public final class JWTUtil { String newAccessToken = generateAccessToken(user); String newRefreshToken = generateRefreshToken(user); // 惰性刷新refreshToken - Long ttl = redisUtil.getExpire(redisKey, TimeUnit.DAYS); + Long ttl = redisUtil.getExpire(redisKey, TimeUnit.MILLISECONDS); if(ttl < NEED_REFRESH_TTL) redisUtil.set(redisKey, newRefreshToken, REFRESH_EXPIRATION, TimeUnit.MILLISECONDS); user.setAccessToken(newAccessToken); diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java b/luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java similarity index 99% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java index 25f0160..20494f9 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java +++ b/luojia_island/common/src/main/java/com/luojia_channel/common/utils/RedisUtil.java @@ -48,7 +48,7 @@ public class RedisUtil { public boolean hasKey(String key) { Boolean result = redisTemplate.hasKey(key); - return result != null; + return result != null && result; } public Long getExpire(String key, TimeUnit timeUnit){ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/UserContext.java b/luojia_island/common/src/main/java/com/luojia_channel/common/utils/UserContext.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/src/main/java/com/luojia_channel/common/utils/UserContext.java rename to luojia_island/common/src/main/java/com/luojia_channel/common/utils/UserContext.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/advice/GlobalExceptionHandler.class b/luojia_island/common/target/classes/com/luojia_channel/common/advice/GlobalExceptionHandler.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/advice/GlobalExceptionHandler.class rename to luojia_island/common/target/classes/com/luojia_channel/common/advice/GlobalExceptionHandler.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/MybatisConfig.class b/luojia_island/common/target/classes/com/luojia_channel/common/config/MybatisConfig.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/MybatisConfig.class rename to luojia_island/common/target/classes/com/luojia_channel/common/config/MybatisConfig.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/RedisConfig.class b/luojia_island/common/target/classes/com/luojia_channel/common/config/RedisConfig.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/RedisConfig.class rename to luojia_island/common/target/classes/com/luojia_channel/common/config/RedisConfig.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/WebMvcConfig.class b/luojia_island/common/target/classes/com/luojia_channel/common/config/WebMvcConfig.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/config/WebMvcConfig.class rename to luojia_island/common/target/classes/com/luojia_channel/common/config/WebMvcConfig.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/constants/RedisConstant.class b/luojia_island/common/target/classes/com/luojia_channel/common/constants/RedisConstant.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/constants/RedisConstant.class rename to luojia_island/common/target/classes/com/luojia_channel/common/constants/RedisConstant.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/Result.class b/luojia_island/common/target/classes/com/luojia_channel/common/domain/Result.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/Result.class rename to luojia_island/common/target/classes/com/luojia_channel/common/domain/Result.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO$UserDTOBuilder.class b/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO$UserDTOBuilder.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO$UserDTOBuilder.class rename to luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO$UserDTOBuilder.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO.class b/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO.class rename to luojia_island/common/target/classes/com/luojia_channel/common/domain/UserDTO.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/exception/BaseException.class b/luojia_island/common/target/classes/com/luojia_channel/common/exception/BaseException.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/exception/BaseException.class rename to luojia_island/common/target/classes/com/luojia_channel/common/exception/BaseException.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/exception/UserException.class b/luojia_island/common/target/classes/com/luojia_channel/common/exception/UserException.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/exception/UserException.class rename to luojia_island/common/target/classes/com/luojia_channel/common/exception/UserException.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class b/luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class similarity index 97% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class rename to luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class index aa34b06..8ee05b1 100644 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class and b/luojia_island/common/target/classes/com/luojia_channel/common/interceptor/AuthInterceptor.class differ diff --git a/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class b/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class new file mode 100644 index 0000000..0d3d235 Binary files /dev/null and b/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil$ZSetItem.class b/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil$ZSetItem.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil$ZSetItem.class rename to luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil$ZSetItem.class diff --git a/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class b/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class new file mode 100644 index 0000000..1c92ad1 Binary files /dev/null and b/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/UserContext.class b/luojia_island/common/target/classes/com/luojia_channel/common/utils/UserContext.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/UserContext.class rename to luojia_island/common/target/classes/com/luojia_channel/common/utils/UserContext.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/common-1.0.0.jar b/luojia_island/common/target/common-1.0.0.jar similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/common-1.0.0.jar rename to luojia_island/common/target/common-1.0.0.jar diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/common-1.0.0.jar.original b/luojia_island/common/target/common-1.0.0.jar.original similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/common-1.0.0.jar.original rename to luojia_island/common/target/common-1.0.0.jar.original diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-archiver/pom.properties b/luojia_island/common/target/maven-archiver/pom.properties similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-archiver/pom.properties rename to luojia_island/common/target/maven-archiver/pom.properties diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst rename to luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst rename to luojia_island/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/pom.xml b/luojia_island/pom.xml similarity index 95% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/pom.xml rename to luojia_island/pom.xml index 6b6c0ab..18b93e5 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/pom.xml +++ b/luojia_island/pom.xml @@ -89,12 +89,12 @@ 5.8.24 - + - org.springframework.boot - spring-boot-starter-security + io.minio + minio + 8.4.5 - diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/pom.xml b/luojia_island/service/pom.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/pom.xml rename to luojia_island/service/pom.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/LuojiaChannelApplication.java b/luojia_island/service/src/main/java/com/luojia_channel/LuojiaChannelApplication.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/LuojiaChannelApplication.java rename to luojia_island/service/src/main/java/com/luojia_channel/LuojiaChannelApplication.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/constant/UserConstant.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/constant/UserConstant.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/constant/UserConstant.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/constant/UserConstant.java diff --git a/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java new file mode 100644 index 0000000..d5c8dd0 --- /dev/null +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java @@ -0,0 +1,32 @@ +package com.luojia_channel.modules.user.controller; + +import com.luojia_channel.common.domain.Result; +import com.luojia_channel.modules.user.dto.UserChangeInfoDTO; +import com.luojia_channel.modules.user.service.UserInfoService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequestMapping("/user/info") +@RequiredArgsConstructor +public class UserInfoController { + private final UserInfoService userInfoService; + @PostMapping("/update") + public Result updateInfo(@RequestBody UserChangeInfoDTO userChangeInfoDTO){ + userInfoService.updateInfo(userChangeInfoDTO); + return Result.success(); + } + + @PostMapping("/password") + public Result updatePassword(@RequestParam String password){ + userInfoService.updatePassword(password); + return Result.success(); + } + + @PostMapping("/avatar") + public Result updateAvatar(@RequestParam MultipartFile file){ + // TODO 通过oss存储服务或者minio实现头像更新 + return Result.success(); + } +} diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java similarity index 88% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java index af6edb5..1a3347e 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserLoginController.java @@ -5,6 +5,7 @@ import com.luojia_channel.common.domain.UserDTO; import com.luojia_channel.modules.user.dto.UserLoginDTO; import com.luojia_channel.modules.user.dto.UserRegisterDTO; import com.luojia_channel.modules.user.service.UserLoginService; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -24,8 +25,8 @@ public class UserLoginController { } @PostMapping("/logout") - public Result logout(@RequestParam String accessToken){ - userLoginService.logout(accessToken); + public Result logout(HttpServletRequest request){ + userLoginService.logout(request); return Result.success(); } diff --git a/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.java new file mode 100644 index 0000000..210ff7b --- /dev/null +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.java @@ -0,0 +1,20 @@ +package com.luojia_channel.modules.user.dto; + +import lombok.Data; + +@Data +public class UserChangeInfoDTO { + private String username; + + private String phone; + + private String email; + + private String studentId; + + private String avatar; + + private Integer gender; + + private String college; +} diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserLoginDTO.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserLoginDTO.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserLoginDTO.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserLoginDTO.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserRegisterDTO.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserRegisterDTO.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserRegisterDTO.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/dto/UserRegisterDTO.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java similarity index 95% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java index d49d1b4..1f8704c 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/entity/User.java @@ -44,6 +44,11 @@ public class User implements Serializable { */ private String studentId; + /** + * 头像url + */ + private String avatar; + /** * 性别(0未知，1男，2女) */ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/mapper/UserMapper.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/mapper/UserMapper.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/mapper/UserMapper.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/mapper/UserMapper.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java similarity index 57% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java index 6982d38..d087544 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserInfoService.java @@ -1,7 +1,11 @@ package com.luojia_channel.modules.user.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.luojia_channel.modules.user.dto.UserChangeInfoDTO; import com.luojia_channel.modules.user.entity.User; public interface UserInfoService extends IService { + void updateInfo(UserChangeInfoDTO userChangeInfoDTO); + + void updatePassword(String password); } diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java similarity index 85% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java index 9330f11..420dcdd 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/UserLoginService.java @@ -5,6 +5,7 @@ import com.luojia_channel.common.domain.UserDTO; import com.luojia_channel.modules.user.dto.UserLoginDTO; import com.luojia_channel.modules.user.dto.UserRegisterDTO; import com.luojia_channel.modules.user.entity.User; +import jakarta.servlet.http.HttpServletRequest; public interface UserLoginService extends IService { @@ -12,7 +13,7 @@ public interface UserLoginService extends IService { UserDTO checkLogin(String accessToken, String refreshToken); - void logout(String accessToken); + void logout(HttpServletRequest request); UserDTO register(UserRegisterDTO userRegisterDTO); } diff --git a/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java new file mode 100644 index 0000000..0a7f4cc --- /dev/null +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,58 @@ +package com.luojia_channel.modules.user.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.crypto.digest.BCrypt; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.luojia_channel.common.exception.UserException; +import com.luojia_channel.common.utils.UserContext; +import com.luojia_channel.modules.user.dto.UserChangeInfoDTO; +import com.luojia_channel.modules.user.entity.User; +import com.luojia_channel.modules.user.mapper.UserMapper; +import com.luojia_channel.modules.user.service.UserInfoService; + +import com.luojia_channel.modules.user.utils.ValidateParameterUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; + +@Service +@RequiredArgsConstructor +public class UserInfoServiceImpl extends ServiceImpl implements UserInfoService { + + private final UserMapper userMapper; + private final ValidateParameterUtil validateParameterUtil; + + @Override + public void updateInfo(UserChangeInfoDTO userChangeInfoDTO) { + Long userId = UserContext.getUserId(); + User currentUser = userMapper.selectById(userId); + if(currentUser == null){ + throw new UserException("用户不存在"); + } + validateParameterUtil.validateFormats(userChangeInfoDTO, userId); + User user = BeanUtil.copyProperties(userChangeInfoDTO, User.class); + user.setId(userId); + user.setUpdateTime(LocalDateTime.now()); + updateById(user); + } + + @Override + public void updatePassword(String password) { + Long userId = UserContext.getUserId(); + User user = userMapper.selectById(userId); + if(user == null){ + throw new UserException("用户不存在"); + } + if (!password.matches(ValidateParameterUtil.PASSWORD_REGEX)) { + throw new UserException("密码格式不符合要求"); + } + if (BCrypt.checkpw(password, user.getPassword())) { + throw new UserException("修改密码不能与原密码相同"); + } + String encodedPassword = BCrypt.hashpw(password, BCrypt.gensalt()); + user.setPassword(encodedPassword); + user.setUpdateTime(LocalDateTime.now()); + updateById(user); + } +} diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java similarity index 91% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java index 30169fe..cab9496 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.java @@ -2,6 +2,7 @@ package com.luojia_channel.modules.user.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,8 +17,8 @@ import com.luojia_channel.modules.user.service.UserLoginService; import com.luojia_channel.common.utils.JWTUtil; import com.luojia_channel.common.utils.RedisUtil; import com.luojia_channel.modules.user.utils.ValidateParameterUtil; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +38,6 @@ public class UserLoginServiceImpl extends ServiceImpl implemen private final RedisUtil redisUtil; private final JWTUtil jwtUtil; private final ValidateParameterUtil validateParameterUtil; - private final PasswordEncoder passwordEncoder; /** * 根据用户标志获得用户学号，用于登录 @@ -92,7 +92,7 @@ public class UserLoginServiceImpl extends ServiceImpl implemen String userFlag = userLoginDTO.getUserFlag(); String password = userLoginDTO.getPassword(); User user = getUserByFlag(userFlag); - if (!passwordEncoder.matches(password, user.getPassword())) { + if (!BCrypt.checkpw(password, user.getPassword())) { throw new UserException("密码错误"); } UserDTO userDTO = UserDTO.builder() @@ -116,11 +116,14 @@ public class UserLoginServiceImpl extends ServiceImpl implemen /** * 登出 - * @param accessToken */ @Override - public void logout(String accessToken) { + public void logout(HttpServletRequest request) { + String accessToken = request.getHeader("Authorization"); Long userId = UserContext.getUserId(); + if(userId == null){ + throw new UserException("用户不存在"); + } // 删除refreshToken String refreshKey = REFRESH_TOKEN_PREFIX + userId; redisUtil.delete(refreshKey); @@ -142,10 +145,10 @@ public class UserLoginServiceImpl extends ServiceImpl implemen @Transactional(rollbackFor = Exception.class) public UserDTO register(UserRegisterDTO userRegisterDTO) { // 校验注册参数 - validateParameterUtil.validateUser(userRegisterDTO); + validateParameterUtil.validateRegisterUser(userRegisterDTO); User user = BeanUtil.copyProperties(userRegisterDTO, User.class); // 加密 - String encodedPassword = passwordEncoder.encode(userRegisterDTO.getPassword()); + String encodedPassword = BCrypt.hashpw(userRegisterDTO.getPassword(), BCrypt.gensalt()); user.setPassword(encodedPassword); user.setCreateTime(LocalDateTime.now()); user.setUpdateTime(LocalDateTime.now()); diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/AnonymousUserUtil.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/AnonymousUserUtil.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/AnonymousUserUtil.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/AnonymousUserUtil.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java similarity index 74% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java rename to luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java index 6be875a..2aa9d45 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java +++ b/luojia_island/service/src/main/java/com/luojia_channel/modules/user/utils/ValidateParameterUtil.java @@ -3,6 +3,7 @@ package com.luojia_channel.modules.user.utils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.luojia_channel.common.exception.UserException; +import com.luojia_channel.modules.user.dto.UserChangeInfoDTO; import com.luojia_channel.modules.user.dto.UserRegisterDTO; import com.luojia_channel.modules.user.entity.User; import com.luojia_channel.modules.user.mapper.UserMapper; @@ -24,7 +25,7 @@ public class ValidateParameterUtil { * 可能需要前端在用户选择注册方式时只暴露出一个文本框 * @param userRegisterDTO */ - public void validateUser(UserRegisterDTO userRegisterDTO) { + public void validateRegisterUser(UserRegisterDTO userRegisterDTO) { String username = userRegisterDTO.getUsername(); String password = userRegisterDTO.getPassword(); String phone = userRegisterDTO.getPhone(); @@ -69,11 +70,31 @@ public class ValidateParameterUtil { if(!password.matches(PASSWORD_REGEX)){ throw new UserException("密码格式错误"); } + validateUserFlag(phone, email, studentId, null); + } + + public void validateFormats(UserChangeInfoDTO userChangeInfoDTO, Long currentUserId){ + String username = userChangeInfoDTO.getUsername(); + String phone = userChangeInfoDTO.getPhone(); + String email = userChangeInfoDTO.getEmail(); + String studentId = userChangeInfoDTO.getStudentId(); + // String college = userChangeInfoDTO.getCollege(); + if (userMapper.exists(Wrappers.lambdaQuery() + .eq(User::getUsername, userChangeInfoDTO.getUsername()) + .ne(currentUserId != null, User::getId, currentUserId))) { + throw new UserException("用户名已被使用"); + } + + validateUserFlag(phone, email, studentId, currentUserId); + } + + private void validateUserFlag(String phone, String email, String studentId, Long currentUserId) { if(StrUtil.isNotBlank(phone)){ if(!phone.matches(PHONE_REGEX)) throw new UserException("手机号格式错误"); if (userMapper.exists(Wrappers.lambdaQuery() - .eq(User::getPhone, phone))) { + .eq(User::getPhone, phone) + .ne(currentUserId != null, User::getId, currentUserId))) { throw new UserException("手机已存在"); } } @@ -81,7 +102,8 @@ public class ValidateParameterUtil { if(!email.matches(EMAIL_REGEX)) throw new UserException("邮箱格式错误"); if (userMapper.exists(Wrappers.lambdaQuery() - .eq(User::getEmail, email))) { + .eq(User::getEmail, email) + .ne(currentUserId != null, User::getId, currentUserId))) { throw new UserException("邮箱已存在"); } } @@ -89,7 +111,8 @@ public class ValidateParameterUtil { if(!studentId.matches(STUDENTID_REGEX)) throw new UserException("学号格式错误"); if (userMapper.exists(Wrappers.lambdaQuery() - .eq(User::getStudentId, studentId))) { + .eq(User::getStudentId, studentId) + .ne(currentUserId != null, User::getId, currentUserId))) { throw new UserException("学号已存在"); } } diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application-dev.yaml b/luojia_island/service/src/main/resources/application-dev.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application-dev.yaml rename to luojia_island/service/src/main/resources/application-dev.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application-local.yaml b/luojia_island/service/src/main/resources/application-local.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application-local.yaml rename to luojia_island/service/src/main/resources/application-local.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application.yaml b/luojia_island/service/src/main/resources/application.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/application.yaml rename to luojia_island/service/src/main/resources/application.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/db/luojia_channel.sql b/luojia_island/service/src/main/resources/db/luojia_channel.sql similarity index 90% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/db/luojia_channel.sql rename to luojia_island/service/src/main/resources/db/luojia_channel.sql index 94bfe34..84cf5ea 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/db/luojia_channel.sql +++ b/luojia_island/service/src/main/resources/db/luojia_channel.sql @@ -1,4 +1,5 @@ +DROP TABLE IF EXISTS `user`; CREATE TABLE `user` ( `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', `username` VARCHAR(50) NOT NULL COMMENT '用户名', @@ -7,6 +8,7 @@ CREATE TABLE `user` ( `phone` VARCHAR(20) UNIQUE COMMENT '注册手机号', `email` VARCHAR(100) UNIQUE COMMENT '邮箱', `student_id` VARCHAR(20) UNIQUE COMMENT '学号', + `avatar` VARCHAR(255) COMMENT '头像URL', `gender` TINYINT DEFAULT 0 COMMENT '性别（0未知，1男，2女）', `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/mapper/user/UserMapper.xml b/luojia_island/service/src/main/resources/mapper/user/UserMapper.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/resources/mapper/user/UserMapper.xml rename to luojia_island/service/src/main/resources/mapper/user/UserMapper.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/test/java/com/luojia/luojia_channel/LuojiaChannelApplicationTests.java b/luojia_island/service/src/test/java/com/luojia/luojia_channel/LuojiaChannelApplicationTests.java similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/test/java/com/luojia/luojia_channel/LuojiaChannelApplicationTests.java rename to luojia_island/service/src/test/java/com/luojia/luojia_channel/LuojiaChannelApplicationTests.java diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application-dev.yaml b/luojia_island/service/target/classes/application-dev.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application-dev.yaml rename to luojia_island/service/target/classes/application-dev.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application-local.yaml b/luojia_island/service/target/classes/application-local.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application-local.yaml rename to luojia_island/service/target/classes/application-local.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application.yaml b/luojia_island/service/target/classes/application.yaml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/application.yaml rename to luojia_island/service/target/classes/application.yaml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/LuojiaChannelApplication.class b/luojia_island/service/target/classes/com/luojia_channel/LuojiaChannelApplication.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/LuojiaChannelApplication.class rename to luojia_island/service/target/classes/com/luojia_channel/LuojiaChannelApplication.class diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/constant/UserConstant.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/constant/UserConstant.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/constant/UserConstant.class rename to luojia_island/service/target/classes/com/luojia_channel/modules/user/constant/UserConstant.class diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class new file mode 100644 index 0000000..442b0dc Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class similarity index 69% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class rename to luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class index cd089e4..87c8815 100644 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserLoginController.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.class new file mode 100644 index 0000000..ef8130d Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserChangeInfoDTO.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class similarity index 68% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class rename to luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class index 50769ed..ea99ddc 100644 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserLoginDTO.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class new file mode 100644 index 0000000..32f9074 Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class new file mode 100644 index 0000000..09312d4 Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/mapper/UserMapper.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/mapper/UserMapper.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/mapper/UserMapper.class rename to luojia_island/service/target/classes/com/luojia_channel/modules/user/mapper/UserMapper.class diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class new file mode 100644 index 0000000..b666680 Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class new file mode 100644 index 0000000..496c49c Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class new file mode 100644 index 0000000..a683548 Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class differ diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class new file mode 100644 index 0000000..41d7f1e Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/AnonymousUserUtil.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/AnonymousUserUtil.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/AnonymousUserUtil.class rename to luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/AnonymousUserUtil.class diff --git a/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class b/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class new file mode 100644 index 0000000..c285acc Binary files /dev/null and b/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/db/luojia_channel.sql b/luojia_island/service/target/classes/db/luojia_channel.sql similarity index 90% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/db/luojia_channel.sql rename to luojia_island/service/target/classes/db/luojia_channel.sql index 94bfe34..84cf5ea 100644 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/db/luojia_channel.sql +++ b/luojia_island/service/target/classes/db/luojia_channel.sql @@ -1,4 +1,5 @@ +DROP TABLE IF EXISTS `user`; CREATE TABLE `user` ( `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', `username` VARCHAR(50) NOT NULL COMMENT '用户名', @@ -7,6 +8,7 @@ CREATE TABLE `user` ( `phone` VARCHAR(20) UNIQUE COMMENT '注册手机号', `email` VARCHAR(100) UNIQUE COMMENT '邮箱', `student_id` VARCHAR(20) UNIQUE COMMENT '学号', + `avatar` VARCHAR(255) COMMENT '头像URL', `gender` TINYINT DEFAULT 0 COMMENT '性别（0未知，1男，2女）', `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/mapper/user/UserMapper.xml b/luojia_island/service/target/classes/mapper/user/UserMapper.xml similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/mapper/user/UserMapper.xml rename to luojia_island/service/target/classes/mapper/user/UserMapper.xml diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/test-classes/com/luojia/luojia_channel/LuojiaChannelApplicationTests.class b/luojia_island/service/target/test-classes/com/luojia/luojia_channel/LuojiaChannelApplicationTests.class similarity index 100% rename from software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/test-classes/com/luojia/luojia_channel/LuojiaChannelApplicationTests.class rename to luojia_island/service/target/test-classes/com/luojia/luojia_channel/LuojiaChannelApplicationTests.class diff --git a/software_teamwork/README.md b/software_teamwork/README.md deleted file mode 100644 index f321b36..0000000 --- a/software_teamwork/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# software_teamwork - diff --git a/software_teamwork/作业截图及文件/第三次_项目任务书/珞珈岛-项目任务书v1.docx b/software_teamwork/作业截图及文件/第三次_项目任务书/珞珈岛-项目任务书v1.docx deleted file mode 100644 index 152a237..0000000 Binary files a/software_teamwork/作业截图及文件/第三次_项目任务书/珞珈岛-项目任务书v1.docx and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/前端/待办列表-李泽童.png b/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/前端/待办列表-李泽童.png deleted file mode 100644 index 6b2572d..0000000 Binary files a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/前端/待办列表-李泽童.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/id查找成功.png b/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/id查找成功.png deleted file mode 100644 index a23f4ae..0000000 Binary files a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/id查找成功.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/数据库可视化.png b/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/数据库可视化.png deleted file mode 100644 index 7d446e8..0000000 Binary files a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/数据库可视化.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/注册请求成功.png b/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/注册请求成功.png deleted file mode 100644 index 128e6fe..0000000 Binary files a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/注册请求成功.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/用户名查找成功.png b/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/用户名查找成功.png deleted file mode 100644 index dbdb555..0000000 Binary files a/software_teamwork/作业截图及文件/第二次_第二周课后实践练习/后端/用户名查找成功.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with ai.docx b/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with ai.docx deleted file mode 100644 index dbc75c4..0000000 Binary files a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with ai.docx and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with deepseek.png b/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with deepseek.png deleted file mode 100644 index 6409874..0000000 Binary files a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/chat with deepseek.png and /dev/null differ diff --git a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/珞珈岛-项目任务书v2.docx b/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/珞珈岛-项目任务书v2.docx deleted file mode 100644 index a0c4d26..0000000 Binary files a/software_teamwork/作业截图及文件/第四次_AI辅助项目选题和获取需求/珞珈岛-项目任务书v2.docx and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class deleted file mode 100644 index 2051a33..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/JWTUtil.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class deleted file mode 100644 index 4b9fa2d..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/common/target/classes/com/luojia_channel/common/utils/RedisUtil.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java deleted file mode 100644 index be109f5..0000000 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/controller/UserInfoController.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.luojia_channel.modules.user.controller; - -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/user/info") -@RequiredArgsConstructor -public class UserInfoController { -} diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java deleted file mode 100644 index d72f795..0000000 --- a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/src/main/java/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.luojia_channel.modules.user.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luojia_channel.modules.user.entity.User; -import com.luojia_channel.modules.user.mapper.UserMapper; -import com.luojia_channel.modules.user.service.UserInfoService; - -import org.springframework.stereotype.Service; - -@Service -public class UserInfoServiceImpl extends ServiceImpl implements UserInfoService { - -} diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class deleted file mode 100644 index 97e0f50..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/controller/UserInfoController.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class deleted file mode 100644 index 8898e1f..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/dto/UserRegisterDTO.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class deleted file mode 100644 index 9ba01c0..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/entity/User.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class deleted file mode 100644 index 5f195b1..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserInfoService.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class deleted file mode 100644 index bd925f4..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/UserLoginService.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class deleted file mode 100644 index ff6e50a..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserInfoServiceImpl.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class deleted file mode 100644 index 439e1f2..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/service/impl/UserLoginServiceImpl.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class b/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class deleted file mode 100644 index f425e6c..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/luojia_island/service/target/classes/com/luojia_channel/modules/user/utils/ValidateParameterUtil.class and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v1.docx b/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v1.docx deleted file mode 100644 index 152a237..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v1.docx and /dev/null differ diff --git a/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v2.docx b/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v2.docx deleted file mode 100644 index a0c4d26..0000000 Binary files a/software_teamwork/珞珈岛-项目相关文件/珞珈岛-项目任务书v2.docx and /dev/null differ