添加阿里云naocs配置

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -159,7 +159,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
         if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) {
             qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike());
         }
-        qw.eq(ActivityPlanInfoDo::getIsDelete, StatusType.VALID.getType());
+        qw.eq(ActivityPlanInfoDo::getIsDelete,Objects.nonNull(wrapper.getStatusType()) && wrapper.getStatusType().equals(StatusType.INVALID) ? StatusType.INVALID.getType() : StatusType.VALID.getType());
         qw.orderByDesc(ActivityPlanInfoDo::getDate)
                 .orderByAsc(ActivityPlanInfoDo::getPlanStatus)
                 .orderByDesc(ActivityPlanInfoDo::getClockInTime);

src/main/java/com/wangxiaolu/promotion/domain/manage/wrapperQo/ActivityPlanInfoWrapper.java

@@ -114,6 +114,8 @@ public class ActivityPlanInfoWrapper {
 
     private Integer limitNum;
 
+    private StatusType statusType;
+
     public Date getActivityEndDate() {
         String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
         return DateUtil.parse(format);

src/main/resources/application-master.yml

+spring:
+
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://rm-2ze28qp55mrm34g8b.mysql.rds.aliyuncs.com:3306/promotion?autoReconnect=true
+    username: sfabus
+    password: Wxl@325Pa91
+  redis:
+    port: 6379
+    host: r-2zehfktt1r34vn4qws.redis.rds.aliyuncs.com
+    database: 0
+    password: Wxl2025!@#$
+
+  main:
+    web-application-type: reactive
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.0.170:8848
+        namespace: a9d4d153-3d4e-4d2f-968e-dffdfcc24bab
+        group: promotion
+
+logging:
+  config: classpath:logback-spring.xml
+
+async:
+  executor:
+    thread:
+      core_pool_size: 4
+      name:
+        prefix: promotion-
+
+wx:
+  miniapp:
+    configs:
+      - appid: wxac14dc7765484d7d
+        secret: e73b574380a822c942e03ea4dc67aaa1
+        token: #微信小程序消息服务器配置的token
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
+    temporary:
+      token_secret: sXwHPj#U#xmim^ts
+    employee:
+      token_secret: xZq%kXASSPD$UtL
+  cx_miniapp:
+    app_id: wxac14dc7765484d7d
+    app_secret: e73b574380a822c942e03ea4dc67aaa1
+tengxunyun:
+  #  腾讯云个人账号信息
+  secret_d: AKIDVt353sWyY0GXn0ANa0YyGdwDIBtjQwGS
+  secret_key: SBqJcrxypSxeGOPF81mLgsANXo3ALhz7
+  sms:
+    #指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com
+    endpoint_beijing: sms.ap-beijing.tencentcloudapi.com
+    #地域信息
+    ap_beijing: ap-beijing
+    #应用ID（默认应用）
+    sdk_app_id_defult: 1400903035
+    #签名内容
+    sign_name_a: 北京王小卤
+    #模板ID
+    template_id_a: 2127434
+    #验证码过期时间（分钟）
+    overdue_long: 5
+
+qince:
+  open_api: https://openapi.region2.qince.com
+  open_id: 8546408787259919799
+  app_key: oV0FHfMt81Tii2_kst
+
+# mybatis-plus 打印sql日志
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+
+# xxl-job配置
+xxl:
+  job:
+    accessToken: default_token
+    admin:
+      addresses: http://10.0.0.170:9001/xxl-job-admin
+    executor:
+      appname: promotion-live
+      port: 9998
+      logretentiondays: 30
+      address:
+      ip: 10.0.0.169
+      logpath: /var/logs/xxl_job # 执行器日志路径
+
+
+aliyun:
+  access-key-id: LTAI5tEvDG8hMRf9tBt9kB3s
+  access-key-secret: TnH1qRJr95t62pNcVLNopeEhpPxiqe
+  oss:
+    region-id: cn-shanghai
+    sts-role-arm: acs:ram::1819206190412770:role/oss-admin-role
+    session-name: promotion-live-miniapp
+    bucket-name: link-promotion
+    web-js-link: link-promotion.oss-cn-shanghai.aliyuncs.com
\ No newline at end of file