From 58f2926507af0bba137b67a9e1bc8d6485955a11 Mon Sep 17 00:00:00 2001
From: kotlindev <1906612210@qq.com>
Date: Sat, 23 Jul 2022 15:33:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=B8=A6release=E5=BA=93=EF=BC=8C=E5=B0=86=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=BA=93=E8=AE=BE=E7=BD=AE=E4=B8=BAdzq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_discuz | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build_discuz b/build_discuz
index b4499bc..5d55256 100755
--- a/build_discuz
+++ b/build_discuz
@@ -17,7 +17,7 @@ echo "---- Build Discuz Q and Commit to Git Repo -----------------------------"
 [ "$DRY_RUN" = "-n" ] && echo "Dry run, no changes will be pushed to remote"
 
 # DiscuzQ后端代码 仓库
-DISCUZ_REPO="git@gitee.com:kotlindev/Discuz-Q.git"
+DISCUZ_REPO="git@gitee.com:Discuz/Discuz-Q.git"
 # DiscuzQ前台代码 编译后的静态资源仓库
 DISCUZ_WEB="git@gitee.com:kotlindev/dzq-default-web-static.git"
 # DiscuzQ后台代码 编译后的静态资源仓库
@@ -106,11 +106,11 @@ function push_to_remote {
     if [ ! "$DRY_RUN" = "-n" ]; then
         echo "---- push to build repo"
         #git remote add build git@git.code.oa.com:discuzq-build2/Discuz.git
-        git remote add build $DISCUZ_BUILDED
+        #git remote add build $DISCUZ_BUILDED
         # push code
-        git push build master -f
+        #git push build master -f
         # push tag
-        git push build $TAG -f
+        #git push build $TAG -f
     else
         echo "---- Dry run mode, do not actually push"
     fi
-- 
Gitee


From bcc78bb15d0faa1d04795f8ed531c118e737e601 Mon Sep 17 00:00:00 2001
From: kotlindev <1906612210@qq.com>
Date: Sat, 23 Jul 2022 17:44:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0release=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_discuz | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_discuz b/build_discuz
index 5d55256..00a9bbd 100755
--- a/build_discuz
+++ b/build_discuz
@@ -106,11 +106,11 @@ function push_to_remote {
     if [ ! "$DRY_RUN" = "-n" ]; then
         echo "---- push to build repo"
         #git remote add build git@git.code.oa.com:discuzq-build2/Discuz.git
-        #git remote add build $DISCUZ_BUILDED
+        git remote add build $DISCUZ_BUILDED
         # push code
-        #git push build master -f
+        git push build master -f
         # push tag
-        #git push build $TAG -f
+        git push build $TAG -f
     else
         echo "---- Dry run mode, do not actually push"
     fi
-- 
Gitee


From 5528a44386231f6dbd58b437a126248757fb3e6f Mon Sep 17 00:00:00 2001
From: kotlindev <1906612210@qq.com>
Date: Sat, 23 Jul 2022 19:47:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E9=80=81vendor?=
 =?UTF-8?q?=E5=8C=85=E5=88=B0cos=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_vendor | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/build_vendor b/build_vendor
index fb6a3be..43163bc 100755
--- a/build_vendor
+++ b/build_vendor
@@ -115,6 +115,27 @@ function cleanup_vendor() {
     done
 }
 
+function make_zip() {
+    cd $BASE/dzfull_temp
+    echo "---- making zip"
+    zip -q -r dzq_latest_offline.zip composer.lock
+    zip -q -r dzq_latest_offline.zip vendor
+}
+
+function upload_zip_to_cos() {
+    cd $BASE/dzfull_temp
+    if [ ! "$DRY_RUN" = "-n" ]; then
+        echo "---- uploading to cos"
+        coscmd upload dzq_latest_offline.zip /offline/$TAG.zip
+        coscmd upload dzq_latest_offline.zip /dzq_latest_offline.zip
+
+        echo "---- removing zip"
+        rm -f dzq_latest_offline.zip
+    else
+        echo "---- Dry run mode, do not actually upload to cos"
+    fi
+}
+
 function make_full_install_pack() {
     cd $BASE/dzfull_temp
     rm -f ../dzq_latest_install.zip
@@ -259,5 +280,8 @@ install_dzq
 export_database
 cleanup_dzq
 
+make_zip
+upload_zip_to_cos
+
 make_full_install_pack
 upload_full_zip_to_cos
-- 
Gitee