【更新】 iot.vwp数据库表统一加前缀vwp_

bin/clean.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause

bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
-pause

bin/run-auth.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Auth���̡�
-echo.
-
-cd %~dp0
-cd ../zd-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-auth.jar
-
-cd bin
-pause

bin/run-gateway.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Gateway���̡�
-echo.
-
-cd %~dp0
-cd ../zd-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-gateway.jar
-
-cd bin
-pause

bin/run-modules-file.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-File���̡�
-echo.
-
-cd %~dp0
-cd ../zd-modules/zd-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-modules-file.jar
-
-cd bin
-pause

bin/run-modules-gen.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-Gen���̡�
-echo.
-
-cd %~dp0
-cd ../zd-modules/zd-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-modules-gen.jar
-
-cd bin
-pause

bin/run-modules-job.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-Job���̡�
-echo.
-
-cd %~dp0
-cd ../zd-modules/zd-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-modules-job.jar
-
-cd bin
-pause

bin/run-modules-system.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Modules-System���̡�
-echo.
-
-cd %~dp0
-cd ../zd-modules/zd-system/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-modules-system.jar
-
-cd bin
-pause

bin/run-monitor.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [��Ϣ] ʹ��Jar��������Monitor���̡�
-echo.
-
-cd %~dp0
-cd ../zd-visual/zd-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 -jar %JAVA_OPTS% zd-visual-monitor.jar
-
-cd bin
-pause

docker/deploy.sh

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# 使用说明，用来提示输入参数
-usage() {
-	echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]"
-	exit 1
-}
-
-# 开启所需端口
-port(){
-	firewall-cmd --add-port=80/tcp --permanent
-	firewall-cmd --add-port=8080/tcp --permanent
-	firewall-cmd --add-port=8848/tcp --permanent
-	firewall-cmd --add-port=9848/tcp --permanent
-	firewall-cmd --add-port=9849/tcp --permanent
-	firewall-cmd --add-port=6379/tcp --permanent
-	firewall-cmd --add-port=3306/tcp --permanent
-	firewall-cmd --add-port=9100/tcp --permanent
-	firewall-cmd --add-port=9200/tcp --permanent
-	firewall-cmd --add-port=9201/tcp --permanent
-	firewall-cmd --add-port=9202/tcp --permanent
-	firewall-cmd --add-port=9203/tcp --permanent
-	firewall-cmd --add-port=9300/tcp --permanent
-	service firewalld restart
-}
-
-# 启动基础环境（必须）
-base(){
-	docker-compose up -d zd-mysql zd-redis zd-nacos zd-nginx
-}
-
-# 启动程序模块（必须）
-modules(){
-	docker-compose up -d zd-gateway zd-auth zd-modules-system
-}
-
-# 关闭所有环境/模块
-stop(){
-	docker-compose stop
-}
-
-# 删除所有环境/模块
-rm(){
-	docker-compose rm
-}
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$1" in
-"port")
-	port
-;;
-"base")
-	base
-;;
-"modules")
-	modules
-;;
-"stop")
-	stop
-;;
-"rm")
-	rm
-;;
-*)
-	usage
-;;
-esac

docker/docker-compose.yml

@@ -1,142 +0,0 @@
-version : '3.8'
-services:
-  zd-nacos:
-    container_name: zd-nacos
-    image: zd.harbor.com/lib/nacos/nacos-server:latest
-    build:
-      context: ./nacos
-    environment:
-      - MODE=standalone
-    volumes:
-      - ./nacos/logs/:/home/nacos/logs
-      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
-    ports:
-      - "8848:8848"
-      - "9848:9848"
-      - "9849:9849"
-    depends_on:
-      - zd-mysql
-
-  #数据库
-  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
-    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
-
-  zd-redis:
-    container_name: zd-redis
-    image: redis
-    build:
-      context: ./redis
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis/conf/redis.conf:/home/zd/redis/redis.conf
-      - ./redis/data:/data
-    command: redis-server /home/zd/redis/redis.conf
-  zd-nginx:
-    container_name: zd-nginx
-    image: nginx
-    build:
-      context: ./nginx
-    ports:
-      - "80:80"
-    volumes:
-      - ./nginx/html/dist:/home/zd/projects/zd-ui
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx/logs:/var/log/nginx
-      - ./nginx/conf.d:/etc/nginx/conf.d
-    depends_on:
-      - zd-gateway
-    links:
-      - zd-gateway
-  zd-gateway:
-    container_name: zd-gateway
-    build:
-      context: ./zd/gateway
-      dockerfile: dockerfile
-    ports:
-      - "8080:8080"
-    depends_on:
-      - zd-redis
-    links:
-      - zd-redis
-  zd-auth:
-    container_name: zd-auth
-    build:
-      context: ./zd/auth
-      dockerfile: dockerfile
-    ports:
-      - "9200:9200"
-    depends_on:
-      - zd-redis
-    links:
-      - zd-redis
-  zd-modules-system:
-    container_name: zd-modules-system
-    build:
-      context: ./zd/modules/system
-      dockerfile: dockerfile
-    ports:
-      - "9201:9201"
-    depends_on:
-      - zd-redis
-      - zd-mysql
-    links:
-      - zd-redis
-      - zd-mysql
-  zd-modules-gen:
-    container_name: zd-modules-gen
-    build:
-      context: ./zd/modules/gen
-      dockerfile: dockerfile
-    ports:
-      - "9202:9202"
-    depends_on:
-      - zd-mysql
-    links:
-      - zd-mysql
-  zd-modules-job:
-    container_name: zd-modules-job
-    build:
-      context: ./zd/modules/job
-      dockerfile: dockerfile
-    ports:
-      - "9203:9203"
-    depends_on:
-      - zd-mysql
-    links:
-      - zd-mysql
-  zd-modules-file:
-    container_name: zd-modules-file
-    build:
-      context: ./zd/modules/file
-      dockerfile: dockerfile
-    ports:
-      - "9300:9300"
-    volumes:
-    - ./zd/uploadPath:/home/zd/uploadPath
-  zd-visual-monitor:
-    container_name: zd-visual-monitor
-    build:
-      context: ./zd/visual/monitor
-      dockerfile: dockerfile
-    ports:
-      - "9100:9100"

docker/mysql/db/readme.txt

@@ -1 +0,0 @@
-存放sql目录下的所有脚本，用于docker自动执行。

docker/mysql/dockerfile

@@ -1,7 +0,0 @@
-# 基础镜像
-FROM mysql:5.7
-# author
-MAINTAINER zd
-
-# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/mysql/update/bottle-update.sql

@@ -1 +0,0 @@
-ALTER TABLE ab_alarm_record ADD attachment_url varchar(250) COMMENT '报警照片附件';

