构建脚本调整,参数调整

package/buildDockerImage.sh

@@ -48,6 +48,14 @@ echo -e "\033[32m ---导出国标平台镜像成功,开始导出redis---- \033[0
 docker save -o ./result/hfyredis.tar hfyredis:latest
 echo -e "\033[32m ---导出redis镜像成功,开始导出mysql---- \033[0m";
 docker save -o ./result/hfysql.tar hfysql:latest
+mkdir ./result/gbRunning
+mkdir ./result/redis
+mkdir ./result/mysql
+cp ./gbDocker/createConfig.sh ./result/gbRunning/createConfig.sh
+cp ./config.cfg ./result/config.cfg
+cp ./startDockerImage.sh ./result/startDockerImage.sh
+cp ./redis/redis.conf ./result/redis/redis.conf
+
 # 为result目录下的文件添加读写权限
 chmod -R 777 ./result
 

package/config.cfg

@@ -6,6 +6,7 @@
 # 是否启用mysql 镜像
 enable_sql=1
 sql_host="0.0.0.0"
+sql_port=6543
 sql_user="hfygb"
 sql_passwd="hfygb28181"
 sql_db="gb_db"
@@ -32,9 +33,9 @@ gb_keyPath="/opt/gb28181/cert/key.pem"
 # web端口
 gb_WebPort=29001
 # sip端口
-gb_SIPPort=29000
+gb_sipPort=29000
 # 国标sip地址
-gb_Host="0.0.0.0"
+gb_host="0.0.0.0"
 # 国标域,具体参考国标文档
 gb_domain=3402000000
 gb_id=34020000002000000001

package/gbDocker/createConfig.sh

