From 43c1dbcee9920e0f0170de0bd0541775d2bd5aa5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:49:12 +0800
Subject: [PATCH] 修改配置
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java | 3 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java | 6 ---
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 16 ++++----
ruoyi-gateway/src/main/resources/bootstrap.yml | 20 +++++-----
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 16 ++++----
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java | 6 ---
ruoyi-auth/src/main/resources/bootstrap.yml | 16 ++++----
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java | 6 ---
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 16 ++++----
11 files changed, 44 insertions(+), 65 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 7e73cfb..c5a7e4f 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/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
# 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 8b55ada..dbcc760 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/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
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/Order.java
rename to ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java
index c450f23..b080b12 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/DYOrder.java
@@ -7,7 +7,7 @@
* @Date 2025/6/11 19:34
*/
@Data
-public class Order {
+public class DYOrder {
/**
* 商家账号id
*/
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java
index 36cd569..eff7485 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/douyin/model/OrderWebHook.java
+++ b/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;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index ed57718..dbc840e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/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
# 共享配置
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index 93c2e40..e9f7309 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/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
# 共享配置
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java
index 9fa754d..447775b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Advert.java
+++ b/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")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
index ca2f7b0..663d0bb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java
index bfd6902..7b68d64 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/QuickEntry.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java
index 3c8f719..8464216 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppAdvertVo.java
+++ b/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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index fed2ac4..8568de5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/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
# 共享配置
--
Gitblit v1.7.1