From b75b7994323b11dc1b702dea9b51a716df65e38c Mon Sep 17 00:00:00 2001
From: yuyongle <1150359267@qq.com>
Date: Thu, 14 Aug 2025 17:23:36 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QuestionnaireController.java      |  0
 .../mobile/MServiceWorkOrdersController.java     | 16 ++++++++++++----
 .../dromara/property/domain/Questionnaire.java   |  0
 .../property/domain/QuestionnaireQuestion.java   |  0
 .../domain/QuestionnaireQuestionItem.java        |  0
 .../property/domain/bo/QuestionnaireBo.java      |  0
 .../domain/bo/QuestionnaireQuestionBo.java       |  0
 .../domain/bo/QuestionnaireQuestionItemBo.java   |  0
 .../domain/vo/QuestionnaireQuestionItemVo.java   |  0
 .../domain/vo/QuestionnaireQuestionVo.java       |  0
 .../property/domain/vo/QuestionnaireVo.java      |  0
 .../property/mapper/QuestionnaireMapper.java     |  0
 .../mapper/QuestionnaireQuestionItemMapper.java  |  0
 .../mapper/QuestionnaireQuestionMapper.java      |  0
 .../property/service/IQuestionnaireService.java  |  0
 .../service/impl/QuestionnaireServiceImpl.java   |  0
 .../mapper/Property/QuestionnaireMapper.xml      |  0
 .../Property/QuestionnaireQuestionItemMapper.xml |  0
 .../Property/QuestionnaireQuestionMapper.xml     |  0
 19 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
 create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml
 create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml
 create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java
index 2114b401..94ce085d 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java
@@ -6,14 +6,15 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
 import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo;
+import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
 import org.dromara.property.service.IServiceWorkOrdersService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 【业务管理-工单处理】
@@ -38,4 +39,11 @@ public class MServiceWorkOrdersController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody MServiceWorkOrdersBo bo) {
         return toAjax(serviceWorkOrdersService.insertMServiceWorkOrdersBo(bo));
     }
+    /**
+     * 小程序查询【工单处理】
+     */
+    @GetMapping("/list")
+    public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
+        return serviceWorkOrdersService.queryPageList(bo, pageQuery);
+    }
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml
new file mode 100644
index 00000000..e69de29b

From c7e81a892c98b2ba00dec5596c9480d6da19d3ca Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 17:24:34 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/dev.yml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 1931e454..5a5e5464 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -195,26 +195,10 @@ jobs:
         uses: http://git.missmoc.top/mocheng/build-push-action@v5
         with:
           context: "${{ github.workspace }}"
-          file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
-          tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
+          file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+          tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+          # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+          # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
-          # 关键配置：允许该仓库使用HTTP
-          daemon-config: |
-            {
-              "insecure-registries": ["172.100.10.45:3000"]
-            }
-
-          # 确保buildx使用正确的网络配置
-          driver-opts: |
-            network=host
-#          context: "${{ github.workspace }}"
-#          file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
-#          tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
-#          # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
-#          # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
-#          push: true
-#          cache-from: type=gha
-#          cache-to: type=gha,mode=max