@@ -0,0 +1,136 @@
+#!/bin/bash -e
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
+p=$SCRIPT_DIR"/application_product.yml"
+t1="  "
+t2="    "
+t3="      "
+
+SQLHost=$sql_host
+SQLPort=$sql_port
+SQLUser=$sql_user
+SQLPasswd=$sql_passwd
+SQLDB=$sql_db
+
+RedisHost=$redis_host
+RedisPort=$redis_port
+RedisPasswd=$redis_passwd
+RedisDb=$redis_db
+
+EnableHttps=$gb_enableHttps
+CertPath=$gb_certPath
+KeyPath=$gb_keyPath
+WebPort=$gb_webPort
+SipPort=$gb_sipPort
+Host=$gb_host
+
+Domain=$gb_domain
+ID=$gb_id
+Password=$gb_password
+KeepaliveTimeout=$gb_keepaliveTimeout
+KeepaliveInterval=$gb_keepaliveInterval
+AiPicPath=$gb_aiPicPath
+PlayTimeout=$gb_playTimeout
+
+echo "GBWebPort"
+finalMysqlHost=$SQLHost;
+finalRedisHost=$RedisHost;
+if [ "$RedisHost" = "0.0.0.0" ];then
+  finalRedisHost="127.0.0.1";
+fi
+if [ "$SQLHost" = "0.0.0.0" ];then
+  finalMysqlHost="127.0.0.1";
+fi
+echo "#hfy 国标平台配置文件" > "$p"
+echo "spring:" >> "$p"
+echo "${t1}servlet:" >> "$p"
+echo "${t2}multipart:" >> "$p"
+echo "${t3}max-file-size: 10MB" >> "$p"
+echo "${t3}max-request-size: 100MB" >> "$p"
+#  redis 配置项
+echo "${t1}redis:" >> "$p"
+echo "${t2}#[必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1:" >> "$p"
+echo "${t2}host: $finalRedisHost" >> "$p"
+echo "${t2}port: $RedisPort" >> "$p"
+echo "${t2}database: $RedisDb" >> "$p"
+echo "${t2}password: $RedisPasswd" >> "$p"
+echo "${t2}timeout: 10000" >> "$p"
+echo "${t2}#[可选] 一个pool最多可分配多少个jedis实例" >> "$p"
+echo "${t2}poolMaxTotal: 1000" >> "$p"
+echo "${t2}#[可选] 一个pool最多有多少个状态为idle(空闲)的jedis实例" >> "$p"
+echo "${t2}poolMaxIdle: 500" >> "$p"
+echo "${t2}#[可选] 最大的等待时间(秒)" >> "$p"
+echo "${t2}poolMaxWait: 7" >> "$p"
+
+# [必选] jdbc数据库配置
+#  mysql 配置项
+echo "${t1}#[必选] jdbc数据库配置" >> "$p"
+echo "${t1}datasource:" >> "$p"
+echo "${t2}type: com.alibaba.druid.pool.DruidDataSource" >> "$p"
+echo "${t2}driver-class-name: com.mysql.cj.jdbc.Driver" >> "$p"
+echo "${t2}url: jdbc:mysql://$finalMysqlHost:$SQLPort/$SQLDB?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=true&allowMultiQueries=true&AllowPublicKeyRetrieval=true" >> "$p"
+echo "${t2}username: $SQLUser" >> "$p"
+echo "${t2}password: $SQLPasswd" >> "$p"
+echo "${t2}druid:" >> "$p"
+echo "${t3}initialSize: 10                       # 连接池初始化连接数" >> "$p"
+echo "${t3}minIdle: 5                            # 连接池最小空闲连接数" >> "$p"
+echo "${t3}maxWait: 60000                        # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，如果需要可以通过配置useUnfairLock属性为true使用非公平锁。" >> "$p"
+echo "${t3}keepAlive: true                       # 连接池中的minIdle数量以内的连接，空闲时间超过minEvictableIdleTimeMillis，则会执行keepAlive操作。" >> "$p"
+echo "${t3}validationQuery: select 1             # 检测连接是否有效sql，要求是查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。" >> "$p"
+echo "${t3}testWhileIdle: true                   # 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。" >> "$p"
+echo "${t3}testOnBorrow: false                   # 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。" >> "$p"
+echo "${t3}testOnReturn: false                   # 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。" >> "$p"
+echo "${t3}poolPreparedStatements: false         # 是否開啟PSCache，並且指定每個連線上PSCache的大小" >> "$p"
+echo "${t3}timeBetweenEvictionRunsMillis: 60000  # 配置間隔多久才進行一次檢測，檢測需要關閉的空閒連線，單位是毫秒" >> "$p"
+echo "${t3}minEvictableIdleTimeMillis: 300000    # 配置一個連線在池中最小生存的時間，單位是毫秒" >> "$p"
+echo "${t3}filters: stat,slf4j                   # 配置监控统计拦截的filters，监控统计用的filter:sta, 日志用的filter:log4j" >> "$p"
+echo "${t3}useGlobalDataSourceStat: true         # 合并多个DruidDataSource的监控数据" >> "$p"
+echo "${t3}connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=1000" >> "$p"
+echo "${t3}maxActive: 200                        # 连接池最大连接数" >> "$p"
+
+echo "server:" >> "$p"
+echo "${t1}address: 0.0.0.0" >> "$p"
+echo "${t1}# 国标平台web端口" >> "$p"
+echo "${t1}port: $WebPort" >> "$p"
+echo "${t1}# [可选] HTTPS配置， 默认不开启" >> "$p"
+echo "${t1}ssl:" >> "$p"
+echo "${t2}# [可选] 是否开启HTTPS访问" >> "$p"
+echo "${t2}enabled: $EnableHttps" >> "$p"
+echo "${t2}# [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名" >> "$p"
+echo "${t2}key-store: classpath:xxx.jks" >> "$p"
+echo "${t2}# [可选] 证书密码" >> "$p"
+echo "${t2}key-store-password: password" >> "$p"
+echo "${t2}# [可选] 证书类型， 默认为jks，根据实际修改" >> "$p"
+echo "${t2}key-store-type: JKS" >> "$p"
+echo "${t2}# 配置证书可以使用如下两项，如上面二选一即可" >> "$p"
+echo "${t2}# PEM 编码证书" >> "$p"
+echo "${t2}certificate: $CertPath" >> "$p"
+echo "${t2}# 私钥文件" >> "$p"
+echo "${t2}certificate-private-key: $KeyPath" >> "$p"
+
+echo "sip:" >> "$p"
+echo "${t1}# [必须修改] 本机的IP, 必须是网卡上的IP，用于sip下协议栈监听ip，如果监听所有设置为0.0.0.0" >> "$p"
+echo "${t1}monitor-ip: 0.0.0.0" >> "$p"
+echo "${t1}# [必须修改] 本机的IP,zlm需要可与此ip通信" >> "$p"
+echo "${t1}ip: $Host" >> "$p"
+echo "${t1}# [必须修改] 国标协议sip信令端口" >> "$p"
+echo "${t1}port: $SipPort" >> "$p"
+echo "${t1}# 根据国标协议6.1.2的规则制定的 10位数" >> "$p"
+echo "${t1}domain: $Domain" >> "$p"
+echo "${t1}# 平台id" >> "$p"
+echo "${t1}id: $ID" >> "$p"
+echo "${t1}# sip认证密码" >> "$p"
+echo "${t1}password: $Password" >> "$p"
+echo "${t1}# 设备心跳超时时间" >> "$p"
+echo "${t1}keepalive-timeout: $KeepaliveTimeout" >> "$p"
+echo "${t1}# [可选] 国标级联注册失败，再次发起注册的时间间隔。 默认60秒" >> "$p"
+echo "${t1}register-time-interval: $KeepaliveInterval" >> "$p"
+echo "${t1}# [可选] 云台控制速度" >> "$p"
+echo "${t1}ptz-speed: 50" >> "$p"
+echo "${t1}# 是否存储alarm信息" >> "$p"
+echo "${t1}alarm: false" >> "$p"
+echo "${t1}# hfy ai图片存储位置" >> "$p"
+echo "${t1}mediaPath: $AiPicPath" >> "$p"
+echo "# [可选] 日志配置, 一般不需要改" >> "$p"
+echo "logging:" >> "$p"
+echo "${t1}config: classpath:logback-spring-local.xml" >> "$p"
+

