Parcourir la source

docker文件编写

hecheng il y a 3 ans
Parent
commit
d3a18b4516
100 fichiers modifiés avec 3637 ajouts et 205 suppressions
  1. 6 4
      docker/docker-compose.yml
  2. 22 0
      docker/zd/README.md
  3. 73 0
      docker/zd/docker-compose-base.yml
  4. 26 0
      docker/zd/docker-compose-nginx.yml
  5. 290 0
      docker/zd/docker-compose-services.yml
  6. 61 0
      docker/zd/docker-compose.env
  7. 19 0
      docker/zd/mysql/conf/my.cnf
  8. 228 0
      docker/zd/nacos/conf/application.properties
  9. 294 0
      docker/zd/nginx/conf/nginx.conf
  10. 1403 0
      docker/zd/redis/redis.conf
  11. 139 0
      docker/zd/start.sh
  12. 7 0
      pom.xml
  13. 8 0
      zd-auth/Dockerfile
  14. 39 0
      zd-auth/pom.xml
  15. 2 2
      zd-auth/src/main/resources/bootstrap.yml
  16. 24 0
      zd-common/zd-common-core/src/main/java/com/zd/common/core/config/SnowFlake.java
  17. 25 0
      zd-common/zd-common-core/src/main/java/com/zd/common/core/properties/SnowflakeProperties.java
  18. 15 0
      zd-common/zd-common-core/src/main/java/com/zd/common/core/utils/IdGen.java
  19. 136 0
      zd-common/zd-common-core/src/main/java/com/zd/common/core/utils/SnowflakeIdWorker.java
  20. 8 0
      zd-gateway/Dockerfile
  21. 40 0
      zd-gateway/pom.xml
  22. 3 3
      zd-gateway/src/main/resources/bootstrap.yml
  23. 1 2
      zd-modules/pom.xml
  24. 8 0
      zd-modules/zd-airbottle/Dockerfile
  25. 39 0
      zd-modules/zd-airbottle/pom.xml
  26. 2 2
      zd-modules/zd-airbottle/src/main/resources/bootstrap.yml
  27. 8 0
      zd-modules/zd-alarm/Dockerfile
  28. 39 0
      zd-modules/zd-alarm/pom.xml
  29. 2 2
      zd-modules/zd-alarm/src/main/resources/bootstrap.yml
  30. 0 131
      zd-modules/zd-camera/DOCKERFILE
  31. 8 0
      zd-modules/zd-camera/Dockerfile
  32. 39 0
      zd-modules/zd-camera/pom.xml
  33. 32 32
      zd-modules/zd-camera/src/main/resources/application.yml
  34. 2 2
      zd-modules/zd-camera/src/main/resources/bootstrap.yml
  35. 8 0
      zd-modules/zd-chemical/Dockerfile
  36. 39 0
      zd-modules/zd-chemical/pom.xml
  37. 2 2
      zd-modules/zd-chemical/src/main/resources/bootstrap.yml
  38. 8 0
      zd-modules/zd-common-face/Dockerfile
  39. 39 0
      zd-modules/zd-common-face/pom.xml
  40. 2 2
      zd-modules/zd-common-face/src/main/resources/bootstrap.yml
  41. 8 0
      zd-modules/zd-exam/Dockerfile
  42. 39 0
      zd-modules/zd-exam/pom.xml
  43. 2 2
      zd-modules/zd-exam/src/main/resources/bootstrap.yml
  44. 8 0
      zd-modules/zd-forward/Dockerfile
  45. 40 1
      zd-modules/local-ai-forward/pom.xml
  46. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/ForwardApp.java
  47. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/component/AppStartedListener.java
  48. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/config/AlgorithmYml.java
  49. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/config/WebConfig.java
  50. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/controller/SignInCheckController.java
  51. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/AnalysisData.java
  52. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/BaseRequestData.java
  53. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/DataPostAnalysisRespDto.java
  54. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/ImageRequestData.java
  55. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/ImgPostResponse.java
  56. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/RequestData.java
  57. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/domain/VideoRequestData.java
  58. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/CheckResultValid.java
  59. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/CheckService.java
  60. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/ImageCheckResultValidImpl.java
  61. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/LoginService.java
  62. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/PeopleCheckResultValidImpl.java
  63. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/SendSginAccessLogService.java
  64. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/ShiYanFuCheckResultValidImpl.java
  65. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValid.java
  66. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValidImpl.java
  67. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/CommonSend.java
  68. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttOutListener.java
  69. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttProducer.java
  70. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/util/Base64DecodedMultipartFile.java
  71. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/util/Base64ToMultipartFile.java
  72. 0 0
      zd-modules/zd-forward/src/main/java/com/zd/forward/util/FileUploadUtils.java
  73. 0 0
      zd-modules/zd-forward/src/main/resources/banner.txt
  74. 4 4
      zd-modules/local-ai-forward/src/main/resources/bootstrap.yml
  75. 0 0
      zd-modules/zd-forward/src/main/resources/logback.xml
  76. 0 0
      zd-modules/zd-forward/src/test/java/com/zd/forward/serivce/CheckServiceTest.java
  77. 8 0
      zd-modules/zd-message/Dockerfile
  78. 39 0
      zd-modules/zd-message/pom.xml
  79. 2 2
      zd-modules/zd-message/src/main/resources/bootstrap.yml
  80. 8 0
      zd-modules/zd-modules-app/Dockerfile
  81. 39 0
      zd-modules/zd-modules-app/pom.xml
  82. 2 2
      zd-modules/zd-modules-app/src/main/resources/bootstrap.yml
  83. 8 0
      zd-modules/zd-modules-file/Dockerfile
  84. 39 0
      zd-modules/zd-modules-file/pom.xml
  85. 2 2
      zd-modules/zd-modules-file/src/main/resources/bootstrap.yml
  86. 8 0
      zd-modules/zd-modules-gen/Dockerfile
  87. 39 0
      zd-modules/zd-modules-gen/pom.xml
  88. 2 2
      zd-modules/zd-modules-gen/src/main/resources/bootstrap.yml
  89. 8 0
      zd-modules/zd-modules-job/Dockerfile
  90. 39 0
      zd-modules/zd-modules-job/pom.xml
  91. 2 2
      zd-modules/zd-modules-job/src/main/resources/bootstrap.yml
  92. 8 0
      zd-modules/zd-modules-laboratory/Dockerfile
  93. 39 0
      zd-modules/zd-modules-laboratory/pom.xml
  94. 2 2
      zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml
  95. 8 0
      zd-modules/zd-modules-system/Dockerfile
  96. 39 0
      zd-modules/zd-modules-system/pom.xml
  97. 2 2
      zd-modules/zd-modules-system/src/main/resources/bootstrap.yml
  98. 8 0
      zd-modules/zd-netty/Dockerfile
  99. 39 0
      zd-modules/zd-netty/pom.xml
  100. 0 0
      zd-modules/zd-netty/src/main/resources/bootstrap.yml

+ 6 - 4
docker/docker-compose.yml

@@ -2,7 +2,7 @@ version : '3.8'
 services:
 services:
   zd-nacos:
   zd-nacos:
     container_name: zd-nacos
     container_name: zd-nacos
-    image: nacos/nacos-server
+    image: zd.harbor.com/lib/nacos/nacos-server:latest
     build:
     build:
       context: ./nacos
       context: ./nacos
     environment:
     environment:
@@ -16,9 +16,11 @@ services:
       - "9849:9849"
       - "9849:9849"
     depends_on:
     depends_on:
       - zd-mysql
       - zd-mysql
+
+  #数据库
   zd-mysql:
   zd-mysql:
     container_name: zd-mysql
     container_name: zd-mysql
-    image: mysql:5.7
+    image: zd.harbor.com/lib/mysql:5.7
     build:
     build:
       context: ./mysql
       context: ./mysql
     ports:
     ports:
@@ -36,8 +38,8 @@ services:
           '--lower-case-table-names=1'
           '--lower-case-table-names=1'
         ]
         ]
     environment:
     environment:
-      MYSQL_DATABASE: 'ry-cloud'
-      MYSQL_ROOT_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: root123456
+
   zd-redis:
   zd-redis:
     container_name: zd-redis
     container_name: zd-redis
     image: redis
     image: redis

+ 22 - 0
docker/zd/README.md

