puzhibing
1 天以前 43c1dbcee9920e0f0170de0bd0541775d2bd5aa5
修改配置
1 文件已重命名
10个文件已修改
109 ■■■■■ 已修改文件
ruoyi-auth/src/main/resources/bootstrap.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-gateway/src/main/resources/bootstrap.yml 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-auth/src/main/resources/bootstrap.yml
@@ -14,24 +14,24 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        # 配置文件格式
        file-extension: yml
        # 共享配置
ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -14,24 +14,24 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        # 配置文件格式
        file-extension: yml
        # 共享配置
@@ -47,8 +47,8 @@
      datasource:
        ds1:
          nacos:
            server-addr: 47.109.78.184:5000
#            server-addr: 127.0.0.1:8848
#            server-addr: 47.109.78.184:5000
            server-addr: 127.0.0.1:8848
            dataId: sentinel-ruoyi-gateway
            groupId: DEFAULT_GROUP
            data-type: json
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java
File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/Order.java
@@ -7,7 +7,7 @@
 * @Date 2025/6/11 19:34
 */
@Data
public class Order {
public class DYOrder {
    /**
     * 商家账号id
     */
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java
@@ -17,5 +17,5 @@
    /**
     * 订单信息
     */
    private Order order;
    private DYOrder DYOrder;
}
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -14,24 +14,24 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        # 配置文件格式
        file-extension: yml
        # 共享配置
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -14,24 +14,24 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
#        pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        # 配置文件格式
        file-extension: yml
        # 共享配置
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java
@@ -96,12 +96,6 @@
    private Long createUserId;
    /**
     * 小程序APPID
     */
    @TableField("appid")
    private String appid;
    /**
     * 广告语- 链接类型1.外部2.内部3.无
     */
    @TableField("target_type_slogan")
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
@@ -91,12 +91,6 @@
    @TableField("jump_type")
    private Integer jumpType;
    /**
     * 小程序APPID
     */
    @TableField("appid")
    private String appid;
    @Override
    protected Serializable pkVal() {
        return this.popId;
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java
@@ -86,12 +86,6 @@
    @TableField("jump_type")
    private Integer jumpType;
    /**
     * 小程序appid
     */
    @TableField("appid")
    private String appid;
    @Override
    protected Serializable pkVal() {
        return this.entryId;
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java
@@ -43,9 +43,6 @@
    @ApiModelProperty(value = "logo地址")
    private String logoUrl;
    @ApiModelProperty(value = "小程序APPID")
    private String appid;
    @ApiModelProperty(value = "广告语- 链接类型1.外部2.内部3.无")
    private Integer targetTypeSlogan;
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -18,24 +18,24 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        #pro
        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test
#        namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
        #dev
#        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
        # 配置文件格式
        file-extension: yml
        # 共享配置