UPDATE
continuous-integration/drone/push Build is passing Details

master
kgdxpr 4 years ago
parent 2b55783d26
commit 3b0ed4584c

@ -2,58 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../dsCommonTools/.idea/dsCommonTools.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/.idea/workspace.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Business/ImRelate/ImRelateController/ImRelateController.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Business/MinIORelate/MinIORelateController/MinIORelateController.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Business/MinIORelate/MinIORelateDao/MinIORelateDao.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Config/Config.ini" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Config/logo.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Router/CommonToolsRouter.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Shell/debug.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Shell/start.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Shell/stop.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Tools/Distribute.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Tools/upx.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/CommonUtil/CommonUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ConfigUtil/ConfigUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/DbUtil/DbUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/MinioUtil/MinioUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/ObsUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/auth.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/client.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/conf.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/const.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/convert.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/error.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/extension.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/http.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/log.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/model.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/pool.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/provider.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/temporary.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/trait.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/transfer.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/ObsUtil/obs/util.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/RedisUtil/RedisUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/SftpUtil/SftpUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/SshUtil/SshUtil.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/Utils/cors.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/WinBuild/Distribute.exe" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/Config/Config.ini" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/Config/logo.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/debug.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/dsCommonTools" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/start.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/build/stop.sh" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/go.mod" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/go.sum" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/main.go" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/一键发布.cmd" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../dsCommonTools/前台备份/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Config/Config.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/Config.ini" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Router/CommonToolsRouter.go" beforeDir="false" afterPath="$PROJECT_DIR$/Router/CommonToolsRouter.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/WinBuild/Distribute.exe" beforeDir="false" afterPath="$PROJECT_DIR$/WinBuild/Distribute.exe" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -73,6 +25,7 @@
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
@ -81,7 +34,7 @@
<property name="go.tried.to.enable.integration.vgo.integrator" value="true" />
<property name="last_opened_file_path" value="$USER_HOME$" />
</component>
<component name="RunManager">
<component name="RunManager" selected="Go Build.go build main.go">
<configuration name="go build dsSzxy" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="dsSzxy" />
<working_directory value="$PROJECT_DIR$" />
@ -91,8 +44,18 @@
<directory value="$PROJECT_DIR$" />
<method v="2" />
</configuration>
<configuration name="go build main.go" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="dsSzxy" />
<working_directory value="$PROJECT_DIR$" />
<kind value="FILE" />
<filePath value="$PROJECT_DIR$/main.go" />
<package value="dsCommonTools" />
<directory value="$PROJECT_DIR$" />
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Go Build.go build main.go" />
<item itemvalue="Go Build.go build dsSzxy" />
</list>
</recent_temporary>

@ -1,6 +1,6 @@
#发布功能的配置
[distribute]
ip = 10.10.14.187
ip = 10.10.14.175
port = 22
user = root
pwd = dsideal

@ -9,7 +9,7 @@ import (
//接口路由
func GinRouter(r *gin.Engine) {
//注册分路线
rr := r.Group("/tools")
rr := r.Group("/dsSzxy")
//MinIo
MinIORelateController.Routers(rr)
//IM

Binary file not shown.

@ -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/

@ -0,0 +1,8 @@
_ _____
| | / ____|
__| |___| (___ ______ ___ _
/ _` / __|\___ \_ /\ \/ / | | |
| (_| \__ \____) / / > <| |_| |
\__,_|___/_____/___|/_/\_\\__, |
__/ |
|___/

@ -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

Binary file not shown.

@ -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 &

@ -0,0 +1,4 @@
#!/bin/bash
# kill 命令不使用 -9 参数时,会回调 onStop() 方法,确定不需要此回调建议使用 -9 参数
kill -9 `pgrep -f dsSzxy` 2>/dev/null
Loading…
Cancel
Save