Merge remote-tracking branch 'origin/master' into 1127/Fengmou

# Conflicts: # muyu-auth/src/main/resources/bootstrap.yml # muyu-gateway/src/main/resources/bootstrap.yml # muyu-modules/muyu-file/src/main/resources/bootstrap.yml # muyu-modules/muyu-gen/src/main/resources/bootstrap.yml # muyu-modules/muyu-job/src/main/resources/bootstrap.yml # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java # muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml # muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml # muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml # muyu-modules/muyu-system/src/main/resources/bootstrap.yml # muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
111
2024-11-27 15:10:14 +08:00 · 2024-11-27 14:24:29 +08:00
52 changed files with 1085 additions and 1309 deletions
--- a/doc/团购修改数据结构.java
+++ b/doc/团购修改数据结构.java
@ -0,0 +1,38 @@
+   {
+        "活动ID": "Long",
+        "商品规格List": [
+        {
+        "规格id":"Logn"
+        "规格SKU": "String",
+        "拼团价格": "BigDecimal",
+        "拼团库存": "Long"
+        }
+        ],
+        "活动状态":"String"
+        }
+
+
+
+
+           {
+           "商品ID": "Long",
+           "商品图片": "String",
+           "活动名称": "String",
+           "活动简介": "String",
+           "商品单位": "String",
+           "商品的轮播图": [
+           "String", "String"
+           ],
+           "活动时间": "date",
+           "策略类型": "String",
+           "策略ID": "Long",
+           "商品规格List": [
+           {
+           "规格SKU": "String",
+           "拼团价格": "BigDecimal",
+           "拼团库存": "Long"
+           }
+           ],
+           "排序": "Integer",
+           "详情": "String"
+           }
--- a/doc/策略.md
+++ b/doc/策略.md
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
@ -58,7 +58,7 @@ public class IpUtils {
            ip = request.getRemoteAddr();
        }

-        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip);
+        return "0:0:0:0:0:0:0:1".equals(ip) ? "124.221.28.250" : getMultistageReverseProxyIp(ip);
    }

    /**
@ -70,7 +70,7 @@ public class IpUtils {
     */
    public static boolean internalIp (String ip) {
        byte[] addr = textToNumericFormatV4(ip);
-        return internalIp(addr) || "127.0.0.1".equals(ip);
+        return internalIp(addr) || "124.221.28.250".equals(ip);
    }

    /**
@ -197,7 +197,7 @@ public class IpUtils {
            return InetAddress.getLocalHost().getHostAddress();
        } catch (UnknownHostException e) {
        }
-        return "127.0.0.1";
+        return "124.221.28.250";
    }

    /**
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
@ -33,7 +33,7 @@ spring:
      datasource:
        ds1:
          nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 120.46.147.226:8848
            dataId: sentinel-muyu-gateway
            groupId: DEFAULT_GROUP
            data-type: json
--- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;

@ -76,13 +74,4 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
            .build();
  }

-  public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel teamProductSkuUpdModel){
-    return ActivityTeamProductSkuInfo.builder()
-            .id(teamProductSkuUpdModel.getId())
-            .teamPrice(teamProductSkuUpdModel.getTeamPrice())
-            .teamStock(teamProductSkuUpdModel.getTeamStock())
-            .remainStock(teamProductSkuUpdModel.getTeamStock())
-            .build();
-  }
-
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionHundred.java
@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
-public class TeamStrategyHundred extends BaseEntity {
+public class TeamStrategyExemptionHundred extends BaseEntity {

  /**
   * 主键
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemptionOrdinary.java
@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
-public class TeamStrategyOrdinary extends BaseEntity {
+public class TeamStrategyExemptionOrdinary extends BaseEntity {

  /**
   * 主键
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
@ -58,7 +58,7 @@ public class ActivityTeamInfoAddModel {
    /**
     * 活动排序
     */
-    private Long sort;
+    private Integer sort;
    /**
     * 商品SkU集合
     */
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
@ -1,15 +1,11 @@
 package com.muyu.marketing.domain.model;

 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

@ -37,7 +33,7 @@ public class ActivityTeamInfoUpdModel {
    private String status;
    private String strategyType;
    private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
+    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;

    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
        return ActivityTeamInfoUpdModel.builder()
@ -54,12 +50,7 @@ public class ActivityTeamInfoUpdModel {
                .status(activityTeamInfoUpdReq.getStatus())
                .strategyType(activityTeamInfoUpdReq.getStrategyType())
                .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
+                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
                .build();
    }
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuEchoModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuEchoModel.java
@ -0,0 +1,55 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ActivityTeamProductSkuEchoModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 19:35
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class ActivityTeamProductSkuEchoModel {
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long teamId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProductSkuEchoModel modelBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){
+       return ActivityTeamProductSkuEchoModel.builder()
+                .teamId(activityTeamProductSkuInfo.getTeamId())
+                .sku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .teamStock(activityTeamProductSkuInfo.getRemainStock())
+                .build();
+    }
+}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java
@ -1,59 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * 团购商品规格一键设置
- *
- * @author DongZeLiang
- * @date 2024-11-28 11:15
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuSettingModel {
-
-    /**
-     * 活动ID
-     */
-    private Long teamId;
-
-    /**
-     * 删除的ID集合
-     */
-    private List<Long> removeIds;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
-
-    /**
-     * 修改的规格集合
-     */
-    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
-
-    public static ActivityTeamProductSkuSettingModel settingReqModel(ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq, Supplier<Long> productId) {
-        return ActivityTeamProductSkuSettingModel.builder()
-                .removeIds(activityTeamProductSkuSettingReq.getRemoveIds())
-                .activityTeamProductSkuAddModelList(
-                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoAddReqList().stream()
-                                .map(teamProjectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.addReqBuild(teamProjectSkuInfoAddReq, productId))
-                                .toList()
-                )
-                .activityTeamProductSkuUpdModelList(
-                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoUpdReqList().stream()
-                                .map(ActivityTeamProductSkuUpdModel::updReqBuild)
-                                .toList()
-                ).build();
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.model;


-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@ -35,12 +34,4 @@ public class ActivityTeamProductSkuUpdModel {
     * 团购库存
     */
    private Long teamStock;
-
-    public static ActivityTeamProductSkuUpdModel updReqBuild(TeamProjectSkuInfoUpdReq teamProjectSkuInfoUpdReq){
-        return ActivityTeamProductSkuUpdModel.builder()
-                .id(teamProjectSkuInfoUpdReq.getId())
-                .teamStock(teamProjectSkuInfoUpdReq.getTeamStock())
-                .teamPrice(teamProjectSkuInfoUpdReq.getTeamPrice())
-                .build();
-    }
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamEchoModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamEchoModel.java
@ -0,0 +1,92 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * @ClassName TeamEchoModel
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 22:14
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class TeamEchoModel {
+    /**
+     * 活动ID
+     */
+    private long id;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private long sort;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private long strategyId;
+
+
+    public static TeamEchoModel echoModelBuild(ActivityTeamInfo teamEchoModel) {
+        return TeamEchoModel.builder()
+                .id(teamEchoModel.getId())
+                .name(teamEchoModel.getName())
+                .productId(teamEchoModel.getProductId())
+                .productImage(teamEchoModel.getProductImage())
+                .introduction(teamEchoModel.getIntroduction())
+                .unit(teamEchoModel.getUnit())
+                .imageList(teamEchoModel.getImageList())
+                .endTime(teamEchoModel.getEndTime())
+                .sort(teamEchoModel.getSort())
+                .content(teamEchoModel.getContent())
+                .strategyType(teamEchoModel.getStrategyType())
+                .strategyId(teamEchoModel.getStrategyId())
+                .build();
+            }
+}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java
@ -51,7 +51,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
    /**
     * 活动排序
     */
-    private Long sort;
+    private Integer sort;
    /**
     * 商品SkU集合
     */
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java
@ -32,5 +32,5 @@ public class ActivityTeamInfoUpdReq {
    private String status;
    private String strategyType;
    private Long strategyId;
-    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
+    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
 }
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuSettingReq.java
@ -1,37 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * 团购商品规格设置
- *
- * @author DongZeLiang
- * @date 2024-11-28 11:27
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ActivityTeamProductSkuSettingReq {
-    /**
-     * 删除的ID集合
-     */
-    private List<Long> removeIds;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
-
-    /**
-     * 添加的规格集合
-     */
-    private List<TeamProjectSkuInfoUpdReq> teamProjectSkuInfoUpdReqList;
-}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoEcho.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoEcho.java
@ -0,0 +1,85 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName TeamInfoEcho
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 15:57
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class TeamInfoEcho extends BaseEntity {
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<TeamProjectSkuInfoEchoResp> teamProjectSkuInfoEchoList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+}
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamProjectSkuInfoEchoResp.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamProjectSkuInfoEchoResp.java
@ -1,4 +1,4 @@
-package com.muyu.marketing.domain.req;
+package com.muyu.marketing.domain.resp;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@ -8,18 +8,24 @@ import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;

 /**
- * 添加的
+ * @ClassName TeamProjectSkuInfoEchoResp
+ * @Description 描述
+ * @Author zhen_xiong_feng
+ * @Date 2024/11/26 15:59
 */
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
-public class TeamProjectSkuInfoUpdReq {
-
+public class TeamProjectSkuInfoEchoResp {
+    /**
+     * 规格id
+     */
+    private Long productSkuId;
    /**
     * 规格SKU
     */
-    private Long id;
+    private String sku;

    /**
     * 拼团价格
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java
@ -2,6 +2,8 @@ package com.muyu.marketing.team.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import org.apache.ibatis.annotations.Mapper;

@Mapper
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java
@ -0,0 +1,11 @@
+package com.muyu.marketing.team.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.marketing.domain.TeamStrategyExemption;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyExemptionHundredMapper extends BaseMapper<TeamStrategyExemptionHundred> {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java
@ -0,0 +1,11 @@
+package com.muyu.marketing.team.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper<TeamStrategyExemptionOrdinary> {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyHundredMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyHundredMapper.java
@ -1,10 +0,0 @@
-package com.muyu.marketing.team.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyHundred;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TeamStrategyHundredMapper extends BaseMapper<TeamStrategyHundred> {
-    
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyOrdinaryMapper.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyOrdinaryMapper.java
@ -1,10 +0,0 @@
-package com.muyu.marketing.team.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyOrdinary;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TeamStrategyOrdinaryMapper extends BaseMapper<TeamStrategyOrdinary> {
-    
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
@ -3,6 +3,7 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import com.muyu.marketing.domain.model.*;

 import java.util.List;
@ -47,27 +48,4 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam

    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);

-    /**
-     * 根据 业务模型 进行 团购商品修改
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
-
-    /**
-     * 根据 业务模型 进行 团购商品批量修改
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
-     */
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
-
-    /**
-     * 一键设置
-     * @param activityTeamProductSkuSettingModel 整体修改模型
-     */
-    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
-        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
-        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
-        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
-    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java
@ -0,0 +1,8 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
+
+public interface TeamStrategyExemptionHundredService extends IService<TeamStrategyExemptionHundred> {
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionOrdinaryService.java
@ -0,0 +1,7 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
+
+public interface TeamStrategyExemptionOrdinaryService extends IService<TeamStrategyExemptionOrdinary> {
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java
@ -2,10 +2,7 @@ package com.muyu.marketing.team.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;

-/**
- * 免单
- */
-public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
+public interface TeamStrategyExemptionService extends IService<TeamStrategyExemption> {
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyHundredService.java
@ -1,11 +0,0 @@
-package com.muyu.marketing.team.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.marketing.domain.TeamStrategyHundred;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-
-/**
- * 百人
- */
-public interface TeamStrategyHundredService extends ActivityTeamStrategy, IService<TeamStrategyHundred> {
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyOrdinaryService.java
@ -1,11 +0,0 @@
-package com.muyu.marketing.team.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.marketing.domain.TeamStrategyOrdinary;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-
-/**
- * 普通
- */
-public interface TeamStrategyOrdinaryService extends ActivityTeamStrategy, IService<TeamStrategyOrdinary> {
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
@ -101,8 +101,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
    @Override
    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
+        io.jsonwebtoken.lang.Assert.isTrue(update,"修改失败");
+        activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
        return update;
    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
@ -1,7 +1,6 @@
 package com.muyu.marketing.team.service.impl;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
@ -101,38 +100,4 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
    }
-
-    /**
-     * 根据 业务模型 进行 团购商品修改
-     *
-     * @param activityTeamProductSkuUpdModel 修改业务模型
-     * @return 修改结果
-     */
-    @Override
-    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) {
-        // update set  where
-        LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
-        // 字段=值
-        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock());
-        updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamProductSkuUpdModel.getTeamStock());
-        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice());
-        // id=？
-        updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId());
-        return this.update(updateWrapper);
-    }
-
-    /**
-     * 根据 业务模型 进行 团购商品批量修改
-     *
-     * @param activityTeamProductSkuUpdModelList 修改业务模型
-     * @return 修改结果
-     */
-    @Override
-    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
-        return this.updateBatchById(
-                activityTeamProductSkuUpdModelList.stream()
-                        .map(ActivityTeamProductSkuInfo::updModelBuild)
-                        .toList()
-        );
-    }
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java
@ -0,0 +1,16 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyExemption;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper;
+import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
+import com.muyu.marketing.team.service.TeamStrategyExemptionHundredService;
+import com.muyu.marketing.team.service.TeamStrategyExemptionService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper, TeamStrategyExemptionHundred>
+    implements TeamStrategyExemptionHundredService {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java
@ -0,0 +1,13 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
+import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper;
+import com.muyu.marketing.team.service.TeamStrategyExemptionOrdinaryService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyExemptionOrdinary>
+    implements TeamStrategyExemptionOrdinaryService {
+    
+}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java
@ -4,62 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.marketing.domain.TeamStrategyExemption;
 import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
 import com.muyu.marketing.team.service.TeamStrategyExemptionService;
-import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;

-@Log4j2
-@Service("team-strategy-exemption")
+@Service
 public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
    implements TeamStrategyExemptionService {
-
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-        log.info("参加 - 免单团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
+    
 }
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyHundredServiceImpl.java
@ -1,66 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyHundred;
-import com.muyu.marketing.team.mapper.TeamStrategyHundredMapper;
-import com.muyu.marketing.team.service.TeamStrategyHundredService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.stereotype.Service;
-
-@Log4j2
-@Service("team-strategy-hundred")
-public class TeamStrategyHundredServiceImpl extends ServiceImpl<TeamStrategyHundredMapper, TeamStrategyHundred>
-    implements TeamStrategyHundredService {
-
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-
-        log.info("参加 - 百人团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyOrdinaryServiceImpl.java
@ -1,66 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyOrdinary;
-import com.muyu.marketing.team.mapper.TeamStrategyOrdinaryMapper;
-import com.muyu.marketing.team.service.TeamStrategyOrdinaryService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.stereotype.Service;
-
-@Log4j2
-@Service("team-strategy-ordinary")
-public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl<TeamStrategyOrdinaryMapper, TeamStrategyOrdinary>
-    implements TeamStrategyOrdinaryService {
-
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-
-        log.info("参加 - 普通团 - [{}]", activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java
@ -1,44 +0,0 @@
-package com.muyu.marketing.team.strategy;
-
-
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 团活动策略
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:03
- */
-public interface ActivityTeamStrategy {
-
-    /**
-     * 开团
-     * @param activityTeamId 团购活动ID
-     */
-    public void openTeam(Long activityTeamId);
-
-    /**
-     * 申请加团
-     * @param teamId 团ID
-     */
-    public void applyTeam(Long teamId);
-
-    /**
-     * 参团
-     * @param teamId 加团ID
-     * @param orderNumber 订单编号
-     */
-    public void addTeam(Long teamId, String orderNumber);
-
-    /**
-     * 退团
-     * @param teamId 团购ID
-     */
-    public void backTeam(Long teamId);
-
-    /**
-     * 结算团
-     * @param teamId 团购ID
-     */
-    public void settle(Long teamId);
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java
@ -1,85 +0,0 @@
-package com.muyu.marketing.team.strategy.impl;
-
-
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-
-/**
- * 团购执行器
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:28
- */
-@Service
-@Primary
-public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
-    /**
-     * 开团
-     *
-     * @param activityTeamId 团购活动ID
-     */
-    @Override
-    public void openTeam(Long activityTeamId) {
-        // 假设这里是通过方法获取的type，activityTeamId.toString()
-        // "team-strategy-exemption"
-        // "team-strategy-hundred"
-        // "team-strategy-ordinary"
-
-        String activityTeamType = null;
-        if (activityTeamId == null) {
-            throw new ServiceException("activityTeamId is null");
-        }else if (activityTeamId == 0) {
-            activityTeamType = "team-strategy-exemption";
-        }else if (activityTeamId == 1) {
-            activityTeamType = "team-strategy-hundred";
-        }else if (activityTeamId == 2) {
-            activityTeamType = "team-strategy-ordinary";
-        }
-        ActivityTeamStrategy activityTeamStrategy = SpringUtils.getBean(activityTeamType);
-        activityTeamStrategy.openTeam(activityTeamId);
-    }
-
-    /**
-     * 申请加团
-     *
-     * @param teamId 团ID
-     */
-    @Override
-    public void applyTeam(Long teamId) {
-
-    }
-
-    /**
-     * 参团
-     *
-     * @param teamId      加团ID
-     * @param orderNumber 订单编号
-     */
-    @Override
-    public void addTeam(Long teamId, String orderNumber) {
-
-    }
-
-    /**
-     * 退团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void backTeam(Long teamId) {
-
-    }
-
-    /**
-     * 结算团
-     *
-     * @param teamId 团购ID
-     */
-    @Override
-    public void settle(Long teamId) {
-
-    }
-}
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java
@ -1,28 +0,0 @@
-package com.muyu.test;
-
-
-import com.muyu.marketing.MuYuMarketIngApplication;
-import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 测试
- *
- * @author DongZeLiang
- * @date 2024-11-29 15:40
- */
-@SpringBootTest(classes = MuYuMarketIngApplication.class)
-public class TeamStrategyTest {
-
-    @Autowired
-    private ActivityTeamStrategy activityTeamStrategy;
-
-    @Test
-    public void testStrategy() {
-        activityTeamStrategy.openTeam(0L);
-        activityTeamStrategy.openTeam(1L);
-        activityTeamStrategy.openTeam(2L);
-    }
-}
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
@ -16,10 +16,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
+++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/sql/product.sql
+++ b/sql/product.sql
@ -4,7 +4,7 @@
 Source Server         : 本地5.7
 Source Server Type    : MySQL
 Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 124.221.28.250:3306
 Source Schema         : product

 Target Server Type    : MySQL
@ -356,10 +356,10 @@ CREATE TABLE `brand_info`  (
 -- ----------------------------
 -- Records of brand_info
 -- ----------------------------
-INSERT INTO `brand_info` VALUES (2, '华为', 'http://127.0.0.1:9300/statics/2024/03/05/仓鼠_20240305092606A001.png', 'Y', '无', ' 几乎一个', 'admin', '2024-03-05 09:26:09', 'admin', '2024-03-08 20:48:35');
-INSERT INTO `brand_info` VALUES (3, '苹果', 'http://127.0.0.1:9300/statics/2024/03/05/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240305092615A002.png', 'Y', '无', 'i看机会', 'admin', '2024-03-05 09:26:18', 'admin', '2024-03-08 20:48:26');
-INSERT INTO `brand_info` VALUES (4, '小米', 'http://127.0.0.1:9300/statics/2024/03/21/1688525436945_20240321112835A002.jpg', 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:39', NULL, NULL);
-INSERT INTO `brand_info` VALUES (5, '苹果', 'http://127.0.0.1:9300/statics/2024/03/26/647726DD13E751DA201EE4D5E9D2A280_20240326135516A015.jpg', 'Y', '而东风', '他又何必', 'admin', '2024-03-26 13:55:47', NULL, NULL);
+INSERT INTO `brand_info` VALUES (2, '华为', 'http://124.221.28.250:9300/statics/2024/03/05/仓鼠_20240305092606A001.png', 'Y', '无', ' 几乎一个', 'admin', '2024-03-05 09:26:09', 'admin', '2024-03-08 20:48:35');
+INSERT INTO `brand_info` VALUES (3, '苹果', 'http://124.221.28.250:9300/statics/2024/03/05/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240305092615A002.png', 'Y', '无', 'i看机会', 'admin', '2024-03-05 09:26:18', 'admin', '2024-03-08 20:48:26');
+INSERT INTO `brand_info` VALUES (4, '小米', 'http://124.221.28.250:9300/statics/2024/03/21/1688525436945_20240321112835A002.jpg', 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:39', NULL, NULL);
+INSERT INTO `brand_info` VALUES (5, '苹果', 'http://124.221.28.250:9300/statics/2024/03/26/647726DD13E751DA201EE4D5E9D2A280_20240326135516A015.jpg', 'Y', '而东风', '他又何必', 'admin', '2024-03-26 13:55:47', NULL, NULL);

 -- ----------------------------
 -- Table structure for category_info
@ -383,23 +383,23 @@ CREATE TABLE `category_info`  (
 -- ----------------------------
 -- Records of category_info
 -- ----------------------------
-INSERT INTO `category_info` VALUES (1, '节点1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170131A002.png', 0, 'Y', '介绍', NULL, 'admin', '2024-02-28 17:09:11', NULL, NULL);
-INSERT INTO `category_info` VALUES (2, '节点1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170926A003.png', 1, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:31', NULL, NULL);
-INSERT INTO `category_info` VALUES (3, '节点1-1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170944A004.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:48', NULL, NULL);
-INSERT INTO `category_info` VALUES (4, '节点2', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170956A005.png', 0, 'Y', '', NULL, 'admin', '2024-02-28 17:09:58', NULL, NULL);
-INSERT INTO `category_info` VALUES (5, '节点2-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171012A006.png', 4, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:14', NULL, NULL);
-INSERT INTO `category_info` VALUES (6, '节点2-1-1', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171031A007.png', 5, 'Y', '', NULL, 'admin', '2024-02-28 17:10:34', NULL, NULL);
-INSERT INTO `category_info` VALUES (7, '节点1-1-2', 'http://127.0.0.1:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171047A008.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:50', NULL, NULL);
-INSERT INTO `category_info` VALUES (13, '测试-1', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114154A001.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:03', NULL, NULL);
-INSERT INTO `category_info` VALUES (14, '测试1-1', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114209A002.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:22', NULL, NULL);
-INSERT INTO `category_info` VALUES (15, '测试1-2', 'http://127.0.0.1:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114446A003.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:44:56', NULL, NULL);
-INSERT INTO `category_info` VALUES (16, '测试1-1-1', 'http://127.0.0.1:9300/statics/2024/03/06/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240306162814A001.png', 14, 'Y', NULL, NULL, 'admin', '2024-03-06 16:28:27', NULL, NULL);
-INSERT INTO `category_info` VALUES (17, '顶级1', 'http://127.0.0.1:9300/statics/2024/03/08/花木兰_20240308170205A043.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-08 17:02:31', NULL, NULL);
-INSERT INTO `category_info` VALUES (18, '测试1-2-1', 'http://127.0.0.1:9300/statics/2024/03/21/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240321112815A001.png', 15, 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:17', NULL, NULL);
-INSERT INTO `category_info` VALUES (19, '二〇二四年四月九日', 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212327A001.jpg', 15, 'Y', NULL, NULL, 'admin', '2024-04-09 21:23:29', NULL, NULL);
-INSERT INTO `category_info` VALUES (20, '2024年5月15日-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688525436945_20240515194730A001.jpg', 0, 'Y', NULL, NULL, 'admin', '2024-05-15 19:47:42', NULL, NULL);
-INSERT INTO `category_info` VALUES (21, '2024年5月15日-1-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194817A002.jpg', 20, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:19', NULL, NULL);
-INSERT INTO `category_info` VALUES (22, '2024年5月15日-1-1-1', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194838A003.jpg', 21, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:46', NULL, NULL);
+INSERT INTO `category_info` VALUES (1, '节点1', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170131A002.png', 0, 'Y', '介绍', NULL, 'admin', '2024-02-28 17:09:11', NULL, NULL);
+INSERT INTO `category_info` VALUES (2, '节点1-1', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170926A003.png', 1, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:31', NULL, NULL);
+INSERT INTO `category_info` VALUES (3, '节点1-1-1', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170944A004.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:09:48', NULL, NULL);
+INSERT INTO `category_info` VALUES (4, '节点2', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228170956A005.png', 0, 'Y', '', NULL, 'admin', '2024-02-28 17:09:58', NULL, NULL);
+INSERT INTO `category_info` VALUES (5, '节点2-1', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171012A006.png', 4, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:14', NULL, NULL);
+INSERT INTO `category_info` VALUES (6, '节点2-1-1', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171031A007.png', 5, 'Y', '', NULL, 'admin', '2024-02-28 17:10:34', NULL, NULL);
+INSERT INTO `category_info` VALUES (7, '节点1-1-2', 'http://124.221.28.250:9300/statics/2024/02/28/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240228171047A008.png', 2, 'Y', '测试', NULL, 'admin', '2024-02-28 17:10:50', NULL, NULL);
+INSERT INTO `category_info` VALUES (13, '测试-1', 'http://124.221.28.250:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114154A001.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:03', NULL, NULL);
+INSERT INTO `category_info` VALUES (14, '测试1-1', 'http://124.221.28.250:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114209A002.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:42:22', NULL, NULL);
+INSERT INTO `category_info` VALUES (15, '测试1-2', 'http://124.221.28.250:9300/statics/2024/03/01/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240301114446A003.png', 13, 'Y', NULL, NULL, 'admin', '2024-03-01 11:44:56', NULL, NULL);
+INSERT INTO `category_info` VALUES (16, '测试1-1-1', 'http://124.221.28.250:9300/statics/2024/03/06/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240306162814A001.png', 14, 'Y', NULL, NULL, 'admin', '2024-03-06 16:28:27', NULL, NULL);
+INSERT INTO `category_info` VALUES (17, '顶级1', 'http://124.221.28.250:9300/statics/2024/03/08/花木兰_20240308170205A043.png', 0, 'Y', NULL, NULL, 'admin', '2024-03-08 17:02:31', NULL, NULL);
+INSERT INTO `category_info` VALUES (18, '测试1-2-1', 'http://124.221.28.250:9300/statics/2024/03/21/7GHOYz1SWffN43a77d257b422464c35bc1da44fc6742_20240321112815A001.png', 15, 'Y', NULL, NULL, 'admin', '2024-03-21 11:28:17', NULL, NULL);
+INSERT INTO `category_info` VALUES (19, '二〇二四年四月九日', 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212327A001.jpg', 15, 'Y', NULL, NULL, 'admin', '2024-04-09 21:23:29', NULL, NULL);
+INSERT INTO `category_info` VALUES (20, '2024年5月15日-1', 'http://124.221.28.250:9300/statics/2024/05/15/1688525436945_20240515194730A001.jpg', 0, 'Y', NULL, NULL, 'admin', '2024-05-15 19:47:42', NULL, NULL);
+INSERT INTO `category_info` VALUES (21, '2024年5月15日-1-1', 'http://124.221.28.250:9300/statics/2024/05/15/1688527462686_20240515194817A002.jpg', 20, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:19', NULL, NULL);
+INSERT INTO `category_info` VALUES (22, '2024年5月15日-1-1-1', 'http://124.221.28.250:9300/statics/2024/05/15/1688527462686_20240515194838A003.jpg', 21, 'Y', NULL, NULL, 'admin', '2024-05-15 19:48:46', NULL, NULL);

 -- ----------------------------
 -- Table structure for comment_info
@ -470,12 +470,12 @@ CREATE TABLE `project_info`  (
 -- ----------------------------
 -- Records of project_info
 -- ----------------------------
-INSERT INTO `project_info` VALUES (1, '测试', '123', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:44:47', NULL, NULL);
-INSERT INTO `project_info` VALUES (2, '测试', '123', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg,http://127.0.0.1:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:45:17', NULL, NULL);
-INSERT INTO `project_info` VALUES (3, '小米10 pro max ', '<p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092431_20240326110040A008.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092537_20240326110045A009.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092613_20240326110052A010.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/20210125092820_20240326110059A011.png\"></p><p><img src=\"http://127.0.0.1:9300/statics/2024/03/26/T20210125092733_20240326110106A012.png\"></p>', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 10:58:09', NULL, NULL);
-INSERT INTO `project_info` VALUES (4, '小米11 pro max ', '商品非常不错', '13', '14', '16', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://127.0.0.1:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://127.0.0.1:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 11:17:12', NULL, NULL);
-INSERT INTO `project_info` VALUES (5, '测试', '出生时', '13', '15', '19', 'http://127.0.0.1:9300/statics/2024/04/09/1688525436945_20240409212344A002.jpg', 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212346A003.jpg', 'Y', 5, 4, NULL, 'admin', '2024-04-09 21:24:36', NULL, NULL);
-INSERT INTO `project_info` VALUES (6, '测试法违法', '啊收发文', '13', '15', '18', 'http://127.0.0.1:9300/statics/2024/05/15/1688525436945_20240515194921A004.jpg', 'http://127.0.0.1:9300/statics/2024/05/15/1688527462686_20240515194923A005.jpg', 'Y', 5, 4, NULL, 'admin', '2024-05-15 19:50:34', NULL, NULL);
+INSERT INTO `project_info` VALUES (1, '测试', '123', '13', '14', '16', 'http://124.221.28.250:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:44:47', NULL, NULL);
+INSERT INTO `project_info` VALUES (2, '测试', '123', '13', '14', '16', 'http://124.221.28.250:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144244A034.jpg,http://124.221.28.250:9300/statics/2024/03/22/1688525436945_20240322144241A033.jpg', 'Y', 5, 4, NULL, 'admin', '2024-03-22 14:45:17', NULL, NULL);
+INSERT INTO `project_info` VALUES (3, '小米10 pro max ', '<p><img src=\"http://124.221.28.250:9300/statics/2024/03/26/20210125092431_20240326110040A008.png\"></p><p><img src=\"http://124.221.28.250:9300/statics/2024/03/26/20210125092537_20240326110045A009.png\"></p><p><img src=\"http://124.221.28.250:9300/statics/2024/03/26/20210125092613_20240326110052A010.png\"></p><p><img src=\"http://124.221.28.250:9300/statics/2024/03/26/20210125092820_20240326110059A011.png\"></p><p><img src=\"http://124.221.28.250:9300/statics/2024/03/26/T20210125092733_20240326110106A012.png\"></p>', '13', '14', '16', 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://124.221.28.250:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://124.221.28.250:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://124.221.28.250:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 10:58:09', NULL, NULL);
+INSERT INTO `project_info` VALUES (4, '小米11 pro max ', '商品非常不错', '13', '14', '16', 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105343A001.png', 'http://124.221.28.250:9300/statics/2024/03/26/20210115220654_20240326105350A002.png,http://124.221.28.250:9300/statics/2024/03/26/20210115220705_20240326105350A003.png,http://124.221.28.250:9300/statics/2024/03/26/20210115220715_20240326105350A004.png', 'Y', 5, 4, NULL, 'admin', '2024-03-26 11:17:12', NULL, NULL);
+INSERT INTO `project_info` VALUES (5, '测试', '出生时', '13', '15', '19', 'http://124.221.28.250:9300/statics/2024/04/09/1688525436945_20240409212344A002.jpg', 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212346A003.jpg', 'Y', 5, 4, NULL, 'admin', '2024-04-09 21:24:36', NULL, NULL);
+INSERT INTO `project_info` VALUES (6, '测试法违法', '啊收发文', '13', '15', '18', 'http://124.221.28.250:9300/statics/2024/05/15/1688525436945_20240515194921A004.jpg', 'http://124.221.28.250:9300/statics/2024/05/15/1688527462686_20240515194923A005.jpg', 'Y', 5, 4, NULL, 'admin', '2024-05-15 19:50:34', NULL, NULL);

 -- ----------------------------
 -- Table structure for project_sku_info
@ -499,38 +499,38 @@ CREATE TABLE `project_sku_info`  (
 -- ----------------------------
 -- Records of project_sku_info
 -- ----------------------------
-INSERT INTO `project_sku_info` VALUES (1, 2, '骁龙888-8G-128G', 12, 12.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (2, 2, '骁龙888-8G-512G', 565, 565.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (3, 2, '骁龙888-16G-128G', 485, 485.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (4, 2, '骁龙888-16G-512G', 658, 658.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (5, 2, '骁龙888plus-8G-128G', 425, 425.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (6, 2, '骁龙888plus-8G-512G', 963, 963.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (7, 2, '骁龙888plus-16G-128G', 875, 875.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (8, 2, '骁龙888plus-16G-512G', 458, 458.000000, 'http://127.0.0.1:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (17, 3, '骁龙888-8G-128G', 25, 2999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (18, 3, '骁龙888-8G-512G', 25, 3999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (19, 3, '骁龙888-16G-128G', 25, 3666.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (20, 3, '骁龙888-16G-512G', 25, 4999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (21, 3, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (22, 3, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (23, 3, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (24, 3, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (25, 4, '骁龙888-8G-128G', 25, 2999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (26, 4, '骁龙888-8G-512G', 25, 3999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (27, 4, '骁龙888-16G-128G', 25, 3666.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (28, 4, '骁龙888-16G-512G', 25, 4999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (29, 4, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (30, 4, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (31, 4, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (32, 4, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://127.0.0.1:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (33, 5, '骁龙888-8G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (34, 5, '骁龙888-8G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (35, 5, '骁龙888-16G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (36, 5, '骁龙888-16G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (37, 5, '骁龙888plus-8G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (38, 5, '骁龙888plus-8G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (39, 5, '骁龙888plus-16G-128G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `project_sku_info` VALUES (40, 5, '骁龙888plus-16G-512G', 25, 1256.000000, 'http://127.0.0.1:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (1, 2, '骁龙888-8G-128G', 12, 12.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (2, 2, '骁龙888-8G-512G', 565, 565.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (3, 2, '骁龙888-16G-128G', 485, 485.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (4, 2, '骁龙888-16G-512G', 658, 658.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (5, 2, '骁龙888plus-8G-128G', 425, 425.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (6, 2, '骁龙888plus-8G-512G', 963, 963.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (7, 2, '骁龙888plus-16G-128G', 875, 875.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (8, 2, '骁龙888plus-16G-512G', 458, 458.000000, 'http://124.221.28.250:9300/statics/2024/03/22/1688527462686_20240322144513A035.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (17, 3, '骁龙888-8G-128G', 25, 2999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (18, 3, '骁龙888-8G-512G', 25, 3999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (19, 3, '骁龙888-16G-128G', 25, 3666.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (20, 3, '骁龙888-16G-512G', 25, 4999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (21, 3, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (22, 3, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (23, 3, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (24, 3, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (25, 4, '骁龙888-8G-128G', 25, 2999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (26, 4, '骁龙888-8G-512G', 25, 3999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (27, 4, '骁龙888-16G-128G', 25, 3666.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (28, 4, '骁龙888-16G-512G', 25, 4999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (29, 4, '骁龙888plus-8G-128G', 25, 5999.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (30, 4, '骁龙888plus-8G-512G', 25, 4356.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (31, 4, '骁龙888plus-16G-128G', 25, 4699.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (32, 4, '骁龙888plus-16G-512G', 25, 6599.000000, 'http://124.221.28.250:9300/statics/2024/03/26/20210115220633_20240326105615A005.png', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (33, 5, '骁龙888-8G-128G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (34, 5, '骁龙888-8G-512G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (35, 5, '骁龙888-16G-128G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (36, 5, '骁龙888-16G-512G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (37, 5, '骁龙888plus-8G-128G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (38, 5, '骁龙888plus-8G-512G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (39, 5, '骁龙888plus-16G-128G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `project_sku_info` VALUES (40, 5, '骁龙888plus-16G-512G', 25, 1256.000000, 'http://124.221.28.250:9300/statics/2024/04/09/1688527462686_20240409212426A004.jpg', NULL, NULL, NULL, NULL, NULL);

 -- ----------------------------
 -- Table structure for rule_attr_info
--- a/sql/ry-cloud.sql
+++ b/sql/ry-cloud.sql
--- a/sql/ry-config.sql
+++ b/sql/ry-config.sql
@ -4,7 +4,7 @@
 Source Server         : 本地5.7
 Source Server Type    : MySQL
 Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 124.221.28.250:3306
 Source Schema         : ry-config

 Target Server Type    : MySQL
@ -47,16 +47,16 @@ CREATE TABLE `config_info`  (
 -- Records of config_info
 -- ----------------------------
 INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n  mvc:\n    pathmatch:\n      matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n', 'aaa73b809cfd4d0058893aa13da57806', '2020-05-20 12:00:00', '2022-04-24 10:26:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', '通用配置', 'null', 'null', 'yaml', NULL, '');
-INSERT INTO `config_info` VALUES (2, 'muyu-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  cloud:\n    gateway:\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: muyu-auth\n          uri: lb://muyu-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: muyu-gen\n          uri: lb://muyu-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: muyu-job\n          uri: lb://muyu-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: muyu-system\n          uri: lb://muyu-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: muyu-file\n          uri: lb://muyu-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: muyu-product\n          uri: lb://muyu-product\n          predicates:\n            - Path=/product/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: shopCart\n          uri: lb://muyu-shop-cart\n          predicates:\n            - Path=/shopCart/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n', 'f03d72cd72f12479a46f8aa2889833cf', '2020-05-14 14:17:55', '2024-03-29 06:56:29', 'nacos', '127.0.0.1', '', '', '网关模块', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (2, 'muyu-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  cloud:\n    gateway:\n      discovery:\n        locator:\n          lowerCaseServiceId: true\n          enabled: true\n      routes:\n        # 认证中心\n        - id: muyu-auth\n          uri: lb://muyu-auth\n          predicates:\n            - Path=/auth/**\n          filters:\n            # 验证码处理\n            - CacheRequestFilter\n            - ValidateCodeFilter\n            - StripPrefix=1\n        # 代码生成\n        - id: muyu-gen\n          uri: lb://muyu-gen\n          predicates:\n            - Path=/code/**\n          filters:\n            - StripPrefix=1\n        # 定时任务\n        - id: muyu-job\n          uri: lb://muyu-job\n          predicates:\n            - Path=/schedule/**\n          filters:\n            - StripPrefix=1\n        # 系统模块\n        - id: muyu-system\n          uri: lb://muyu-system\n          predicates:\n            - Path=/system/**\n          filters:\n            - StripPrefix=1\n        # 文件服务\n        - id: muyu-file\n          uri: lb://muyu-file\n          predicates:\n            - Path=/file/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: muyu-product\n          uri: lb://muyu-product\n          predicates:\n            - Path=/product/**\n          filters:\n            - StripPrefix=1\n        # 商品服务\n        - id: shopCart\n          uri: lb://muyu-shop-cart\n          predicates:\n            - Path=/shopCart/**\n          filters:\n            - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /csrf\n', 'f03d72cd72f12479a46f8aa2889833cf', '2020-05-14 14:17:55', '2024-03-29 06:56:29', 'nacos', '124.221.28.250', '', '', '网关模块', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (3, 'muyu-auth-dev.yml', 'DEFAULT_GROUP', 'spring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n', '8bd9dada9a94822feeab40de55efced6', '2020-11-20 00:00:00', '2022-09-29 02:48:42', 'nacos', '0:0:0:0:0:0:0:1', '', '', '认证中心', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (4, 'muyu-monitor-dev.yml', 'DEFAULT_GROUP', '# spring\nspring:\n  security:\n    user:\n      name: muyu\n      password: 123456\n  boot:\n    admin:\n      ui:\n        title: 若依服务状态监控\n', '6f122fd2bfb8d45f858e7d6529a9cd44', '2020-11-20 00:00:00', '2022-09-29 02:48:54', 'nacos', '0:0:0:0:0:0:0:1', '', '', '监控中心', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (5, 'muyu-system-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n\ngaode:\n  key: 9d17aa33a6d6d32bd34944f0d8ae60cf', '1389042777f9f091c7f95627534a56e3', '2020-11-20 00:00:00', '2024-04-11 03:31:57', 'nacos', '127.0.0.1', '', '', '系统模块', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (6, 'muyu-gen-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.gen.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 代码生成接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n  # 作者\n  author: DongZeLiang\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n  packageName: com.muyu.product\n  # 自动去除表前缀，默认是false\n  autoRemovePre: false\n  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n  tablePrefix: sys_\n', '2eb9f41bee0332235f3baca38e603abb', '2020-11-20 00:00:00', '2024-02-27 03:00:52', 'nacos', '127.0.0.1', '', '', '代码生成', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (5, 'muyu-system-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n\ngaode:\n  key: 9d17aa33a6d6d32bd34944f0d8ae60cf', '1389042777f9f091c7f95627534a56e3', '2020-11-20 00:00:00', '2024-04-11 03:31:57', 'nacos', '124.221.28.250', '', '', '系统模块', 'null', 'null', 'yaml', '', '');
+INSERT INTO `config_info` VALUES (6, 'muyu-gen-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.gen.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 代码生成接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n  # 作者\n  author: DongZeLiang\n  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n  packageName: com.muyu.product\n  # 自动去除表前缀，默认是false\n  autoRemovePre: false\n  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n  tablePrefix: sys_\n', '2eb9f41bee0332235f3baca38e603abb', '2020-11-20 00:00:00', '2024-02-27 03:00:52', 'nacos', '124.221.28.250', '', '', '代码生成', 'null', 'null', 'yaml', '', '');
 INSERT INTO `config_info` VALUES (7, 'muyu-job-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password: \n  datasource:\n    driver-class-name: com.mysql.cj.jdbc.Driver\n    url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n    username: root\n    password: root\n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.job.domain\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 定时任务接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip\n', 'edcf0e3fe13fea07b4ec08b1088f30b3', '2020-11-20 00:00:00', '2022-09-29 02:50:50', 'nacos', '0:0:0:0:0:0:0:1', '', '', '定时任务', 'null', 'null', 'yaml', '', '');
-INSERT INTO `config_info` VALUES (8, 'muyu-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传    \r\nfile:\r\n    domain: http://127.0.0.1:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test', '5382b93f3d8059d6068c0501fdd41195', '2020-11-20 00:00:00', '2020-12-21 21:01:59', NULL, '0:0:0:0:0:0:0:1', '', '', '文件服务', 'null', 'null', 'yaml', NULL, '');
+INSERT INTO `config_info` VALUES (8, 'muyu-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传    \r\nfile:\r\n    domain: http://124.221.28.250:9300\r\n    path: D:/muyu/uploadPath\r\n    prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n  domain: http://8.129.231.12\r\n  soTimeout: 3000\r\n  connectTimeout: 2000\r\n  trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n  url: http://8.129.231.12:9000\r\n  accessKey: minioadmin\r\n  secretKey: minioadmin\r\n  bucketName: test', '5382b93f3d8059d6068c0501fdd41195', '2020-11-20 00:00:00', '2020-12-21 21:01:59', NULL, '0:0:0:0:0:0:0:1', '', '', '文件服务', 'null', 'null', 'yaml', NULL, '');
 INSERT INTO `config_info` VALUES (9, 'sentinel-muyu-gateway', 'DEFAULT_GROUP', '[\r\n    {\r\n        \"resource\": \"muyu-auth\",\r\n        \"count\": 500,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-system\",\r\n        \"count\": 1000,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-gen\",\r\n        \"count\": 200,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    },\r\n	{\r\n        \"resource\": \"muyu-job\",\r\n        \"count\": 300,\r\n        \"grade\": 1,\r\n        \"limitApp\": \"default\",\r\n        \"strategy\": 0,\r\n        \"controlBehavior\": 0\r\n    }\r\n]', '9f3a3069261598f74220bc47958ec252', '2020-11-20 00:00:00', '2020-11-20 00:00:00', NULL, '0:0:0:0:0:0:0:1', '', '', '限流策略', 'null', 'null', 'json', NULL, '');
-INSERT INTO `config_info` VALUES (10, 'muyu-product-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.product\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '644efaa3b18b043cb536b40f0eb2b6bf', '2024-02-26 08:13:17', '2024-02-26 08:13:46', 'nacos', '127.0.0.1', '', '', '系统模块', '', '', 'yaml', '', NULL);
-INSERT INTO `config_info` VALUES (11, 'muyu-shop-cart-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/shop_cart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.shop.cart\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '13a3eadf2d1484790b582fcf76192c1f', '2024-03-29 03:50:12', '2024-03-29 03:51:28', 'nacos', '127.0.0.1', '', '', '系统模块', '', '', 'yaml', '', NULL);
+INSERT INTO `config_info` VALUES (10, 'muyu-product-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.product\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '644efaa3b18b043cb536b40f0eb2b6bf', '2024-02-26 08:13:17', '2024-02-26 08:13:46', 'nacos', '124.221.28.250', '', '', '系统模块', '', '', 'yaml', '', NULL);
+INSERT INTO `config_info` VALUES (11, 'muyu-shop-cart-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n  redis:\n    host: localhost\n    port: 6379\n    password:\n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: admin\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/shop_cart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: root\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.muyu.shop.cart\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n  title: 系统模块接口文档\n  license: Powered By muyu\n  licenseUrl: https://muyu.vip', '13a3eadf2d1484790b582fcf76192c1f', '2024-03-29 03:50:12', '2024-03-29 03:51:28', 'nacos', '124.221.28.250', '', '', '系统模块', '', '', 'yaml', '', NULL);

 -- ----------------------------
 -- Table structure for config_info_aggr
--- a/sql/shop_cart.sql
+++ b/sql/shop_cart.sql
@ -4,7 +4,7 @@
 Source Server         : 本地5.7
 Source Server Type    : MySQL
 Source Server Version : 50737
- Source Host           : 127.0.0.1:3306
+ Source Host           : 124.221.28.250:3306
 Source Schema         : shop_cart

 Target Server Type    : MySQL