@@ -0,0 +1,22 @@
+# 部署相关的配置文件
+
+## docker-compose.env
+所有服务共享的环境变量
+
+## docker-compose-base.yml
+基础服务:nacos、Redis、mysql、MQTT
+
+## docker-compose-services.yml
+核心服务:zd-auth、zd-system、zd-gateway、zd-local-forward、zd-airbottle、zd-alarm、zd-camera、zd-chemical、zd-face、zd-exam、zd-message、zd-app、zd-file、zd-gen、zd-job、zd-laboratory、zd-netty、zd-speaker、zd-monitor
+
+## docker-compose-nginx.yml
+前端服务:web-service
+
+## redis.conf
+redis的配置
+
+## nginx.conf
+前端服务共享的nginx配置,主要配置将api请求转发到网关zd-gateway
+
+## start.sh
+启动脚本

+ 73 - 0
docker/zd/docker-compose-base.yml

@@ -0,0 +1,73 @@
+version : '3.8'
+services:
+  # ---------------------------
+  # nacos 注册中心
+  # ---------------------------
+  zd-nacos:
+    container_name: zd-nacos
+    image: zd.harbor.com/lib/nacos/nacos-server:latest
+    env_file: docker-compose.env  # 从文件中获取配置
+    environment:
+      - MODE=standalone
+    volumes:
+      - /zd/nacos/logs/:/home/nacos/logs
+      - /zd/nacos/data/:/home/nacos/data
+      - /zd/nacos/conf/application.properties:/home/nacos/conf/application.properties
+    ports:
+      - "8848:8848"
+      - "9848:9848"
+      - "9849:9849"
+#    内部依赖数据库配置,暂使用外部数据库
+#    depends_on:
+#      - zd-mysql
+    networks:
+      - net
+
+  # ---------------------------
+  # 数据库
+  # ---------------------------
+#  zd-mysql:
+#    container_name: zd-mysql
+#    image: zd.harbor.com/lib/mysql:5.7
+#    build:
+#      context: ./mysql
+#    ports:
+#      - "3306:3306"
+#    volumes:
+#      - ./mysql/conf:/etc/mysql/conf.d
+#      - ./mysql/logs:/logs
+#      - ./mysql/data:/var/lib/mysql
+#      - ./mysql/mysql-files:/var/lib/mysql-files
+#    command: [
+#      'mysqld',
+#      '--innodb-buffer-pool-size=80M',
+#      '--character-set-server=utf8mb4',
+#      '--collation-server=utf8mb4_unicode_ci',
+#      '--default-time-zone=+8:00',
+#      '--lower-case-table-names=1'
+#    ]
+#    environment:
+#      MYSQL_ROOT_PASSWORD: root123456
+#    networks:
+#      - net
+
+  # ---------------------------
+  # Redis
+  # ---------------------------
+  zd-redis:
+    image: zd.harbor.com/lib/redis:latest
+    container_name: zd-redis
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    command: redis-server /usr/local/etc/redis/redis.conf
+    ports:
+      - "16379:6379"
+    volumes:
+      - /zd/redis/data:/data
+      - /zd/redis/redis.conf:/usr/local/etc/redis/redis.conf
+    networks:
+      - net
+
+networks:
+  net:
+    driver: bridge

+ 26 - 0
docker/zd/docker-compose-nginx.yml

@@ -0,0 +1,26 @@
+version : '3.8'
+services:
+  # ---------------------------
+  # 前台
+  # ---------------------------
+  lab-web:
+    image: zd.harbor.com/zd/lab-web:latest
+    volumes:
+      # 挂载nginx的配置文件
+      - /zd/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+    container_name: lab-web
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "80:80"
+    networks:
+      - net
+
+
+networks:
+  net:
+    driver: bridge
+
+volumes:
+  data:
+    driver: local

+ 290 - 0
docker/zd/docker-compose-services.yml

@@ -0,0 +1,290 @@
+version : '3.8'
+services:
+  # ---------------------------
+  # api网关
+  # ---------------------------
+  zd-gateway:
+    image: zd.harbor.com/zd/zd-gateway:latest
+    container_name: zd-gateway
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "8080:8080"
+    volumes:
+      - /zd/logs/zd-gateway:/logs/zd-gateway
+    networks:
+      - net
+
+  # ---------------------------
+  # 授权服务
+  # ---------------------------
+  zd-auth:
+    image: zd.harbor.com/zd/zd-auth:latest
+    container_name: zd-auth
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9200:9200"
+    volumes:
+      - /zd/logs/zd-auth:/logs/zd-auth
+    networks:
+      - net
+
+  # ---------------------------
+  # 系统服务
+  # ---------------------------
+  zd-system:
+    image: zd.harbor.com/zd/zd-modules-system:latest
+    container_name: zd-system
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9201:9201"
+    volumes:
+      - /zd/logs/zd-system:/logs/zd-system
+    networks:
+      - net
+
+#  # ---------------------------
+#  # 测试算法转发服务
+#  # ---------------------------
+  zd-forward:
+    image: zd.harbor.com/zd/zd-forward:latest
+    container_name: zd-forward
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9319:9319"
+    volumes:
+      - /zd/logs/zd-forward:/logs/zd-forward
+    networks:
+      - net
+
+  # ---------------------------
+  # 气瓶服务
+  # ---------------------------
+  zd-airbottle:
+    image: zd.harbor.com/zd/zd-airbottle:latest
+    container_name: zd-airbottle
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9400:9400"
+    volumes:
+      - /zd/logs/zd-airbottle:/logs/zd-airbottle
+    networks:
+      - net
+
+  # ---------------------------
+  # 报警系统
+  # ---------------------------
+  zd-alarm:
+    image: zd.harbor.com/zd/zd-alarm:latest
+    container_name: zd-alarm
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9901:9901"
+    volumes:
+      - /zd/logs/zd-alarm:/logs/zd-alarm
+    networks:
+      - net
+
+  # ---------------------------
+  # 相机系统
+  # ---------------------------
+  zd-camera:
+    image: zd.harbor.com/zd/zd-camera:latest
+    container_name: zd-camera
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "18080:18080"
+    volumes:
+      - /zd/logs/zd-camera:/logs/zd-camera
+    networks:
+      - net
+
+  # ---------------------------
+  # 化学品系统
+  # ---------------------------
+  zd-chemical:
+    image: zd.harbor.com/zd/zd-chemical:latest
+    container_name: zd-chemical
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9501:9501"
+    volumes:
+      - /zd/logs/zd-chemical:/logs/zd-chemical
+    networks:
+      - net
+
+  # ---------------------------
+  # 人脸识别系统
+  # ---------------------------
+  zd-face:
+    image: zd.harbor.com/zd/zd-common-face:latest
+    container_name: zd-face
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9220:9220"
+    volumes:
+      - /zd/logs/zd-face:/logs/zd-face
+    networks:
+      - net
+
+  # ---------------------------
+  # 考试系统
+  # ---------------------------
+  zd-exam:
+    image: zd.harbor.com/zd/zd-exam:latest
+    container_name: zd-exam
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9301:9301"
+    volumes:
+      - /zd/logs/zd-exam:/logs/zd-exam
+    networks:
+      - net
+
+  # ---------------------------
+  # 消息系统
+  # ---------------------------
+  zd-message:
+    image: zd.harbor.com/zd/zd-message:latest
+    container_name: zd-message
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9500:9500"
+    volumes:
+      - /zd/logs/zd-message:/logs/zd-message
+    networks:
+      - net
+
+  # ---------------------------
+  # app系统
+  # ---------------------------
+  zd-app:
+    image: zd.harbor.com/zd/zd-modules-app:latest
+    container_name: zd-app
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9219:9219"
+    volumes:
+      - /zd/logs/zd-app:/logs/zd-app
+    networks:
+      - net
+
+  # ---------------------------
+  # 文件系统
+  # ---------------------------
+  zd-file:
+    image: zd.harbor.com/zd/zd-modules-file:latest
+    container_name: zd-file
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9300:9300"
+    volumes:
+      - /zd/logs/zd-file:/logs/zd-file
+    networks:
+      - net
+
+  # ---------------------------
+  # 代码生成系统
+  # ---------------------------
+  zd-gen:
+    image: zd.harbor.com/zd/zd-modules-gen:latest
+    container_name: zd-gen
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9202:9202"
+    volumes:
+      - /zd/logs/zd-gen:/logs/zd-gen
+    networks:
+      - net
+
+  # ---------------------------
+  # 任务调度系统
+  # ---------------------------
+  zd-job:
+    image: zd.harbor.com/zd/zd-modules-job:latest
+    container_name: zd-job
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9203:9203"
+    volumes:
+      - /zd/logs/zd-job:/logs/zd-job
+    networks:
+      - net
+
+  # ---------------------------
+  # 实验室管理系统
+  # ---------------------------
+  zd-laboratory:
+    image: zd.harbor.com/zd/zd-modules-laboratory:latest
+    container_name: zd-laboratory
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9218:9218"
+    volumes:
+      - /zd/logs/zd-laboratory:/logs/zd-laboratory
+    networks:
+      - net
+
+  # ---------------------------
+  # netty系统
+  # ---------------------------
+  zd-netty:
+    image: zd.harbor.com/zd/zd-netty:latest
+    container_name: zd-netty
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9600:9600"
+    volumes:
+      - /zd/logs/zd-netty:/logs/zd-netty
+    networks:
+      - net
+
+  # ---------------------------
+  # 喇叭系统
+  # ---------------------------
+  zd-speaker:
+    image: zd.harbor.com/zd/zd-speaker:latest
+    container_name: zd-speaker
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9903:9903"
+    volumes:
+      - /zd/logs/zd-speaker:/logs/zd-speaker
+    networks:
+      - net
+
+  # ---------------------------
+  # 监控系统
+  # ---------------------------
+  zd-monitor:
+    image: zd.harbor.com/zd/zd-monitor:latest
+    container_name: zd-monitor
+    env_file: docker-compose.env  # 从文件中获取配置
+    restart: always
+    ports:
+      - "9100:9100"
+    volumes:
+      - /zd/logs/zd-monitor:/logs/zd-monitor
+    networks:
+      - net
+
+networks:
+  net:
+    driver: bridge

