diff --git a/24Hour/24Hour.csproj.user b/24Hour/24Hour.csproj.user
index 3ba383c..c14dd2c 100644
--- a/24Hour/24Hour.csproj.user
+++ b/24Hour/24Hour.csproj.user
@@ -3,7 +3,7 @@
MvcControllerEmptyScaffolder
root/Common/MVC/Controller
- C:\Users\callm\source\repos\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml
+ C:\Users\admin\source\repos\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml
24Hour
diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
index 730ce7b..7cfcf58 100644
--- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>D:\24小时发布
- True|2023-11-03T01:11:38.7916510Z;True|2023-11-03T08:40:24.5632765+08:00;True|2023-11-03T08:37:19.0763825+08:00;True|2023-11-03T08:36:41.6309999+08:00;True|2023-11-02T14:19:17.6046194+08:00;True|2023-11-02T14:15:47.1550796+08:00;True|2023-11-02T13:58:56.0115577+08:00;True|2023-11-02T00:37:10.3635423+08:00;True|2023-11-02T00:26:11.2303702+08:00;True|2023-11-01T21:54:27.4514001+08:00;True|2023-11-01T16:27:26.0102835+08:00;True|2023-11-01T16:08:36.9703787+08:00;True|2023-11-01T15:49:53.9555050+08:00;True|2023-10-26T10:25:30.8904861+08:00;True|2023-10-26T10:20:28.5509543+08:00;True|2023-10-25T18:39:03.5694693+08:00;True|2023-10-25T18:31:40.2734836+08:00;True|2023-07-02T03:22:32.2918206+08:00;True|2023-07-02T02:25:58.6238404+08:00;True|2023-07-02T02:21:25.4053957+08:00;True|2023-07-02T02:09:02.6137949+08:00;True|2023-07-02T00:23:44.4442673+08:00;True|2023-07-01T23:42:35.7302162+08:00;True|2023-07-01T23:24:47.4663991+08:00;True|2023-07-01T22:22:56.9799185+08:00;True|2023-07-01T22:04:26.8941882+08:00;True|2023-07-01T21:40:11.5842496+08:00;True|2023-07-01T21:12:07.0048729+08:00;True|2023-07-01T18:55:25.7547257+08:00;True|2023-07-01T15:55:14.1686837+08:00;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;
+ True|2023-11-07T09:16:15.5300706Z;True|2023-11-07T16:47:19.5627089+08:00;True|2023-11-07T16:14:19.9763601+08:00;True|2023-11-07T14:20:54.2182060+08:00;True|2023-11-07T10:05:12.3979135+08:00;True|2023-11-07T09:57:50.9919178+08:00;True|2023-11-03T09:11:38.7916510+08:00;True|2023-11-03T08:40:24.5632765+08:00;True|2023-11-03T08:37:19.0763825+08:00;True|2023-11-03T08:36:41.6309999+08:00;True|2023-11-02T14:19:17.6046194+08:00;True|2023-11-02T14:15:47.1550796+08:00;True|2023-11-02T13:58:56.0115577+08:00;True|2023-11-02T00:37:10.3635423+08:00;True|2023-11-02T00:26:11.2303702+08:00;True|2023-11-01T21:54:27.4514001+08:00;True|2023-11-01T16:27:26.0102835+08:00;True|2023-11-01T16:08:36.9703787+08:00;True|2023-11-01T15:49:53.9555050+08:00;True|2023-10-26T10:25:30.8904861+08:00;True|2023-10-26T10:20:28.5509543+08:00;True|2023-10-25T18:39:03.5694693+08:00;True|2023-10-25T18:31:40.2734836+08:00;True|2023-07-02T03:22:32.2918206+08:00;True|2023-07-02T02:25:58.6238404+08:00;True|2023-07-02T02:21:25.4053957+08:00;True|2023-07-02T02:09:02.6137949+08:00;True|2023-07-02T00:23:44.4442673+08:00;True|2023-07-01T23:42:35.7302162+08:00;True|2023-07-01T23:24:47.4663991+08:00;True|2023-07-01T22:22:56.9799185+08:00;True|2023-07-01T22:04:26.8941882+08:00;True|2023-07-01T21:40:11.5842496+08:00;True|2023-07-01T21:12:07.0048729+08:00;True|2023-07-01T18:55:25.7547257+08:00;True|2023-07-01T15:55:14.1686837+08:00;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;
\ No newline at end of file
diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json
index 9b0711c..d2ee6ed 100644
--- a/24Hour/appsettings.json
+++ b/24Hour/appsettings.json
@@ -8,7 +8,7 @@
"AllowedHosts": "*",
"ConnectionStrings": {
"DBType": "MySQL",
- "MySQLConnString": "server=127.0.0.1;Database=equipmentrearend;Uid=root;Pwd=insght;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;"
+ "MySQLConnString": "server=192.168.0.251;Database=equipmentrearend;Uid=root;Pwd=sa@admin;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;"
},
//JwtConfig
"JwtConfiguration": {
diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt
index 0093e27..623daa1 100644
--- a/24Hour/build/dockerbuild.txt
+++ b/24Hour/build/dockerbuild.txt
@@ -3,7 +3,7 @@ docker build -t twentyfoursvc:1.0.1.2 .
docker on windows for fake data
create container
-docker run --name twentyfoursvc -p 8098:8098 -v D://dockrconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.2
+docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5
docker on linux with network bridge
@@ -13,6 +13,79 @@ docker network create twentytotwneyfour
for 24hourserver
docker run --name twentyfoursvc -p 8098:8098 -v /home/24hour/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyfour -d twentyfoursvc:1.0.1.5
+docker run --name twentyfoursvc -p 8098:8098 -v /home/24hour/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always -d twentyfoursvc:1.0.1.5
for 2.0 proxyclient
-docker run --name twentysysproxy -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.1
\ No newline at end of file
+docker run --name twentysysproxy -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.1
+
+
+
+
+
+
+
+
+
+
+docker run --name twentyfoursvc -p 8098:8098 \
+-v /home/24hour/config/appsettings.json:/app/appsettings.json \
+-v /home/24hour/config/caselist.txt:/app/caselist.txt \
+-v /home/24hour/config/jzlist.txt:/app/jzlist.txt \
+-v /home/24hour/wwwroot:/app/wwwroot \
+-v /etc/localtime:/etc/localtime \
+--restart=always -d twentyfoursvc:1.0.1.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+