From 2399fc16f68afb9592eadcc1d64b2078f21df6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Tue, 13 Jan 2026 15:15:21 +0800 Subject: [PATCH] x --- .gitmodules.backup | 42 --------------------------- a_th_web | 2 +- bin/run-auth.bat | 14 --------- bin/run-gateway.bat | 14 --------- bin/run-modules-file.bat | 14 --------- bin/run-modules-gen.bat | 14 --------- bin/run-modules-job.bat | 14 --------- bin/run-modules-system.bat | 14 --------- bin/run-monitor.bat | 14 --------- docker/thingsboard/docker-compose.yml | 40 +++++++++++++++++++++++++ docker/thingsboard/reademe.md | 1 + ruoyi-auth | 2 +- ruoyi-gateway | 2 +- ruoyi-modules/ruoyi-file | 2 +- ruoyi-modules/ruoyi-gen | 2 +- ruoyi-modules/ruoyi-job | 2 +- ruoyi-modules/ruoyi-system | 2 +- ruoyi-modules/tuoheng-device | 2 +- ruoyi-ui | 2 +- ruoyi-visual/ruoyi-monitor | 2 +- 20 files changed, 51 insertions(+), 150 deletions(-) delete mode 100644 .gitmodules.backup delete mode 100644 bin/run-auth.bat delete mode 100644 bin/run-gateway.bat delete mode 100644 bin/run-modules-file.bat delete mode 100644 bin/run-modules-gen.bat delete mode 100644 bin/run-modules-job.bat delete mode 100644 bin/run-modules-system.bat delete mode 100644 bin/run-monitor.bat create mode 100644 docker/thingsboard/docker-compose.yml create mode 100644 docker/thingsboard/reademe.md diff --git a/.gitmodules.backup b/.gitmodules.backup deleted file mode 100644 index 5a3e5e8..0000000 --- a/.gitmodules.backup +++ /dev/null @@ -1,42 +0,0 @@ -[submodule "ruoyi-gateway"] - path = ruoyi-gateway - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gateway.git -[submodule "ruoyi-ui"] - path = ruoyi-ui - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-ui.git -[submodule "ruoyi-auth"] - path = ruoyi-auth - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-auth.git -[submodule "ruoyi-visual/ruoyi-monitor"] - path = ruoyi-visual/ruoyi-monitor - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-visual.git -[submodule "ruoyi-modules/ruoyi-file"] - path = ruoyi-modules/ruoyi-file - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-file.git -[submodule "ruoyi-modules/ruoyi-gen"] - path = ruoyi-modules/ruoyi-gen - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gen.git -[submodule "ruoyi-modules/ruoyi-job"] - path = ruoyi-modules/ruoyi-job - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-job.git -[submodule "ruoyi-modules/ruoyi-system"] - path = ruoyi-modules/ruoyi-system - url = http://th.local.t-aaron.com:13000/THENG/a-ruoyi-system.git -[submodule "ruoyi-modules/tuoheng-airline"] - path = ruoyi-modules/tuoheng-airline - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-airline.git -[submodule "ruoyi-modules/tuoheng-approval"] - path = ruoyi-modules/tuoheng-approval - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-approval.git -[submodule "ruoyi-modules/tuoheng-device"] - path = ruoyi-modules/tuoheng-device - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-device.git -[submodule "ruoyi-modules/tuoheng-fms"] - path = ruoyi-modules/tuoheng-fms - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-fms.git -[submodule "ruoyi-modules/tuoheng-media"] - path = ruoyi-modules/tuoheng-media - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-media.git -[submodule "ruoyi-modules/tuoheng-task"] - path = ruoyi-modules/tuoheng-task - url = http://th.local.t-aaron.com:13000/THENG/a-tuoheng-task.git diff --git a/a_th_web b/a_th_web index 59fc0d7..27c4446 160000 --- a/a_th_web +++ b/a_th_web @@ -1 +1 @@ -Subproject commit 59fc0d763460c2984a8f740ebe1633f8b060d868 +Subproject commit 27c444605579bcca708df367d71cd171558a0dd2 diff --git a/bin/run-auth.bat b/bin/run-auth.bat deleted file mode 100644 index 0d0952a..0000000 --- a/bin/run-auth.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Auth工程。 -echo. - -cd %~dp0 -cd ../ruoyi-auth/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat deleted file mode 100644 index e43d60b..0000000 --- a/bin/run-gateway.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Gateway工程。 -echo. - -cd %~dp0 -cd ../ruoyi-gateway/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat deleted file mode 100644 index 6d89c90..0000000 --- a/bin/run-modules-file.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-File工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat deleted file mode 100644 index 0a4c390..0000000 --- a/bin/run-modules-gen.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Gen工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat deleted file mode 100644 index 443e59d..0000000 --- a/bin/run-modules-job.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-Job工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat deleted file mode 100644 index 26db55e..0000000 --- a/bin/run-modules-system.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Modules-System工程。 -echo. - -cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar - -cd bin -pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat deleted file mode 100644 index 3e8e322..0000000 --- a/bin/run-monitor.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo off -echo. -echo [信息] 使用Jar命令运行Monitor工程。 -echo. - -cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target - -set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m - -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar - -cd bin -pause \ No newline at end of file diff --git a/docker/thingsboard/docker-compose.yml b/docker/thingsboard/docker-compose.yml new file mode 100644 index 0000000..80b9032 --- /dev/null +++ b/docker/thingsboard/docker-compose.yml @@ -0,0 +1,40 @@ +services: + postgres: + restart: always + image: "registry.t-aaron.com/postgres:16" + ports: + - "5432" + environment: + POSTGRES_DB: thingsboard + POSTGRES_PASSWORD: postgres + volumes: + - postgres-data:/var/lib/postgresql/data + thingsboard-ce: + restart: always + image: "registry.t-aaron.com/thingsboard/tb-node:4.2.1.1" + ports: + - "18080:8080" + - "7070:7070" + - "1883:1883" + - "8883:8883" + - "5683-5688:5683-5688/udp" + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" + environment: + TB_SERVICE_ID: tb-ce-node + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/thingsboard + depends_on: + - postgres + +volumes: + postgres-data: + name: tb-postgres-data + driver: local + +networks: + default: + external: true + name: docker_default \ No newline at end of file diff --git a/docker/thingsboard/reademe.md b/docker/thingsboard/reademe.md new file mode 100644 index 0000000..9846a53 --- /dev/null +++ b/docker/thingsboard/reademe.md @@ -0,0 +1 @@ +浼氬姞鍏uoyi鐨勯粯璁ょ綉缁渄ocker_default \ No newline at end of file diff --git a/ruoyi-auth b/ruoyi-auth index c09cd60..33a04b0 160000 --- a/ruoyi-auth +++ b/ruoyi-auth @@ -1 +1 @@ -Subproject commit c09cd603b4dabc14ef48f7eea2a7dfbf52e7f642 +Subproject commit 33a04b067b29865102832c5c75e76d28d61d921d diff --git a/ruoyi-gateway b/ruoyi-gateway index b9d746e..e0dbb59 160000 --- a/ruoyi-gateway +++ b/ruoyi-gateway @@ -1 +1 @@ -Subproject commit b9d746ed86acfed5d552ae955a510354501c9db3 +Subproject commit e0dbb593bf4c8decee3c36d638b5e2181f837875 diff --git a/ruoyi-modules/ruoyi-file b/ruoyi-modules/ruoyi-file index bc468b5..2a0b7ec 160000 --- a/ruoyi-modules/ruoyi-file +++ b/ruoyi-modules/ruoyi-file @@ -1 +1 @@ -Subproject commit bc468b502fac84e6e4146bc48028b15281eceb4f +Subproject commit 2a0b7ecbfb5167fbc6be12bf12b49d7bbd2b9bc0 diff --git a/ruoyi-modules/ruoyi-gen b/ruoyi-modules/ruoyi-gen index f61f434..7260fb8 160000 --- a/ruoyi-modules/ruoyi-gen +++ b/ruoyi-modules/ruoyi-gen @@ -1 +1 @@ -Subproject commit f61f434512731190b6949ec851bef4d0a2b54f41 +Subproject commit 7260fb807d04c692c4c2d485e06fb6c37454bbd6 diff --git a/ruoyi-modules/ruoyi-job b/ruoyi-modules/ruoyi-job index 0e36223..4d80e67 160000 --- a/ruoyi-modules/ruoyi-job +++ b/ruoyi-modules/ruoyi-job @@ -1 +1 @@ -Subproject commit 0e362237f575fcd76b899eb0fa38976b39c166b2 +Subproject commit 4d80e679589cd1c51f3fb066958f79bd9e4085b2 diff --git a/ruoyi-modules/ruoyi-system b/ruoyi-modules/ruoyi-system index 984a84e..2390d0d 160000 --- a/ruoyi-modules/ruoyi-system +++ b/ruoyi-modules/ruoyi-system @@ -1 +1 @@ -Subproject commit 984a84e2ccebfb8536da25047d2f7e80a1f1373d +Subproject commit 2390d0d2b0df028a4fea5ffeb596c0347c8eb028 diff --git a/ruoyi-modules/tuoheng-device b/ruoyi-modules/tuoheng-device index 7a89488..72f3952 160000 --- a/ruoyi-modules/tuoheng-device +++ b/ruoyi-modules/tuoheng-device @@ -1 +1 @@ -Subproject commit 7a89488c3d5216a4d54a13769e5355ba56fa943b +Subproject commit 72f39521a00f89a43b673cb9e64cd6cd9fc5acc9 diff --git a/ruoyi-ui b/ruoyi-ui index 3cf0076..95e9260 160000 --- a/ruoyi-ui +++ b/ruoyi-ui @@ -1 +1 @@ -Subproject commit 3cf007642c2ab2a2c10300171e62b7a250dfee57 +Subproject commit 95e92606f4ba7dfc049dd09e762c499404904dd1 diff --git a/ruoyi-visual/ruoyi-monitor b/ruoyi-visual/ruoyi-monitor index bf44098..68d88c1 160000 --- a/ruoyi-visual/ruoyi-monitor +++ b/ruoyi-visual/ruoyi-monitor @@ -1 +1 @@ -Subproject commit bf44098e8a690c4671829f16711d1d7f10d1a8fa +Subproject commit 68d88c1db4c7db63278121fc9694d9e9a6392a40