From 90e8af6335f64787962d6f158f29b7d762d1522f Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Thu, 29 May 2025 14:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E4=B8=80=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=BE=9D=E8=B5=96=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Directory.Build.JiShe.targets | 136 ++++++-------
Directory.Build.Volo.targets | 188 +++++++++---------
Directory.Build.props | 9 +
JiShe.IoT.Admin.sln | 1 +
NuGet.Config | 2 +-
.../appsettings.Development.json | 16 +-
host/JiShe.IoT.HttpApi.Host/appsettings.json | 2 +-
7 files changed, 188 insertions(+), 166 deletions(-)
create mode 100644 Directory.Build.props
diff --git a/Directory.Build.JiShe.targets b/Directory.Build.JiShe.targets
index f5174ca..5b50c88 100644
--- a/Directory.Build.JiShe.targets
+++ b/Directory.Build.JiShe.targets
@@ -1,88 +1,88 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/Directory.Build.Volo.targets b/Directory.Build.Volo.targets
index 7b10791..c40b1cc 100644
--- a/Directory.Build.Volo.targets
+++ b/Directory.Build.Volo.targets
@@ -1,98 +1,98 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..5f925a9
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+
+
+ 1.0.1
+
+ 9.1.1
+
+
\ No newline at end of file
diff --git a/JiShe.IoT.Admin.sln b/JiShe.IoT.Admin.sln
index 3309979..c7af634 100644
--- a/JiShe.IoT.Admin.sln
+++ b/JiShe.IoT.Admin.sln
@@ -36,6 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solut
ProjectSection(SolutionItems) = preProject
Directory.Build.JiShe.targets = Directory.Build.JiShe.targets
Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets
+ Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Build.Volo.targets = Directory.Build.Volo.targets
Dockerfile = Dockerfile
diff --git a/NuGet.Config b/NuGet.Config
index b26ab05..3459391 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -2,7 +2,7 @@
-
+
diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json
index 667d801..887c0fe 100644
--- a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json
+++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json
@@ -31,12 +31,24 @@
"IoTDBOptions": {
"UserName": "root",
"Password": "root",
- "ClusterList": [ "121.42.175.177:16667" ],
+ "TreeModelClusterList": [ "121.42.175.177:16667" ],
+ "TableModelClusterList": [ "121.42.175.177:16667" ],
"PoolSize": 32,
- "DataBaseName": "energy",
+ "TableModelDataBaseName": "energy",
"OpenDebugMode": true,
"UseTableSessionPoolByDefault": false
},
+ "ServerApplicationOptions": {
+ "ServerTagName": "JiSheCollectBus77",
+ "SystemType": "Energy",
+ "FirstCollectionTime": "2025-04-28 15:07:00",
+ "AutomaticVerificationTime": "16:07:00",
+ "AutomaticTerminalVersionTime": "17:07:00",
+ "AutomaticTelematicsModuleTime": "17:30:00",
+ "AutomaticDayFreezeTime": "02:30:00",
+ "AutomaticMonthFreezeTime": "03:30:00",
+ "DefaultProtocolPlugin": "T37612012ProtocolPlugin"
+ },
"Jwt": {
"Audience": "JiShe.IoT",
"SecurityKey": "dzehzRz9a8asdfasfdadfasdfasdfafsdadfasbasdf=",
diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.json b/host/JiShe.IoT.HttpApi.Host/appsettings.json
index 8d12345..f8bb961 100644
--- a/host/JiShe.IoT.HttpApi.Host/appsettings.json
+++ b/host/JiShe.IoT.HttpApi.Host/appsettings.json
@@ -24,7 +24,7 @@
"Name": "File",
"Args": {
"path": "logs/logs-.txt",
- "rollingInterval": "Day"
+ "rollingInterval": "Hour"
}
}
]