From e4988958151bc901076c1ae09f4986ebac00a940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 3 Aug 2021 17:23:50 +0800 Subject: [PATCH] 'commit' --- dsSzxy/Config/Config.ini | 2 +- dsSzxy/Shell/debug.sh | 6 +++--- dsSzxy/Shell/remote.sh | 12 +++++------ dsSzxy/Shell/start.sh | 6 +++--- dsSzxy/Shell/stop.sh | 2 +- dsSzxy/Tools/Distribute.go | 2 +- dsSzxy/Utils/LogUtil/LogUtil.go | 34 -------------------------------- dsSzxy/WinBuild/Distribute.exe | Bin 5313024 -> 5313024 bytes dsSzxy/build/Config/Config.ini | 2 +- dsSzxy/build/debug.sh | 6 +++--- dsSzxy/build/remote.sh | 12 +++++------ dsSzxy/build/start.sh | 6 +++--- dsSzxy/build/stop.sh | 2 +- 13 files changed, 29 insertions(+), 63 deletions(-) delete mode 100644 dsSzxy/Utils/LogUtil/LogUtil.go diff --git a/dsSzxy/Config/Config.ini b/dsSzxy/Config/Config.ini index 57446e53..810d5290 100644 --- a/dsSzxy/Config/Config.ini +++ b/dsSzxy/Config/Config.ini @@ -16,4 +16,4 @@ port = 22 user = root pwd = dsideal remotePath = /usr/local/dsMin/dsSzxy/ -localPath = E:\Work\dsMin\dsSso\build \ No newline at end of file +localPath = E:\Work\dsMin\dsSzxy\build \ No newline at end of file diff --git a/dsSzxy/Shell/debug.sh b/dsSzxy/Shell/debug.sh index f4caaa07..e47ac54a 100644 --- a/dsSzxy/Shell/debug.sh +++ b/dsSzxy/Shell/debug.sh @@ -1,9 +1,9 @@ #!/bin/bash -mkdir -p /usr/local/dsMin/dsSso/Logs -chmod +x dsSso +mkdir -p /usr/local/dsMin/dsSzxy/Logs +chmod +x dsSzxy chmod +x *.sh # 运行为前台进程 -/usr/local/dsMin/dsSso/dsSso \ No newline at end of file +/usr/local/dsMin/dsSzxy/dsSzxy \ No newline at end of file diff --git a/dsSzxy/Shell/remote.sh b/dsSzxy/Shell/remote.sh index c67f405a..e13a4553 100644 --- a/dsSzxy/Shell/remote.sh +++ b/dsSzxy/Shell/remote.sh @@ -1,18 +1,18 @@ #!/bin/bash # 先杀掉内存中的进程 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null # 休息3秒 sleep 3 -cd /usr/local/dsMin/dsSso -chmod +x dsSso +cd /usr/local/dsMin/dsSzxy +chmod +x dsSzxy # 运行为后台进程 -cd /usr/local/dsMin/dsSso && +cd /usr/local/dsMin/dsSzxy && # kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null # 使用dlv方便远程调试 -dlv --listen=:2345 --headless=true --api-version=2 exec ./dsSso +dlv --listen=:2345 --headless=true --api-version=2 exec ./dsSzxy diff --git a/dsSzxy/Shell/start.sh b/dsSzxy/Shell/start.sh index 543551a4..0412ec72 100644 --- a/dsSzxy/Shell/start.sh +++ b/dsSzxy/Shell/start.sh @@ -1,10 +1,10 @@ #!/bin/bash -mkdir -p /usr/local/dsMin/dsSso/Logs -chmod +x dsSso +mkdir -p /usr/local/dsMin/dsSzxy/Logs +chmod +x dsSzxy chmod +x *.sh # 运行为后台进程 -nohup /usr/local/dsMin/dsSso/dsSso >> /usr/local/dsSso.out 2>&1 & +nohup /usr/local/dsMin/dsSzxy/dsSzxy >> /usr/local/dsSzxy.out 2>&1 & diff --git a/dsSzxy/Shell/stop.sh b/dsSzxy/Shell/stop.sh index 557de070..8dffa9f7 100644 --- a/dsSzxy/Shell/stop.sh +++ b/dsSzxy/Shell/stop.sh @@ -1,4 +1,4 @@ #!/bin/bash # kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null diff --git a/dsSzxy/Tools/Distribute.go b/dsSzxy/Tools/Distribute.go index 030081c8..c6b107cd 100644 --- a/dsSzxy/Tools/Distribute.go +++ b/dsSzxy/Tools/Distribute.go @@ -35,7 +35,7 @@ func main() { cli.Run("chmod +x /usr/local/dsMin/dsSzxy/start.sh") cli.Run("chmod +x /usr/local/dsMin/dsSzxy/debug.sh") cli.Run("chmod +x /usr/local/dsMin/dsSzxy/stop.sh") - cli.Run("cd /usr/local/dsMin/dsSso/ && dos2unix *.sh") + cli.Run("cd /usr/local/dsMin/dsSzxy/ && dos2unix *.sh") //启动 cli.Run("cd /usr/local/dsMin/dsSzxy && ./start.sh") log.Println("恭喜，智慧校园服务上传并启动成功！") diff --git a/dsSzxy/Utils/LogUtil/LogUtil.go b/dsSzxy/Utils/LogUtil/LogUtil.go deleted file mode 100644 index 26ba1e94..00000000 --- a/dsSzxy/Utils/LogUtil/LogUtil.go +++ /dev/null @@ -1,34 +0,0 @@ -package LogUtil - -import ( - "dsSso/Utils/CommonUtil" - "log" - "os" -) - -/** -功能：记录错误信息 -作者：黄海 -时间：2020-03-24 -*/ -func Error(code string, msg string) { - //判断是不是单元测试，如果是的话，那么配置文件的路径需要加上一个. - var logPath = "./Logs" - //判断文件不是存在（用于兼容单元测试不同的目录结构） - if !CommonUtil.Exists(logPath) { - logPath = "." + logPath - } - if !CommonUtil.Exists(logPath) { - //创建 - os.Mkdir(logPath, os.ModePerm) - } - //设置手工日志的办法 - logFile, err := os.OpenFile(logPath+"/dsSso.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) - defer logFile.Close() - if err != nil { - log.Fatalln("open file error !") - } - // 创建一个日志对象 - debugLog := log.New(logFile, "[Error]", log.LstdFlags) - debugLog.Println(code, "\t", msg) -} diff --git a/dsSzxy/WinBuild/Distribute.exe b/dsSzxy/WinBuild/Distribute.exe index 16df4336f7230161eea130409f2fef229dad2a4a..c2afe9ee3597f5abdce235b179834d98fc9074a7 100644 GIT binary patch delta 2793 zcmZ9N3sh9q8pr2<&de~w!*K>?WX`C7AQOlT;)BLVfQ>mQ56wrKB@n1V2qF(jQz(~= zXzES8>{i~c;+5_~4aG4&%NxkGY3~%%kqk5PEXCq&Uh*}C%4Fwo|BpwwQ|gy<%{w%ifz{P zoW=PCmV(7O@iF;@%je9_&3qwd#hBdqDOr}Nr;`gZG83le7g`gtCdb%jwlYz7?8 z^{280v^sB{e#sMGRHj~-hDzt23qb;cogH1ad>kWf3MLQ50-C)Pg(4=gwq;0#g~IaD zXF?u@ZNj2Kn8>#5h7reD?QZNsCMDJ&9SEhmcMv%c7pSWNZ<(=+O1?w`u%0a4nD2*G zRB;;t7U-!qSg?5@ntluyn!T`u4vZ6i2|)_gE)XsTB9O{o5ta#fhwiKq8dX?94G!U! z3URdOFT#3Xm}&HGVNMt_sN$rsI+R@Bts)hL-vcD3^rnasXP zVWR6wag`rVP?kyD4=9*%h-gC%EgT}Q717AP3KZ``Nf(2}V!hP#*8dGN*EP(%#7D#I zXE`zASj?bZG2&itL6$=)Hc=_Z5;oT^Mnlai>|zAYQ-fXH>IF3=%ogYQV=?W@5s#Y? zPg(254HitI+azxDz#gh-5^L1~S+@dy&w7k2T*(K0eOG6l>FeXEZ=jiN;$>h8jXojn z6EKXrPl~4%@S*z8#BYt*L2q6c2YSItwZDjclkpYRPLMaMag|=2BEP1`M4G)o{@Mt% zQ)junJQn9@;cK|)8KKoGEBK0Ib;Y|?v6nV9Z6T7)1lt6wNOc03q3Yj@ID3Z z_BdOODEfJd>XL|k>|BD%hRI}_rg~O^m#8>Jwewk|vq5`QcD%sS_Nb~bjoop1B8%Ir zO5*!w^Ip}BGz_9rZ*>50hj#d=w}FetXw+r6Oz&ybl`rvGCah9tXNtOZBb&ZTEz#*q z>c4pjy+J}Sdb~^)bW`|H?~N}amm12wOUv-OW1NQ% zX8?`!&`cPC5Vky8lZubnnP^QJo}^i$HL+@lR5?*oy8&0&q!x`GYgu`V<_$a~|5i zK45?^8&axEkca%wUF~vhiTz)xt5la%3Jn|4r<=}e&x$^svl)BYh-Tl}c!tWFeP4Y8 zr%0IPS2+?TR8{6zG!;$EyVY+j+GujC-nHpR_4ISOVTS@|sp@q@ z?Oc38abFvjifEv^Zw&zg9ABv1D3JQ9}HE{vfOJ1J1>`X&5$L>Nea4Q zcpmU(rM(7*H8kj^0V>R8#(Rb?zS4K@aq$Tjci)hN=h)`^+^eR}`-Wnmge5;Pn(W)@tS^kq;yt=fwXy?6r$k!!Z|@=F$iVT3#4g$Dpdv2M+(0A7rZQmjpcuLU7eH! zY^2ZjORo&Tw`@kER4f$rv6+pMA6;ye&U*@_H(6S{h*cj7ydL)oJ$uu(x!|CPKrj%e_Dcg3MBtJgm zZw{H(O~eq&?lswm;y>in46c70t7*}@gY% zVF}?3rwU7``5xx6`Y>}WFTuTG<~;59Co_0KmC0fry=AgzSbn(Kf`hC&oQpnZm&46l zkj3&xm`k-6Tix2R{aPnOgn0+9vuc;gVeun*&q*wQq`3*vY*eJ#GU`g(AG<7WaQh?s zhxqAzw;$Q>|H|HoGzXxM)$`sM%`Uq!x)*2mTbIg=wSA zP4UT{Zdu$TkxZujlWg7LKSsV%@Af15^?R6hlzD%U=5u#*e1G$6|91PoMR&5xqj-u% z4AI<#vmlqzv-oJUMeB3Mt#w^lt|ywk%D-yw^fym%x5{c9_0eX|W1KKfIA;VWf-{m6 z$+2*vIHNexoY9;yoUxp7oEXmIR3B~aF`wTq6pbNp=qcjEea3*plah~ABa^g7goXMOgIX2D|&QqMJ96Kk0GmSHylgLRTZA0?c T8k9SJ`Z$@BLO*>x!z=N>u;bAA delta 2797 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 alTO;^j4w6VQ2oQl8JtY|;o~fiwEqH)j?lsY diff --git a/dsSzxy/build/Config/Config.ini b/dsSzxy/build/Config/Config.ini index 57446e53..810d5290 100644 --- a/dsSzxy/build/Config/Config.ini +++ b/dsSzxy/build/Config/Config.ini @@ -16,4 +16,4 @@ port = 22 user = root pwd = dsideal remotePath = /usr/local/dsMin/dsSzxy/ -localPath = E:\Work\dsMin\dsSso\build \ No newline at end of file +localPath = E:\Work\dsMin\dsSzxy\build \ No newline at end of file diff --git a/dsSzxy/build/debug.sh b/dsSzxy/build/debug.sh index f4caaa07..e47ac54a 100644 --- a/dsSzxy/build/debug.sh +++ b/dsSzxy/build/debug.sh @@ -1,9 +1,9 @@ #!/bin/bash -mkdir -p /usr/local/dsMin/dsSso/Logs -chmod +x dsSso +mkdir -p /usr/local/dsMin/dsSzxy/Logs +chmod +x dsSzxy chmod +x *.sh # 运行为前台进程 -/usr/local/dsMin/dsSso/dsSso \ No newline at end of file +/usr/local/dsMin/dsSzxy/dsSzxy \ No newline at end of file diff --git a/dsSzxy/build/remote.sh b/dsSzxy/build/remote.sh index c67f405a..e13a4553 100644 --- a/dsSzxy/build/remote.sh +++ b/dsSzxy/build/remote.sh @@ -1,18 +1,18 @@ #!/bin/bash # 先杀掉内存中的进程 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null # 休息3秒 sleep 3 -cd /usr/local/dsMin/dsSso -chmod +x dsSso +cd /usr/local/dsMin/dsSzxy +chmod +x dsSzxy # 运行为后台进程 -cd /usr/local/dsMin/dsSso && +cd /usr/local/dsMin/dsSzxy && # kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null # 使用dlv方便远程调试 -dlv --listen=:2345 --headless=true --api-version=2 exec ./dsSso +dlv --listen=:2345 --headless=true --api-version=2 exec ./dsSzxy diff --git a/dsSzxy/build/start.sh b/dsSzxy/build/start.sh index 543551a4..0412ec72 100644 --- a/dsSzxy/build/start.sh +++ b/dsSzxy/build/start.sh @@ -1,10 +1,10 @@ #!/bin/bash -mkdir -p /usr/local/dsMin/dsSso/Logs -chmod +x dsSso +mkdir -p /usr/local/dsMin/dsSzxy/Logs +chmod +x dsSzxy chmod +x *.sh # 运行为后台进程 -nohup /usr/local/dsMin/dsSso/dsSso >> /usr/local/dsSso.out 2>&1 & +nohup /usr/local/dsMin/dsSzxy/dsSzxy >> /usr/local/dsSzxy.out 2>&1 & diff --git a/dsSzxy/build/stop.sh b/dsSzxy/build/stop.sh index 557de070..8dffa9f7 100644 --- a/dsSzxy/build/stop.sh +++ b/dsSzxy/build/stop.sh @@ -1,4 +1,4 @@ #!/bin/bash # kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数 -kill -9 `pgrep -f dsSso` 2>/dev/null +kill -9 `pgrep -f dsSzxy` 2>/dev/null