diff --git a/docker-compose.yml b/docker-compose.yml index ccda26e..45307ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,36 @@ +version: '3' +networks: + tsg-bridge: + driver: bridge services: - hsz: - image: openjdk:21 - container_name: hsz - restart: no - network_mode: host - volumes: - - /root/gunshiApp/hsz:/app - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro + hsz-redis: + container_name: hsz-redis + image: redis:latest + privileged: true environment: - - SPRING_PROFILES_ACTIVE=dev - TZ=Asia/Shanghai - command: java -jar /app/gunshi-project-hsz-1.0-SNAPSHOT.jar \ No newline at end of file + ports: + - 6369:6379 + networks: + - tsg-bridge + volumes: + - /opt/hsz/redis/conf/redis.conf:/usr/local/etc/redis/conf/redis.conf + - /opt/hsz/redis/data:/data + command: redis-server /usr/local/etc/redis/conf/redis.conf + + hsz-proj: + container_name: hsz-proj + image: openjdk:21 + working_dir: /app + networks: + - tsg-bridge + volumes: + - /opt/hsz/java:/app + ports: + - "24205:24105" + environment: + - SPRING_PROFILES_ACTIVE=prod + - TZ=Asia/Shanghai + depends_on: + - hsz-redis + entrypoint: java -cp "gunshi-project-hsz-1.0-SNAPSHOT.jar:./lib/*" com.gunshi.project.hsz.Main \ No newline at end of file diff --git a/src/main/resources/doc/2002年6月1日_GB3838-2002地表水环境质量标准.pdf b/docs/2002年6月1日_GB3838-2002地表水环境质量标准.pdf similarity index 100% rename from src/main/resources/doc/2002年6月1日_GB3838-2002地表水环境质量标准.pdf rename to docs/2002年6月1日_GB3838-2002地表水环境质量标准.pdf diff --git a/src/main/resources/fonts/ChineseFonts.ttf b/docs/ChineseFonts.ttf similarity index 100% rename from src/main/resources/fonts/ChineseFonts.ttf rename to docs/ChineseFonts.ttf diff --git a/src/main/resources/doc/地表径流过程计算表.jpg b/docs/地表径流过程计算表.jpg similarity index 100% rename from src/main/resources/doc/地表径流过程计算表.jpg rename to docs/地表径流过程计算表.jpg diff --git a/src/main/resources/doc/时段单位线计算方法.xlsx b/docs/时段单位线计算方法.xlsx similarity index 100% rename from src/main/resources/doc/时段单位线计算方法.xlsx rename to docs/时段单位线计算方法.xlsx diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 0000000..742d699 --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,303 @@ + + + 4.0.0 + + + com.gunshi + gunshi-boot + 1.4-SNAPSHOT + + + + com.gunshi + gunshi-project-hsz-parent + 1.0-SNAPSHOT + pom + + + 黑石咀水库系统 - 父级POM + + + + 21 + 21 + 21 + true + UTF-8 + + + 2.0-SNAPSHOT + 1.0-SNAPSHOT + 1.3.1 + 7.2.4 + 3.5.7 + 1.1.3 + 3.3 + 3.1.1 + 2.0.43 + 1.18.1 + 3.8.8 + 42.7.1 + + + + + + + com.gunshi + gunshi-boot + 1.4-SNAPSHOT + + + com.baomidou + mybatis-plus + + + com.baomidou + mybatis-plus-boot-starter + + + + + + com.gunshi + gunshi-db + ${gunshi-db.version} + + + com.baomidou + mybatis-plus-boot-starter + + + + + + com.gunshi + gunshi-modules-file + ${gunshi-modules-file.version} + + + + org.gunshi + flood_algorithm + ${flood-algorithm.version} + + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi + + + org.springframework.boot + spring-boot-starter + + + + + + + com.itextpdf + kernel + ${itext.version} + + + + com.itextpdf + io + ${itext.version} + + + + com.itextpdf + forms + ${itext.version} + + + + com.itextpdf + layout + ${itext.version} + + + + com.itextpdf + svg + ${itext.version} + + + + + com.baomidou + mybatis-plus-spring-boot3-starter + ${mybatis-plus.version} + + + + + com.hikvision.ga + artemis-http-client + ${artemis-http-client.version} + + + + commons-net + commons-net + ${commons-net.version} + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + commons-compress + org.apache.commons + + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + org.locationtech.jts + jts-core + ${jts-core.version} + + + + com.ruoyi + integration-ruoyi + ${integration-ruoyi.version} + + + swagger-annotations + io.swagger + + + swagger-annotations + io.swagger.core.v3 + + + swagger-models + io.swagger + + + swagger-models + io.swagger.core.v3 + + + springfox-swagger-common + io.springfox + + + springfox-swagger-ui + io.springfox + + + springfox-swagger2 + io.springfox + + + jsqlparser + com.github.jsqlparser + + + mybatis + org.mybatis + + + mybatis-plus-spring-boot3-starter + com.baomidou + + + + + + + org.postgresql + postgresql + ${postgresql.version} + + + checker-qual + org.checkerframework + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + 21 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + ${project.build.directory}/lib + false + false + true + runtime + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + lib/ + com.gunshi.project.hsz.Main + + + + + + + + + + + nexus + Nexus public + http://local.gunshiiot.com:8081/repository/maven-public/ + + + + + + nexus-releases + Nexus Releases + http://local.gunshiiot.com:8081/repository/maven-releases + + + nexus-snapshots + Nexus Snapshot + http://local.gunshiiot.com:8081/repository/maven-snapshots/ + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index baecfa7..f2719cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,9 @@ com.gunshi - gunshi-boot - 1.4-SNAPSHOT + gunshi-project-hsz-parent + 1.0-SNAPSHOT + ./parent/pom.xml gunshi-project-hsz @@ -15,44 +16,13 @@ 黑石咀水库系统 - - 21 - 21 - 21 - true - UTF-8 - + - - - - com.gunshi - gunshi-boot - 1.4-SNAPSHOT - - - com.baomidou - mybatis-plus - - - com.baomidou - mybatis-plus-boot-starter - - - - - + com.gunshi gunshi-db - 2.0-SNAPSHOT - - - com.baomidou - mybatis-plus-boot-starter - - @@ -60,55 +30,42 @@ com.itextpdf kernel - 7.2.4 com.itextpdf io - 7.2.4 com.itextpdf forms - 7.2.4 com.itextpdf layout - 7.2.4 com.itextpdf svg - 7.2.4 com.baomidou mybatis-plus-spring-boot3-starter - 3.5.7 org.postgresql postgresql - - - checker-qual - org.checkerframework - - com.gunshi gunshi-modules-file - 1.0-SNAPSHOT @@ -130,53 +87,23 @@ com.hikvision.ga artemis-http-client - 1.1.3 commons-net commons-net - 3.3 com.alibaba easyexcel - 3.1.1 - - - commons-compress - org.apache.commons - - com.alibaba.fastjson2 fastjson2 - 2.0.43 org.gunshi flood_algorithm - 1.3.1 - - - org.apache.poi - poi-ooxml - - - org.apache.poi - poi - - - org.springframework.boot - spring-boot-starter - - - - - com.hikvision.ga - artemis-http-client - 1.1.3 @@ -201,107 +128,25 @@ com.ruoyi integration-ruoyi - 3.8.8 - - - swagger-annotations - io.swagger - - - swagger-annotations - io.swagger.core.v3 - - - swagger-models - io.swagger - - - swagger-models - io.swagger.core.v3 - - - springfox-swagger-common - io.springfox - - - springfox-swagger-ui - io.springfox - - - springfox-swagger2 - io.springfox - - - jsqlparser - com.github.jsqlparser - - - mybatis - org.mybatis - - - mybatis-plus-spring-boot3-starter - com.baomidou - - org.locationtech.jts jts-core - 1.18.1 + - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - com.gunshi.project.hsz.Main - - - org.projectlombok - lombok - - - + org.apache.maven.plugins + maven-dependency-plugin org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - + maven-jar-plugin - - - nexus - Nexus public - http://local.gunshiiot.com:8081/repository/maven-public/ - - - - - - nexus-releases - Nexus Releases - http://local.gunshiiot.com:8081/repository/maven-releases - - - nexus-snapshots - Nexus Snapshot - http://local.gunshiiot.com:8081/repository/maven-snapshots/ - - + diff --git a/src/main/resources/config-prod.yml b/src/main/resources/config-prod.yml index e361220..03b0fdf 100644 --- a/src/main/resources/config-prod.yml +++ b/src/main/resources/config-prod.yml @@ -16,8 +16,8 @@ spring: driver-class-name: org.postgresql.Driver data: redis: - host: redis - port: 6369 + host: hsz-redis + port: 6379 #password: 1234567a database: 4 mybatis-plus: