From 9ce3e831b535b3f803dc42ae549aa8d080056b3f Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@yunhaixingtong.com>
Date: Mon, 10 Aug 2026 16:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95ci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/ci.yml               | 116 --------------------------
 pom.xml                               |   6 ++
 src/main/resources/bootstrap.yml      |   3 +-
 src/main/resources/logback-spring.xml |  41 +++++----
 4 files changed, 32 insertions(+), 134 deletions(-)
 delete mode 100644 .gitea/workflows/ci.yml

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
deleted file mode 100644
index 7970afb..0000000
--- a/.gitea/workflows/ci.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-name: ci-userbase-service
-
-# 后端标准化 CI：maven 构建 jar -> docker build -> 推 Nexus docker-hosted -> 部署 160
-# 触发：push 到 main（service 仓库根即后端代码）/ 手动 Run workflow
-# 依赖仓库 Actions Secrets：NEXUS_USER / NEXUS_PASSWORD（ci-docker 账号，仅 docker-hosted 推送权）
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'image tag (default = short sha)'
-        required: false
-        default: 'auto'
-      deploy:
-        description: 'deploy to 160 after build (auto / skip)'
-        required: false
-        default: 'auto'
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    # docker:24 自带 docker CLI，复用宿主 docker daemon（act_runner v0.6.1 已挂载 docker.sock）。
-    # 切勿再声明 volumes: docker.sock（会报 Duplicate mount point）。
-    container:
-      image: docker:24
-    steps:
-      - name: Install git (alpine)
-        run: apk add --no-cache git
-
-      # 内网 Gitea 无法访问 github.com 拉取 actions/checkout，改为直接 clone 本仓库
-      - name: Checkout (manual, internal Gitea)
-        run: |
-          git clone --depth 1 --branch main http://192.168.10.160:3000/${GITHUB_REPOSITORY}.git /tmp/src
-          cp -a /tmp/src/. .
-          rm -rf /tmp/src
-
-      - name: Compute image tag
-        id: meta
-        run: |
-          if [ "${{ inputs.tag }}" = "auto" ] || [ -z "${{ inputs.tag }}" ]; then
-            echo "tag=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
-          else
-            echo "tag=${{ inputs.tag }}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Build jar with Maven
-        run: |
-          # job 容器经 docker.sock 调宿主 docker daemon，故 docker run -v 路径按宿主解析；
-          # act 工作区是宿主 docker volume，容器内 $PWD 对宿主不可见，直接 -v $PWD:/build 会绑空目录。
-          # 故改为：起 maven 容器 -> docker cp 源码入容器 -> exec 构建 -> cp 产物回工作区。
-          # mavenbuild 加入 infra-infra-net，用容器名 nexus 直连 Nexus(8081 maven-public)。
-          # 先清理上次失败残留的同名容器
-          docker rm -f mavenbuild 2>/dev/null || true
-          docker run -d --name mavenbuild \
-            --network infra-infra-net \
-            -v /opt/docker/ubs-m2:/root/.m2 \
-            -w /build maven:3.6.3-jdk-8 sleep 3600
-          docker cp "${PWD}/." mavenbuild:/build/
-          # settings.xml：新增 profile 把 nexus:8081 maven-public 作为额外仓库（infra-infra-net 内容器名直连）。
-          # 不用 mirror(external:http:*)：对 BOM import 解析未生效；profile 方式更可靠。
-          docker exec mavenbuild sh -c "printf '%s' '<settings><profiles><profile><id>nexus-repo</id><repositories><repository><id>nexus-internal</id><url>http://nexus:8081/repository/maven-public/</url><releases><enabled>true</enabled></releases><snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots></repository></repositories></profile></profiles><activeProfiles><activeProfile>nexus-repo</activeProfile></activeProfiles></settings>' > /root/.m2/settings.xml"
-          # 仅清旧 yh-auth 缓存（含 08-05 local install 的 maven-metadata-local.xml）；BOM 等其它模块保留缓存。
-          docker exec mavenbuild rm -rf /root/.m2/repository/com/yunhai/platform/yh-auth-spring-boot-starter
-          docker exec mavenbuild sh -c 'cd /build && mvn -U -B -DskipTests clean package'
-          mkdir -p "${PWD}/target"
-          docker cp mavenbuild:/build/target/userbase.jar "${PWD}/target/userbase.jar"
-          docker rm -f mavenbuild
-
-      - name: Login to Nexus docker registry
-        run: echo "${{ secrets.NEXUS_PASSWORD }}" | docker login nexus:8083 -u ${{ secrets.NEXUS_USER }} --password-stdin
-
-      - name: Build image
-        run: docker build -t nexus:8083/docker-hosted/userbase-service:${{ steps.meta.outputs.tag }} -f docker/Dockerfile .
-
-      - name: Push image
-        run: docker push nexus:8083/docker-hosted/userbase-service:${{ steps.meta.outputs.tag }}
-
-      - name: Report build
-        run: echo "pushed nexus:8083/docker-hosted/userbase-service:${{ steps.meta.outputs.tag }}"
-
-      # 部署阶段（仅在 push 或手动 dispatch deploy=auto 时执行），运行在 160 的 act_runner 上。
-      - name: Deploy (pull + rollout with rollback)
-        if: github.event_name == 'push' || inputs.deploy == 'auto'
-        run: |
-          set +e
-          IMG=nexus:8083/docker-hosted/userbase-service:${{ steps.meta.outputs.tag }}
-          echo "deploying $IMG"
-          echo "${{ secrets.NEXUS_PASSWORD }}" | docker login nexus:8083 -u ${{ secrets.NEXUS_USER }} --password-stdin
-          docker pull "$IMG"
-          RB=userbase-service:rb-$(date +%s)
-          docker tag userbase-service:latest "$RB" 2>/dev/null || true
-          docker stop userbase-service 2>/dev/null; docker rm -f userbase-service 2>/dev/null
-          # SCA 2.2.4 坑: 命名空间必须用 SPRING_CLOUD_NACOS_CONFIG_NAMESPACE；
-          # 凭据必须放顶层 SPRING_CLOUD_NACOS_USERNAME/PASSWORD。
-          docker run -d --name userbase-service --restart unless-stopped --network infra-infra-net -p 8060:8060 \
-            -e NACOS_ADDR=nacos:8848 \
-            -e SPRING_CLOUD_NACOS_CONFIG_NAMESPACE=6196f0de-a28d-4894-8f10-e2982b57c6bc \
-            -e SPRING_CLOUD_NACOS_USERNAME=yh-reader \
-            -e SPRING_CLOUD_NACOS_PASSWORD=123456 \
-            "$IMG"
-          OK=0
-          for i in $(seq 1 30); do
-            sleep 5
-            CODE=$(curl -s -o /dev/null -w '%{http_code}' http://localhost:8060/userbase/ 2>/dev/null || true)
-            if [ "$CODE" != "000" ]; then OK=1; break; fi
-          done
-          if [ "$OK" = "0" ]; then
-            echo "!! UNHEALTHY -> rollback to userbase-service:latest"
-            docker stop userbase-service 2>/dev/null; docker rm -f userbase-service 2>/dev/null
-            docker run -d --name userbase-service --restart unless-stopped --network infra-infra-net -p 8060:8060 userbase-service:latest
-            echo "rolled back"; exit 7
-          fi
-          echo "DEPLOY OK: $IMG"
-          docker tag "$IMG" userbase-service:latest
-          docker ps --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}' | grep userbase || true
diff --git a/pom.xml b/pom.xml
index bd1a429..83cce41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,12 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <!-- Jackson Java 8 日期时间支持（LocalDateTime / LocalDate 序列化）；
+             虽 spring-boot-starter-json 会传递引入，但此处显式声明以防上层排除 → 序列化异常 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <!-- Redisson 核心：分布式锁、限流器、Lua 复杂操作（与 Spring Cache 隔离，手动配置 RedissonClient 避免自动配置冲突） -->
         <dependency>
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index bf4aa1c..257ebb5 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
         # Nacos 配置中心地址；生产也可通过环境变量 NACOS_ADDR 覆盖（例如内网别名 nacos:8848）
         server-addr: ${NACOS_ADDR:nacos.yunhaixingtong.com:8848}
         # public 命名空间：Nacos 中 public 的 namespace id 固定为空字符串