+ 61 - 0
docker/zd/docker-compose.env

@@ -0,0 +1,61 @@
+# JVM参数
+# 可通过docker-compose -f docker-compose-services.yml config命令查看是否生效
+JAVA_OPTS=-Xmx128m -Xms128m
+
+# 环境配置
+SPRING_PROFILES_ACTIVE=dev
+
+# nacos配置
+NACOS_HOST=zd-nacos
+NACOS_PORT=8848
+NACOS_DATA_BASE=cloud_data_test
+
+# Redis配置
+REDIS_HOST=zd-redis
+REDIS_PORT=16379
+REDIS_PASS=2ask8to9
+
+# 数据库配置
+MYSQL_HOST=192.168.1.43
+MYSQL_PORT=13306
+MYSQL_USERNAME=root
+MYSQL_PASSWORD=root123456
+
+#MQTT配置
+MQTT_HOST=192.168.1.43
+MQTT_PORT=1883
+MQTT_WEBSOCKET_PORT=1884
+MQTT_USERNAME=mqtt
+MQTT_PASS=mqtt@zd1883
+
+#文件上传配置
+#内网地址
+INNER_HOST=192.168.1.88
+#互联网地址
+NET_HOST=lab.sxitdlc.com
+
+#电话报警配置
+ALARM_HOST=192.168.1.100
+
+#算法服务器地址
+ARITHMETIC_HOST=180.76.134.43
+ARITHMETIC_PORT=31005
+
+# ID生成配置
+CLUSTER_WORK_ID=1
+CLUSTER_DATA_CENTER_ID=1
+
+#各模块数据库名称
+SYSTEM_DATABASE=cloud_data_test
+LABORATORY_DATABASE=cloud_data_test
+EXAM_DATABASE=cloud_data_test
+ALARM_DATABASE=cloud_data_test
+CHEMICAL_DATABASE=cloud_data_test
+AIRBOTTLE_DATABASE=cloud_data_test
+CAMERA_DATABASE=wvp
+
+#指定程序运行环境
+SPRING_PROFILES_ACTIVE=dev
+
+# 时区设置,否则容器里的时间和主机时间差8小时,前端配置
+TZ=Asia/Shanghai

+ 19 - 0
docker/zd/mysql/conf/my.cnf

@@ -0,0 +1,19 @@
+[mysqld]
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under a different user or group,
+# customize your systemd unit file for mariadb according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
+
+[mysqld_safe]
+log-error=/var/log/mariadb/mariadb.log
+pid-file=/var/run/mariadb/mariadb.pid
+
+#
+# include all files from the config directory
+#
+!includedir /etc/my.cnf.d
+

+ 228 - 0
docker/zd/nacos/conf/application.properties

@@ -0,0 +1,228 @@
+#
+# Copyright 1999-2018 Alibaba Group Holding Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#*************** Spring Boot Related Configurations ***************#
+### Default web context path:
+server.servlet.contextPath=/nacos
+### Default web server port:
+server.port=8848
+
+#*************** Network Related Configurations ***************#
+### If prefer hostname over ip for Nacos server addresses in cluster.conf:
+# nacos.inetutils.prefer-hostname-over-ip=false
+
+### Specify local server's IP:
+# nacos.inetutils.ip-address=
+
+
+#*************** Config Module Related Configurations ***************#
+### If use MySQL as datasource:
+spring.datasource.platform=mysql
+
+### Count of DB:
+db.num=1
+
+### Connect URL of DB:
+db.url.0=jdbc:mysql://${MYSQL_HOST:192.168.1.43}:${MYSQL_PORT:13306}/${NACOS_DATA_BASE:cloud_data_test}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.user=${MYSQL_USERNAME:root}
+db.password=${MYSQL_PASSWORD:root123456}
+
+### Connection pool configuration: hikariCP
+db.pool.config.connectionTimeout=30000
+db.pool.config.validationTimeout=10000
+db.pool.config.maximumPoolSize=20
+db.pool.config.minimumIdle=2
+
+#*************** Naming Module Related Configurations ***************#
+### Data dispatch task execution period in milliseconds: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.delayMs
+# nacos.naming.distro.taskDispatchPeriod=200
+
+### Data count of batch sync task: Will removed on v2.1.X. Deprecated
+# nacos.naming.distro.batchSyncKeyCount=1000
+
+### Retry delay in milliseconds if sync task failed: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.retryDelayMs
+# nacos.naming.distro.syncRetryDelay=5000
+
+### If enable data warmup. If set to false, the server would accept request without local data preparation:
+# nacos.naming.data.warmup=true
+
+### If enable the instance auto expiration, kind like of health check of instance:
+# nacos.naming.expireInstance=true
+
+### will be removed and replaced by `nacos.naming.clean` properties
+nacos.naming.empty-service.auto-clean=true
+nacos.naming.empty-service.clean.initial-delay-ms=50000
+nacos.naming.empty-service.clean.period-time-ms=30000
+
+### Add in 2.0.0
+### The interval to clean empty service, unit: milliseconds.
+# nacos.naming.clean.empty-service.interval=60000
+
+### The expired time to clean empty service, unit: milliseconds.
+# nacos.naming.clean.empty-service.expired-time=60000
+
+### The interval to clean expired metadata, unit: milliseconds.
+# nacos.naming.clean.expired-metadata.interval=5000
+
+### The expired time to clean metadata, unit: milliseconds.
+# nacos.naming.clean.expired-metadata.expired-time=60000
+
+### The delay time before push task to execute from service changed, unit: milliseconds.
+# nacos.naming.push.pushTaskDelay=500
+
+### The timeout for push task execute, unit: milliseconds.
+# nacos.naming.push.pushTaskTimeout=5000
+
+### The delay time for retrying failed push task, unit: milliseconds.
+# nacos.naming.push.pushTaskRetryDelay=1000
+
+#*************** CMDB Module Related Configurations ***************#
+### The interval to dump external CMDB in seconds:
+# nacos.cmdb.dumpTaskInterval=3600
+
+### The interval of polling data change event in seconds:
+# nacos.cmdb.eventTaskInterval=10
+
+### The interval of loading labels in seconds:
+# nacos.cmdb.labelTaskInterval=300
+
+### If turn on data loading task:
+# nacos.cmdb.loadDataAtStart=false
+
+
+#*************** Metrics Related Configurations ***************#
+### Metrics for prometheus
+#management.endpoints.web.exposure.include=*
+
+### Metrics for elastic search
+management.metrics.export.elastic.enabled=false
+#management.metrics.export.elastic.host=http://localhost:9200
+
+### Metrics for influx
+management.metrics.export.influx.enabled=false
+#management.metrics.export.influx.db=springboot
+#management.metrics.export.influx.uri=http://localhost:8086
+#management.metrics.export.influx.auto-create-db=true
+#management.metrics.export.influx.consistency=one
+#management.metrics.export.influx.compressed=true
+
+#*************** Access Log Related Configurations ***************#
+### If turn on the access log:
+server.tomcat.accesslog.enabled=true
+
+### The access log pattern:
+server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
+
+### The directory of access log:
+server.tomcat.basedir=
+
+#*************** Access Control Related Configurations ***************#
+### If enable spring security, this option is deprecated in 1.2.0:
+#spring.security.enabled=false
+
+### The ignore urls of auth, is deprecated in 1.2.0:
+nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
+
+### The auth system to use, currently only 'nacos' and 'ldap' is supported:
+nacos.core.auth.system.type=nacos
+
+### If turn on auth system:
+nacos.core.auth.enabled=false
+
+### worked when nacos.core.auth.system.type=ldap,{0} is Placeholder,replace login username
+# nacos.core.auth.ldap.url=ldap://localhost:389
+# nacos.core.auth.ldap.userdn=cn={0},ou=user,dc=company,dc=com
+
+### The token expiration in seconds:
+nacos.core.auth.default.token.expire.seconds=18000
+
+### The default token:
+nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+
+### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay.
+nacos.core.auth.caching.enabled=true
+
+### Since 1.4.1, Turn on/off white auth for user-agent: nacos-server, only for upgrade from old version.
+nacos.core.auth.enable.userAgentAuthWhite=false
+
+### Since 1.4.1, worked when nacos.core.auth.enabled=true and nacos.core.auth.enable.userAgentAuthWhite=false.
+### The two properties is the white list for auth and used by identity the request from other server.
+nacos.core.auth.server.identity.key=serverIdentity
+nacos.core.auth.server.identity.value=security
+
+#*************** Istio Related Configurations ***************#
+### If turn on the MCP server:
+nacos.istio.mcp.server.enabled=false
+
+#*************** Core Related Configurations ***************#
+
+### set the WorkerID manually
+# nacos.core.snowflake.worker-id=
+
+### Member-MetaData
+# nacos.core.member.meta.site=
+# nacos.core.member.meta.adweight=
+# nacos.core.member.meta.weight=
+
+### MemberLookup
+### Addressing pattern category, If set, the priority is highest
+# nacos.core.member.lookup.type=[file,address-server]
+## Set the cluster list with a configuration file or command-line argument
+# nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809
+## for AddressServerMemberLookup
+# Maximum number of retries to query the address server upon initialization
+# nacos.core.address-server.retry=5
+## Server domain name address of [address-server] mode
+# address.server.domain=jmenv.tbsite.net
+## Server port of [address-server] mode
+# address.server.port=8080
+## Request address of [address-server] mode
+# address.server.url=/nacos/serverlist
+
+#*************** JRaft Related Configurations ***************#
+
+### Sets the Raft cluster election timeout, default value is 5 second
+# nacos.core.protocol.raft.data.election_timeout_ms=5000
+### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute
+# nacos.core.protocol.raft.data.snapshot_interval_secs=30
+### raft internal worker threads
+# nacos.core.protocol.raft.data.core_thread_num=8
+### Number of threads required for raft business request processing
+# nacos.core.protocol.raft.data.cli_service_thread_num=4
+### raft linear read strategy. Safe linear reads are used by default, that is, the Leader tenure is confirmed by heartbeat
+# nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
+### rpc request timeout, default 5 seconds
+# nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
+
+#*************** Distro Related Configurations ***************#
+
+### Distro data sync delay time, when sync task delayed, task will be merged for same data key. Default 1 second.
+# nacos.core.protocol.distro.data.sync.delayMs=1000
+
+### Distro data sync timeout for one sync data, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.timeoutMs=3000
+
+### Distro data sync retry delay time when sync data failed or timeout, same behavior with delayMs, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.retryDelayMs=3000
+
+### Distro data verify interval time, verify synced data whether expired for a interval. Default 5 seconds.
+# nacos.core.protocol.distro.data.verify.intervalMs=5000
+
+### Distro data verify timeout for one verify, default 3 seconds.
+# nacos.core.protocol.distro.data.verify.timeoutMs=3000
+
+### Distro data load retry delay when load snapshot data failed, default 30 seconds.
+# nacos.core.protocol.distro.data.load.retryDelayMs=30000

