高雪慈 cloud初始化 2024-11-25 21:35

2024-11-25 21:35:11 +08:00 · 2024-11-25 21:35:11 +08:00 · f7a3209486
parent 06ec124790
commit f7a3209486
12 changed files with 45 additions and 24 deletions
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@ -14,12 +14,14 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace:  gxc-muyu
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
@ -28,12 +30,12 @@ spring:
      eager: true
      transport:
        # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 113.44.75.158:8718
      # nacos配置持久化
      datasource:
        ds1:
          nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 113.44.75.158: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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel {
     * @return 优惠力度
     */
    public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) {
-        TeamProductDiscountPriceModel.builder()
+        return TeamProductDiscountPriceModel.builder()
                .productPrice(productPrice)
                .teamPrice(teamPrice)
                .discount(
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java
@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req;
 import com.muyu.common.core.web.page.PageDomain;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 import lombok.*;
+import lombok.experimental.SuperBuilder;

@Data
-@Builder
+@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
--- 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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- 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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        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,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.75.158:8848
+        namespace:  gxc-muyu
        # 配置文件格式
        file-extension: yml
        # 共享配置