From 28d26fcd6af8478622094d0e18fad59022d118ab Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:38:53 +0800
Subject: [PATCH] 10.17
---
ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 10 ++--
ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 11 +++--
ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml | 56 +++++++--------------------
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 7 +++
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 16 ++++----
ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml | 13 +++---
6 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
index 89c2c9f..58f341b 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
@@ -7,6 +7,8 @@
import org.springframework.data.mongodb.core.mapping.Document;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 上传实时监测数据
@@ -45,6 +47,11 @@
private BigDecimal period_charging_degree;// @ApiModelProperty("时段充电度数")
+ private Integer orderType; //1=充电订单（小程序），2=充电订单（刷卡））
+ private Integer siteId;
+ private Integer status; //状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）"
+ private Date startTime; //充电开始时间
+ private Date endTime; //充电结束时间
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index dbd2ab0..beeeb57 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -12,7 +12,6 @@
profiles:
# 环境配置
active: dev
-# active: prod
---
spring:
config:
@@ -22,15 +21,16 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
- username: nacos
- password: nacos
+ ip: 192.168.110.111
+ username: nacos
+ password: nacos
config:
# 配置中心地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -55,7 +55,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -73,7 +73,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -88,7 +88,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ server-addr: 127.0.0.1:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
index 7c025cd..3c55e60 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml
@@ -13,7 +13,6 @@
profiles:
# 环境配置
active: dev
-# active: prod
---
spring:
config:
@@ -23,7 +22,7 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
@@ -31,7 +30,7 @@
password: nacos
config:
# 配置中心地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
name: ${spring.application.name}
@@ -47,7 +46,7 @@
enabled: true
application-id: ${spring.application.name}
tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
- enable-auto-data-source-proxy: false
+ enable-auto-data-source-proxy: true
service:
vgroup-mapping:
seata_tx_group: default
@@ -56,7 +55,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -74,7 +73,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -89,7 +88,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ server-addr: 127.0.0.1:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index 6587762..c6193f7 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -23,7 +23,7 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
@@ -32,7 +32,7 @@
# ip: 192.168.110.85
config:
# 配置中心地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
name: ${spring.application.name}
@@ -57,7 +57,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -75,7 +75,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -90,7 +90,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ server-addr: 127.0.0.1:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
@@ -122,6 +122,7 @@
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
username: nacos
password: nacos
+ ip: 192.168.110.111
config:
# 配置中心地址
server-addr: 192.168.0.137:8848,192.168.0.123:8848
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index 6b94607..5a81fb2 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -23,7 +23,7 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
@@ -32,7 +32,7 @@
# ip: 192.168.110.85
config:
# 配置中心地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
name: ${spring.application.name}
@@ -57,7 +57,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -75,7 +75,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -90,7 +90,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ server-addr: 127.0.0.1:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
diff --git a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
index 0c4c5ce..8694268 100644
--- a/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml
@@ -1,7 +1,3 @@
-server:
- port: 9500
- tomcat:
- basedir: /data/tomcat
# Spring
spring:
application:
@@ -13,7 +9,6 @@
profiles:
# 环境配置
active: dev
-# active: prod
---
spring:
config:
@@ -23,15 +18,16 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
username: nacos
password: nacos
+ ip: 192.168.110.111
config:
# 配置中心地址
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
name: ${spring.application.name}
@@ -42,7 +38,10 @@
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
---
+
seata:
enabled: true
application-id: ${spring.application.name}
@@ -55,57 +54,36 @@
config:
type: nacos
nacos:
- # 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1: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
-# password: nacos
registry:
type: nacos
nacos:
application: seata-server
- # 开发环境
- server-addr: 192.168.110.169:8848
+ server-addr: 127.0.0.1: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注册中心地址
+ server-addr: 127.0.0.1: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控制台地址
eager: true
+
+
---
spring:
config:
@@ -115,18 +93,14 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
- username: nacos
- password: nacos
+ namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
config:
# 配置中心地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
- username: nacos
- password: nacos
+ server-addr: 127.0.0.1:8848
+ namespace: 3452d750-b08d-4485-a1e9-4fb0548f1fc2
group: DEFAULT_GROUP
name: ${spring.application.name}
# 配置文件格式
--
Gitblit v1.7.1