diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java index 46a61f67..6db8f3cd 100644 --- a/src/main/java/com/youlai/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/system/controller/SysUserController.java @@ -179,7 +179,7 @@ public class SysUserController { @PathVariable Long userId, @RequestBody UserProfileForm formData ) { - boolean result = userService.updateUserProfile(formData); + boolean result = userService.updateUserProfile(userId,formData); return Result.judge(result); } diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/system/service/SysUserService.java index 93d81d18..d85cf46f 100644 --- a/src/main/java/com/youlai/system/service/SysUserService.java +++ b/src/main/java/com/youlai/system/service/SysUserService.java @@ -105,10 +105,11 @@ public interface SysUserService extends IService { /** * 修改个人中心用户信息 * + * @param userId 用户ID * @param formData 表单数据 * @return */ - boolean updateUserProfile(UserProfileForm formData); + boolean updateUserProfile(Long userId, UserProfileForm formData); /** * 修改用户密码 @@ -122,7 +123,7 @@ public interface SysUserService extends IService { /** * 重置用户密码 * - * @param userId 用户ID + * @param userId 用户ID * @param password 重置后的密码 * @return */ diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index 4b1227a6..084c6a7d 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java @@ -273,8 +273,9 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return */ @Override - public boolean updateUserProfile(UserProfileForm formData) { + public boolean updateUserProfile(Long userId, UserProfileForm formData) { SysUser entity = userConverter.toEntity(formData); + entity.setId(userId); return this.updateById(entity); } diff --git a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java b/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java index 5062713f..6cb63cfb 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java +++ b/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java @@ -14,6 +14,7 @@ import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -29,7 +30,7 @@ import java.time.LocalDateTime; * @since 2.3.0 */ @Component -@ConditionalOnProperty(value = "oss.type", havingValue = "aliyun") +@ConditionalOnExpression("'${oss.enabled}' == 'true' and '${oss.type}' == 'aliyun'") @ConfigurationProperties(prefix = "oss.aliyun") @RequiredArgsConstructor @Data diff --git a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java b/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java index fa3f1232..dcb77295 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java +++ b/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java @@ -14,6 +14,7 @@ import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -32,7 +33,7 @@ import java.time.LocalDateTime; * @since 2023/6/2 */ @Component -@ConditionalOnProperty(value = "oss.type", havingValue = "minio") +@ConditionalOnExpression("'${oss.enabled}' == 'true' and '${oss.type}' == 'minio'") @ConfigurationProperties(prefix = "oss.minio") @RequiredArgsConstructor @Data @@ -69,7 +70,7 @@ public class MinioOssService implements OssService { .credentials(accessKey, secretKey) .build(); // 创建存储桶 - // createBucketIfAbsent(bucketName); + createBucketIfAbsent(bucketName); }