+ 294 - 0
docker/zd/nginx/conf/nginx.conf

@@ -0,0 +1,294 @@
+
+user  nobody;
+worker_processes  2;
+
+error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    client_max_body_size 30M; 
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    server {
+        listen       98;
+        location / {
+           proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+           proxy_pass http://127.0.0.1:9800;
+        }
+    location /mqtt {
+           proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+           proxy_pass http://127.0.0.1:1884;
+       proxy_http_version 1.1; 
+       proxy_set_header Upgrade $http_upgrade; 
+       proxy_set_header Connection "upgrade";
+        }
+        
+    }
+
+
+    #静态文件根路径
+    server {
+        listen       81;
+        location / {
+           root /home/web/;
+           try_files $uri $uri/ /index.html;
+           index index.html;
+        }
+    }
+
+    server {
+        listen       80;
+        server_name  test.com localnet.com www.test.com 192.168.1.88;
+        #charset koi8-r;
+        access_log  logs/host.access.log  main;
+        error_page  404              /404.html;
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+        
+        location /statics/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1/labSystem/statics/;
+        }
+       
+       
+         location ^~/labSystem/admin/statics/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1/labSystem/statics/;
+        }
+       
+        
+        location /mettingroom/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:8080/mettingroom/;
+        }
+        location ^~/mettingroom/admin/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/mettingroom/;
+        }
+        #jenkins相关配置
+        location /jenkins/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:8082/jenkins/;
+        }
+        #git相关配置
+        location /gogs/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:3000/;
+        }
+         #wq相关配置
+        location /wq/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:8083/wq/;
+        }
+        location ^~/wq/admin/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/wq/;
+        }
+        
+        #wq相关配置
+        location /xzgd/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:8091/xzgd/;
+        }
+        location ^~/xzgd/admin/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/xzgd/;
+        }
+        location /labSystem/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:9800/;
+        }
+        location ^~/labSystem/admin/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/labSystem/;
+        }
+        location ^~/labSystem/bigData/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/bigData/;
+        }
+
+    location ^~/labSystem/labBigData/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:81/labBigData/;
+         }
+
+
+    }
+    server {
+        listen 443 ssl;
+        server_name lab.sxitdlc.com;
+        
+        #ssl on;
+        ssl_certificate  /usr/local/nginx/cert/server.crt;
+        ssl_certificate_key  /usr/local/nginx/cert/server.key;
+        
+        ssl_session_timeout 5m;
+        ssl_protocols TLSv1 TLSv1.1 TLSv1.2; 
+        ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+        ssl_prefer_server_ciphers on;
+        
+        #add_header Access-Control-Allow-Origin *;
+        #add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
+        #add_header Access-Control-Allow-Headers 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization';
+
+        #if ($request_method = 'OPTIONS') {
+        #    return 204;
+        #}
+        
+        location / {
+            root   /home/;
+            #index  index.html index.htm;
+        }
+        
+       location /statics/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1/labSystem/statics/;
+        }
+       
+       
+         location ^~/labSystem/admin/statics/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1/labSystem/statics/;
+        }
+       
+       
+        location /labSystem/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            proxy_pass http://127.0.0.1:9800/;
+        }
+        location ^~/labSystem/admin/ {
+            proxy_redirect off;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            client_max_body_size    1000m;
+            proxy_read_timeout   3600s;#超时设置
+            
+            proxy_pass http://127.0.0.1:81/labSystem/;
+        }
+        location /mqtt {
+            proxy_pass http://127.0.0.1:1884; 
+            proxy_set_header   Host             $host;
+            proxy_set_header   X-Real-IP        $remote_addr;
+            proxy_set_header   X-Forwarded-For  $remote_addr;
+            proxy_http_version 1.1;
+            proxy_set_header   Upgrade          $http_upgrade;
+            proxy_set_header   Connection "upgrade";
+            proxy_set_header   Sec-WebSocket-Protocol mqtt;
+        }
+    }
+}

Fichier diff supprimé car celui-ci est trop grand
+ 1403 - 0
docker/zd/redis/redis.conf


+ 139 - 0
docker/zd/start.sh

