diff --git a/src/main/java/com/example/caseData/config/RedisConfig.java b/src/main/java/com/example/caseData/config/RedisConfig.java new file mode 100644 index 0000000..0542b86 --- /dev/null +++ b/src/main/java/com/example/caseData/config/RedisConfig.java @@ -0,0 +1,33 @@ +package com.example.caseData.config; + +import lombok.Getter; +import org.springframework.stereotype.Component; +import org.springframework.beans.factory.annotation.Value; + +@Component +@Getter +public class RedisConfig { + @Value("${spring.redis.dev.host}") + private String devHost; + + @Value("${spring.redis.dev.port}") + private int devPort; + + @Value("${spring.redis.dev.password}") + private String devPassword; + + @Value("${spring.redis.dev.database}") + private String devDatabase; + + @Value("${spring.redis.prod.host}") + private String prodHost; + + @Value("${spring.redis.prod.port}") + private int prodPort; + + @Value("${spring.redis.prod.password}") + private String prodPassword; + + @Value("${spring.redis.prod.database}") + private String prodDatabase; +} diff --git a/src/main/java/com/example/caseData/core/RedisConfig.java b/src/main/java/com/example/caseData/core/RedisConfiguration.java similarity index 72% rename from src/main/java/com/example/caseData/core/RedisConfig.java rename to src/main/java/com/example/caseData/core/RedisConfiguration.java index 7e368f8..951be81 100644 --- a/src/main/java/com/example/caseData/core/RedisConfig.java +++ b/src/main/java/com/example/caseData/core/RedisConfiguration.java @@ -1,14 +1,25 @@ package com.example.caseData.core; +import com.example.caseData.config.RedisConfig; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.serializer.StringRedisSerializer; +import java.time.Duration; + @Configuration -public class RedisConfig { +public class RedisConfiguration { +// private final RedisConfig redisConfig; // 自动注入你的配置类 +// +// public RedisConfiguration(RedisConfig redisConfig) { +// this.redisConfig = redisConfig; +// } + + @Bean public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { RedisTemplate template = new RedisTemplate<>(); diff --git a/src/main/java/com/example/caseData/request/publicRequest/GetOssSignRequest.java b/src/main/java/com/example/caseData/request/publicRequest/GetOssSignRequest.java index e616a84..c09eeb4 100644 --- a/src/main/java/com/example/caseData/request/publicRequest/GetOssSignRequest.java +++ b/src/main/java/com/example/caseData/request/publicRequest/GetOssSignRequest.java @@ -10,6 +10,6 @@ import lombok.Data; public class GetOssSignRequest { @NotNull(message = "错误请求") @Min(value = 1, message = "错误请求") - @Max(value = 1, message = "错误请求") - private String scene; + @Max(value = 2, message = "错误请求") + private int scene; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7364953..99501b9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,16 +12,21 @@ spring: url: jdbc:p6spy:mysql://42.193.16.243:30001/case_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8 username: root password: gdxz123456^%$d - data: - redis: + jackson: + time-zone: Asia/Shanghai + default-property-inclusion: always + redis: + dev: host: '139.155.127.177' port: 30002 password: gdxz2022&dj. database: 9 - timeout: 3000 - jackson: - time-zone: Asia/Shanghai - default-property-inclusion: always + prod: + host: '139.155.127.177' + port: 30002 + password: gdxz2022&dj. + database: 9 + # MyBatis-Plus 配置 mybatis-plus: