diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 323ad45..47435ed 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -10,6 +10,7 @@ import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; +import java.util.Collection; import java.util.Date; @Data @@ -112,7 +113,7 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoSaveModel.getStrategyId()) .build(); } - public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){ + public static ActivityTeamInfo teamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){ return ActivityTeamInfo.builder() .id(activityTeamInfoUpdModel.getId()) .name(activityTeamInfoUpdModel.getName()) diff --git 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 index 697b5b4..6e17c35 100644 --- 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 @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; 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.ActivityTeamProductSkuReqModel; +import com.muyu.marketing.domain.model.*; import lombok.*; import lombok.experimental.SuperBuilder; @@ -60,10 +59,11 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .teamId(activityTeamProductSkuAddModel.getTeamId()) .teamStock(activityTeamProductSkuAddModel.getTeamStock()) .productSku(activityTeamProductSkuAddModel.getSku()) - .remainStock(activityTeamProductSkuAddModel.getTeamStock()) .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) .build(); } + + public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) { return ActivityTeamProductSkuInfo.builder() .id(activityTeamProductSkuReqModel.getId()) @@ -74,4 +74,35 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .build(); } + /** + * 批量修改的构造器 + * @param activityTeamProductSkuModel + * @return + */ + public static ActivityTeamProductSkuInfo batchUpdate(ActivityTeamProductSkuUpdModel activityTeamProductSkuModel){ + return ActivityTeamProductSkuInfo.builder() + .id(activityTeamProductSkuModel.getId()) + .teamPrice(activityTeamProductSkuModel.getTeamPrice()) + .teamStock(activityTeamProductSkuModel.getTeamStock()) + .build(); + } + + + public static ActivityTeamProductSkuInfo batchSaveSku(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel){ + return ActivityTeamProductSkuInfo.builder() + .productSku(activityTeamProductSkuAddModel.getSku()) + .teamStock(activityTeamProductSkuAddModel.getTeamStock()) + .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) + .build(); + } + +// public static ActivityTeamProductSkuInfo addSuk(ActivityTeamInfoUpdModel ActivityTeamInfoUpdModel){ +// return ActivityTeamProductSkuInfo.builder() +// .productSku(activityTeamProductSkuAddModel.getSku()) +// .teamStock(activityTeamProductSkuAddModel.getTeamStock()) +// .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) +// .build(); +// } + + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java index beb468f..69a32ad 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java @@ -82,7 +82,7 @@ public class ActivityTeamInfoSaveModel { .unit(activityTeamInfoAddModel.getUnit()) .imageList(activityTeamInfoAddModel.getImageList()) .endTime(activityTeamInfoAddModel.getEndTime()) - .sort(activityTeamInfoAddModel.getSort()) + .sort(Long.valueOf(activityTeamInfoAddModel.getSort())) .content(activityTeamInfoAddModel.getContent()) .status(activityTeamInfoAddModel.getStatus()) .strategyType(activityTeamInfoAddModel.getStrategyType()) diff --git 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 index 6ebfd78..6594f57 100644 --- 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,5 +1,6 @@ package com.muyu.marketing.domain.model; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,22 +21,78 @@ import java.util.List; @NoArgsConstructor @Builder public class ActivityTeamInfoUpdModel { + /** + * 拼团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; - private Long strategyId; - private List activityTeamProductSkuModelList; + /** + * 单位 + */ - public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + private String unit; + /** + * 轮播图 + */ + + private String imageList; + /** + * 活动结束时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date endTime; + /** + * 活动排序 + */ + private Integer sort; + /** + * 活动详情 + */ + private String content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private Long strategyId; + + /** + * 修改 商品的SKU集合 + */ + private List activityTeamProductSkuUpdModels; + + /** + * 添加商品的SKU集合 + */ + private List activityTeamProductSkuAddModelList; + + /** + * 删除商品SKU集合 + */ + private List ids; + + public static ActivityTeamInfoUpdModel infoUpdReqBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ return ActivityTeamInfoUpdModel.builder() .id(activityTeamInfoUpdReq.getId()) .name(activityTeamInfoUpdReq.getName()) @@ -50,7 +107,9 @@ public class ActivityTeamInfoUpdModel { .status(activityTeamInfoUpdReq.getStatus()) .strategyType(activityTeamInfoUpdReq.getStrategyType()) .strategyId(activityTeamInfoUpdReq.getStrategyId()) - .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList()) + .activityTeamProductSkuUpdModels(activityTeamInfoUpdReq.getActivityTeamProductSkuUpdModels()) + .activityTeamProductSkuAddModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuAddModelList()) + .ids(activityTeamInfoUpdReq.getIds()) .build(); } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java index 3b6fc78..6ae38ff 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java @@ -34,6 +34,10 @@ public class ActivityTeamProductSkuModel { */ private BigDecimal teamPrice; + /** + * 剩余库存 + */ + private Long remainStock; /** * 拼团库存 */ diff --git 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 index 82939fa..7c52bdd 100644 --- 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 @@ -1,5 +1,8 @@ package com.muyu.marketing.domain.req; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,18 +22,76 @@ import java.util.List; @NoArgsConstructor @Builder public class ActivityTeamInfoUpdReq { + + /** + * 拼团ID + */ private Long id; + /** + * 拼团名称 + */ 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 Long sort; + /** + * 活动排序 + */ + private Integer sort; + /** + * 活动详情 + */ private String content; + /** + * 活动状态 + */ private String status; + /** + * 策略类型 + */ private String strategyType; + /** + * 策略ID + */ private Long strategyId; - private List activityTeamProductSkuList; + + /** + * 修改 商品的SKU集合 + */ + private List activityTeamProductSkuUpdModels; + + /** + * 添加商品的SKU集合 + */ + private List activityTeamProductSkuAddModelList; + + /** + * 删除商品SKU集合 + */ + private List ids; + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java index 3efe23a..7f5ad83 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java @@ -1,13 +1,10 @@ package com.muyu.marketing.domain.resp; - import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.model.ActivityTeamDetailModel; -import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - import java.util.Date; import java.util.List; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index 9494be5..011e413 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -63,9 +63,16 @@ public class ActivityTeamController { public Result findTeamById(@PathVariable Long id){ return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } - @PutMapping("/updateByTeamId") - public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ - activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); +// @PutMapping("/updateByTeamId") +// public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ +// activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); +// return Result.success(); +// } + + + @PutMapping("/batctUpdTeam") + public Result batchUpdTeam(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + activityTeamInfoService.batchUpdTeam(ActivityTeamInfoUpdModel.infoUpdReqBuild(activityTeamInfoUpdReq)); return Result.success(); } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index f1409d4..4afd79b 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -28,12 +28,12 @@ public interface ActivityTeamInfoService extends IService { */ ActivityTeamDetailModel findDetailById(Long id); + /** - * 修改团购活动信息 - * @param activityTeamInfoUpdModel 团购活动信息 - * @return 是否成功 + * 修改拼团活动信息 + * @param activityTeamInfoUpdModel */ - boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); + void batchUpdTeam(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); } diff --git 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 index 3bf453a..3e5c03a 100644 --- 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,7 +3,6 @@ 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; @@ -46,6 +45,32 @@ public interface ActivityTeamProductSkuInfoService extends IService findListByTeamId(Long teamId); - public boolean updateBath(List activityTeamProductSkuReqModelList); + /** + * 根据业务模型 进行 团购商品修改 + * @param activityTeamProductSkuUpdModel + * @return + */ + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel); + /** + * 根据 业务模型 进行 团购商品批量修改 + * @param activityTeamProductSkuUpdModels + * @return + */ + public boolean bathUpdate(List activityTeamProductSkuUpdModels); + + + /** + * 根据 业务模型 进行 团购商品批量添加 + * @param activityTeamProductSkuAddModelList + * @return + */ + public boolean batchSaveSku(List activityTeamProductSkuAddModelList); + + + /** + * 根据业务模型 进行 团购商品批量删除 + * @param ids + */ + public boolean batchDek(List ids); } diff --git 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 index a75f0e0..96b10e3 100644 --- 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 @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; import com.muyu.marketing.team.service.ActivityTeamOpenInfoService; @@ -16,6 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; +import java.util.stream.Collectors; @Service @@ -93,16 +96,22 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModelList = activityTeamInfoUpdModel.getActivityTeamProductSkuAddModelList(); + activityTeamProductSkuAddModelList.stream().forEach(activityTeamProductSkuAddModel -> { + activityTeamProductSkuAddModel.setTeamId(activityTeamInfoUpdModel.getId()); + activityTeamProductSkuAddModel.setProductId(activityTeamInfoUpdModel.getProductId()); + }); + activityTeamProductSkuInfoService.batchDek(activityTeamInfoUpdModel.getIds()); + activityTeamProductSkuInfoService.batchSaveSku(activityTeamProductSkuAddModelList); + activityTeamProductSkuInfoService.bathUpdate(activityTeamInfoUpdModel.getActivityTeamProductSkuUpdModels()); + + } + + } diff --git 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 index f1c3369..ed3f24c 100644 --- 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,6 +1,7 @@ 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; @@ -95,9 +96,56 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList(); } + + /** + * 根据业务模型进行商品价格修改 + * @param activityTeamProductSkuUpdModel + * @return + */ + @Override + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice()); + updateWrapper.set(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId()); + return update(updateWrapper); + + } + + /** + * 根据 业务模型 进行 团购商品批量修改 + * @param activityTeamProductSkuUpdModels + * @return + */ @Transactional @Override - public boolean updateBath(List activityTeamProductSkuReqModelList) { - return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList()); + public boolean bathUpdate(List activityTeamProductSkuUpdModels) { + + return this.updateBatchById(activityTeamProductSkuUpdModels.stream() + .map(ActivityTeamProductSkuInfo::batchUpdate).toList()); } + + + /** + * 根据 业务模型 进行 团购商品批量添加 + * @param activityTeamProductSkuAddModelList + * @return + */ + @Transactional + @Override + public boolean batchSaveSku(List activityTeamProductSkuAddModelList) { + return this.saveBatch(activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::batchSaveSku).toList()); + } + + /** + * 根据业务模型 进行 团购商品批量删除 + * @param ids + */ + @Override + public boolean batchDek(List ids) { + this.removeBatchByIds(ids); + return false; + } + + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml index 699e778..cfa0f09 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-buy + name: muyu-marketing profiles: # 环境配置 active: dev @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 113.44.75.158:8848 + namespace: 3212aa0d-f01a-48bb-8676-5b6f43ae0c59 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 113.44.75.158:8848 + namespace: 3212aa0d-f01a-48bb-8676-5b6f43ae0c59 # 配置文件格式 file-extension: yml # 共享配置