From 0932715970a6992a92896803a78b5dd20b703085 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Fri, 8 Nov 2024 11:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.bat                            |   6 ++---
 build_linux.bat                      |   8 +-----
 shell/build_sub.bat => build_sub.bat |   9 ++++---
 clean.bat                            |   2 +-
 close.bat                            |   2 +-
 data/DB_PropExchange.dat             | Bin 384 -> 384 bytes
 data/DB_Task.dat                     | Bin 5519 -> 5519 bytes
 deploy.bat                           |  36 ---------------------------
 shell/exclude.txt => exclude.txt     |   0
 gen_data.bat                         |   2 +-
 shell/programs.txt => programs.txt   |   0
 protocol/webapi/webapi.pb.go         |   1 +
 shell/build.bat                      |   7 ------
 startup.bat                          |   2 +-
 update_deploy.bat                    |   4 +--
 15 files changed, 15 insertions(+), 64 deletions(-)
 rename shell/build_sub.bat => build_sub.bat (57%)
 delete mode 100644 deploy.bat
 rename shell/exclude.txt => exclude.txt (100%)
 rename shell/programs.txt => programs.txt (100%)
 delete mode 100644 shell/build.bat

diff --git a/build.bat b/build.bat
index df5c7ff..292476e 100644
--- a/build.bat
+++ b/build.bat
@@ -1,7 +1,5 @@
 @echo off
 
-call shell/build.bat
-
-if %errorcode% neq 0 (
-    pause
+for /f %%i in (programs.txt) do (
+    start "%%i" cmd /c "build_sub.bat %%i"
 )
\ No newline at end of file
diff --git a/build_linux.bat b/build_linux.bat
index 43531c2..70dfd6b 100644
--- a/build_linux.bat
+++ b/build_linux.bat
@@ -2,10 +2,4 @@ set CGO_ENABLED=0
 set GOOS=linux
 set GOARCH=amd64
 
-@echo off
-
-call shell/build.bat
-
-if %errorcode% neq 0 (
-    pause
-)
+call build.bat
diff --git a/shell/build_sub.bat b/build_sub.bat
similarity index 57%
rename from shell/build_sub.bat
rename to build_sub.bat
index 919bd76..266357f 100644
--- a/shell/build_sub.bat
+++ b/build_sub.bat
@@ -1,10 +1,11 @@
+@echo off
+
 cd %1
-echo ========= Build %1 =========
 go fmt
 go vet
 go build -v
+
 if %errorlevel% neq 0 (
     echo Build failed %1.
-    set errorcode=1
-)
-cd ..
\ No newline at end of file
+    pause
+)
\ No newline at end of file
diff --git a/clean.bat b/clean.bat
index 80e5a52..3749439 100644
--- a/clean.bat
+++ b/clean.bat
@@ -1,6 +1,6 @@
 @echo off
 
-for /f "tokens=*" %%a in (shell/programs.txt) do (
+for /f "tokens=*" %%a in (programs.txt) do (
     if exist "%%a\*.log" del /q "%%a\*.log"
     if exist "%%a\*.log.*" del /q "%%a\*.log.*"
 
diff --git a/close.bat b/close.bat
index 25709d5..4b8a912 100644
--- a/close.bat
+++ b/close.bat
@@ -1,6 +1,6 @@
 @echo off
 
-for /f %%i in (shell/programs.txt) do (
+for /f %%i in (programs.txt) do (
     taskkill /F /IM %%i.exe
 )
 
diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat
index d82a96a50ad2d2990640ca9d15e38e5b3423eb15..804f10646fe2eaa8171cfa2bf4475d6bf342eea8 100644
GIT binary patch
literal 384
zcmd-w<6snElw#w!*2WB`uS4m}Q2Gj#z6zq1I5-yevI!h$vE|a^U;?YZ1(m-IrEfs#
zn`r98IUwev+k>JW=nk+wKpJK*y7^#tDRF|`(XjRr3s)=$3)mqrjW7#f2E!bN?je{*
a!43sl2(#!8*x~FPi+~>e!py}$TL=JT;yg6~

literal 384
zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$
z+i2>;IUweP%>mj6(+5@u<iqSiHwUY`lsLieXjuD*g)5eW1?&)*Mwo$EH6mFIvk>MW
Vn8WXY9nQ|N2<Xu-%v=n#g#cx;JT(9S

diff --git a/data/DB_Task.dat b/data/DB_Task.dat
index 257271850d35ce7db5641289d55bc31b7aea60dc..adeaa2c214e90e75e727ba605c283a59b8524c3e 100644
GIT binary patch
delta 239
zcmeCz?$_QhkwuV=V^J@g0HYTN$3h@|pv89cB9>>2lUsNM7@0QDWD{aUQ?a0zZSo#=
z6R0Q?Oy4Y?$&4JPf)G<4EEn>En9Drbox^<c25ynblQ?RjdPJal8ak^cD{%groW?7%
zS&z#OW)U+~8feJmTJ8#{CN7voEw+={cur29%qcSYF;6qd=*?BU%#1(*!OeYq?_j2|
PLe(!gB)7R&fQc0VH?u?9

delta 223
zcmeCz?$_QhkwuV$V_`3wz=0N9FE)-vKo;ZXMJ&%41tA<JFNpMlUbf9M*@PG;xA2He
z-p_70c`~QSWEKu1s4`}#vIonBCcAT(Lq%C(nh(iM?&oNj+{`aHS%LG{<TPH9&3asR
zjFYc%icN0fE}p!ZS7b6L&#}oL*hMBk=4r;%zPX&24c$oxX7Oz9<9o*l^}vEda!?Pj
KZtfLeVg&$fB0%K;

diff --git a/deploy.bat b/deploy.bat
deleted file mode 100644
index 2491820..0000000
--- a/deploy.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-set work_path=%cd%
-git checkout develop
-
-call shell/gen_data.bat
-
-call shell/gen_go.bat
-
-call shell/update_public.bat
-
-git add .
-git commit -m "update develop"
-
-git checkout release
-
-git merge develop
-
-git add .
-git reset public
-git commit -m "update release"
-
-set CGO_ENABLED=0
-set GOOS=linux
-set GOARCH=amd64
-go env -w GO111MODULE=off
-call shell/build.bat
-
-rem copy
-cd %work_path%
-call shell/update_deploy.bat
-
-git checkout develop
-pause
-
-
-
diff --git a/shell/exclude.txt b/exclude.txt
similarity index 100%
rename from shell/exclude.txt
rename to exclude.txt
diff --git a/gen_data.bat b/gen_data.bat
index ecd1d8e..b0fb3f1 100644
--- a/gen_data.bat
+++ b/gen_data.bat
@@ -10,7 +10,7 @@ go build
 xlsx2proto.exe
 
 cd ../../
-%protoc% --proto_path=./protocol/server --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=../../ pbdata.proto
+%protoc% --proto_path=. --plugin=protoc-gen-go=%protoc-gen-go-plugin-path% --go_out=../../ protocol/server/pbdata.proto
 
 cd ./tools/xlsx2binary
 go build
diff --git a/shell/programs.txt b/programs.txt
similarity index 100%
rename from shell/programs.txt
rename to programs.txt
diff --git a/protocol/webapi/webapi.pb.go b/protocol/webapi/webapi.pb.go
index 89c47e5..d9b98fa 100644
--- a/protocol/webapi/webapi.pb.go
+++ b/protocol/webapi/webapi.pb.go
@@ -101,6 +101,7 @@ func (TagCode) EnumDescriptor() ([]byte, []int) {
 	return file_protocol_webapi_webapi_proto_rawDescGZIP(), []int{0}
 }
 
+// 保持和 shop.proto 中的 OpResultCode 一样
 type ExchangeCreateCode int32
 
 const (
diff --git a/shell/build.bat b/shell/build.bat
deleted file mode 100644
index e803d1f..0000000
--- a/shell/build.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-for /f %%i in (shell/programs.txt) do (
-    call shell/build_sub.bat %%i
-)
-
-echo "build complete!"
\ No newline at end of file
diff --git a/startup.bat b/startup.bat
index 1785d1a..faed53e 100644
--- a/startup.bat
+++ b/startup.bat
@@ -2,7 +2,7 @@ set GODEBUG=gctrace=1
 @echo off
 setlocal enabledelayedexpansion
 
-for /f "tokens=*" %%a in (shell/programs.txt) do (
+for /f "tokens=*" %%a in (programs.txt) do (
     set program=%%a/%%a.exe
 
     if exist "!program!" (
diff --git a/update_deploy.bat b/update_deploy.bat
index b63e3cd..8bb5f20 100644
--- a/update_deploy.bat
+++ b/update_deploy.bat
@@ -4,12 +4,12 @@ set deployDir=".\deploy"
 
 xcopy .\data\* %deployDir%\data\ /s /e /y
 
-for /f "tokens=*" %%a in (shell/programs.txt) do (
+for /f "tokens=*" %%a in (programs.txt) do (
     xcopy .\%%a\%%a %deployDir% /y
     del .\%%a\%%a
 )
 
-for /f "tokens=*" %%f in (shell/exclude.txt) do (
+for /f "tokens=*" %%f in (exclude.txt) do (
     if exist "%deployDir%\data\%%f" (del "%deployDir%\data\%%f")
 )