@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# 配置文件根目录,固定是zd
+DOCKERHOME=/zd
+
+# 镜像名称前缀、标签
+BASE_IMAGE_NAME=zd.harbor.com/zd
+BASE_IMAGE_TAG=latest
+
+# 各服务的镜像名称
+ZD-AUTH=$BASE_IMAGE_NAME/zd-auth:$BASE_IMAGE_TAG
+ZD-SYSTEM=$BASE_IMAGE_NAME/zd-modules-system:$BASE_IMAGE_TAG
+ZD-GATEWAY=$BASE_IMAGE_NAME/zd-gateway:$BASE_IMAGE_TAG
+ZD-FORWARD=$BASE_IMAGE_NAME/zd-forward:$BASE_IMAGE_TAG
+ZD-AIRBOTTLE=$BASE_IMAGE_NAME/zd-airbottle:$BASE_IMAGE_TAG
+ZD-ALARM=$BASE_IMAGE_NAME/zd-alarm:$BASE_IMAGE_TAG
+ZD-CAMERA=$BASE_IMAGE_NAME/zd-camera:$BASE_IMAGE_TAG
+ZD-CHEMICAL=$BASE_IMAGE_NAME/zd-chemical:$BASE_IMAGE_TAG
+ZD-FACE=$BASE_IMAGE_NAME/zd-common-face:$BASE_IMAGE_TAG
+ZD-EXAM=$BASE_IMAGE_NAME/zd-exam:$BASE_IMAGE_TAG
+ZD-MESSAGE=$BASE_IMAGE_NAME/zd-message:$BASE_IMAGE_TAG
+ZD-APP=$BASE_IMAGE_NAME/zd-modules-app:$BASE_IMAGE_TAG
+ZD-FILE=$BASE_IMAGE_NAME/zd-modules-file:$BASE_IMAGE_TAG
+ZD-GEN=$BASE_IMAGE_NAME/zd-modules-gen:$BASE_IMAGE_TAG
+ZD-JOB=$BASE_IMAGE_NAME/zd-modules-job:$BASE_IMAGE_TAG
+ZD-LABORATORY=$BASE_IMAGE_NAME/zd-modules-laboratory:$BASE_IMAGE_TAG
+ZD-NETTY=$BASE_IMAGE_NAME/zd-netty:$BASE_IMAGE_TAG
+ZD-SPEAKER=$BASE_IMAGE_NAME/zd-speaker:$BASE_IMAGE_TAG
+ZD-MONITOR=$BASE_IMAGE_NAME/zd-monitor:$BASE_IMAGE_TAG
+
+
+case "$1" in
+
+    # 删除容器
+    removeAll)
+        echo "* 正在删除容器..."
+        # shellcheck disable=SC2046
+        time docker rm $(docker ps -aq) -f
+        echo "* 删除容器成功..."
+        ;;
+    # 拉取镜像
+    pull)
+        echo "* 正在拉取后端镜像..."
+        time docker pull "$ZD-AUTH"
+        time docker pull "$ZD-SYSTEM"
+        time docker pull "$ZD-GATEWAY"
+        time docker pull "$ZD-FORWARD"
+        time docker pull "$ZD-AIRBOTTLE"
+        time docker pull "$ZD-ALARM"
+        time docker pull "$ZD-CAMERA"
+        time docker pull "$ZD-CHEMICAL"
+        time docker pull "$ZD-FACE"
+        time docker pull "$ZD-EXAM"
+        time docker pull "$ZD-MESSAGE"
+        time docker pull "$ZD-APP"
+        time docker pull "$ZD-FILE"
+        time docker pull "$ZD-GEN"
+        time docker pull "$ZD-JOB"
+        time docker pull "$ZD-LABORATORY"
+        time docker pull "$ZD-NETTY"
+        time docker pull "$ZD-SPEAKER"
+        time docker pull "$ZD-MONITOR"
+        echo "* 开始拉取前端镜像..."
+        time docker pull "$WEB_SERVICE"
+        echo "* 拉取镜像成功..."
+        ;;
+    # 运行镜像
+    run)
+        echo "* 开始运行基础镜像..."
+        time docker-compose -f $DOCKERHOME/docker-compose-base.yml up -d
+        echo "* 等待10s..."
+        sleep 10
+        echo "* 开始运行后端服务镜像..."
+        time docker-compose -f $DOCKERHOME/docker-compose-services.yml up -d
+        echo "* 等待10s..."
+        sleep 10
+        echo "* 开始运行前端服务镜像..."
+#        time docker-compose -f $DOCKERHOME/docker-compose-nginx.yml up -d
+        echo "* 运行成功..."
+        ;;
+    # 拉取镜像并运行
+    pullrun)
+        echo "* 正在拉取后端镜像..."
+        time docker pull "$ZD-AUTH"
+        time docker pull "$ZD-SYSTEM"
+        time docker pull "$ZD-GATEWAY"
+        time docker pull "$ZD-FORWARD"
+        time docker pull "$ZD-AIRBOTTLE"
+        time docker pull "$ZD-ALARM"
+        time docker pull "$ZD-CAMERA"
+        time docker pull "$ZD-CHEMICAL"
+        time docker pull "$ZD-FACE"
+        time docker pull "$ZD-EXAM"
+        time docker pull "$ZD-MESSAGE"
+        time docker pull "$ZD-APP"
+        time docker pull "$ZD-FILE"
+        time docker pull "$ZD-GEN"
+        time docker pull "$ZD-JOB"
+        time docker pull "$ZD-LABORATORY"
+        time docker pull "$ZD-NETTY"
+        time docker pull "$ZD-SPEAKER"
+        time docker pull "$ZD-MONITOR"
+        echo "* 开始拉取前端镜像..."
+        time docker pull "$WEB_SERVICE"
+        echo "* 拉取镜像成功..."
+
+        echo "* 开始运行基础镜像..."
+        time docker-compose -f $DOCKERHOME/docker-compose-base.yml up -d
+        echo "* 等待10s..."
+        sleep 10
+        echo "* 开始运行后端服务镜像..."
+        time docker-compose -f $DOCKERHOME/docker-compose-services.yml up -d
+        echo "* 等待10s..."
+        sleep 10
+        echo "* 开始运行前端服务镜像..."
+#        time docker-compose -f $DOCKERHOME/docker-compose-nginx.yml up -d
+        echo "* 运行成功..."
+        ;;
+    # 停止容器
+    stop)
+        echo "* 正在停止容器..."
+#        time docker-compose -f $DOCKERHOME/docker-compose-nginx.yml stop
+        time docker-compose -f $DOCKERHOME/docker-compose-services.yml stop
+        time docker-compose -f $DOCKERHOME/docker-compose-base.yml stop
+        echo "* 停止容器成功..."
+        ;;
+    # 重启容器
+    restart)
+        echo "* 正在停止镜像..."
+#        time docker-compose -f $DOCKERHOME/docker-compose-nginx.yml restart
+        time docker-compose -f $DOCKERHOME/docker-compose-services.yml restart
+        time docker-compose -f $DOCKERHOME/docker-compose-base.yml restart
+        ;;
+    # 其它
+    *)
+        echo "* ..."
+        ;;
+esac
+exit 0

+ 7 - 0
pom.xml

@@ -43,6 +43,13 @@
         <face.version>3.0.0.0</face.version>
         <face.version>3.0.0.0</face.version>
         <bce.version>0.10.154</bce.version>
         <bce.version>0.10.154</bce.version>
         <pinyin4j.version>2.5.1</pinyin4j.version>
         <pinyin4j.version>2.5.1</pinyin4j.version>
+
+        <!-- docker -->
+        <docker.maven.verion>1.4.10</docker.maven.verion>
+        <docker.registry>zd.harbor.com</docker.registry>
+        <docker.namespace>zd</docker.namespace>
+        <scanner.maven.version>3.3.0.603</scanner.maven.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
     </properties>
 
 
     <!-- 依赖声明 -->
     <!-- 依赖声明 -->

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-auth/Dockerfile


+ 39 - 0
zd-auth/pom.xml

@@ -72,6 +72,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-auth/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

+ 24 - 0
zd-common/zd-common-core/src/main/java/com/zd/common/core/config/SnowFlake.java

@@ -0,0 +1,24 @@
+package com.zd.common.core.config;
+
+import com.zd.common.core.properties.SnowflakeProperties;
+import com.zd.common.core.utils.SnowflakeIdWorker;
+import lombok.AllArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * ID生成配置
+ * @author hanson
+ */
+@Configuration
+@AllArgsConstructor
+public class SnowFlake {
+
+	private final SnowflakeProperties snowflakeProperties;
+
+	@Bean
+	public SnowflakeIdWorker initTokenWorker() {
+		return new SnowflakeIdWorker(Integer.parseInt(snowflakeProperties.getWorkId()),
+				Integer.parseInt(snowflakeProperties.getDataCenterId()));
+	}
+}

+ 25 - 0
zd-common/zd-common-core/src/main/java/com/zd/common/core/properties/SnowflakeProperties.java

@@ -0,0 +1,25 @@
+package com.zd.common.core.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * ID生成配置
+ * @author hanson
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "cluster")
+public class SnowflakeProperties {
+
+    /**
+     * 工作节点ID
+     */
+    private String workId;
+
+    /**
+     * 数据中心ID
+     */
+    private String dataCenterId;
+}