package/startDockerImage.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # 本脚本用于修改mysql安装配置文件信息
-
+# 获取脚本运行所在路径
+SCRIPT_DIR=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
 echo -e "\033[33m
 ---------------
 -----SZHFY-----
@@ -10,43 +11,80 @@ echo -e "\033[33m
 echo  -e "\033[33m 欢迎使用深圳合方圆科技一键部署国标平台安装程序 \033[0m";
 # 读取配置文件
 source ./config.cfg
+# 检查必要启动参数是否存在
+#sql_host="0.0.0.0"
+#sql_port=3306
+#sql_user="hfygb"
+#sql_passwd="hfygb28181"
+#sql_db="gb_db"
+#sql_path="sqlRuning"
+#redis_host="0.0.0.0"
+#redis_port=7654
+#redis_db=6
+#redis_passwd="hfyredis28181"
+echo "检查基础参数中,,,,,,"
+if [ ! -n "$sql_host" ]; then
+    echo "sql_host 未设置"
+    exit 1
+fi
+if [ ! -n "$sql_user" ]; then
+    echo "sql_user 未设置"
+    exit 1
+fi
+if [ ! -n "$sql_passwd" ]; then
+    echo "sql_passwd 未设置"
+    exit 1
+fi
+if [ ! -n "$sql_db" ]; then
+    echo "sql_db 未设置"
+    exit 1
+fi
+
+
+
+echo "开始启动redis"
 #检查是否启用docker安装 enable_sql 为1时启用 为0时不启用
 if("$enable_sql" == "1");then
+    # 判断是否存在mysql目录,没有则创建
+    if [ ! -d "$SCRIPT_DIR/sql" ]; then
+        mkdir -p /data/mysql
+    fi
     # 导入mysql镜像
     docker load -i ./result/hfysql.tar
     # 检查容器是否已经启动,如果已经启动则尝试导出数据库
     docker ps -a | grep hfysql
     if [ $? -eq 0 ]; then
         # 导出数据库
