diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml index fc2b73b8..ad667e85 100644 --- a/dsSzxy/.idea/workspace.xml +++ b/dsSzxy/.idea/workspace.xml @@ -2,58 +2,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -81,7 +34,7 @@ - + @@ -91,8 +44,18 @@ + + + + + + + + + + diff --git a/dsSzxy/Config/Config.ini b/dsSzxy/Config/Config.ini index e3738020..abe3b024 100644 --- a/dsSzxy/Config/Config.ini +++ b/dsSzxy/Config/Config.ini @@ -1,6 +1,6 @@ #发布功能的配置 [distribute] -ip = 10.10.14.187 +ip = 10.10.14.175 port = 22 user = root pwd = dsideal diff --git a/dsSzxy/Router/CommonToolsRouter.go b/dsSzxy/Router/CommonToolsRouter.go index 322e1c02..abda476a 100644 --- a/dsSzxy/Router/CommonToolsRouter.go +++ b/dsSzxy/Router/CommonToolsRouter.go @@ -9,7 +9,7 @@ import ( //接口路由 func GinRouter(r *gin.Engine) { //注册分路线 - rr := r.Group("/tools") + rr := r.Group("/dsSzxy") //MinIo MinIORelateController.Routers(rr) //IM diff --git a/dsSzxy/WinBuild/Distribute.exe b/dsSzxy/WinBuild/Distribute.exe index f72dbd9a..70d7bdcb 100644 Binary files a/dsSzxy/WinBuild/Distribute.exe and b/dsSzxy/WinBuild/Distribute.exe differ diff --git a/dsSzxy/build/Config/Config.ini b/dsSzxy/build/Config/Config.ini new file mode 100644 index 00000000..abe3b024 --- /dev/null +++ b/dsSzxy/build/Config/Config.ini @@ -0,0 +1,49 @@ +#发布功能的配置 +[distribute] +ip = 10.10.14.175 +port = 22 +user = root +pwd = dsideal +remotePath = /usr/local/dsMin/dsSzxy/ +localPath = E:/Work/dsMin/dsSzxy + +#gin服务器的端口 +[server] +port = 8006 + +# 本项目名称,用于记录日志 +[project] +project_name = dsSzxy + +[mysql] +ip = 10.10.14.187 +port = 22066 +db_name = base_db_dev +user = root +pwd = DsideaL147258369 + +[redis] +ip = 10.10.14.175 +port = 18890 +db = 0 + +#minio配置 +[minio] +minio_endpoint = 10.10.14.231:9000 +minio_accessKeyId = minioadmin +minio_secretAccessKey = minioadmin +minio_bucket = dsideal +download_prefix = http://10.10.14.231:9000/ + +[obs] +obs_endpoint = https://obs.myhuaweicloud.com +obs_accessKeyId = HZDE30KAN5C5OLJ9JCCF +obs_secretAccessKey = 3QO1IJNRrFZyER1e1NBBu4qSyqDfZ8Xup0YPzDFW +obs_bucket = dsideal + +[preview] +prefix = https://ow365.cn/?i=14531&furl=http://video.edusoa.com/crh/ + +[savePath] +path= /usr/local/dsMin/dsSzxy/files/ + diff --git a/dsSzxy/build/Config/logo.txt b/dsSzxy/build/Config/logo.txt new file mode 100644 index 00000000..a2124fe4 --- /dev/null +++ b/dsSzxy/build/Config/logo.txt @@ -0,0 +1,8 @@ + _ _____ + | | / ____| + __| |___| (___ ______ ___ _ + / _` / __|\___ \_ /\ \/ / | | | + | (_| \__ \____) / / > <| |_| | + \__,_|___/_____/___|/_/\_\\__, | + __/ | + |___/ \ No newline at end of file diff --git a/dsSzxy/build/debug.sh b/dsSzxy/build/debug.sh new file mode 100644 index 00000000..2652d116 --- /dev/null +++ b/dsSzxy/build/debug.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# 杀掉进程 +kill -9 `pgrep -f dsSzxy` 2>/dev/null +sleep 3 + +cd /usr/local/dsMin/dsSzxy +chmod +x dsSzxy +# 运行为后台进程1 +/usr/local/dsMin/dsSzxy/dsSzxy diff --git a/dsSzxy/build/dsSzxy b/dsSzxy/build/dsSzxy new file mode 100644 index 00000000..8f68f6b6 Binary files /dev/null and b/dsSzxy/build/dsSzxy differ diff --git a/dsSzxy/build/start.sh b/dsSzxy/build/start.sh new file mode 100644 index 00000000..980499c2 --- /dev/null +++ b/dsSzxy/build/start.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# 杀掉进程 +kill -9 `pgrep -f dsSzxy` 2>/dev/null +sleep 3 + +chmod +x dsSzxy +# 运行为后台进程 +nohup /usr/local/dsMin/dsSzxy/dsSzxy >> /usr/local/dsMin/dsSzxy/dsSzxy.log 2>&1 & diff --git a/dsSzxy/build/stop.sh b/dsSzxy/build/stop.sh new file mode 100644 index 00000000..8dffa9f7 --- /dev/null +++ b/dsSzxy/build/stop.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# kill 命令不使用 -9 参数时,会回调 onStop() 方法,确定不需要此回调建议使用 -9 参数 +kill -9 `pgrep -f dsSzxy` 2>/dev/null