From ff987c1b72aceaaa17c5f486052cf96323b11d32 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 九月 2024 18:52:03 +0800
Subject: [PATCH] 增加生产环境配置
---
ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 55 ++++-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java | 4
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java | 4
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java | 5
ruoyi-service/ruoyi-account/pom.xml | 15 +
ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml | 56 ++++-
ruoyi-service/pom.xml | 2
ruoyi-gateway/src/main/resources/bootstrap.yml | 24 +
ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml | 53 ++++-
ruoyi-auth/src/main/resources/bootstrap.yml | 56 ++++-
ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml | 63 +++++-
ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 53 ++++-
ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml | 56 ++++-
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 56 ++++-
14 files changed, 368 insertions(+), 134 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java
index f8d1dcf..2736da3 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java
@@ -21,10 +21,6 @@
@TableName("t_accounting_strategy_order")
public class AccountingStrategyOrder extends BasePojo {
- @ApiModelProperty(value = "主键")
- @TableField(value = "id")
- private Integer id;
-
@ApiModelProperty(value = "站点id")
@TableField("site_id")
private Integer siteId;
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 0f74bbf..56494a5 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -1,13 +1,16 @@
+server:
+ port: 9100
# Spring
spring:
profiles:
# 环境配置
- active: dev
+ active: prod
application:
# 应用名称
name: ruoyi-auth
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
---
spring:
config:
@@ -36,9 +39,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -51,8 +52,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -61,16 +70,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+ # server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ # namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # group: DEFAULT_GROUP
+ # application: seata-server #Nacos 中 Seata 名称
+ # username: nacos
+ # password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -79,8 +103,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -90,14 +112,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 8fb6e4a..092b794 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9000
# Spring
spring:
application:
@@ -7,7 +9,7 @@
allow-bean-definition-overriding: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -49,6 +51,8 @@
server-addr: 192.168.110.169:8848
dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP
+ username: nacos
+ password: nacos
data-type: json
rule-type: gw-flow
---
@@ -60,14 +64,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c2f47d1c-6355-4a68-b357-7523d73b2d13
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: c2f47d1c-6355-4a68-b357-7523d73b2d13
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
@@ -80,14 +88,16 @@
eager: true
transport:
# 控制台地址
- dashboard: 122.9.150.46:8718
+ dashboard: 192.168.0.137:8718
# nacos配置持久化
datasource:
ds1:
nacos:
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP
+ username: nacos
+ password: nacos
data-type: json
rule-type: gw-flow
---
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index cb911b6..08fea37 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9800
# Spring
spring:
application:
@@ -7,7 +9,7 @@
allow-bean-definition-overriding: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -36,10 +38,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -52,8 +51,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -62,16 +69,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -80,8 +102,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -91,14 +111,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/pom.xml b/ruoyi-service/pom.xml
index 4988328..d1690fb 100644
--- a/ruoyi-service/pom.xml
+++ b/ruoyi-service/pom.xml
@@ -7,7 +7,7 @@
<version>3.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
+
<modules>
<module>ruoyi-account</module>
<module>ruoyi-chargingPile</module>
diff --git a/ruoyi-service/ruoyi-account/pom.xml b/ruoyi-service/ruoyi-account/pom.xml
index 7cd42a7..a464162 100644
--- a/ruoyi-service/ruoyi-account/pom.xml
+++ b/ruoyi-service/ruoyi-account/pom.xml
@@ -150,7 +150,13 @@
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.huaweicloud.apigateway</groupId>
+ <artifactId>apigateway</artifactId>
+ <version>3.2.5</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
+ </dependency>
</dependencies>
<build>
@@ -173,6 +179,13 @@
<directory>src/main/resources</directory>
</resource>
<resource>
+ <directory>lib</directory>
+ <targetPath>/BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
index 7895000..9aa8ddd 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9200
# Spring
spring:
application:
@@ -8,7 +10,7 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -38,7 +40,6 @@
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -51,8 +52,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -61,26 +70,39 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+ # server-addr: 192.168.110.169:8848
+ # namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # group: DEFAULT_GROUP
+ # username: nacos
+ # password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+ # server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ # namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # group: DEFAULT_GROUP
+ # application: seata-server #Nacos 中 Seata 名称
+ # username: nacos
+ # password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
password: nacos
sentinel:
transport:
- dashboard: 127.0.0.1:8080 # Sentinel控制台地址
+ dashboard: 192.168.0.137:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -90,14 +112,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
index 225c084..c24df46 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9300
# Spring
spring:
application:
@@ -8,7 +10,7 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -37,9 +39,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -52,8 +52,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -62,16 +70,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -89,14 +112,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
index f8c49a6..adf78b9 100644
--- a/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-integration/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9700
# Spring
spring:
application:
@@ -8,7 +10,15 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
+
+---
+spring:
+ cloud:
+ stream:
+ rocketmq:
+ binder:
+ name-server: 127.0.0.1:9876
---
spring:
config:
@@ -37,9 +47,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -52,8 +60,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -62,16 +78,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -80,8 +111,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -91,14 +120,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index 9a41659..4d15611 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9400
# Spring
spring:
application:
@@ -8,7 +10,7 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -37,9 +39,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -52,8 +52,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -62,16 +70,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -80,8 +103,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -91,14 +112,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index 887402d..d8684e9 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9600
# Spring
spring:
application:
@@ -8,7 +10,7 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -50,8 +52,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -60,16 +70,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -78,8 +103,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -89,14 +112,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
index 5fcab95..f589d48 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/AppletPayUtil.java
@@ -207,12 +207,12 @@
alipayConfig.setSignType(SignType.RSA2.getType());
//判断加签方式
String signType = aliProperties.getSignType();
- if(SignType.CERT.getType().equals(signType)){
+ if(SignType.SECRET_KEY.getType().equals(signType)){
alipayConfig.setPrivateKey(aliProperties.getPrivateKey());
alipayConfig.setAlipayPublicKey(aliProperties.getAlipayPublicKey());
return alipayConfig;
}
- if(SignType.SECRET_KEY.getType().equals(signType)){
+ if(SignType.CERT.getType().equals(signType)){
alipayConfig.setAppCertPath(aliProperties.getAppCertPath());
alipayConfig.setAlipayPublicCertPath(aliProperties.getAlipayPublicCertPath());
alipayConfig.setRootCertPath(aliProperties.getRootCertPath());
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java
index 71eb21c..b08ca9d 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/wx/model/V3.java
@@ -5,6 +5,7 @@
import org.apache.poi.util.IOUtils;
import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -54,8 +55,10 @@
public InputStream getPrivateKeyStream() {
// 需要证书释放
byte[] certData;
- InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(this.privateKeyPath);
+// InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(this.privateKeyPath);
+ InputStream certStream = null;
try {
+ certStream = new FileInputStream(this.privateKeyPath);
certData = IOUtils.toByteArray(certStream);
} catch (IOException e) {
throw new RuntimeException("私钥文件未找到");
diff --git a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
index f72b520..fe58855 100644
--- a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
+server:
+ port: 9500
# Spring
spring:
application:
@@ -8,7 +10,7 @@
allow-circular-references: true
profiles:
# 环境配置
- active: dev
+ active: prod
---
spring:
config:
@@ -38,10 +40,7 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-
---
-
seata:
enabled: true
application-id: ${spring.application.name}
@@ -54,8 +53,16 @@
config:
type: nacos
nacos:
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
@@ -64,16 +71,31 @@
type: nacos
nacos:
application: seata-server
- server-addr: 192.168.110.169:8848
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+ # 开发环境
+# server-addr: 192.168.110.169:8848
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
username: nacos
password: nacos
cloud:
nacos:
discovery:
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+ # 开发环境
+# server-addr: 192.168.110.169:8848 # nacos注册中心地址
+# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
+ # 生产环境
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
@@ -82,8 +104,6 @@
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
eager: true
-
-
---
spring:
config:
@@ -93,14 +113,18 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
- namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
+ server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ username: nacos
+ password: nacos
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
--
Gitblit v1.7.1