Commit 6a6e95fcb65d0cf3d3d9d8c83685b2469888bfe8
1 parent
023a7b14
✨ 对齐 BOOT 与 CLOUD 的代码
Showing
7 changed files
with
5 additions
and
15 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
| @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; | @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; | ||
| 6 | import org.springframework.context.annotation.Configuration; | 6 | import org.springframework.context.annotation.Configuration; |
| 7 | import org.springframework.security.config.annotation.web.builders.HttpSecurity; | 7 | import org.springframework.security.config.annotation.web.builders.HttpSecurity; |
| 8 | import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; | 8 | import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; |
| 9 | -import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; | ||
| 10 | 9 | ||
| 11 | /** | 10 | /** |
| 12 | * Infra 模块的 Security 配置 | 11 | * Infra 模块的 Security 配置 |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
| @@ -70,7 +70,7 @@ public class CouponServiceImpl implements CouponService { | @@ -70,7 +70,7 @@ public class CouponServiceImpl implements CouponService { | ||
| 70 | throw exception(COUPON_STATUS_NOT_UNUSED); | 70 | throw exception(COUPON_STATUS_NOT_UNUSED); |
| 71 | } | 71 | } |
| 72 | // 校验有效期;为避免定时器没跑,实际优惠劵已经过期 | 72 | // 校验有效期;为避免定时器没跑,实际优惠劵已经过期 |
| 73 | - if (LocalDateTimeUtils.isBetween(coupon.getValidStartTime(), coupon.getValidEndTime())) { | 73 | + if (!LocalDateTimeUtils.isBetween(coupon.getValidStartTime(), coupon.getValidEndTime())) { |
| 74 | throw exception(COUPON_VALID_TIME_NOT_NOW); | 74 | throw exception(COUPON_VALID_TIME_NOT_NOW); |
| 75 | } | 75 | } |
| 76 | } | 76 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java
| @@ -10,7 +10,7 @@ import java.time.LocalDateTime; | @@ -10,7 +10,7 @@ import java.time.LocalDateTime; | ||
| 10 | public class AppMemberPointRecordRespVO { | 10 | public class AppMemberPointRecordRespVO { |
| 11 | 11 | ||
| 12 | @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457") | 12 | @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457") |
| 13 | - private Long id;; | 13 | + private Long id; |
| 14 | 14 | ||
| 15 | @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") | 15 | @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") |
| 16 | private String title; | 16 | private String title; |
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
| @@ -197,7 +197,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest { | @@ -197,7 +197,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest { | ||
| 197 | channelMapper.insert(dbChannel);// @Sql: 先插入出一条存在的数据 | 197 | channelMapper.insert(dbChannel);// @Sql: 先插入出一条存在的数据 |
| 198 | // 准备参数 | 198 | // 准备参数 |
| 199 | Long appId = dbChannel.getAppId(); | 199 | Long appId = dbChannel.getAppId(); |
| 200 | - String code = dbChannel.getCode();; | 200 | + String code = dbChannel.getCode(); |
| 201 | 201 | ||
| 202 | // 调用 | 202 | // 调用 |
| 203 | PayChannelDO channel = channelService.getChannelByAppIdAndCode(appId, code); | 203 | PayChannelDO channel = channelService.getChannelByAppIdAndCode(appId, code); |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.java
| @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotNull; | @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotNull; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | - * 系统操作日志 Create Req BO | 9 | + * 系统操作日志 Create Request DTO |
| 10 | * | 10 | * |
| 11 | * @author HUIHUI | 11 | * @author HUIHUI |
| 12 | */ | 12 | */ |
yudao-server/src/main/resources/application-dev.yaml
| @@ -201,12 +201,4 @@ justauth: | @@ -201,12 +201,4 @@ justauth: | ||
| 201 | cache: | 201 | cache: |
| 202 | type: REDIS | 202 | type: REDIS |
| 203 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: | 203 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: |
| 204 | - timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 | ||
| 205 | -wx: | ||
| 206 | - mp: | ||
| 207 | - useRedis: false | ||
| 208 | - defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F | ||
| 209 | - redisConfig: | ||
| 210 | - host: 127.0.0.1 | ||
| 211 | - port: 6379 | ||
| 212 | - password: | 204 | + timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 |
| 213 | \ No newline at end of file | 205 | \ No newline at end of file |
yudao-server/src/main/resources/application-local.yaml
| @@ -262,7 +262,6 @@ justauth: | @@ -262,7 +262,6 @@ justauth: | ||
| 262 | client-id: ${wx.mp.app-id} | 262 | client-id: ${wx.mp.app-id} |
| 263 | client-secret: ${wx.mp.secret} | 263 | client-secret: ${wx.mp.secret} |
| 264 | ignore-check-redirect-uri: true | 264 | ignore-check-redirect-uri: true |
| 265 | - | ||
| 266 | cache: | 265 | cache: |
| 267 | type: REDIS | 266 | type: REDIS |
| 268 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: | 267 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: |