docker/mysql/update/hxp-update.sql

@@ -1 +0,0 @@
-ALTER TABLE `hxp_alarm_record` ADD COLUMN `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父级ID' AFTER `userecord_id`;

docker/mysql/update/job-update.sql

@@ -1,7 +0,0 @@
-
-# 添加任务
-INSERT INTO `sys_job` (`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (16, '实验室风险指标监测', 'DEFAULT', 'chemicalTask.indicatorMonitoring', '0 0 0/1 * * ?', '1', '1', '1', 'superAdmin', '2022-08-30 10:21:11', '', NULL, '');
-
-# 2022-09-19 liubo
-INSERT INTO `sys_job` (`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (17, '监测四医大短信上行结果', 'DEFAULT', 'chemicalTask.queryUplinkResult', '0 0/5 * * * ? ', '1', '1', '0', 'superAdmin', '2022-09-19 15:31:02', '', '2022-09-19 15:31:06', '');
-INSERT INTO `sys_job` (`job_id`, `job_name`, `job_group`, `invoke_target`, `cron_expression`, `misfire_policy`, `concurrent`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (18, '四医大短信告警方案', 'DEFAULT', 'chemicalTask.sendPhoneBySyd', '0 0/5 * * * ? ', '1', '1', '0', 'superAdmin', '2022-09-19 15:32:12', '', '2022-09-19 15:32:21', '');

docker/mysql/update/lab-update.sql

@@ -1,3 +0,0 @@
-ALTER TABLE lab_hardware ADD manufacturer_type TINYINT(4) COMMENT '供应厂商';
-ALTER TABLE lab_notifyplan ADD execution_time datetime COMMENT '执行时间';
-alter table lab_hardware modify column uniform_power varchar(100);

docker/mysql/update/化学品分类初始化脚本.sql

@@ -1,2 +0,0 @@
-INSERT INTO `hxp_chemical_classify` (`id`, `parent_id`, `ancestors`, `classify_name`, `hazard_level`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (1, 0, '0', '危险化学品', 1, '超级管理员', '2022-06-16 14:13:09', '', NULL);
-INSERT INTO `hxp_chemical_classify` (`id`, `parent_id`, `ancestors`, `classify_name`, `hazard_level`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (2, 0, '0', '普通化学品', 2, '超级管理员', '2022-06-16 14:14:43', '', NULL);

docker/nacos/conf/application.properties

@@ -1,32 +0,0 @@
-spring.datasource.platform=mysql
-db.num=1
-db.url.0=jdbc:mysql://zd-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
-db.user=root
-db.password=password
-
-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
-
-management.endpoints.web.exposure.include=*
-
-management.metrics.export.elastic.enabled=false
-management.metrics.export.influx.enabled=false
-
-server.tomcat.accesslog.enabled=true
-server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
-
-server.tomcat.basedir=
-
-nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
-
-nacos.core.auth.system.type=nacos
-nacos.core.auth.enabled=false
-nacos.core.auth.default.token.expire.seconds=18000
-nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
-nacos.core.auth.caching.enabled=true
-nacos.core.auth.enable.userAgentAuthWhite=false
-nacos.core.auth.server.identity.key=serverIdentity
-nacos.core.auth.server.identity.value=security
-
-nacos.istio.mcp.server.enabled=false

docker/nacos/dockerfile

@@ -1,7 +0,0 @@
-# 基础镜像
-FROM nacos/nacos-server
-# author
-MAINTAINER zd
-
-# 复制conf文件到路径
-COPY ./conf/application.properties /home/nacos/conf/application.properties

docker/nginx/conf/nginx.conf

@@ -1,36 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-		location / {
-            root   /home/zd/projects/zd-ui;
-			try_files $uri $uri/ /index.html;
-            index  index.html index.htm;
-        }
-
-		location /prod-api/{
-			proxy_set_header Host $http_host;
-			proxy_set_header X-Real-IP $remote_addr;
-			proxy_set_header REMOTE-HOST $remote_addr;
-			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-			proxy_pass http://zd-gateway:8080/;
-		}
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-}# requirepass 123456

docker/nginx/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM nginx
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd/projects/zd-ui
-# 创建目录
-RUN mkdir -p /home/zd/projects/zd-ui
-# 指定路径
-WORKDIR /home/zd/projects/zd-ui
-# 复制conf文件到路径
-COPY ./conf/nginx.conf /etc/nginx/nginx.conf
-# 复制html文件到路径
-COPY ./html/dist /home/zd/projects/zd-ui

docker/redis/conf/redis.conf

@@ -1 +0,0 @@
-# requirepass 123456

docker/redis/dockerfile

@@ -1,13 +0,0 @@
-# 基础镜像
-FROM redis
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd/redis
-# 创建目录
-RUN mkdir -p /home/zd/redis
-# 指定路径
-WORKDIR /home/zd/redis
-# 复制conf文件到路径
-COPY ./conf/redis.conf /home/zd/redis/redis.conf

docker/ruoyi/auth/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-auth.jar /home/zd/zd-auth.jar
-# 启动认证服务
-ENTRYPOINT ["java","-jar","zd-auth.jar"]

docker/ruoyi/auth/jar/readme.txt

@@ -1 +0,0 @@
-存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-gateway.jar /home/zd/zd-gateway.jar
-# 启动网关服务
-ENTRYPOINT ["java","-jar","zd-gateway.jar"]

docker/ruoyi/gateway/jar/readme.txt

@@ -1 +0,0 @@
-存放网关模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/file/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-modules-file.jar /home/zd/zd-modules-file.jar
-# 启动文件服务
-ENTRYPOINT ["java","-jar","zd-modules-file.jar"]

docker/ruoyi/modules/file/jar/readme.txt

@@ -1 +0,0 @@
-存放文件服务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/gen/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-modules-gen.jar /home/zd/zd-modules-gen.jar
-# 启动代码生成服务
-ENTRYPOINT ["java","-jar","zd-modules-gen.jar"]

docker/ruoyi/modules/gen/jar/readme.txt

@@ -1 +0,0 @@
-存放代码生成打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/job/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-modules-job.jar /home/zd/zd-modules-job.jar
-# 启动定时任务服务
-ENTRYPOINT ["java","-jar","zd-modules-job.jar"]

docker/ruoyi/modules/job/jar/readme.txt

@@ -1 +0,0 @@
-存放定时任务打包好的jar文件，用于docker启动应用。

docker/ruoyi/modules/system/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-modules-system.jar /home/zd/zd-modules-system.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","zd-modules-system.jar"]

docker/ruoyi/modules/system/jar/readme.txt

@@ -1 +0,0 @@
-存放系统模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/visual/monitor/dockerfile

@@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER zd
-
-# 挂载目录
-VOLUME /home/zd
-# 创建目录
-RUN mkdir -p /home/zd
-# 指定路径
-WORKDIR /home/zd
-# 复制jar文件到路径
-COPY ./jar/zd-visual-monitor.jar /home/zd/zd-visual-monitor.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","zd-visual-monitor.jar"]

docker/ruoyi/visual/monitor/jar/readme.txt

@@ -1 +0,0 @@
-存放监控中心打包好的jar文件，用于docker启动应用。

docker/zd/README.md

@@ -1,22 +0,0 @@
-# 部署相关的配置文件
-
-## 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
-启动脚本

docker/zd/docker-compose-nginx.yml

@@ -1,26 +0,0 @@
-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

docker/zd/docker-compose-services.yml

@@ -1,460 +0,0 @@
-version : '3.8'
-services:
-
-  # ---------------------------
-  # 数据库
-  # ---------------------------
-#  zd-mysql:
-#    container_name: zd-mysql
-#    image: registry.cn-hangzhou.aliyuncs.com/lib/mysql:5.7
-#    restart: always
-#    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
-
-  # ---------------------------
-  # nacos 注册中心
-  # ---------------------------
-  zd-nacos:
-    container_name: zd-nacos
-    image: registry.cn-hangzhou.aliyuncs.com/lib/nacos/nacos-server:latest
-    # 从文件中获取配置
-    env_file: docker-compose.env
-#   内部依赖数据库配置，暂使用外部数据库
-#    depends_on:
-#      - zd-mysql
-    restart: always
-    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"
-    networks:
-      - net
-
-  # ---------------------------
-  # Redis
-  # ---------------------------
-  zd-redis:
-    image: registry.cn-hangzhou.aliyuncs.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
-
-  # ---------------------------
-  # api网关
-  # ---------------------------
-  zd-gateway:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-gateway:latest
-    container_name: zd-gateway
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    links:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "8080:8080"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-gateway:/logs/zd-gateway
-    networks:
-      - net
-
-  # ---------------------------
-  # 授权服务
-  # ---------------------------
-  zd-auth:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-auth:latest
-    container_name: zd-auth
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9200:9200"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-auth:/logs/zd-auth
-    networks:
-      - net
-
-  # ---------------------------
-  # 系统服务
-  # ---------------------------
-  zd-system:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-system:latest
-    container_name: zd-system
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9201:9201"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-system:/logs/zd-system
-    networks:
-      - net
-
-#  # ---------------------------
-#  # 测试算法转发服务
-#  # ---------------------------
-  zd-forward:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-forward:latest
-    container_name: zd-forward
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9319:9319"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-forward:/logs/zd-forward
-    networks:
-      - net
-
-  # ---------------------------
-  # 气瓶服务
-  # ---------------------------
-#  zd-airbottle:
-#    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-airbottle:latest
-#    container_name: zd-airbottle
-#    env_file: docker-compose.env  # 从文件中获取配置
-#    depends_on:
-#      - zd-nacos
-#      - zd-redis
-#    restart: always
-#    ports:
-#      - "9400:9400"
-#    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-#    volumes:
-#      - /zd/logs/zd-airbottle:/logs/zd-airbottle
-#    networks:
-#      - net
-
-  # ---------------------------
-  # 新气瓶服务
-  # ---------------------------
-  zd-bottle:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-bottle:latest
-    container_name: zd-bottle
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9401:9401"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-bottle:/logs/zd-bottle
-    networks:
-      - net
-
-  # ---------------------------
-  # 报警系统
-  # ---------------------------
-  zd-alarm:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-alarm:latest
-    container_name: zd-alarm
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9901:9901"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-alarm:/logs/zd-alarm
-    networks:
-      - net
-
-  # ---------------------------
-  # 相机系统
-  # ---------------------------
-  zd-camera:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-camera:latest
-    container_name: zd-camera
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "18080:18080"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-camera:/logs/zd-camera
-    networks:
-      - net
-
-  # ---------------------------
-  # 化学品系统
-  # ---------------------------
-  zd-chemical:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-chemical:latest
-    container_name: zd-chemical
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9501:9501"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-chemical:/logs/zd-chemical
-    networks:
-      - net
-
-  # ---------------------------
-  # 人脸识别系统
-  # ---------------------------
-  zd-face:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-common-face:latest
-    container_name: zd-face
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9220:9220"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-face:/logs/zd-face
-    networks:
-      - net
-
-  # ---------------------------
-  # 考试系统
-  # ---------------------------
-  zd-exam:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-exam:latest
-    container_name: zd-exam
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9301:9301"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-exam:/logs/zd-exam
-    networks:
-      - net
-
-  # ---------------------------
-  # 消息系统
-  # ---------------------------
-  zd-message:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-message:latest
-    container_name: zd-message
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9500:9500"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-message:/logs/zd-message
-    networks:
-      - net
-
-  # ---------------------------
-  # app系统
-  # ---------------------------
-  zd-app:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-app:latest
-    container_name: zd-app
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9219:9219"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-app:/logs/zd-app
-    networks:
-      - net
-
-  # ---------------------------
-  # 文件系统
-  # ---------------------------
-  zd-file:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-file:latest
-    container_name: zd-file
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9300:9300"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-file:/logs/zd-file
-    networks:
-      - net
-
-  # ---------------------------
-  # 代码生成系统
-  # ---------------------------
-  zd-gen:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-gen:latest
-    container_name: zd-gen
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9202:9202"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-gen:/logs/zd-gen
-    networks:
-      - net
-
-  # ---------------------------
-  # 任务调度系统
-  # ---------------------------
-  zd-job:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-job:latest
-    container_name: zd-job
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9203:9203"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-job:/logs/zd-job
-    networks:
-      - net
-
-  # ---------------------------
-  # 实验室管理系统
-  # ---------------------------
-  zd-laboratory:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-modules-laboratory:latest
-    container_name: zd-laboratory
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9218:9218"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-laboratory:/logs/zd-laboratory
-    networks:
-      - net
-
-  # ---------------------------
-  # netty系统
-  # ---------------------------
-  zd-netty:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-netty:latest
-    container_name: zd-netty
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9600:9600"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-netty:/logs/zd-netty
-    networks:
-      - net
-
-  # ---------------------------
-  # 喇叭系统
-  # ---------------------------
-  zd-speaker:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-speaker:latest
-    container_name: zd-speaker
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9903:9903"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-speaker:/logs/zd-speaker
-    networks:
-      - net
-
-  # ---------------------------
-  # 监控系统
-  # ---------------------------
-  zd-monitor:
-    image: registry.cn-hangzhou.aliyuncs.com/zd/zd-monitor:latest
-    container_name: zd-monitor
-    env_file: docker-compose.env  # 从文件中获取配置
-    depends_on:
-      - zd-nacos
-      - zd-redis
-    restart: always
-    ports:
-      - "9100:9100"
-    entrypoint: ./wait-for-it.sh zd-nacos:8848 -t 10 -- ./wait-for-it.sh zd-redis:8848 -t 10 -- java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -jar /opt/app.jar
-    volumes:
-      - /zd/logs/zd-monitor:/logs/zd-monitor
-    networks:
-      - net
-
-networks:
-  net:
-    driver: bridge

docker/zd/docker-compose.env

@@ -1,58 +0,0 @@
-# JVM参数
-# 可通过docker-compose -f docker-compose-services.yml config命令查看是否生效
-JAVA_OPTS=-Xmx128m -Xms128m
-
-# nacos配置
-NACOS_HOST=192.168.1.88
-NACOS_PORT=8848
-NACOS_DATA_BASE=cloud_data_test
-
-# Redis配置
-REDIS_HOST=192.168.1.43
-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

docker/zd/mysql/conf/my.cnf

@@ -1,19 +0,0 @@
-[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
-

docker/zd/nacos/conf/application.properties

@@ -1,228 +0,0 @@
-#
-# 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

docker/zd/nginx/conf/nginx.conf

@@ -1,294 +0,0 @@
-
-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;
-        }
-    }
-}

docker/zd/start.sh

@@ -1,129 +0,0 @@
-#!/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-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 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
-        echo "* 停止容器成功..."
-        ;;
-    # 重启容器
-    restart)
-        echo "* 正在停止镜像..."
-#        time docker-compose -f $DOCKERHOME/docker-compose-nginx.yml restart
-        time docker-compose -f $DOCKERHOME/docker-compose-services.yml restart
-        ;;
-    # 其它
-    *)
-        echo "* ..."
-        ;;
-esac
-exit 0

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceAlarmMapper.java

@@ -13,13 +13,13 @@ import java.util.List;
 @Repository
 public interface DeviceAlarmMapper {
 
-    @Insert("INSERT INTO device_alarm (deviceId, alarmPriority, alarmMethod, alarmTime, alarmDescription, longitude, latitude, alarmType ) " +
+    @Insert("INSERT INTO vmp_device_alarm (deviceId, alarmPriority, alarmMethod, alarmTime, alarmDescription, longitude, latitude, alarmType ) " +
             "VALUES ('${deviceId}', '${alarmPriority}', '${alarmMethod}', '${alarmTime}', '${alarmDescription}', ${longitude}, ${latitude}, '${alarmType}')")
     int add(DeviceAlarm alarm);
 
 
     @Select(value = {" <script>" +
-            " SELECT * FROM device_alarm " +
+            " SELECT * FROM vmp_device_alarm " +
             " WHERE 1=1 " +
             " <if test=\"deviceId != null\" >  AND deviceId = '${deviceId}'</if>" +
             " <if test=\"alarmPriority != null\" >  AND alarmPriority = '${alarmPriority}' </if>" +
@@ -34,7 +34,7 @@ public interface DeviceAlarmMapper {
 
 
     @Delete(" <script>" +
-            "DELETE FROM device_alarm WHERE 1=1 " +
+            "DELETE FROM vmp_device_alarm WHERE 1=1 " +
             " <if test=\"deviceIdList != null and id == null \" > AND deviceId in " +
             "<foreach collection='deviceIdList'  item='item'  open='(' separator=',' close=')' > '${item}'</foreach>" +
             "</if>" +

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Repository
 public interface DeviceChannelMapper {
 
-    @Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
+    @Insert("INSERT INTO vmp_device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
             "address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
             "ipAddress, port, password, PTZType, status, streamId, longitude, latitude, createTime, updateTime) " +
             "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
@@ -23,7 +23,7 @@ public interface DeviceChannelMapper {
     int add(DeviceChannel channel);
 
     @Update(value = {" <script>" +
-            "UPDATE device_channel " +
+            "UPDATE vmp_device_channel " +
             "SET updateTime='${updateTime}'" +
             "<if test=\"name != null\">, name='${name}'</if>" +
             "<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
@@ -55,7 +55,7 @@ public interface DeviceChannelMapper {
 
     @Select(value = {" <script>" +
             "SELECT * FROM ( "+
-            " SELECT * , (SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount FROM device_channel dc " +
+            " SELECT * , (SELECT count(0) FROM vmp_device_channel WHERE parentId=dc.channelId) as subCount FROM vmp_device_channel dc " +
             " WHERE dc.deviceId=#{deviceId} " +
             " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
             " <if test=\"parentChannelId != null\"> AND dc.parentId=#{parentChannelId} </if> " +
@@ -68,31 +68,31 @@ public interface DeviceChannelMapper {
             " </script>"})
     List<DeviceChannel> queryChannelsByDeviceId(@Param("deviceId") String deviceId, @Param("parentChannelId") String parentChannelId, @Param("query") String query, @Param("hasSubChannel") Boolean hasSubChannel,@Param("online") Boolean online);
 
-    @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
+    @Select("SELECT * FROM vmp_device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
     DeviceChannel queryChannel(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
 
     @Select("<script>" +
-            "SELECT * FROM device_channel WHERE deviceId in \n" +
+            "SELECT * FROM vmp_device_channel WHERE deviceId in \n" +
             "<foreach collection='deviceIds' index='index' item='item' open='(' separator=',' close=')'>#{item}</foreach> \n"+
             "</script>")
     List<DeviceChannel> queryChannelByDeviceId(@Param("deviceIds") List<String> deviceIds);
 
-    @Delete("DELETE FROM device_channel WHERE deviceId=#{deviceId}")
+    @Delete("DELETE FROM vmp_device_channel WHERE deviceId=#{deviceId}")
     int cleanChannelsByDeviceId(String deviceId);
 
-    @Update(value = {"UPDATE device_channel SET streamId=null WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
+    @Update(value = {"UPDATE vmp_device_channel SET streamId=null WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
     void stopPlay(@Param("deviceId") String deviceId,@Param("channelId") String channelId);
 
-    @Update(value = {"UPDATE device_channel SET streamId=#{streamId} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
+    @Update(value = {"UPDATE vmp_device_channel SET streamId=#{streamId} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
     void startPlay(@Param("deviceId") String deviceId, @Param("channelId") String channelId, @Param("streamId") String streamId);
 
 
     @Select(value = {" <script>" +
             "SELECT * FROM ( "+
                 " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
-                "(SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount, " +
+                "(SELECT count(0) FROM vmp_device_channel WHERE parentId=dc.channelId) as subCount, " +
                 "(SELECT pc.platformId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId ) as platformId " +
-                "FROM device_channel dc " +
+                "FROM vmp_device_channel dc " +
                 "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
                 " WHERE 1=1 " +
                 " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
@@ -109,11 +109,11 @@ public interface DeviceChannelMapper {
 
     List<ChannelReduce> queryChannelListInAll(@Param("query") String query, @Param("online") Boolean online, @Param("hasSubChannel") Boolean hasSubChannel, @Param("platformId") String platformId, @Param("inPlatform") Boolean inPlatform);
 
-    @Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
+    @Select("SELECT * FROM vmp_device_channel WHERE channelId=#{channelId}")
     List<DeviceChannel> queryChannelByChannelId(String channelId);
 
     @Select("<script>" +
-            "SELECT * FROM device_channel WHERE deviceId in \n" +
+            "SELECT * FROM vmp_device_channel WHERE deviceId in \n" +
             "<foreach collection='deviceIds' index='index' item='item' open='(' separator=',' close=')'>#{item}</foreach> \n"+
             "</script>")
     List<DeviceChannel> queryChannelsByDeviceIds(List<String> deviceIds);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceMapper.java

@@ -13,10 +13,10 @@ import java.util.List;
 @Repository
 public interface DeviceMapper {
 
-    @Select("SELECT * FROM device WHERE deviceId = #{deviceId}")
+    @Select("SELECT * FROM vmp_device WHERE deviceId = #{deviceId}")
     Device getDeviceByDeviceId(String deviceId);
 
-    @Insert("INSERT INTO device (" +
+    @Insert("INSERT INTO vmp_device (" +
                 "deviceId, " +
                 "name, " +
                 "manufacturer, " +
@@ -56,7 +56,7 @@ public interface DeviceMapper {
     int add(Device device);
 
     @Update(value = {" <script>" +
-                "UPDATE device " +
+                "UPDATE vmp_device " +
                 "SET updateTime='${updateTime}'" +
                 "<if test=\"name != null\">, name='${name}'</if>" +
                 "<if test=\"manufacturer != null\">, manufacturer='${manufacturer}'</if>" +
@@ -76,12 +76,12 @@ public interface DeviceMapper {
             " </script>"})
     int update(Device device);
 
-    @Select("SELECT *, (SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount  FROM device de")
+    @Select("SELECT *, (SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount FROM vmp_device de")
     List<Device> getDevices();
 
-    @Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
+    @Delete("DELETE FROM vmp_device WHERE deviceId=#{deviceId}")
     int del(String deviceId);
 
-    @Update("UPDATE device SET online=0")
+    @Update("UPDATE vmp_device SET online=0")
     int outlineForAll();
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/DeviceMobilePositionMapper.java

@@ -10,12 +10,12 @@ import org.apache.ibatis.annotations.*;
 //@Repository
 public interface DeviceMobilePositionMapper {
 
-    @Insert("INSERT INTO device_mobile_position (deviceId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, geodeticSystem, cnLng, cnLat) " +
+    @Insert("INSERT INTO vmp_device_mobile_position (deviceId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, geodeticSystem, cnLng, cnLat) " +
             "VALUES ('${deviceId}', '${deviceName}', '${time}', ${longitude}, ${latitude}, ${altitude}, ${speed}, ${direction}, '${reportSource}', '${geodeticSystem}', '${cnLng}', '${cnLat}')")
     int insertNewPosition(MobilePosition mobilePosition);
 
     @Select(value = {" <script>" +
-    "SELECT * FROM device_mobile_position" +
+    "SELECT * FROM vmp_device_mobile_position" +
     " WHERE deviceId = #{deviceId} " +
     "<if test=\"startTime != null\"> AND time&gt;=#{startTime}</if>" +
     "<if test=\"endTime != null\"> AND time&lt;=#{endTime}</if>" +
@@ -23,11 +23,11 @@ public interface DeviceMobilePositionMapper {
     " </script>"})
     List<MobilePosition> queryPositionByDeviceIdAndTime(@Param("deviceId") String deviceId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    @Select("SELECT * FROM device_mobile_position WHERE deviceId = #{deviceId}" +
+    @Select("SELECT * FROM vmp_device_mobile_position WHERE deviceId = #{deviceId}" +
             " ORDER BY time DESC LIMIT 1")
     MobilePosition queryLatestPositionByDevice(String deviceId);
 
-    @Delete("DELETE FROM device_mobile_position WHERE deviceId = #{deviceId}")
+    @Delete("DELETE FROM vmp_device_mobile_position WHERE deviceId = #{deviceId}")
     int clearMobilePositionsByDeviceId(String deviceId);
 
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/GbStreamMapper.java

@@ -11,14 +11,14 @@ import java.util.List;
 @Repository
 public interface GbStreamMapper {
 
-    @Insert("INSERT INTO gb_stream (app, stream, gbId, name, " +
+    @Insert("INSERT INTO vmp_gb_stream (app, stream, gbId, name, " +
             "longitude, latitude, streamType, mediaServerId, status) VALUES" +
             "('${app}', '${stream}', '${gbId}', '${name}', " +
             "'${longitude}', '${latitude}', '${streamType}', " +
             "'${mediaServerId}', ${status})")
     int add(GbStream gbStream);
 
-    @Update("UPDATE gb_stream " +
+    @Update("UPDATE vmp_gb_stream " +
             "SET app=#{app}," +
             "stream=#{stream}," +
             "gbId=#{gbId}," +
@@ -31,30 +31,30 @@ public interface GbStreamMapper {
             "WHERE app=#{app} AND stream=#{stream} AND gbId=#{gbId}")
     int update(GbStream gbStream);
 
-    @Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
+    @Delete("DELETE FROM vmp_gb_stream WHERE app=#{app} AND stream=#{stream}")
     int del(@Param("app") String app,@Param("stream") String stream);
 
-    @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN  platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream")
+    @Select("SELECT gs.*, pgs.platformId FROM vmp_gb_stream gs LEFT JOIN vmp_platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream")
     List<GbStream> selectAll();
 
-    @Select("SELECT * FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
+    @Select("SELECT * FROM vmp_gb_stream WHERE app=#{app} AND stream=#{stream}")
     StreamProxyItem selectOne(@Param("app") String app,@Param("stream") String stream);
 
-    @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
-            "LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
+    @Select("SELECT gs.*, pgs.platformId FROM vmp_gb_stream gs " +
+            "LEFT JOIN vmp_platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
             "WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
     GbStream queryStreamInPlatform(@Param("platformId") String platformId, @Param("gbId") String gbId);
 
-    @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
-            "LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
+    @Select("SELECT gs.*, pgs.platformId FROM vmp_gb_stream gs " +
+            "LEFT JOIN vmp_platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
             "WHERE pgs.platformId = '${platformId}'")
     List<GbStream> queryGbStreamListInPlatform(String platformId);
 
-    @Update("UPDATE gb_stream " +
+    @Update("UPDATE vmp_gb_stream " +
             "SET status=${status} " +
             "WHERE app=#{app} AND stream=#{stream}")
     void setStatus(@Param("app") String app,@Param("stream") String stream,@Param("status") boolean status);
 
-    @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN  platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream WHERE mediaServerId=#{mediaServerId} ")
+    @Select("SELECT gs.*, pgs.platformId FROM vmp_gb_stream gs LEFT JOIN vmp_platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream WHERE mediaServerId=#{mediaServerId} ")
     List<GbStream> selectAllByMediaServerId(String mediaServerId);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/LogMapper.java

@@ -13,13 +13,13 @@ import java.util.List;
 @Repository
 public interface LogMapper {
 
-    @Insert("insert into log ( name, type, uri, address, result, timing, username, createTime) " +
+    @Insert("insert into vmp_log ( name, type, uri, address, result, timing, username, createTime) " +
             "values ('${name}', '${type}', '${uri}', '${address}', '${result}', ${timing}, '${username}', '${createTime}')")
     int add(LogDto logDto);
 
 
     @Select(value = {"<script>" +
-            " SELECT * FROM log " +
+            " SELECT * FROM vmp_log " +
             " WHERE 1=1 " +
             " <if test=\"query != null\"> AND (name LIKE '%${query}%')</if> " +
             " <if test=\"type != null\" >  AND type = '${type}'</if>" +
@@ -30,6 +30,6 @@ public interface LogMapper {
     List<LogDto> query(@Param("query") String query, @Param("type") String type,@Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
-    @Delete("DELETE FROM log")
+    @Delete("DELETE FROM vmp_log")
     int clear();
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/MediaServerMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Repository
 public interface MediaServerMapper {
 
-    @Insert("INSERT INTO media_server (" +
+    @Insert("INSERT INTO vmp_media_server (" +
             "id, " +
             "ip, " +
             "hookIp, " +
@@ -59,7 +59,7 @@ public interface MediaServerMapper {
     int add(MediaServerItem mediaServerItem);
 
     @Update(value = {" <script>" +
-            "UPDATE media_server " +
+            "UPDATE vmp_media_server " +
             "SET updateTime='${updateTime}'" +
             "<if test=\"ip != null\">, ip='${ip}'</if>" +
             "<if test=\"hookIp != null\">, hookIp='${hookIp}'</if>" +
@@ -82,21 +82,21 @@ public interface MediaServerMapper {
             " </script>"})
     int update(MediaServerItem mediaServerItem);
 
-    @Select("SELECT * FROM media_server WHERE id='${id}'")
+    @Select("SELECT * FROM vmp_media_server WHERE id='${id}'")
     MediaServerItem queryOne(String id);
 
-    @Select("SELECT * FROM media_server")
+    @Select("SELECT * FROM vmp_media_server")
     List<MediaServerItem> queryAll();
 
-    @Select("DELETE FROM media_server WHERE id='${id}'")
+    @Select("DELETE FROM vmp_media_server WHERE id='${id}'")
     void delOne(String id);
 
-    @Select("DELETE FROM media_server WHERE ip='${host}' and httpPort=${port}")
+    @Select("DELETE FROM vmp_media_server WHERE ip='${host}' and httpPort=${port}")
     void delOneByIPAndPort(@Param("host") String host, @Param("port") int port);
 
-    @Select("DELETE FROM media_server WHERE defaultServer=1;")
+    @Select("DELETE FROM vmp_media_server WHERE defaultServer=1;")
     void delDefault();
 
-    @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
+    @Select("SELECT * FROM vmp_media_server WHERE ip='${host}' and httpPort=${port}")
     MediaServerItem queryOneByHostAndPort(@Param("host") String host,@Param("port") int port);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/ParentPlatformMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Repository
 public interface ParentPlatformMapper {
 
-    @Insert("INSERT INTO parent_platform (enable, name, serverGBId, serverGBDomain, serverIP, serverPort, deviceGBId, deviceIp,  " +
+    @Insert("INSERT INTO vmp_parent_platform (enable, name, serverGBId, serverGBDomain, serverIP, serverPort, deviceGBId, deviceIp,  " +
             "            devicePort, username, password, expires, keepTimeout, transport, characterSet, ptz, rtcp, " +
             "            status) " +
             "            VALUES (${enable}, '${name}', '${serverGBId}', '${serverGBDomain}', '${serverIP}', ${serverPort}, '${deviceGBId}', '${deviceIp}', " +
@@ -21,7 +21,7 @@ public interface ParentPlatformMapper {
             "            ${status})")
     int addParentPlatform(ParentPlatform parentPlatform);
 
-    @Update("UPDATE parent_platform " +
+    @Update("UPDATE vmp_parent_platform " +
             "SET enable=#{enable}, " +
             "name=#{name}," +
             "deviceGBId=#{deviceGBId}," +
@@ -43,31 +43,31 @@ public interface ParentPlatformMapper {
             "WHERE id=#{id}")
     int updateParentPlatform(ParentPlatform parentPlatform);
 
-    @Delete("DELETE FROM parent_platform WHERE serverGBId=#{serverGBId}")
+    @Delete("DELETE FROM vmp_parent_platform WHERE serverGBId=#{serverGBId}")
     int delParentPlatform(ParentPlatform parentPlatform);
 
     @Select("SELECT *, ((SELECT count(0)\n" +
-            "              FROM platform_gb_channel pc\n" +
+            "              FROM vmp_platform_gb_channel pc\n" +
             "              WHERE pc.platformId = pp.serverGBId)\n" +
             "              +\n" +
             "              (SELECT count(0)\n" +
-            "              FROM platform_gb_stream pgs\n" +
+            "              FROM vmp_platform_gb_stream pgs\n" +
             "              WHERE pgs.platformId = pp.serverGBId)) as channelCount\n" +
-            "FROM parent_platform pp ")
+            "FROM vmp_parent_platform pp ")
     List<ParentPlatform> getParentPlatformList();
 
-    @Select("SELECT * FROM parent_platform WHERE enable=#{enable}")
+    @Select("SELECT * FROM vmp_parent_platform WHERE enable=#{enable}")
     List<ParentPlatform> getEnableParentPlatformList(boolean enable);
 
-    @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}")
+    @Select("SELECT * FROM vmp_parent_platform WHERE serverGBId=#{platformGbId}")
     ParentPlatform getParentPlatByServerGBId(String platformGbId);
 
-    @Select("SELECT * FROM parent_platform WHERE id=#{id}")
+    @Select("SELECT * FROM vmp_parent_platform WHERE id=#{id}")
     ParentPlatform getParentPlatById(int id);
 
-    @Update("UPDATE parent_platform SET status=false" )
+    @Update("UPDATE vmp_parent_platform SET status=false" )
     int outlineForAllParentPlatform();
 
-    @Update("UPDATE parent_platform SET status=#{online} WHERE serverGBId=#{platformGbID}" )
+    @Update("UPDATE vmp_parent_platform SET status=#{online} WHERE serverGBId=#{platformGbID}" )
     int updateParentPlatformStatus(@Param("platformGbID") String platformGbID, @Param("online") boolean online);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/PlatformChannelMapper.java

@@ -16,39 +16,39 @@ public interface PlatformChannelMapper {
      * 查询列表里已经关联的
      */
     @Select("<script> "+
-            "SELECT deviceAndChannelId FROM platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
+            "SELECT deviceAndChannelId FROM vmp_platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
             "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach> ORDER BY deviceAndChannelId ASC" +
             "</script>")
     List<String> findChannelRelatedPlatform(@Param("platformId") String platformId,@Param("deviceAndChannelIds") List<String> deviceAndChannelIds);
 
     @Insert("<script> "+
-            "INSERT INTO platform_gb_channel (channelId, deviceId, platformId, deviceAndChannelId) VALUES" +
+            "INSERT INTO vmp_platform_gb_channel (channelId, deviceId, platformId, deviceAndChannelId) VALUES" +
             "<foreach collection='channelReducesToAdd'  item='item' separator=','> ('${item.channelId}','${item.deviceId}', '${platformId}', '${item.deviceId}_${item.channelId}' )</foreach>" +
             "</script>")
     int addChannels(@Param("platformId") String platformId, @Param("channelReducesToAdd") List<ChannelReduce> channelReducesToAdd);
 
 
     @Delete("<script> "+
-            "DELETE FROM platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
+            "DELETE FROM vmp_platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
             "<foreach collection='channelReducesToDel'  item='item'  open='(' separator=',' close=')' > '${item.deviceId}_${item.channelId}'</foreach>" +
             "</script>")
     int delChannelForGB(String platformId, List<ChannelReduce> channelReducesToDel);
 
     @Delete("<script> "+
-            "DELETE FROM platform_gb_channel WHERE deviceId='${deviceId}' " +
+            "DELETE FROM vmp_platform_gb_channel WHERE deviceId='${deviceId}' " +
             "</script>")
     int delChannelForDeviceId(String deviceId);
 
     @Delete("<script> "+
-            "DELETE FROM platform_gb_channel WHERE platformId='${platformId}'"  +
+            "DELETE FROM vmp_platform_gb_channel WHERE platformId='${platformId}'"  +
             "</script>")
     int cleanChannelForGB(String platformId);
 
 
-    @Select("SELECT * FROM device_channel WHERE deviceId = (SELECT deviceId FROM platform_gb_channel WHERE " +
+    @Select("SELECT * FROM vmp_device_channel WHERE deviceId = (SELECT deviceId FROM vmp_platform_gb_channel WHERE " +
             "platformId='${platformId}' AND channelId='${channelId}' ) AND channelId='${channelId}'")
     DeviceChannel queryChannelInParentPlatform(@Param("platformId") String platformId,@Param("channelId") String channelId);
 
-    @Select("SELECT * FROM device WHERE deviceId = (SELECT deviceId FROM platform_gb_channel WHERE platformId='${platformId}' AND channelId='${channelId}')")
+    @Select("SELECT * FROM vmp_device WHERE deviceId = (SELECT deviceId FROM vmp_platform_gb_channel WHERE platformId='${platformId}' AND channelId='${channelId}')")
     Device queryVideoDeviceByPlatformIdAndChannelId(@Param("platformId") String platformId, @Param("channelId") String channelId);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/PlatformGbStreamMapper.java

@@ -12,16 +12,16 @@ import java.util.List;
 @Repository
 public interface PlatformGbStreamMapper {
 
-    @Insert("INSERT INTO platform_gb_stream (app, stream, platformId) VALUES" +
+    @Insert("INSERT INTO vmp_platform_gb_stream (app, stream, platformId) VALUES" +
             "('${app}', '${stream}', '${platformId}')")
     int add(PlatformGbStream platformGbStream);
 
-    @Delete("DELETE FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
+    @Delete("DELETE FROM vmp_platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
     int delByAppAndStream(String app, String stream);
 
-    @Delete("DELETE FROM platform_gb_stream WHERE platformId=#{platformId}")
+    @Delete("DELETE FROM vmp_platform_gb_stream WHERE platformId=#{platformId}")
     int delByPlatformId(String platformId);
 
-    @Select("SELECT * FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
+    @Select("SELECT * FROM vmp_platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
     List<StreamProxyItem> selectByAppAndStream(@Param("app") String app, @Param("stream") String stream);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/RoleMapper.java

@@ -10,12 +10,12 @@ import java.util.List;
 @Repository
 public interface RoleMapper {
 
-    @Insert("INSERT INTO role (name, authority, createTime, updateTime) VALUES" +
+    @Insert("INSERT INTO  vmp_role (name, authority, createTime, updateTime) VALUES" +
             "('${name}', '${authority}', '${createTime}', '${updateTime}')")
     int add(Role role);
 
     @Update(value = {" <script>" +
-            "UPDATE role " +
+            "UPDATE  vmp_role " +
             "SET updateTime='${updateTime}' " +
             "<if test=\"name != null\">, name='${name}'</if>" +
             "<if test=\"authority != null\">, authority='${authority}'</if>" +
@@ -23,12 +23,12 @@ public interface RoleMapper {
             " </script>"})
     int update(Role role);
 
-    @Delete("DELETE FROM role WHERE  id != 1 and id=#{id}")
+    @Delete("DELETE FROM  vmp_role WHERE  id != 1 and id=#{id}")
     int delete(int id);
 
-    @Select("select * FROM role WHERE id=#{id}")
+    @Select("select * FROM  vmp_role WHERE id=#{id}")
     Role selectById(int id);
 
-    @Select("select * FROM role")
+    @Select("select * FROM vmp_role")
     List<Role> selectAll();
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/StreamProxyMapper.java

@@ -10,13 +10,13 @@ import java.util.List;
 @Repository
 public interface StreamProxyMapper {
 
-    @Insert("INSERT INTO stream_proxy (type, app, stream,mediaServerId, url, src_url, dst_url, " +
+    @Insert("INSERT INTO vmp_stream_proxy (type, app, stream,mediaServerId, url, src_url, dst_url, " +
             "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable, createTime) VALUES" +
             "('${type}','${app}', '${stream}', '${mediaServerId}','${url}', '${src_url}', '${dst_url}', " +
             "'${timeout_ms}', '${ffmpeg_cmd_key}', '${rtp_type}', ${enable_hls}, ${enable_mp4}, ${enable}, '${createTime}' )")
     int add(StreamProxyItem streamProxyDto);
 
-    @Update("UPDATE stream_proxy " +
+    @Update("UPDATE vmp_stream_proxy " +
             "SET type=#{type}, " +
             "app=#{app}," +
             "stream=#{stream}," +
@@ -33,20 +33,20 @@ public interface StreamProxyMapper {
             "WHERE app=#{app} AND stream=#{stream}")
     int update(StreamProxyItem streamProxyDto);
 
-    @Delete("DELETE FROM stream_proxy WHERE app=#{app} AND stream=#{stream}")
+    @Delete("DELETE FROM vmp_stream_proxy WHERE app=#{app} AND stream=#{stream}")
     int del(String app, String stream);
 
-    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createTime desc")
+    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_proxy st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createTime desc")
     List<StreamProxyItem> selectAll();
 
-    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable} order by st.createTime desc")
+    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_proxy st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable} order by st.createTime desc")
     List<StreamProxyItem> selectForEnable(boolean enable);
 
-    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream} order by st.createTime desc")
+    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_proxy st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream} order by st.createTime desc")
     StreamProxyItem selectOne(@Param("app") String app, @Param("stream") String stream);
 
-    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM stream_proxy st " +
-            "LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream " +
+    @Select("SELECT st.*, pgs.gbId, pgs.name, pgs.longitude, pgs.latitude FROM   vmp_stream_proxy st " +
+            "LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream " +
             "WHERE st.enable=${enable} and st.mediaServerId = '${id}' order by st.createTime desc")
     List<StreamProxyItem> selectForEnableInMediaServer(String id, boolean enable);
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/StreamPushMapper.java

@@ -10,13 +10,13 @@ import java.util.List;
 @Repository
 public interface StreamPushMapper {
 
-    @Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+    @Insert("INSERT INTO vmp_stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
             "createStamp, aliveSecond, mediaServerId) VALUES" +
             "('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
             "'${createStamp}', '${aliveSecond}', '${mediaServerId}' )")
     int add(StreamPushItem streamPushItem);
 
-    @Update("UPDATE stream_push " +
+    @Update("UPDATE vmp_stream_push " +
             "SET app=#{app}," +
             "stream=#{stream}," +
             "mediaServerId=#{mediaServerId}," +
@@ -28,20 +28,20 @@ public interface StreamPushMapper {
             "WHERE app=#{app} AND stream=#{stream}")
     int update(StreamPushItem streamPushItem);
 
-    @Delete("DELETE FROM stream_push WHERE app=#{app} AND stream=#{stream}")
+    @Delete("DELETE FROM vmp_stream_push WHERE app=#{app} AND stream=#{stream}")
     int del(String app, String stream);
 
-    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream")
+    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_push st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream")
     List<StreamPushItem> selectAll();
 
-    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")
+    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_push st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")
     List<StreamPushItem> selectForEnable(boolean enable);
 
-    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
+    @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM vmp_stream_push st LEFT JOIN vmp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
     StreamPushItem selectOne(String app, String stream);
 
     @Insert("<script>"  +
-            "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+            "INSERT INTO vmp_stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
             "createStamp, aliveSecond, mediaServerId) " +
             "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
             "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
@@ -50,7 +50,7 @@ public interface StreamPushMapper {
             "</script>")
     void addAll(List<StreamPushItem> streamPushItems);
 
-    @Delete("DELETE FROM stream_push")
+    @Delete("DELETE FROM vmp_stream_push")
     void clear();
 
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/dao/UserMapper.java

@@ -10,12 +10,12 @@ import java.util.List;
 @Repository
 public interface UserMapper {
 
-    @Insert("INSERT INTO user (username, password, roleId, createTime, updateTime) VALUES" +
+    @Insert("INSERT INTO vmp_user (username, password, roleId, createTime, updateTime) VALUES" +
             "('${username}', '${password}', '${role.id}', '${createTime}', '${updateTime}')")
     int add(User user);
 
     @Update(value = {" <script>" +
-            "UPDATE user " +
+            "UPDATE vmp_user " +
             "SET updateTime='${updateTime}' " +
             "<if test=\"role != null\">, roleId='${role.id}'</if>" +
             "<if test=\"password != null\">, password='${password}'</if>" +
@@ -24,10 +24,10 @@ public interface UserMapper {
             " </script>"})
     int update(User user);
 
-    @Delete("DELETE FROM user WHERE id != 1 and id=#{id}")
+    @Delete("DELETE FROM vmp_user WHERE id != 1 and id=#{id}")
     int delete(int id);
 
-    @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority , role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and user.username=#{username} AND user.password=#{password}")
+    @Select("select u.*, u.id roleID, r.name roleName, r.authority roleAuthority , r.createTime roleCreateTime , r.updateTime roleUpdateTime FROM vmp_user u, vmp_role r WHERE u.roleId=r.id and u.username=#{username} AND u.password=#{password}")
     @Results(id = "roleMap", value = {
             @Result(column = "roleID", property = "role.id"),
             @Result(column = "roleName", property = "role.name"),
@@ -37,15 +37,15 @@ public interface UserMapper {
     })
     User select(String username, String password);
 
-    @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and user.id=#{id}")
+    @Select("select u.*, r.id roleID, r.name roleName, r.authority roleAuthority, r.createTime roleCreateTime , r.updateTime roleUpdateTime FROM vmp_user u, vmp_role r WHERE u.roleId=u.id and user.id=#{id}")
     @ResultMap(value="roleMap")
     User selectById(int id);
 
-    @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and username=#{username}")
+    @Select("select u.*, r.id roleID, r.name roleName, r.authority roleAuthority, r.createTime roleCreateTime , r.updateTime roleUpdateTime FROM vmp_user u, vmp_role r WHERE u.roleId=r.id and u.username=#{username}")
     @ResultMap(value="roleMap")
     User getUserByUsername(String username);
 
-    @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id")
+    @Select("select u.*, r.id roleID, r.name roleName, r.authority roleAuthority, r.createTime roleCreateTime , r.updateTime roleUpdateTime FROM vmp_user u, vmp_role r WHERE u.roleId=r.id")
     @ResultMap(value="roleMap")
     List<User> selectAll();
 }