-        namespace: ${NACOS_NAMESPACE:dev}
+        namespace: ${NACOS_NAMESPACE:ce902c5c-b568-4465-b058-a98e1e2992e7}
         # 应用自身配置所在分组
         group: USERBASE
         # 配置文件格式；最终主配置 dataId = ${spring.application.name}.${file-extension}，即 userbase.yaml
@@ -23,4 +23,5 @@ spring:
         shared-configs:
           - data-id: common.yaml
             group: DEFAULT_GROUP
+            namespace: ""
             refresh: false
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 73fa22c..0f1304e 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,28 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <!-- 引入 Spring Boot 默认彩色日志变量 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+
+    <!-- 控制台：所有环境都有，且带颜色 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
         </encoder>
     </appender>
 
-    <!-- 按天切割的文件日志 -->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>/app/logs/app.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/app/logs/app.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>5GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-    </appender>
+    <!-- 文件日志：只有非 local 环境才启用 -->
+    <springProfile name="!local">
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <file>/app/logs/app.log</file>
+            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                <fileNamePattern>/app/logs/app.%d{yyyy-MM-dd}.log</fileNamePattern>
+                <maxHistory>30</maxHistory>
+                <totalSizeCap>5GB</totalSizeCap>
+            </rollingPolicy>
+            <encoder>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            </encoder>
+        </appender>
+    </springProfile>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE" />
-        <appender-ref ref="FILE" />
+        <springProfile name="!local">
+            <appender-ref ref="FILE" />
+        </springProfile>
     </root>
 </configuration>
\ No newline at end of file