+ 15 - 0
zd-common/zd-common-core/src/main/java/com/zd/common/core/utils/IdGen.java

@@ -0,0 +1,15 @@
+package com.zd.common.core.utils;
+
+/**
+ * id生成工具类
+ */
+public class IdGen {
+
+    /**
+     * 基于snowflake算法生成ID
+     * @return String
+     */
+    public static long snowflakeId() {
+        return SpringUtils.getApplicationContext().getBean(SnowflakeIdWorker.class).nextId();
+    }
+}

+ 136 - 0
zd-common/zd-common-core/src/main/java/com/zd/common/core/utils/SnowflakeIdWorker.java

@@ -0,0 +1,136 @@
+package com.zd.common.core.utils;
+
+import cn.hutool.core.date.SystemClock;
+import com.zd.common.core.exception.ServiceException;
+
+/**
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识,由于long基本类型在Java中是带符号的,最高位是符号位,正数是0,负数是1,所以id一般是正数,最高位是0<br>
+ * 41位时间截(毫秒级),注意,41位时间截不是存储当前时间的时间截,而是存储时间截的差值(当前时间截 - 开始时间截)
+ * 得到的值),这里的的开始时间截,一般是我们的id生成器开始使用的时间,由我们程序来指定的(如下下面程序IdWorker类的startTime属性)。41位的时间截,可以使用69年,年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位,可以部署在1024个节点,包括5位datacenterId和5位workerId<br>
+ * 12位序列,毫秒内的计数,12位的计数顺序号支持每个节点每毫秒(同一机器,同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位,为一个Long型。<br>
+ * SnowFlake的优点是,整体上按照时间自增排序,并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分),并且效率较高,经测试,SnowFlake每秒能够产生26万ID左右。
+ * @author hanson
+ */
+public class SnowflakeIdWorker {
+
+    /**
+     * 机器id所占的位数
+     */
+    private static final long WORKER_ID_BITS = 5L;
+
+    /**
+     * 数据标识id所占的位数
+     */
+    private static final long DATACENTER_ID_BITS = 5L;
+
+    /**
+     * 工作机器ID(0~31)
+     */
+    private final long workerId;
+
+    /**
+     * 数据中心ID(0~31)
+     */
+    private final long datacenterId;
+
+    /**
+     * 毫秒内序列(0~4095)
+     */
+    private long sequence = 0L;
+
+    /**
+     * 上次生成ID的时间截
+     */
+    private long lastTimestamp = -1L;
+
+    /**
+     * 构造函数
+     *
+     * @param workerId     工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long workerId, long datacenterId) {
+        // 支持的最大机器id,结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+        long maxWorkerId = ~(-1L << WORKER_ID_BITS);
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        // 支持的最大数据标识id,结果是31
+        long maxDatacenterId = ~(-1L << DATACENTER_ID_BITS);
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+        // 如果当前时间小于上一次ID生成的时间戳,说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new ServiceException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+        // 如果是同一时间生成的,则进行毫秒内序列
+        // 序列在id中占的位数
+        long sequenceBits = 12L;
+        if (lastTimestamp == timestamp) {
+            // 生成序列的掩码,这里为4095 (0b111111111111=0xfff=4095)
+            long sequenceMask = ~(-1L << sequenceBits);
+            sequence = (sequence + 1) & sequenceMask;
+            // 毫秒内序列溢出
+            if (sequence == 0) {
+                // 阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        // 时间戳改变,毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        // 上次生成ID的时间截
+        lastTimestamp = timestamp;
+        long datacenterIdShift = sequenceBits + WORKER_ID_BITS;
+        // 时间截向左移22位(5+5+12)
+        long timestampLeftShift = sequenceBits + WORKER_ID_BITS + DATACENTER_ID_BITS;
+        // 开始时间截 (2015-01-01)
+        long twepoch = 1420041600000L;
+        return ((timestamp - twepoch) << timestampLeftShift)
+                | (datacenterId << datacenterIdShift)
+                | (workerId << sequenceBits)
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒,直到获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    private long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     *
+     * @return 当前时间(毫秒)
+     */
+    private long timeGen() {
+        return SystemClock.now();
+    }
+}

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-gateway/Dockerfile


+ 40 - 0
zd-gateway/pom.xml

@@ -103,6 +103,46 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 3 - 3
zd-gateway/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置
@@ -35,7 +35,7 @@ spring:
       datasource:
       datasource:
         ds1:
         ds1:
           nacos:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
             dataId: sentinel-zd-gateway
             dataId: sentinel-zd-gateway
             groupId: DEFAULT_GROUP
             groupId: DEFAULT_GROUP
             data-type: json
             data-type: json

+ 1 - 2
zd-modules/pom.xml

@@ -16,11 +16,10 @@
         <module>zd-exam</module>
         <module>zd-exam</module>
         <module>zd-modules-laboratory</module>
         <module>zd-modules-laboratory</module>
         <module>zd-modules-app</module>
         <module>zd-modules-app</module>
-        <module>zd-websocket</module>
         <module>zd-camera</module>
         <module>zd-camera</module>
         <module>zd-common-face</module>
         <module>zd-common-face</module>
         <module>zd-alarm</module>
         <module>zd-alarm</module>
-        <module>local-ai-forward</module>
+        <module>zd-forward</module>
         <module>zd-airbottle</module>
         <module>zd-airbottle</module>
         <module>zd-chemical</module>
         <module>zd-chemical</module>
         <module>zd-speaker</module>
         <module>zd-speaker</module>

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-airbottle/Dockerfile


+ 39 - 0
zd-modules/zd-airbottle/pom.xml

@@ -134,6 +134,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-airbottle/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 动态刷新
         # 动态刷新

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-alarm/Dockerfile


+ 39 - 0
zd-modules/zd-alarm/pom.xml

@@ -92,6 +92,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-alarm/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
       # server-addr: 180.76.134.43:8848
       # server-addr: 180.76.134.43:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
         # server-addr: 180.76.134.43:8848
         # server-addr: 180.76.134.43:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

+ 0 - 131
zd-modules/zd-camera/DOCKERFILE

