From 5f347db62be5a19d13791a2d834abc5e54b3ad40 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Wed, 25 Sep 2024 18:12:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ee4bd9f..7c9bb4d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,8 @@ type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
  
 name: filesystem-drone # 定义流水线名称
  
- 
+clone:
+  disable: true
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
   - name: package-and-push-image
@@ -28,7 +29,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       script:
         - cd /root/allLikeMall
         - git fetch origin
-        - git reset --hard origin/main
+        - git reset --hard origin/master
         - git clean -fd
         - mvn package -Dmaven.test.skip=true
         - cd yudao-server

From 25b5767474b47c1905ec206c9a6bd9a7f246f4cf Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Wed, 25 Sep 2024 18:14:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-server/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yudao-server/Dockerfile b/yudao-server/Dockerfile
index 0954267..91adc36 100644
--- a/yudao-server/Dockerfile
+++ b/yudao-server/Dockerfile
@@ -10,7 +10,6 @@ ADD ./target/yudao-server.jar app.jar
 ENV TZ=Asia/Shanghai
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
 ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom"
-Duser.timezone=Asia/Shanghai"
 ## 应用参数
 ENV ARGS=""