From 4b3ed9dbaf83b041cb0bcd1053ad701fabcbf755 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 17:30:14 +0800
Subject: [PATCH 03/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/dev.yml | 59 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 5a5e5464..e0bfee72 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -80,38 +80,38 @@ jobs:
             sleep 10
           done
 
-  # build-common-modules:
-  #   needs: build-parent-pom
-  #   runs-on: ubuntu
-  #   steps:
-  #     - name: 拉取代码仓库
-  #       uses: http://git.missmoc.top/mocheng/checkout@v4
+          # build-common-modules:
+          #   needs: build-parent-pom
+          #   runs-on: ubuntu
+          #   steps:
+          #     - name: 拉取代码仓库
+          #       uses: http://git.missmoc.top/mocheng/checkout@v4
 
-  #     - name: 配置环境变量
-  #       run: |
-  #         export JAVA_HOME="/java17/java17"
-  #         export MAVEN_HOME="/maven/apache-maven-3.9.11"
-  #         echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-  #         echo "$JAVA_HOME/bin" >> $GITHUB_PATH
-  #         echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
-  #         echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+          #     - name: 配置环境变量
+          #       run: |
+          #         export JAVA_HOME="/java17/java17"
+          #         export MAVEN_HOME="/maven/apache-maven-3.9.11"
+          #         echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+          #         echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+          #         echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+          #         echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
 
-  #     - name: 构建通用模块（仅本地使用，不上传）
-  #       run: |
-  #         COMMON_MODULES=(
-  #           "ruoyi-common"
-  #           "ruoyi-api"
-  #           "ruoyi-common-bom"
-  #           "ruoyi-common-alibaba-bom"
-  #           "ruoyi-api-bom"
-  #         )
+          #     - name: 构建通用模块（仅本地使用，不上传）
+          #       run: |
+          #         COMMON_MODULES=(
+          #           "ruoyi-common"
+          #           "ruoyi-api"
+          #           "ruoyi-common-bom"
+          #           "ruoyi-common-alibaba-bom"
+          #           "ruoyi-api-bom"
+          #         )
 
-  #         for module in "${COMMON_MODULES[@]}"; do
-  #           MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
-  #           if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
-  #             echo "警告：模块 $module 不存在，跳过"
-  #             continue
-  #           fi
+          #         for module in "${COMMON_MODULES[@]}"; do
+          #           MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
+          #           if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
+          #             echo "警告：模块 $module 不存在，跳过"
+          #             continue
+          #           fi
 
   #           retries=3
   #           count=0
@@ -202,3 +202,4 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
+

From 6ceea972006b74e186f9fe387c924247e249025f Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:23:51 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/dev.yml    |  2 +-
 .gitea/workflows/master.yml | 61 +++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 .gitea/workflows/master.yml

diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index e0bfee72..9a657a4b 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -2,7 +2,7 @@ run-name: ${{ gitea.actor }} 构建镜像并推送（不含JAR依赖上传）
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build-parent-pom:
diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
new file mode 100644
index 00000000..8aaf5554
--- /dev/null
+++ b/.gitea/workflows/master.yml
@@ -0,0 +1,61 @@
+name: Build and Push Docker Images
+
+# 监听master分支的push事件
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build-and-push:
+    # 使用当前运行器（已安装Java、Maven和Docker）
+    runs-on: self-hosted
+
+    steps:
+      # 拉取代码
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # 使用服务器上的Maven构建项目
+      - name: Build with Maven
+        run: |
+          echo "开始使用Maven构建项目..."
+          mvn clean package -DskipTests
+          echo "Maven构建完成"
+
+      # 查找所有Dockerfile并构建推送镜像
+      - name: Build and push Docker images
+        env:
+          # 私有仓库地址（请替换为实际地址）
+          DOCKER_REGISTRY: your-private-registry.example.com
+          # 私有仓库认证信息（在Gitea仓库设置中配置secrets）
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "登录到私有Docker仓库..."
+          echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
+
+          echo "查找项目中的所有Dockerfile..."
+          # 查找所有Dockerfile（排除.git目录）
+          find . -type f -name "Dockerfile" ! -path "./.git/*" | while read -r dockerfile; do
+            echo "处理Dockerfile: $dockerfile"
+
+            # 获取Dockerfile所在目录
+            docker_context=$(dirname "$dockerfile")
+
+            # 生成镜像名称（基于目录结构）
+            image_name=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-')
+            full_image_name="$DOCKER_REGISTRY/$image_name:${{ github.sha }}"
+
+            echo "构建镜像: $full_image_name"
+            docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"
+
+            echo "推送镜像: $full_image_name"
+            docker push "$full_image_name"
+
+            # 可选：添加latest标签并推送
+            docker tag "$full_image_name" "$DOCKER_REGISTRY/$image_name:latest"
+            docker push "$DOCKER_REGISTRY/$image_name:latest"
+          done
+
+          echo "所有镜像构建和推送完成"
+          docker logout $DOCKER_REGISTRY

From 46735c04ba9bf2c352bc6498c3459393c985b287 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:25:24 +0800
Subject: [PATCH 05/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 8aaf5554..90e57914 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-and-push:
     # 使用当前运行器（已安装Java、Maven和Docker）
-    runs-on: self-hosted
+    runs-on: ubuntu
 
     steps:
       # 拉取代码

From 0a25ddc8ef1d08e5a4da6a2f508186e4da278eba Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:26:12 +0800
Subject: [PATCH 06/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 90e57914..717822f0 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       # 拉取代码
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: http://git.missmoc.top/mocheng/checkout@v4
 
       # 使用服务器上的Maven构建项目
       - name: Build with Maven

From 64538d32e9e0afb786315a5e5bd9997ef1f6d356 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:29:17 +0800
Subject: [PATCH 07/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 717822f0..65615e6f 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -19,20 +19,20 @@ jobs:
       - name: Build with Maven
         run: |
           echo "开始使用Maven构建项目..."
-          mvn clean package -DskipTests
+          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
           echo "Maven构建完成"
 
       # 查找所有Dockerfile并构建推送镜像
       - name: Build and push Docker images
         env:
           # 私有仓库地址（请替换为实际地址）
-          DOCKER_REGISTRY: your-private-registry.example.com
+          DOCKER_REGISTRY: 172.100.10.45:3000
           # 私有仓库认证信息（在Gitea仓库设置中配置secrets）
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_USERNAME: ${{ secrets.REGISTRY_USER }}
+          DOCKER_PASSWORD: ${{ secrets.REGISTRY_PASS }}
         run: |
           echo "登录到私有Docker仓库..."
-          echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
+          echo "REGISTRY_PASS" | docker login REGISTRY_URL -u REGISTRY_USER --password-stdin
 
           echo "查找项目中的所有Dockerfile..."
           # 查找所有Dockerfile（排除.git目录）
@@ -44,7 +44,7 @@ jobs:
 
             # 生成镜像名称（基于目录结构）
             image_name=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-')
-            full_image_name="$DOCKER_REGISTRY/$image_name:${{ github.sha }}"
+            full_image_name="REGISTRY_URL/$image_name:${{ github.sha }}"
 
             echo "构建镜像: $full_image_name"
             docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"
@@ -53,9 +53,9 @@ jobs:
             docker push "$full_image_name"
 
             # 可选：添加latest标签并推送
-            docker tag "$full_image_name" "$DOCKER_REGISTRY/$image_name:latest"
-            docker push "$DOCKER_REGISTRY/$image_name:latest"
+            docker tag "$full_image_name" "REGISTRY_URL/$image_name:latest"
+            docker push "REGISTRY_URL/$image_name:latest"
           done
 
           echo "所有镜像构建和推送完成"
-          docker logout $DOCKER_REGISTRY
+          docker logout REGISTRY_URL

From 78cba4532dbd77de9dfbf186a8be45f18666138e Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:32:22 +0800
Subject: [PATCH 08/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 65615e6f..11915509 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Build and push Docker images
         env:
           # 私有仓库地址（请替换为实际地址）
-          DOCKER_REGISTRY: 172.100.10.45:3000
+          REGISTRY_URL: 172.100.10.45:3000
           # 私有仓库认证信息（在Gitea仓库设置中配置secrets）
           DOCKER_USERNAME: ${{ secrets.REGISTRY_USER }}
           DOCKER_PASSWORD: ${{ secrets.REGISTRY_PASS }}

From 9d0e22e9e687ddd83fa5be49007246e5d873a6cc Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:36:39 +0800
Subject: [PATCH 09/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 11915509..77964a39 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -8,31 +8,31 @@ on:
 jobs:
   build-and-push:
     # 使用当前运行器（已安装Java、Maven和Docker）
-    runs-on: ubuntu
+    runs-on: self-hosted
 
     steps:
       # 拉取代码
       - name: Checkout code
-        uses: http://git.missmoc.top/mocheng/checkout@v4
+        uses: actions/checkout@v4
 
       # 使用服务器上的Maven构建项目
       - name: Build with Maven
         run: |
           echo "开始使用Maven构建项目..."
-          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
+          mvn clean package -DskipTests
           echo "Maven构建完成"
 
       # 查找所有Dockerfile并构建推送镜像
       - name: Build and push Docker images
         env:
           # 私有仓库地址（请替换为实际地址）
-          REGISTRY_URL: 172.100.10.45:3000
+          DOCKER_REGISTRY: 172.100.10.45:3000
           # 私有仓库认证信息（在Gitea仓库设置中配置secrets）
-          DOCKER_USERNAME: ${{ secrets.REGISTRY_USER }}
-          DOCKER_PASSWORD: ${{ secrets.REGISTRY_PASS }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: |
           echo "登录到私有Docker仓库..."
-          echo "REGISTRY_PASS" | docker login REGISTRY_URL -u REGISTRY_USER --password-stdin
+          echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
 
           echo "查找项目中的所有Dockerfile..."
           # 查找所有Dockerfile（排除.git目录）
@@ -44,7 +44,7 @@ jobs:
 
             # 生成镜像名称（基于目录结构）
             image_name=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-')
-            full_image_name="REGISTRY_URL/$image_name:${{ github.sha }}"
+            full_image_name="$DOCKER_REGISTRY/$image_name:${{ github.sha }}"
 
             echo "构建镜像: $full_image_name"
             docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"
@@ -53,9 +53,9 @@ jobs:
             docker push "$full_image_name"
 
             # 可选：添加latest标签并推送
-            docker tag "$full_image_name" "REGISTRY_URL/$image_name:latest"
-            docker push "REGISTRY_URL/$image_name:latest"
+            docker tag "$full_image_name" "$DOCKER_REGISTRY/$image_name:latest"
+            docker push "$DOCKER_REGISTRY/$image_name:latest"
           done
 
           echo "所有镜像构建和推送完成"
-          docker logout REGISTRY_URL
+          docker logout $DOCKER_REGISTRY

From 0db34e94fd352a7760cf65a4e38780192a3ccd7d Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:37:31 +0800
Subject: [PATCH 10/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 77964a39..0b0995c7 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-and-push:
     # 使用当前运行器（已安装Java、Maven和Docker）
-    runs-on: self-hosted
+    runs-on: ubuntu
 
     steps:
       # 拉取代码

From c5ab0b0217080a7760cc103ebb5991208ec7e8c9 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:38:20 +0800
Subject: [PATCH 11/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 0b0995c7..984b7bc8 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       # 拉取代码
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: http://git.missmoc.top/mocheng/checkout@v4
 
       # 使用服务器上的Maven构建项目
       - name: Build with Maven

From 1e35f72bd993d0fd3dd98931e094dc44af2c41e8 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 19:39:06 +0800
Subject: [PATCH 12/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 984b7bc8..f3695db5 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Build with Maven
         run: |
           echo "开始使用Maven构建项目..."
-          mvn clean package -DskipTests
+          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
           echo "Maven构建完成"
 
       # 查找所有Dockerfile并构建推送镜像

From 72b431f1a96f706b83cb4764ab2bad7ad783cfd7 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:08:14 +0800
Subject: [PATCH 13/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 103 +++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index f3695db5..af1bb707 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -1,61 +1,90 @@
-name: Build and Push Docker Images
+name: Build and Push to SmartParks Registry
 
-# 监听master分支的push事件
+# 监听master分支的推送事件
 on:
   push:
     branches: [ master ]
 
 jobs:
-  build-and-push:
-    # 使用当前运行器（已安装Java、Maven和Docker）
+  build-and-deploy:
+    name: 构建并推送镜像到仓库注册表
     runs-on: ubuntu
+    timeout-minutes: 30  # 设置超时时间，防止无限等待
 
     steps:
-      # 拉取代码
-      - name: Checkout code
-        uses: http://git.missmoc.top/mocheng/checkout@v4
+      - name: 拉取代码
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # 拉取完整历史，确保版本信息正确
 
-      # 使用服务器上的Maven构建项目
-      - name: Build with Maven
+      - name: 使用Maven构建项目
         run: |
-          echo "开始使用Maven构建项目..."
-          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
-          echo "Maven构建完成"
+          echo "===== 开始Maven构建 ====="
+          mvn clean package -DskipTests
+          echo "===== Maven构建完成 ====="
+          # 验证构建结果
+          if [ ! -d "./target" ]; then
+            echo "错误：Maven构建未生成target目录"
+            exit 1
+          fi
 
-      # 查找所有Dockerfile并构建推送镜像
-      - name: Build and push Docker images
+      - name: 构建并推送Docker镜像
         env:
-          # 私有仓库地址（请替换为实际地址）
-          DOCKER_REGISTRY: 172.100.10.45:3000
-          # 私有仓库认证信息（在Gitea仓库设置中配置secrets）
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          # Gitea容器注册表地址（请确认是否正确）
+          GITEA_REGISTRY: 172.100.10.45:3000
+          # 仓库路径（组织/仓库名，严格区分大小写）
+          REPO_PATH: by2025/SmartParks
+          # Gitea内置认证令牌
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |
-          echo "登录到私有Docker仓库..."
-          echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
+          echo "===== 登录到Gitea容器注册表 ====="
+          # 登录并检查结果
+          if ! echo "$GITEA_TOKEN" | docker login $GITEA_REGISTRY -u ${{ github.actor }} --password-stdin; then
+            echo "错误：登录到容器注册表失败"
+            exit 1
+          fi
 
-          echo "查找项目中的所有Dockerfile..."
-          # 查找所有Dockerfile（排除.git目录）
-          find . -type f -name "Dockerfile" ! -path "./.git/*" | while read -r dockerfile; do
-            echo "处理Dockerfile: $dockerfile"
+          echo "===== 查找项目中的Dockerfile ====="
+          # 查找所有Dockerfile并检查是否存在
+          dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
+          if [ -z "$dockerfiles" ]; then
+            echo "警告：未找到任何Dockerfile"
+            exit 0
+          fi
+
+          # 处理每个Dockerfile
+          echo "$dockerfiles" | while read -r dockerfile; do
+            echo "===== 处理Dockerfile: $dockerfile ====="
 
-            # 获取Dockerfile所在目录
             docker_context=$(dirname "$dockerfile")
-
-            # 生成镜像名称（基于目录结构）
-            image_name=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-')
-            full_image_name="$DOCKER_REGISTRY/$image_name:${{ github.sha }}"
+            # 生成镜像标签（基于目录名，转换为小写并替换斜杠）
+            image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]')
+            # 完整镜像名称
+            full_image_name="$GITEA_REGISTRY/$REPO_PATH:$image_tag-${{ github.sha }}"
 
             echo "构建镜像: $full_image_name"
-            docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"
+            if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
+              echo "错误：构建镜像 $full_image_name 失败"
+              exit 1
+            fi
 
             echo "推送镜像: $full_image_name"
-            docker push "$full_image_name"
+            if ! docker push "$full_image_name"; then
+              echo "错误：推送镜像 $full_image_name 失败"
+              exit 1
+            fi
 
-            # 可选：添加latest标签并推送
-            docker tag "$full_image_name" "$DOCKER_REGISTRY/$image_name:latest"
-            docker push "$DOCKER_REGISTRY/$image_name:latest"
+            # 推送latest标签
+            latest_image="$GITEA_REGISTRY/$REPO_PATH:$image_tag-latest"
+            echo "推送最新标签: $latest_image"
+            docker tag "$full_image_name" "$latest_image"
+            if ! docker push "$latest_image"; then
+              echo "错误：推送最新标签 $latest_image 失败"
+              exit 1
+            fi
           done
 
-          echo "所有镜像构建和推送完成"
-          docker logout $DOCKER_REGISTRY
+          echo "===== 清理操作 ====="
+          docker logout $GITEA_REGISTRY
+          echo "===== 所有操作完成 ====="
+

From 7c8ddfcda57b600df11e19636cfcaab0b8271494 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:09:16 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index af1bb707..592b16ff 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: 拉取代码
-        uses: actions/checkout@v4
+        uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
           fetch-depth: 0  # 拉取完整历史，确保版本信息正确
 

From 81d60e38322be1f45833cd3af79c9f5e25ff9bb7 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:11:04 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 592b16ff..aa33f820 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -20,7 +20,7 @@ jobs:
       - name: 使用Maven构建项目
         run: |
           echo "===== 开始Maven构建 ====="
-          mvn clean package -DskipTests
+          /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
           echo "===== Maven构建完成 ====="
           # 验证构建结果
           if [ ! -d "./target" ]; then

From 93af6976da4fd56210c75af97b4a285edd64ae95 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:14:14 +0800
Subject: [PATCH 16/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index aa33f820..2a2b8350 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -22,12 +22,6 @@ jobs:
           echo "===== 开始Maven构建 ====="
           /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
           echo "===== Maven构建完成 ====="
-          # 验证构建结果
-          if [ ! -d "./target" ]; then
-            echo "错误：Maven构建未生成target目录"
-            exit 1
-          fi
-
       - name: 构建并推送Docker镜像
         env:
           # Gitea容器注册表地址（请确认是否正确）

From c1ee3a3328beadfaa5e973067f776ae502d9a53e Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:17:21 +0800
Subject: [PATCH 17/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 2a2b8350..9463a76d 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -27,7 +27,7 @@ jobs:
           # Gitea容器注册表地址（请确认是否正确）
           GITEA_REGISTRY: 172.100.10.45:3000
           # 仓库路径（组织/仓库名，严格区分大小写）
-          REPO_PATH: by2025/SmartParks
+          REPO_PATH: by2025/smartparks
           # Gitea内置认证令牌
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |

From 1179cbd77a15486935a75eb5a5d40c483f908e55 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:21:49 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 9463a76d..a42605c6 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -27,7 +27,7 @@ jobs:
           # Gitea容器注册表地址（请确认是否正确）
           GITEA_REGISTRY: 172.100.10.45:3000
           # 仓库路径（组织/仓库名，严格区分大小写）
-          REPO_PATH: by2025/smartparks
+          REPO_PATH: by2025/dockerimage
           # Gitea内置认证令牌
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
         run: |

From 78a33f408fc9156b85f024cbab1f3a6d61cb93ab Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:32:26 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 48 +++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index a42605c6..4f918a5a 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -10,6 +10,9 @@ jobs:
     name: 构建并推送镜像到仓库注册表
     runs-on: ubuntu
     timeout-minutes: 30  # 设置超时时间，防止无限等待
+    permissions:
+      packages: write  # 明确请求包管理权限
+      contents: read   # 读取代码权限
 
     steps:
       - name: 拉取代码
@@ -21,20 +24,34 @@ jobs:
         run: |
           echo "===== 开始Maven构建 ====="
           /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
+          echo "===== 验证构建结果 ====="
+          if [ ! -d "./target" ] || [ -z "$(ls -A ./target/*.jar 2>/dev/null)" ]; then
+            echo "错误：Maven构建未生成有效JAR包"
+            exit 1
+          fi
           echo "===== Maven构建完成 ====="
+
       - name: 构建并推送Docker镜像
         env:
-          # Gitea容器注册表地址（请确认是否正确）
+          # Gitea容器注册表地址
           GITEA_REGISTRY: 172.100.10.45:3000
-          # 仓库路径（组织/仓库名，严格区分大小写）
+          # 仓库路径（严格区分大小写）
           REPO_PATH: by2025/dockerimage
-          # Gitea内置认证令牌
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          # 使用手动创建的专用推送令牌（推荐）
+          GITEA_TOKEN: ${{ secrets.DOCKER_PUSH_TOKEN }}
+          # 当前仓库信息（用于调试）
+          CURRENT_REPO: ${{ github.repository }}
         run: |
+          echo "===== 环境信息验证 ====="
+          echo "当前仓库: $CURRENT_REPO"
+          echo "目标仓库路径: $REPO_PATH"
+          echo "镜像仓库地址: $GITEA_REGISTRY"
+
           echo "===== 登录到Gitea容器注册表 ====="
           # 登录并检查结果
           if ! echo "$GITEA_TOKEN" | docker login $GITEA_REGISTRY -u ${{ github.actor }} --password-stdin; then
             echo "错误：登录到容器注册表失败"
+            echo "请检查令牌权限和仓库地址是否正确"
             exit 1
           fi
 
@@ -52,25 +69,35 @@ jobs:
 
             docker_context=$(dirname "$dockerfile")
             # 生成镜像标签（基于目录名，转换为小写并替换斜杠）
-            image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]')
-            # 完整镜像名称
+            image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
+            # 完整镜像名称（确保符合Docker规范）
             full_image_name="$GITEA_REGISTRY/$REPO_PATH:$image_tag-${{ github.sha }}"
+            echo "镜像名称: $full_image_name"
 
-            echo "构建镜像: $full_image_name"
+            echo "===== 构建镜像 ====="
             if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
               echo "错误：构建镜像 $full_image_name 失败"
               exit 1
             fi
 
-            echo "推送镜像: $full_image_name"
+            echo "===== 测试镜像 ====="
+            if ! docker images "$full_image_name" | grep -q "$full_image_name"; then
+              echo "错误：镜像构建后未找到 $full_image_name"
+              exit 1
+            fi
+
+            echo "===== 推送镜像 ====="
             if ! docker push "$full_image_name"; then
               echo "错误：推送镜像 $full_image_name 失败"
+              echo "可能原因：令牌无write:packages权限、仓库不存在或网络问题"
+              # 尝试获取详细错误信息
+              curl -u ${{ github.actor }}:$GITEA_TOKEN $GITEA_REGISTRY/v2/_catalog
               exit 1
             fi
 
             # 推送latest标签
             latest_image="$GITEA_REGISTRY/$REPO_PATH:$image_tag-latest"
-            echo "推送最新标签: $latest_image"
+            echo "===== 推送最新标签: $latest_image ====="
             docker tag "$full_image_name" "$latest_image"
             if ! docker push "$latest_image"; then
               echo "错误：推送最新标签 $latest_image 失败"
@@ -80,5 +107,6 @@ jobs:
 
           echo "===== 清理操作 ====="
           docker logout $GITEA_REGISTRY
+          # 可选：清理构建的镜像释放空间
+          docker system prune -f
           echo "===== 所有操作完成 ====="
-

From 515d473da0e16641d9d9cab3ef2e1d5782bd34ed Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:35:16 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 4f918a5a..51c8c1a5 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -24,11 +24,7 @@ jobs:
         run: |
           echo "===== 开始Maven构建 ====="
           /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
-          echo "===== 验证构建结果 ====="
-          if [ ! -d "./target" ] || [ -z "$(ls -A ./target/*.jar 2>/dev/null)" ]; then
-            echo "错误：Maven构建未生成有效JAR包"
-            exit 1
-          fi
+
           echo "===== Maven构建完成 ====="
 
       - name: 构建并推送Docker镜像

From db30232834b974a33df2586ab664b2e17f61bc85 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 20:41:54 +0800
Subject: [PATCH 21/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 69 ++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 51c8c1a5..116b0369 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -1,4 +1,4 @@
-name: Build and Push to SmartParks Registry
+name: Build and Push to Target Registry
 
 # 监听master分支的推送事件
 on:
@@ -7,18 +7,15 @@ on:
 
 jobs:
   build-and-deploy:
-    name: 构建并推送镜像到仓库注册表
+    name: 构建并推送镜像到目标仓库
     runs-on: ubuntu
-    timeout-minutes: 30  # 设置超时时间，防止无限等待
-    permissions:
-      packages: write  # 明确请求包管理权限
-      contents: read   # 读取代码权限
+    timeout-minutes: 30
 
     steps:
       - name: 拉取代码
         uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 0  # 拉取完整历史，确保版本信息正确
+          fetch-depth: 0
 
       - name: 使用Maven构建项目
         run: |
@@ -29,30 +26,24 @@ jobs:
 
       - name: 构建并推送Docker镜像
         env:
-          # Gitea容器注册表地址
-          GITEA_REGISTRY: 172.100.10.45:3000
-          # 仓库路径（严格区分大小写）
-          REPO_PATH: by2025/dockerimage
-          # 使用手动创建的专用推送令牌（推荐）
-          GITEA_TOKEN: ${{ secrets.DOCKER_PUSH_TOKEN }}
-          # 当前仓库信息（用于调试）
-          CURRENT_REPO: ${{ github.repository }}
+          # 目标仓库的容器注册表地址
+          TARGET_REGISTRY: 172.100.10.45:3000
+          # 目标代码仓库路径（组织/仓库名，严格区分大小写）
+          TARGET_REPO: by2025/dockerimage  # 替换为目标仓库路径
+          # 登录目标仓库的账户密码（在Gitea secrets中配置）
+          REGISTRY_USERNAME: ${{ secrets.TARGET_REGISTRY_USERNAME }}
+          REGISTRY_PASSWORD: ${{ secrets.TARGET_REGISTRY_PASSWORD }}
         run: |
-          echo "===== 环境信息验证 ====="
-          echo "当前仓库: $CURRENT_REPO"
-          echo "目标仓库路径: $REPO_PATH"
-          echo "镜像仓库地址: $GITEA_REGISTRY"
+          echo "===== 环境信息 ====="
+          echo "目标仓库: $TARGET_REGISTRY/$TARGET_REPO"
 
-          echo "===== 登录到Gitea容器注册表 ====="
-          # 登录并检查结果
-          if ! echo "$GITEA_TOKEN" | docker login $GITEA_REGISTRY -u ${{ github.actor }} --password-stdin; then
-            echo "错误：登录到容器注册表失败"
-            echo "请检查令牌权限和仓库地址是否正确"
+          echo "===== 使用账户密码登录目标仓库 ====="
+          if ! echo "$REGISTRY_PASSWORD" | docker login $TARGET_REGISTRY -u $REGISTRY_USERNAME --password-stdin; then
+            echo "错误：登录目标仓库失败，请检查账户密码"
             exit 1
           fi
 
           echo "===== 查找项目中的Dockerfile ====="
-          # 查找所有Dockerfile并检查是否存在
           dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
           if [ -z "$dockerfiles" ]; then
             echo "警告：未找到任何Dockerfile"
@@ -64,45 +55,35 @@ jobs:
             echo "===== 处理Dockerfile: $dockerfile ====="
 
             docker_context=$(dirname "$dockerfile")
-            # 生成镜像标签（基于目录名，转换为小写并替换斜杠）
+            # 生成镜像标签（转换为小写，符合Docker规范）
             image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
-            # 完整镜像名称（确保符合Docker规范）
-            full_image_name="$GITEA_REGISTRY/$REPO_PATH:$image_tag-${{ github.sha }}"
+            # 完整镜像名称（目标仓库路径）
+            full_image_name="$TARGET_REGISTRY/$TARGET_REPO:$image_tag-${{ github.sha }}"
             echo "镜像名称: $full_image_name"
 
             echo "===== 构建镜像 ====="
             if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
-              echo "错误：构建镜像 $full_image_name 失败"
+              echo "错误：构建镜像失败"
               exit 1
             fi
 
-            echo "===== 测试镜像 ====="
-            if ! docker images "$full_image_name" | grep -q "$full_image_name"; then
-              echo "错误：镜像构建后未找到 $full_image_name"
-              exit 1
-            fi
-
-            echo "===== 推送镜像 ====="
+            echo "===== 推送镜像到目标仓库 ====="
             if ! docker push "$full_image_name"; then
-              echo "错误：推送镜像 $full_image_name 失败"
-              echo "可能原因：令牌无write:packages权限、仓库不存在或网络问题"
-              # 尝试获取详细错误信息
-              curl -u ${{ github.actor }}:$GITEA_TOKEN $GITEA_REGISTRY/v2/_catalog
+              echo "错误：推送镜像失败，请检查账户是否有目标仓库的推送权限"
               exit 1
             fi
 
             # 推送latest标签
-            latest_image="$GITEA_REGISTRY/$REPO_PATH:$image_tag-latest"
+            latest_image="$TARGET_REGISTRY/$TARGET_REPO:$image_tag-latest"
             echo "===== 推送最新标签: $latest_image ====="
             docker tag "$full_image_name" "$latest_image"
             if ! docker push "$latest_image"; then
-              echo "错误：推送最新标签 $latest_image 失败"
+              echo "错误：推送latest标签失败"
               exit 1
             fi
           done
 
           echo "===== 清理操作 ====="
-          docker logout $GITEA_REGISTRY
-          # 可选：清理构建的镜像释放空间
+          docker logout $TARGET_REGISTRY
           docker system prune -f
           echo "===== 所有操作完成 ====="

From 44e6a1b556b7ad6d956aa12221db5cce7ac79d37 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:07:03 +0800
Subject: [PATCH 22/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 116b0369..80945c9b 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -27,9 +27,9 @@ jobs:
       - name: 构建并推送Docker镜像
         env:
           # 目标仓库的容器注册表地址
-          TARGET_REGISTRY: 172.100.10.45:3000
+          TARGET_REGISTRY: 10.20.1.60:5000
           # 目标代码仓库路径（组织/仓库名，严格区分大小写）
-          TARGET_REPO: by2025/dockerimage  # 替换为目标仓库路径
+          TARGET_REPO: by2025  # 替换为目标仓库路径
           # 登录目标仓库的账户密码（在Gitea secrets中配置）
           REGISTRY_USERNAME: ${{ secrets.TARGET_REGISTRY_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.TARGET_REGISTRY_PASSWORD }}

From d235ac8e815c29b41bb37ca43f2598298e88b4ae Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:12:12 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 80945c9b..af81d846 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -26,22 +26,15 @@ jobs:
 
       - name: 构建并推送Docker镜像
         env:
-          # 目标仓库的容器注册表地址
-          TARGET_REGISTRY: 10.20.1.60:5000
-          # 目标代码仓库路径（组织/仓库名，严格区分大小写）
-          TARGET_REPO: by2025  # 替换为目标仓库路径
-          # 登录目标仓库的账户密码（在Gitea secrets中配置）
-          REGISTRY_USERNAME: ${{ secrets.TARGET_REGISTRY_USERNAME }}
-          REGISTRY_PASSWORD: ${{ secrets.TARGET_REGISTRY_PASSWORD }}
+          # 替换为你的Docker Registry地址（例如：localhost:5000 或 192.168.1.100:5000）
+          TARGET_REGISTRY: 127.0.0.1:5000
+          # 目标仓库中的项目名称
+          TARGET_PROJECT: smartparks
         run: |
           echo "===== 环境信息 ====="
-          echo "目标仓库: $TARGET_REGISTRY/$TARGET_REPO"
+          echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
 
-          echo "===== 使用账户密码登录目标仓库 ====="
-          if ! echo "$REGISTRY_PASSWORD" | docker login $TARGET_REGISTRY -u $REGISTRY_USERNAME --password-stdin; then
-            echo "错误：登录目标仓库失败，请检查账户密码"
-            exit 1
-          fi
+          # 【删除登录步骤】因为仓库无认证，无需登录
 
           echo "===== 查找项目中的Dockerfile ====="
           dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
@@ -50,15 +43,13 @@ jobs:
             exit 0
           fi
 
-          # 处理每个Dockerfile
+          # 处理每个Dockerfile（后续构建、推送逻辑与之前类似，保持不变）
           echo "$dockerfiles" | while read -r dockerfile; do
             echo "===== 处理Dockerfile: $dockerfile ====="
 
             docker_context=$(dirname "$dockerfile")
-            # 生成镜像标签（转换为小写，符合Docker规范）
             image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
-            # 完整镜像名称（目标仓库路径）
-            full_image_name="$TARGET_REGISTRY/$TARGET_REPO:$image_tag-${{ github.sha }}"
+            full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
             echo "镜像名称: $full_image_name"
 
             echo "===== 构建镜像 ====="
@@ -67,14 +58,14 @@ jobs:
               exit 1
             fi
 
-            echo "===== 推送镜像到目标仓库 ====="
+            echo "===== 推送镜像到仓库 ====="
             if ! docker push "$full_image_name"; then
-              echo "错误：推送镜像失败，请检查账户是否有目标仓库的推送权限"
+              echo "错误：推送镜像失败，请检查仓库是否可访问"
               exit 1
             fi
 
-            # 推送latest标签
-            latest_image="$TARGET_REGISTRY/$TARGET_REPO:$image_tag-latest"
+            # 推送latest标签（逻辑保持不变）
+            latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
             echo "===== 推送最新标签: $latest_image ====="
             docker tag "$full_image_name" "$latest_image"
             if ! docker push "$latest_image"; then
@@ -84,6 +75,5 @@ jobs:
           done
 
           echo "===== 清理操作 ====="
-          docker logout $TARGET_REGISTRY
           docker system prune -f
           echo "===== 所有操作完成 ====="

From 9d12fc7fdd0fdbc3406afc4e782806e4bd31f1d5 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:17:29 +0800
Subject: [PATCH 24/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index af81d846..fd4a22dc 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -1,13 +1,12 @@
-name: Build and Push to Target Registry
+name: Build and Push to Docker Registry
 
-# 监听master分支的推送事件
 on:
   push:
     branches: [ master ]
 
 jobs:
   build-and-deploy:
-    name: 构建并推送镜像到目标仓库
+    name: 构建并推送镜像到Docker Registry
     runs-on: ubuntu
     timeout-minutes: 30
 
@@ -21,20 +20,30 @@ jobs:
         run: |
           echo "===== 开始Maven构建 ====="
           /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
-
           echo "===== Maven构建完成 ====="
 
       - name: 构建并推送Docker镜像
         env:
-          # 替换为你的Docker Registry地址（例如：localhost:5000 或 192.168.1.100:5000）
+          # 目标仓库地址（你的新建仓库）
           TARGET_REGISTRY: 127.0.0.1:5000
           # 目标仓库中的项目名称
           TARGET_PROJECT: smartparks
+          # 基础镜像所在仓库地址（需要认证的仓库）
+          BASE_REGISTRY: 172.100.10.45:3000
+          # 基础镜像仓库的登录凭证（在Gitea secrets中配置）
+          BASE_REGISTRY_USERNAME: ${{ secrets.BASE_REGISTRY_USERNAME }}
+          BASE_REGISTRY_PASSWORD: ${{ secrets.BASE_REGISTRY_PASSWORD }}
         run: |
           echo "===== 环境信息 ====="
           echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
+          echo "基础镜像仓库: $BASE_REGISTRY"
 
-          # 【删除登录步骤】因为仓库无认证，无需登录
+          # 关键步骤：先登录到基础镜像仓库（解决401认证问题）
+          echo "===== 登录基础镜像仓库 ====="
+          if ! echo "$BASE_REGISTRY_PASSWORD" | docker login $BASE_REGISTRY -u $BASE_REGISTRY_USERNAME --password-stdin; then
+            echo "错误：登录基础镜像仓库 $BASE_REGISTRY 失败，请检查账户密码"
+            exit 1
+          fi
 
           echo "===== 查找项目中的Dockerfile ====="
           dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
@@ -43,7 +52,7 @@ jobs:
             exit 0
           fi
 
-          # 处理每个Dockerfile（后续构建、推送逻辑与之前类似，保持不变）
+          # 处理每个Dockerfile
           echo "$dockerfiles" | while read -r dockerfile; do
             echo "===== 处理Dockerfile: $dockerfile ====="
 
@@ -58,13 +67,14 @@ jobs:
               exit 1
             fi
 
-            echo "===== 推送镜像到仓库 ====="
+            echo "===== 推送镜像到目标仓库 ====="
+            # 目标仓库无认证，直接推送
             if ! docker push "$full_image_name"; then
-              echo "错误：推送镜像失败，请检查仓库是否可访问"
+              echo "错误：推送镜像到目标仓库失败，请检查仓库是否可访问"
               exit 1
             fi
 
-            # 推送latest标签（逻辑保持不变）
+            # 推送latest标签
             latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
             echo "===== 推送最新标签: $latest_image ====="
             docker tag "$full_image_name" "$latest_image"
@@ -75,5 +85,6 @@ jobs:
           done
 
           echo "===== 清理操作 ====="
+          docker logout $BASE_REGISTRY  # 退出基础镜像仓库登录
           docker system prune -f
           echo "===== 所有操作完成 ====="

From be52875780e05134b4bbe234cd4550db75d6ea8b Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:24:11 +0800
Subject: [PATCH 25/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 31 ++++++++++---------------------
 ruoyi-auth/Dockerfile       |  2 +-
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index fd4a22dc..af81d846 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -1,12 +1,13 @@
-name: Build and Push to Docker Registry
+name: Build and Push to Target Registry
 
+# 监听master分支的推送事件
 on:
   push:
     branches: [ master ]
 
 jobs:
   build-and-deploy:
-    name: 构建并推送镜像到Docker Registry
+    name: 构建并推送镜像到目标仓库
     runs-on: ubuntu
     timeout-minutes: 30
 
@@ -20,30 +21,20 @@ jobs:
         run: |
           echo "===== 开始Maven构建 ====="
           /maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
+
           echo "===== Maven构建完成 ====="
 
       - name: 构建并推送Docker镜像
         env:
-          # 目标仓库地址（你的新建仓库）
+          # 替换为你的Docker Registry地址（例如：localhost:5000 或 192.168.1.100:5000）
           TARGET_REGISTRY: 127.0.0.1:5000
           # 目标仓库中的项目名称
           TARGET_PROJECT: smartparks
-          # 基础镜像所在仓库地址（需要认证的仓库）
-          BASE_REGISTRY: 172.100.10.45:3000
-          # 基础镜像仓库的登录凭证（在Gitea secrets中配置）
-          BASE_REGISTRY_USERNAME: ${{ secrets.BASE_REGISTRY_USERNAME }}
-          BASE_REGISTRY_PASSWORD: ${{ secrets.BASE_REGISTRY_PASSWORD }}
         run: |
           echo "===== 环境信息 ====="
           echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
-          echo "基础镜像仓库: $BASE_REGISTRY"
 
-          # 关键步骤：先登录到基础镜像仓库（解决401认证问题）
-          echo "===== 登录基础镜像仓库 ====="
-          if ! echo "$BASE_REGISTRY_PASSWORD" | docker login $BASE_REGISTRY -u $BASE_REGISTRY_USERNAME --password-stdin; then
-            echo "错误：登录基础镜像仓库 $BASE_REGISTRY 失败，请检查账户密码"
-            exit 1
-          fi
+          # 【删除登录步骤】因为仓库无认证，无需登录
 
           echo "===== 查找项目中的Dockerfile ====="
           dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
@@ -52,7 +43,7 @@ jobs:
             exit 0
           fi
 
-          # 处理每个Dockerfile
+          # 处理每个Dockerfile（后续构建、推送逻辑与之前类似，保持不变）
           echo "$dockerfiles" | while read -r dockerfile; do
             echo "===== 处理Dockerfile: $dockerfile ====="
 
@@ -67,14 +58,13 @@ jobs:
               exit 1
             fi
 
-            echo "===== 推送镜像到目标仓库 ====="
-            # 目标仓库无认证，直接推送
+            echo "===== 推送镜像到仓库 ====="
             if ! docker push "$full_image_name"; then
-              echo "错误：推送镜像到目标仓库失败，请检查仓库是否可访问"
+              echo "错误：推送镜像失败，请检查仓库是否可访问"
               exit 1
             fi
 
-            # 推送latest标签
+            # 推送latest标签（逻辑保持不变）
             latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
             echo "===== 推送最新标签: $latest_image ====="
             docker tag "$full_image_name" "$latest_image"
@@ -85,6 +75,5 @@ jobs:
           done
 
           echo "===== 清理操作 ====="
-          docker logout $BASE_REGISTRY  # 退出基础镜像仓库登录
           docker system prune -f
           echo "===== 所有操作完成 ====="
diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile
index 716df43d..70e18c37 100644
--- a/ruoyi-auth/Dockerfile
+++ b/ruoyi-auth/Dockerfile
@@ -2,7 +2,7 @@
 #FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
 #FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
 #FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
-FROM 172.100.10.45:3000/by2025/base-images/liberica-openjdk-debian:17.0.11-cds
+FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

From 2becd3e7ce0eb4229b88aa9d0c8ab71a75fd8690 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:27:44 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-auth/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile
index 70e18c37..9734be2d 100644
--- a/ruoyi-auth/Dockerfile
+++ b/ruoyi-auth/Dockerfile
@@ -2,7 +2,8 @@
 #FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
 #FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
 #FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
-FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian
+#FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian
+FROM 127.0.0.1:5000/smartparks/base-images/liberica-openjdk-debian:17.0.11-cds
 #FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"

From 9a4be9e609678d5a1fd375fa616f99992fce224a Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 21:33:46 +0800
Subject: [PATCH 27/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=813?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-modules/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 267aca5a..3e55175f 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -14,8 +14,8 @@
         <module>ruoyi-job</module>
         <module>ruoyi-resource</module>
         <module>ruoyi-workflow</module>
-<!--        <module>Property</module>-->
-<!--        <module>Sis</module>-->
+        <module>Property</module>
+        <module>Sis</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

From fc4d7a2bdf32977fdd90081a85ef82ceb3000698 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:17:45 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-modules/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 3e55175f..267aca5a 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -14,8 +14,8 @@
         <module>ruoyi-job</module>
         <module>ruoyi-resource</module>
         <module>ruoyi-workflow</module>
-        <module>Property</module>
-        <module>Sis</module>
+<!--        <module>Property</module>-->
+<!--        <module>Sis</module>-->
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

From 63ee35574599ae99e5f69a90821d4c4541893ded Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:37:12 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index af81d846..3daf0aed 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -31,6 +31,7 @@ jobs:
           # 目标仓库中的项目名称
           TARGET_PROJECT: smartparks
         run: |
+
           echo "===== 环境信息 ====="
           echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
 
@@ -52,6 +53,16 @@ jobs:
             full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
             echo "镜像名称: $full_image_name"
 
+            # 检查JAR包是否存在
+            echo "===== 检查JAR包 ====="
+            jar_files=$(find "$docker_context" -name "*.jar" -type f)
+            if [ -z "$jar_files" ]; then
+              echo "警告：在 $docker_context 目录中未找到JAR包"
+              exit 1
+            fi
+            echo "找到JAR包："
+            echo "$jar_files"
+
             echo "===== 构建镜像 ====="
             if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
               echo "错误：构建镜像失败"
@@ -77,3 +88,4 @@ jobs:
           echo "===== 清理操作 ====="
           docker system prune -f
           echo "===== 所有操作完成 ====="
+

From 6075704524a70ac427592d9fa62a423a9ef6871a Mon Sep 17 00:00:00 2001
From: bichangxiong <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:39:56 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/mas?=
 =?UTF-8?q?ter.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 3daf0aed..458188ed 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -60,7 +60,7 @@ jobs:
               echo "警告：在 $docker_context 目录中未找到JAR包"
               exit 1
             fi
-            echo "找到JAR包："
+            echo "找到JAR包:"
             echo "$jar_files"
 
             echo "===== 构建镜像 ====="

From f488acf9cc1fc95f698d973306aa121a40a04cc4 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:41:27 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 3daf0aed..af81d846 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -31,7 +31,6 @@ jobs:
           # 目标仓库中的项目名称
           TARGET_PROJECT: smartparks
         run: |
-
           echo "===== 环境信息 ====="
           echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
 
@@ -53,16 +52,6 @@ jobs:
             full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
             echo "镜像名称: $full_image_name"
 
-            # 检查JAR包是否存在
-            echo "===== 检查JAR包 ====="
-            jar_files=$(find "$docker_context" -name "*.jar" -type f)
-            if [ -z "$jar_files" ]; then
-              echo "警告：在 $docker_context 目录中未找到JAR包"
-              exit 1
-            fi
-            echo "找到JAR包："
-            echo "$jar_files"
-
             echo "===== 构建镜像 ====="
             if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
               echo "错误：构建镜像失败"
@@ -88,4 +77,3 @@ jobs:
           echo "===== 清理操作 ====="
           docker system prune -f
           echo "===== 所有操作完成 ====="
-

From 9110c152aa749c0552d765158ee90fc71160ec75 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:43:25 +0800
Subject: [PATCH 32/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index af81d846..33371768 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -76,4 +76,4 @@ jobs:
 
           echo "===== 清理操作 ====="
           docker system prune -f
-          echo "===== 所有操作完成 ====="
+          echo "===== 所有操作完成 ===="

From d13f58cb95771677b5a3e5be0373ff511e84db46 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:46:20 +0800
Subject: [PATCH 33/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index 33371768..b9c977b9 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -52,6 +52,16 @@ jobs:
             full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
             echo "镜像名称: $full_image_name"
 
+            # 检查JAR包是否存在
+            echo "===== 检查JAR包 ====="
+            jar_files=$(find "$docker_context" -name "*.jar" -type f)
+            if [ -z "$jar_files" ]; then
+              echo "警告：在 $docker_context 目录中未找到JAR包"
+              exit 1
+            fi
+            echo "找到JAR包："
+            echo "$jar_files"
+
             echo "===== 构建镜像 ====="
             if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
               echo "错误：构建镜像失败"

From d9cf6ef530abd2aedf561dcf5643cc758ecdaf42 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 23:55:35 +0800
Subject: [PATCH 34/34] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/master.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/master.yml b/.gitea/workflows/master.yml
index b9c977b9..9ca94237 100644
--- a/.gitea/workflows/master.yml
+++ b/.gitea/workflows/master.yml
@@ -57,7 +57,7 @@ jobs:
             jar_files=$(find "$docker_context" -name "*.jar" -type f)
             if [ -z "$jar_files" ]; then
               echo "警告：在 $docker_context 目录中未找到JAR包"
-              exit 1
+              continue
             fi
             echo "找到JAR包："
             echo "$jar_files"