-        docker exec -it hfysql mysqldump -uroot -p$mysqlPasswd --all-databases > /data/mysql/hfysqlSave.sql
+        docker exec -it hfysql mysqldump -uroot -p"hfy$sql_passwd" --all-databases > /data/mysql/hfysqlSave.sql
         # 停止容器
         docker stop hfysql
         # 删除容器
         docker rm hfysql
     fi
-#    为mysql添加用户,并且授权数据库给该用户
-    docker exec -it mysql mysql -uroot -p$mysqlPasswd -e "CREATE USER '$mysqlUser'@'%' IDENTIFIED BY '$mysqlPasswd';GRANT ALL PRIVILEGES ON *.* TO '$mysqlUser'@'%';FLUSH PRIVILEGES;"
     # 启动mysql容器
     docker run -d --name hfysql \
-    -p "$mysql_port":3306 \
+    -p "$sql_port":3306 \
     -v /data/mysql:/var/lib/mysql \
-    -e MYSQL_ROOT_PASSWORD="$mysqlPasswd" \
-    -e MYSQL_DATABASE="$mysqlDatabase" \
+    -e MYSQL_DATABASE="$sql_db" \
     -e MYSQL_USER="root" \
-    -e MYSQL_ROOT_PASSWORD="hfy$mysqlPasswd" \
+    -e MYSQL_ROOT_PASSWORD="hfy$sql_passwd" \
     hfysql:latest
     if [ $? -ne 0 ]; then
       echo "run mysql docker failed";
     fi
+    #    为mysql添加用户,并且授权数据库给该用户
+    docker exec -it mysql mysql -uroot -p"hfy$sql_passwd" -e "CREATE USER '$sql_user'@'%' IDENTIFIED BY '$sql_passwd';GRANT ALL PRIVILEGES ON *.* TO '$sql_user'@'%';FLUSH PRIVILEGES;"
 fi
 
+echo "开始启动redis"
 # 检查是否启用redis安装 enable_redis 为1时启用 为0时不启用
 if("enable_redis" == "1");then
+    #
 #  修改配置redis配置文件
     sed -i \
     -e "s/^port .*$/port $redis_port/g" \
     -e "s/^requirepass .*$/requirepass $redis_passwd/g" \
-    $SCRIPT_DIR"/redis.conf";
+    "$SCRIPT_DIR/redis/redis.conf";
     # 导入redis镜像
     docker load -i ./result/hfyredis.tar
     # 检查容器是否已经启动,如果已经启动则关闭并且删除容器
@@ -58,8 +96,33 @@ if("enable_redis" == "1");then
         docker rm hfyredis
     fi
     # 启动redis容器 host 模式启动,端口映射到宿主机
-    docker run -it -p "$redisPort":"$redisPort" \
+    docker run -it -p "$redis_port":"$redis_port" \
      -v /data/redis:/data/redis \
      -v /data/redis/logs:/data/redis/logs \
+     -v "$SCRIPT_DIR/redis/redis.conf":/etc/redis/redis.conf \
      --name hfy_redis -itd hfyredis:latest
-fi
+fi
+
+echo "开始启动国标平台"
+# 根据参数生成国标平台配置文件
+source ./result/gbRunning/createConfig.sh
+# 导入国标平台镜像
+docker load -i ./result/hfygb.tar
+# 检查容器是否已经启动,如果已经启动则关闭并且删除容器 hfy_gb
+docker ps -a | grep hfy_gb
+if [ $? -eq 0 ]; then
+    # 停止容器
+    docker stop hfy_gb
+    # 删除容器
+    docker rm hfy_gb
+fi
+sudo docker run -itd --net=host  \
+ -v /data/gb:/data/gb -e LANG=C.UTF-8 \
+ -v $SCRIPT_DIR"/gbRunning":/data/hfygb \
+ -v $SCRIPT_DIR"/gbRunning/application_product.yml":/data/hfygb/config/"application_product.yml" --name hfy_gp -it hfy_gb:latest
+if [ $? -ne 0 ]; then
+  echo "run gb docker failed";
+fi
+echo -e "\033[33m国标平台以全部启动,请使用浏览器访问 http://$gb_host:$gb_WebPort\033[0m";
+
+