@@ -1,131 +0,0 @@
-FROM ubuntu:20.04 AS build
-
-ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=Asia/Shanghai
-
-EXPOSE 18080/tcp
-
-EXPOSE 5060/tcp
-EXPOSE 5060/udp
-
-EXPOSE 6379/tcp
-
-EXPOSE 18081/tcp
-
-EXPOSE 80/tcp
-EXPOSE 1935/tcp
-EXPOSE 554/tcp
-EXPOSE 554/udp
-EXPOSE 30000-30500/tcp
-EXPOSE 30000-30500/udp
-
-ENV LC_ALL zh_CN.UTF-8
-
-# 使用了自己的settings.xml作为maven的源,加快打包速度
-RUN apt-get update && \
-        DEBIAN_FRONTEND="noninteractive" && \
-         apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm build-essential tcl language-pack-zh-hans \
-         cmake curl  vim ca-certificates  tzdata libmysqlclient-dev  redis-server libssl-dev libx264-dev libfaac-dev ffmpeg
-WORKDIR /home
-
-RUN      git clone https://gitee.com/18010473990/maven.git && \
-         cp maven/settings.xml /usr/share/maven/conf/ && \
-         git clone https://gitee.com/18010473990/wvp-GB28181.git && \
-         git clone https://gitee.com/18010473990/wvp-pro-assist.git
-         # 编译前端界面
-WORKDIR /home/wvp-GB28181/web_src
-
-RUN      npm install && \
-         npm run build && \
-         mkdir -p /opt/wvp/config && \
-         mkdir -p /opt/assist/config && \
-         cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml && \
-         cp /home/wvp-pro-assist/src/main/resources/application-dev.yml /opt/assist/config/application.yml
-
-RUN      npm install && \
-         npm run build && \
-         mkdir -p /opt/wvp/config && \
-         cp /home/wvp-GB28181/src/main/resources/application-dev.yml /opt/wvp/config/application.yml
-
-         # wvp打包
-WORKDIR /home/wvp-GB28181
-RUN      mvn compile && \
-         mvn package && \
-         cp /home/wvp-GB28181/target/wvp*.jar /opt/wvp/
-
-         # wvp 录像管理打包
-WORKDIR /home/wvp-pro-assist
-RUN      mvn compile && \
-         mvn package && \
-         cp /home/wvp-pro-assist/target/*.jar /opt/assist/
-
-         # zlm打包
-WORKDIR /home
-RUN     mkdir -p /opt/media && \
-        git clone --depth=1 https://gitee.com/xia-chu/ZLMediaKit && \
-        cd ZLMediaKit && git submodule update --init --recursive && \
-        mkdir -p build release/linux/Release/ &&\
-        cd build && \
-        cmake -DCMAKE_BUILD_TYPE=Release .. && \
-        make -j4 && \
-        cp -r ../release/linux/Release/* /opt/media && \
-        mkdir -p /opt/media/www/record
-
-
-         # 清理
- RUN     rm -rf /home/wiki && \
-         rm -rf /home/wvp-GB28181 && \
-         apt-get autoremove -y git maven nodejs npm && \
-         apt-get clean -y && \
-         rm -rf /var/lib/apt/lists/*dic
-
-WORKDIR /opt/wvp
-RUN     echo '#!/bin/bash' > run.sh && \
-        echo 'echo ${WVP_IP}' >> run.sh && \
-        echo 'echo ${WVP_CONFIG}' >> run.sh && \
-        echo 'redis-server --daemonize yes --bind 0.0.0.0' >> run.sh && \
-        echo 'cd /opt/assist' >> run.sh && \
-        echo 'nohup java -jar *.jar --userSettings.record=/opt/media/www/record/ &' >> run.sh && \
-        echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \
-        echo 'cd /opt/wvp' >> run.sh && \
-        echo 'if [${WVP_CONFIG}]; then' >> run.sh && \
-        echo '        java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \
-        echo 'else' >> run.sh && \
-        echo '        java -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 --media.ip=127.0.0.1 --media.sdp-ip=${WVP_IP} --sip.ip=${WVP_IP} --media.stream-ip=${WVP_IP}' >> run.sh  && \
-        echo 'fi' >> run.sh
-RUN chmod +x run.sh
-
-FROM ubuntu:20.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=Asia/Shanghai
-
-EXPOSE 18080/tcp
-
-EXPOSE 5060/tcp
-EXPOSE 5060/udp
-
-EXPOSE 6379/tcp
-
-EXPOSE 18081/tcp
-
-EXPOSE 80/tcp
-EXPOSE 1935/tcp
-EXPOSE 554/tcp
-EXPOSE 554/udp
-EXPOSE 30000-30500/tcp
-EXPOSE 30000-30500/udp
-
-ENV LC_ALL zh_CN.UTF-8
-
-RUN apt-get update && \
-        DEBIAN_FRONTEND="noninteractive" && \
-        apt-get install -y --no-install-recommends openjdk-11-jre tcl language-pack-zh-hans \
-        ca-certificates  tzdata libmysqlclient21  redis-server libssl1.1 libx264-155 libfaac0 ffmpeg && \
-        apt-get autoremove -y && \
-        apt-get clean -y && \
-        rm -rf /var/lib/apt/lists/*dic
-
-WORKDIR /opt/wvp
-COPY --from=build /opt /opt
-CMD ["sh", "run.sh"]

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-camera/Dockerfile


+ 39 - 0
zd-modules/zd-camera/pom.xml

@@ -273,6 +273,45 @@
 					</execution>
 					</execution>
 				</executions>
 				</executions>
 			</plugin>
 			</plugin>
+			<!-- 打包时跳过test插件,不运行test测试用例 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+
+			<!-- docker的maven插件 -->
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>dockerfile-maven-plugin</artifactId>
+				<version>${docker.maven.verion}</version>
+
+				<executions>
+					<!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+					<execution>
+						<id>default</id>
+						<phase>package</phase>
+						<goals>
+							<goal>build</goal>
+							<goal>push</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+					<tag>latest</tag>
+					<!-- 镜像服务器账号密码  -->
+					<username>admin</username>
+					<password>zd123456..</password>
+					<!-- 构建参数,指定jar包名称 -->
+					<buildArgs>
+						<JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+					</buildArgs>
+				</configuration>
+			</plugin>
 		</plugins>
 		</plugins>
 	</build>
 	</build>
 </project>
 </project>

+ 32 - 32
zd-modules/zd-camera/src/main/resources/application.yml

@@ -1,26 +1,26 @@
 spring:
 spring:
-  #REDIS数据库配?
+  #REDIS数据库配??
   redis:
   redis:
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
     # host: 127.0.0.1
     # host: 127.0.0.1
-    # # [必须修改] 端口?
+    # # [必须修改] 端口??
     # port: 6379
     # port: 6379
-    # # [可�?�] 数据�? DB
+    # # [可???] 数据?? DB
     database: 1
     database: 1
-    # # [可�?�] 访问密码,若你的redis服务器没有设置密码,就不�?要用密码去连�?
+    # # [可???] 访问密码,若你的redis服务器没有设置密码,就不??要用密码去连??
     # password:
     # password:
-    # # [可�?�] 超时时间
+    # # [可???] 超时时间
     timeout: 10000
     timeout: 10000
-    host: 192.168.1.43
-    port: 16379
-    password: 2ask8to9
-  # [可�?�] jdbc数据库配�?, 项目使用sqlite作为数据库,�?般不�?要配�?
+    host: ${REDIS_HOST:192.168.1.43}
+    port: ${REDIS_PORT:16379}
+    password: ${REDIS_PASS:2ask8to9}
+  # [可???] jdbc数据库配??, 项目使用sqlite作为数据库,??般不??要配??
   datasource:
   datasource:
-    #使用mysql 打开23-28行注释, 删除29-36?
+    #使用mysql 打开23-28行注释, 删除29-36??
     name: wvp
     name: wvp
-    url: jdbc:mysql://192.168.1.43:13306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=GMT
-    username: root
-    password: root123456
+    url: jdbc:mysql://${MYSQL_HOST:192.168.1.43}:${MYSQL_PORT:13306}/${CAMERA_DATABASE:wvp}?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=GMT
+    username: ${MYSQL_USERNAME:root}
+    password: ${MYSQL_PASSWORD:root123456}
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
     #        name: eiot
     #        name: eiot
@@ -32,7 +32,7 @@ spring:
     max-active: 1
     max-active: 1
     min-idle: 1
     min-idle: 1
 
 
-# [可�?�] WVP监听的HTTP端口, 网页和接口调用都是这个端�?
+# [可???] WVP监听的HTTP端口, 网页和接口调用都是这个端??
 server:
 server:
   port: 18080
   port: 18080
 
 
@@ -40,50 +40,50 @@ server:
 sip:
 sip:
   # [必须修改] 本机的IP
   # [必须修改] 本机的IP
   ip: 192.168.1.88
   ip: 192.168.1.88
-  # [可�?�] 28181服务监听的端�?
+  # [可???] 28181服务监听的端??
   port: 5060
   port: 5060
-  # 根据国标6.1.2中规定,domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码(由省级、市级�?�区级�?�基层编号组成,参照GB/T 2260-2007�?
+  # 根据国标6.1.2中规定,domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码(由省级、市级???区级???基层编号组成,参照GB/T 2260-2007??
   # 后两位为行业编码,定义参照附录D.3
   # 后两位为行业编码,定义参照附录D.3
-  # 3701020049标识山东济南历下? 信息行业接入
-  # [可�?�]
+  # 3701020049标识山东济南历下?? 信息行业接入
+  # [可???]
   domain: 4401020049
   domain: 4401020049
-  # [可�?�]
+  # [可???]
   id: 44010200492000000001
   id: 44010200492000000001
-  # [可�?�] 默认设备认证密码,后续扩展使用设备单独密�?, 移除密码将不进行校验
+  # [可???] 默认设备认证密码,后续扩展使用设备单独密??, 移除密码将不进行校验
   password: admin123
   password: admin123
 
 
-#zlm 默认服务器配?
+#zlm 默认服务器配??
 media:
 media:
   # [必须修改] zlm服务器的内网IP
   # [必须修改] zlm服务器的内网IP
   ip: 192.168.1.88
   ip: 192.168.1.88
   # [必须修改] zlm服务器的http.port
   # [必须修改] zlm服务器的http.port
   http-port: 8230
   http-port: 8230
-  # [可�?�] zlm服务器的hook.admin_params=secret
+  # [可???] zlm服务器的hook.admin_params=secret
   secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
   secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
-  # [可�?�] 是否自动配置ZLM, 如果希望手动配置ZLM, 可以设为false, 不建议新接触的用户修?
+  # [可???] 是否自动配置ZLM, 如果希望手动配置ZLM, 可以设为false, 不建议新接触的用户修??
   auto-config: false
   auto-config: false
-  # 启用多端口模�?, 多端口模式使用端口区分每路流,兼容�?�更好�?? 单端口使用流的ssrc区分�? 点播超时建议使用多端口测�?
-  # [可�?�] zlm服务器的general.streamNoneReaderDelayMS
-  stream-none-reader-delay-ms:  -1  # 无人观看多久自动关闭�?, -1表示永不自动关闭,�? 关闭按需拉流
+  # 启用多端口模??, 多端口模式使用端口区分每路流,兼容???更好??? 单端口使用流的ssrc区分?? 点播超时建议使用多端口测??
+  # [可???] zlm服务器的general.streamNoneReaderDelayMS
+  stream-none-reader-delay-ms:  -1  # 无人观看多久自动关闭??, -1表示永不自动关闭,?? 关闭按需拉流
   rtp:
   rtp:
-    # [可�?�] 是否启用多端口模�?, �?启后会在portRange范围内�?�择端口用于媒体流传�?
+    # [可???] 是否启用多端口模??, ??启后会在portRange范围内???择端口用于媒体流传??
     enable: true
     enable: true
-    # [可�?�] 在此范围内�?�择端口用于媒体流传�?,
+    # [可???] 在此范围内???择端口用于媒体流传??,
     port-range: 30000,30500 # 端口范围
     port-range: 30000,30500 # 端口范围
-  # 录像辅助服务�? 部署此服务可以实现zlm录像的管理与下载�? 0 表示不使�?
+  # 录像辅助服务?? 部署此服务可以实现zlm录像的管理与下载?? 0 表示不使??
   record-assist-port: 0
   record-assist-port: 0
 
 
 
 
-# [根据业务?求配置]
+# [根据业务??求配置]
 user-settings:
 user-settings:
   # 推流直播是否录制
   # 推流直播是否录制
   record-push-live: true
   record-push-live: true
 
 
-# 在线文档? swagger-ui(生产环境建议关闭)
+# 在线文档?? swagger-ui(生产环境建议关闭)
 swagger-ui:
 swagger-ui:
   enabled: true
   enabled: true
 
 
-# 版本信息? 不需修改
+# 版本信息?? 不需修改
 version:
 version:
   version: "@project.version@"
   version: "@project.version@"
   description: "@project.description@"
   description: "@project.description@"

+ 2 - 2
zd-modules/zd-camera/src/main/resources/bootstrap.yml

@@ -13,10 +13,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_HOST:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_HOST:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-chemical/Dockerfile


+ 39 - 0
zd-modules/zd-chemical/pom.xml

@@ -150,6 +150,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

+ 2 - 2
zd-modules/zd-chemical/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-common-face/Dockerfile


+ 39 - 0
zd-modules/zd-common-face/pom.xml

@@ -86,6 +86,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

+ 2 - 2
zd-modules/zd-common-face/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-exam/Dockerfile


+ 39 - 0
zd-modules/zd-exam/pom.xml

@@ -116,6 +116,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-exam/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-forward/Dockerfile


+ 40 - 1
zd-modules/local-ai-forward/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
 
 
-    <artifactId>local-ai-forward</artifactId>
+    <artifactId>zd-forward</artifactId>
 
 
     <properties>
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.source>8</maven.compiler.source>
@@ -99,6 +99,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

zd-modules/local-ai-forward/src/main/java/com/zd/forward/ForwardApp.java → zd-modules/zd-forward/src/main/java/com/zd/forward/ForwardApp.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/component/AppStartedListener.java → zd-modules/zd-forward/src/main/java/com/zd/forward/component/AppStartedListener.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/config/AlgorithmYml.java → zd-modules/zd-forward/src/main/java/com/zd/forward/config/AlgorithmYml.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/config/WebConfig.java → zd-modules/zd-forward/src/main/java/com/zd/forward/config/WebConfig.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/controller/SignInCheckController.java → zd-modules/zd-forward/src/main/java/com/zd/forward/controller/SignInCheckController.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/AnalysisData.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/AnalysisData.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/BaseRequestData.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/BaseRequestData.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/DataPostAnalysisRespDto.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/DataPostAnalysisRespDto.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/ImageRequestData.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/ImageRequestData.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/ImgPostResponse.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/ImgPostResponse.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/RequestData.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/RequestData.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/domain/VideoRequestData.java → zd-modules/zd-forward/src/main/java/com/zd/forward/domain/VideoRequestData.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/CheckResultValid.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/CheckResultValid.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/CheckService.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/CheckService.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/ImageCheckResultValidImpl.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/ImageCheckResultValidImpl.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/LoginService.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/LoginService.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/PeopleCheckResultValidImpl.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/PeopleCheckResultValidImpl.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/SendSginAccessLogService.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/SendSginAccessLogService.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/ShiYanFuCheckResultValidImpl.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/ShiYanFuCheckResultValidImpl.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValid.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValid.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValidImpl.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/VideoCheckResultValidImpl.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/mqtt/CommonSend.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/CommonSend.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttOutListener.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttOutListener.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttProducer.java → zd-modules/zd-forward/src/main/java/com/zd/forward/serivce/mqtt/MqttProducer.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/util/Base64DecodedMultipartFile.java → zd-modules/zd-forward/src/main/java/com/zd/forward/util/Base64DecodedMultipartFile.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/util/Base64ToMultipartFile.java → zd-modules/zd-forward/src/main/java/com/zd/forward/util/Base64ToMultipartFile.java


zd-modules/local-ai-forward/src/main/java/com/zd/forward/util/FileUploadUtils.java → zd-modules/zd-forward/src/main/java/com/zd/forward/util/FileUploadUtils.java


zd-modules/local-ai-forward/src/main/resources/banner.txt → zd-modules/zd-forward/src/main/resources/banner.txt


+ 4 - 4
zd-modules/local-ai-forward/src/main/resources/bootstrap.yml

@@ -6,18 +6,18 @@ server:
 spring:
 spring:
   application:
   application:
     # 应用名称
     # 应用名称
-    name: zd-local-forward
+    name: zd-forward
   profiles:
   profiles:
     # 环境配置
     # 环境配置
-    active: dev
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   cloud:
   cloud:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

zd-modules/local-ai-forward/src/main/resources/logback.xml → zd-modules/zd-forward/src/main/resources/logback.xml


zd-modules/local-ai-forward/src/test/java/com/zd/forward/serivce/CheckServiceTest.java → zd-modules/zd-forward/src/test/java/com/zd/forward/serivce/CheckServiceTest.java


Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-message/Dockerfile


+ 39 - 0
zd-modules/zd-message/pom.xml

@@ -142,6 +142,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

+ 2 - 2
zd-modules/zd-message/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 动态刷新
         # 动态刷新

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-app/Dockerfile


+ 39 - 0
zd-modules/zd-modules-app/pom.xml

@@ -78,6 +78,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

+ 2 - 2
zd-modules/zd-modules-app/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-file/Dockerfile


+ 39 - 0
zd-modules/zd-modules-file/pom.xml

@@ -106,6 +106,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-modules-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-gen/Dockerfile


+ 39 - 0
zd-modules/zd-modules-gen/pom.xml

@@ -94,6 +94,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-modules-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-job/Dockerfile


+ 39 - 0
zd-modules/zd-modules-job/pom.xml

@@ -94,6 +94,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-modules-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-laboratory/Dockerfile


+ 39 - 0
zd-modules/zd-modules-laboratory/pom.xml

@@ -154,6 +154,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 动态刷新
         # 动态刷新

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-modules-system/Dockerfile


+ 39 - 0
zd-modules/zd-modules-system/pom.xml

@@ -109,6 +109,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 
 

+ 2 - 2
zd-modules/zd-modules-system/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
     nacos:
       discovery:
       discovery:
         # 服务注册地址
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
       config:
       config:
         # 配置中心地址
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
         # 配置文件格式
         # 配置文件格式
         file-extension: yml
         file-extension: yml
         # 共享配置
         # 共享配置

Fichier diff supprimé car celui-ci est trop grand
+ 8 - 0
zd-modules/zd-netty/Dockerfile


+ 39 - 0
zd-modules/zd-netty/pom.xml

@@ -156,6 +156,45 @@
                     </execution>
                     </execution>
                 </executions>
                 </executions>
             </plugin>
             </plugin>
+            <!-- 打包时跳过test插件,不运行test测试用例 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <!-- docker的maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>${docker.registry}/${docker.namespace}/${project.artifactId}</repository>
+                    <tag>latest</tag>
+                    <!-- 镜像服务器账号密码  -->
+                    <username>admin</username>
+                    <password>zd123456..</password>
+                    <!-- 构建参数,指定jar包名称 -->
+                    <buildArgs>
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
 </project>
 </project>

+ 0 - 0
zd-modules/zd-netty/src/main/resources/bootstrap.yml


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff