From 603a1a60d01b54ffe5b7e12db3fc666d1a52873d Mon Sep 17 00:00:00 2001
From: panjia <panjia@ulee.work>
Date: Sun, 7 Jan 2024 22:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BB=BA=E7=AB=8B=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E7=9A=84=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 8.version/{1.0.0.panda => 1.0.2.panda} |  2 +-
 8.version/version.txt                  |  2 +-
 8.version/建立分支.bat                 | 72 ++++++++++++++++++++++++++
 8.version/建立版本.bat                 | 35 +++++++++++--
 4 files changed, 104 insertions(+), 7 deletions(-)
 rename 8.version/{1.0.0.panda => 1.0.2.panda} (66%)
 create mode 100644 8.version/建立分支.bat

diff --git a/8.version/1.0.0.panda b/8.version/1.0.2.panda
similarity index 66%
rename from 8.version/1.0.0.panda
rename to 8.version/1.0.2.panda
index 9c558e3..73fbd95 100644
--- a/8.version/1.0.0.panda
+++ b/8.version/1.0.2.panda
@@ -1 +1 @@
-.
+.
diff --git a/8.version/version.txt b/8.version/version.txt
index 047acbf..5dbdcba 100644
--- a/8.version/version.txt
+++ b/8.version/version.txt
@@ -1 +1 @@
-1.0.0.221103145242
+1.0.2.022401205052
diff --git a/8.version/建立分支.bat b/8.version/建立分支.bat
new file mode 100644
index 0000000..578c766
--- /dev/null
+++ b/8.version/建立分支.bat
@@ -0,0 +1,72 @@
+@echo off
+chcp 65001
+setlocal EnableDelayedExpansion
+cd /d %~dp0
+
+net.exe session 1>NUL 2>NUL && (
+    goto as_admin
+) || (
+    goto not_admin
+)
+
+:as_admin
+set versionPath=%cd%
+cd ..
+set rootPath=%cd%
+
+::读取项目配置
+set appName="xxxxx"
+set file99=%rootPath%\config.txt
+if exist %file99% (
+    for /f "tokens=*" %%a in (%file99%) do (
+	    set var=%%a
+    
+	    if "!var:~0,16!"=="applicationName:" (
+	    	set appName=!var:~16,-1!!var:~-1,1!
+	    )
+    )
+    set appName=!appName!
+)
+
+::检查是否主干项目
+if not exist %rootPath%\%appName%.master (
+    echo 当前不是主干，不能建立分支,请先建立 %rootPath%\%appName%.master
+    goto end
+)
+
+::读取版本配置文件
+cd /d %versionPath%
+if not exist version.txt echo 1.0.0.20000101>version.txt
+set configVersion=version.txt
+for /f "tokens=1,2,3 delims=." %%a IN (%configVersion%)  Do (
+     set tag1=%%a
+     set tag2=%%b
+     set tag3=%%c
+)
+set oldVersion=!tag1!.!tag2!.!tag3!
+set /a tag3=1+!tag3!
+set newVersion=!tag1!.!tag2!.!tag3!
+set branchName=branch.v%newVersion%
+git checkout -b %branchName%
+del /s /q %rootPath%\%appName%.master
+del /s /q %rootPath%\%appName%.branch.*
+echo .>%rootPath%\%appName%.branch.v%newVersion%
+cd /d %rootPath%
+git add .
+pause
+git commit -m "创建分支 %appName%.branch.v%newVersion%"
+
+pause
+
+git push origin %branchName%
+
+echo 执行成功，生成 %appName%.branch.v%newVersion%
+goto end
+
+:not_admin
+echo not as admin
+
+:end
+ping 127.0.0.1 -n 10 >nul
+exit
+
diff --git a/8.version/建立版本.bat b/8.version/建立版本.bat
index 90ac8e8..8a59b50 100644
--- a/8.version/建立版本.bat
+++ b/8.version/建立版本.bat
@@ -1,4 +1,5 @@
 @echo off
+chcp 65001
 setlocal EnableDelayedExpansion
 cd /d %~dp0
 
@@ -9,7 +10,31 @@ net.exe session 1>NUL 2>NUL && (
 )
 
 :as_admin
-::��ȡ�汾�����ļ�
+set versionPath=%cd%
+cd ..
+set rootPath=%cd%
+::读取配置
+set appName="xxxxx"
+set file99=%rootPath%\config.txt
+if exist %file99% (
+    for /f "tokens=*" %%a in (%file99%) do (
+	    set var=%%a
+    
+	    if "!var:~0,16!"=="applicationName:" (
+	    	set appName=!var:~16,-1!!var:~-1,1!
+	    )
+    )
+    set appName=!appName!
+)
+if not exist %rootPath%\%appName%.panda (
+    echo .>%rootPath%\%appName%.panda
+    echo %appName%.v*>>.gitignore
+)
+
+pause
+
+::读取版本配置文件
+cd /d %versionPath%
 if not exist version.txt echo 1.0.0.20000101>version.txt
 set configVersion=version.txt
 for /f "tokens=1,2,3 delims=." %%a IN (%configVersion%)  Do (
@@ -19,19 +44,19 @@ for /f "tokens=1,2,3 delims=." %%a IN (%configVersion%)  Do (
 )
 set oldVersion=%tag1%.%tag2%.%tag3%
 
-::�ύ���ݣ������Ϊ�ڵ�
+::提交数据，并打包为节点
 set verPath=%cd%
 cd ..
 set rootPath=%cd%
 cd /d %rootPath%
 set tagName=%oldVersion%_%date:~0,4%%date:~5,2%%date:~8,2%%time:~0,2%%time:~3,2%%time:~6,2%
-git tag -a %tagName% -m �����ڵ�
+git tag -a %tagName% -m 建立节点
 git push origin %tagName%
 
 set /a tag3=1+%tag3%
 set newVersion=%tag1%.%tag2%.%tag3%
 
-::�滻
+::替换
 set d=%date: =0%
 set t=%time: =0%
 
@@ -46,7 +71,7 @@ cd ..
 del /q *.panda
 echo .>%newVersion%.panda
 
-echo ִ�гɹ������� v%oldVersion%
+echo 执行成功，生成 v%oldVersion%
 goto end
 
 :not_admin