Squashed commit of the following:

commit 2ed4e3e307 Author: DAI Mingchen <daimingchen@mail.ustc.edu.cn> Date: Thu Jul 25 11:48:00 2024 +0000 resolved WARN NoEmptyContinuation (grammar mistakes), and removed trivial unit test for hCAPTCHA commit 690157811b Author: DAI Mingchen <daimingchen@mail.ustc.edu.cn> Date: Thu Jul 25 10:21:39 2024 +0000 fix: checkout the corresponding branch(master or dev) commit 046ff63e42 Author: DAI Mingchen <daimingchen@mail.ustc.edu.cn> Date: Thu Jul 25 10:01:24 2024 +0000 test new CI pipeline workflow in the org repo, with a bunch of ENV vars commit faf7f51d85 Author: 戴明辰 <daimingchen@mail.ustc.edu.cn> Date: Thu Jul 25 07:59:31 2024 +0000 !1 DevStar Studio 界面原型 + CI流水线测试通过 * finalize this PoC repo, and migrate to the main repo (as a dev branch) * bugFix: nullptr dereference @ routers/web/auth/wechat_utils.go * bugFix: CAPTCHA needs manual reloading * Updated UI * Changed logo and favicon * Made WeChat QR optional (will not cause HTTP 500 Internal Error), and … * Added Unit Test in CI workflow, and removed redundant tests in dev container * Compliance with open source licensing requirements * Fix workflow: only exec 'docker rm' if there are dangling volumes * Removed Magic values about: Docker registry(URL, username), k8s(nanesp… * fix mistakes: git checkout branch should be master rather than the sta… * Updated UI layouts and build scripts * Updated copyright info and ICP License ID at page footer * Updated ICP License ID at page footer * Updated code ownership: web footer, logo and favicon * Updated Internationalization(i18n): removed languages other than CN an…
2024-07-30 12:46:01 +00:00
--- a/.gitea/workflows/devstar-studio-ci.yaml
+++ b/.gitea/workflows/devstar-studio-ci.yaml
@@ -0,0 +1,58 @@
+#
+# Add secrets of Remote Git Repository Panel:
+#   - ${{ secrets.DOCKER_REGISTRY_USERNAME }}: username of Docker Registry
+#   - ${{ secrets.DOCKER_REGISTRY_PASSWORD }}: password corresponding to the Docker Registry username
+
+# Add variables of Remote Git Repository Panel:
+#   - ${{ vars.DOCKER_REGISTRY_ADDRESS }}:     the address for Docker Registry
+#   - ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}:   the artifact $name:$version, e.g., `devstar/devstar-studio:latest-rootless` 
+#   - ${{ vars.K8S_NAMESPACE }}:               the namespace defined in Helm Chart
+#   - ${{ vars.K8S_DEPLOYMENT_NAME}}:          the Deployment to rolled out restart after pushing artifact to Docker Registry
+
+name: DevStar Studio CI Pipeline - master branch
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build-and-push-x86-64-docker-image:
+    # TODO: 使用私有 registry 绕过默认 docker.io
+    runs-on: ubuntu-latest # Actual image: docker.io/library/gitea/runner_image:ubuntu-latest
+    steps:
+      - name: 🔍 Check out repository code
+        uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: 🔧 Test Codes and Build an Artifact
+        run: |
+          echo "Prepare to build repository code ${{ gitea.repository }}:${{ gitea.ref }}."
+          make docker
+      - name: 🚀 Push Artifact to Docker Registry
+        run: |
+          docker tag devstar-studio:latest ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT }}
+          echo "${{ secrets.DOCKER_REGISTRY_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_REGISTRY_USERNAME }} ${{ vars.DOCKER_REGISTRY_ADDRESS }} --password-stdin
+          docker push ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT }}
+      - name: 🔧 Roll out Update on Kubernetes
+        run: |
+          echo "Please manually execute: kubectl rollout restart deployment -n ${{ vars.K8S_NAMESPACE }}  ${{ vars.K8S_DEPLOYMENT_NAME}}"
+      - name: 🍏 Job Status Report
+        run: echo "🍏 This job's status is ${{ job.status }}."
+
+
+#
+# P.S.: 
+################################################################################
+# 1. How to config runner:
+#  $ docker run \
+#      --name gitea-act-runner-repo-devstar-studio \
+#      -d \
+#      -e GITEA_INSTANCE_URL=https://www.mengning.net \
+#      -e GITEA_RUNNER_REGISTRATION_TOKEN=${YOUR_GITEA_RUNNER_REGISTRATION_TOKEN} \
+#      -v /var/run/docker.sock:/var/run/docker.sock \
+#      gitea/act_runner:latest
+#
+# 2. To clean the docker cache:
+#  $  docker builder prune --force
+#  $  if [ "$(docker volume ls -qf dangling=true)" ]; then docker volume rm $(docker volume ls -qf dangling=true); fi
+#
--- a/.gitea/workflows/devstar-studio-dev-ci.yaml
+++ b/.gitea/workflows/devstar-studio-dev-ci.yaml
@@ -0,0 +1,58 @@
+#
+# Add secrets of Remote Git Repository Panel:
+#   - ${{ secrets.DOCKER_REGISTRY_USERNAME }}: username of Docker Registry
+#   - ${{ secrets.DOCKER_REGISTRY_PASSWORD }}: password corresponding to the Docker Registry username
+
+# Add variables of Remote Git Repository Panel:
+#   - ${{ vars.DOCKER_REGISTRY_ADDRESS }}:     the address for Docker Registry
+#   - ${{ vars.DOCKER_REPOSITORY_ARTIFACT}}:   the artifact $name:$version, e.g., `devstar/devstar-studio:latest-rootless` 
+#   - ${{ vars.K8S_NAMESPACE }}:               the namespace defined in Helm Chart
+#   - ${{ vars.K8S_DEPLOYMENT_NAME}}:          the Deployment to rolled out restart after pushing artifact to Docker Registry
+
+name: DevStar Studio CI Pipeline - dev branch
+on:
+  push:
+    branches:
+      - dev-proof-of-concept
+
+jobs:
+  build-and-push-x86-64-docker-image:
+    # TODO: 使用私有 registry 绕过默认 docker.io
+    runs-on: ubuntu-latest # Actual image: docker.io/library/gitea/runner_image:ubuntu-latest
+    steps:
+      - name: 🔍 Check out repository code
+        uses: actions/checkout@v4
+        with:
+          ref: dev-proof-of-concept
+      - name: 🔧 Test Codes and Build an Artifact
+        run: |
+          echo "Prepare to build repository code ${{ gitea.repository }}:${{ gitea.ref }}."
+          make docker
+      - name: 🚀 Push Artifact to Docker Registry
+        run: |
+          docker tag devstar-studio:latest ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT }}
+          echo "${{ secrets.DOCKER_REGISTRY_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_REGISTRY_USERNAME }} ${{ vars.DOCKER_REGISTRY_ADDRESS }} --password-stdin
+          docker push ${{ vars.DOCKER_REGISTRY_ADDRESS }}/${{ vars.DOCKER_REPOSITORY_ARTIFACT }}
+      - name: 🔧 Roll out Update on Kubernetes
+        run: |
+          echo "Please manually execute: kubectl rollout restart deployment -n ${{ vars.K8S_NAMESPACE }}  ${{ vars.K8S_DEPLOYMENT_NAME}}"
+      - name: 🍏 Job Status Report
+        run: echo "🍏 This job's status is ${{ job.status }}."
+
+
+#
+# P.S.: 
+################################################################################
+# 1. How to config runner:
+#  $ docker run \
+#      --name gitea-act-runner-repo-devstar-studio \
+#      -d \
+#      -e GITEA_INSTANCE_URL=https://www.mengning.net \
+#      -e GITEA_RUNNER_REGISTRATION_TOKEN=${YOUR_GITEA_RUNNER_REGISTRATION_TOKEN} \
+#      -v /var/run/docker.sock:/var/run/docker.sock \
+#      gitea/act_runner:latest
+#
+# 2. To clean the docker cache:
+#  $  docker builder prune --force
+#  $  if [ "$(docker volume ls -qf dangling=true)" ]; then docker volume rm $(docker volume ls -qf dangling=true); fi
+#
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -1,86 +0,0 @@
-# Build stage
-FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
-
-ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-direct}
-
-ARG GITEA_VERSION
-ARG TAGS="sqlite sqlite_unlock_notify"
-ENV TAGS="bindata timetzdata $TAGS"
-ARG CGO_EXTRA_CFLAGS
-
-# Build deps
-RUN apk --no-cache add \
-    build-base \
-    git \
-    nodejs \
-    npm \
-    && rm -rf /var/cache/apk/*
-
-# Setup repo
-COPY . ${GOPATH}/src/code.gitea.io/gitea
-WORKDIR ${GOPATH}/src/code.gitea.io/gitea
-
-# Checkout version if set
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
- && make clean-all build
-
-# Begin env-to-ini build
-RUN go build contrib/environment-to-ini/environment-to-ini.go
-
-# Copy local files
-COPY docker/root /tmp/local
-
-# Set permissions
-RUN chmod 755 /tmp/local/usr/bin/entrypoint \
-              /tmp/local/usr/local/bin/gitea \
-              /tmp/local/etc/s6/gitea/* \
-              /tmp/local/etc/s6/openssh/* \
-              /tmp/local/etc/s6/.s6-svscan/* \
-              /go/src/code.gitea.io/gitea/gitea \
-              /go/src/code.gitea.io/gitea/environment-to-ini
-RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
-
-FROM docker.io/library/alpine:3.20
-LABEL maintainer="maintainers@gitea.io"
-
-EXPOSE 22 3000
-
-RUN apk --no-cache add \
-    bash \
-    ca-certificates \
-    curl \
-    gettext \
-    git \
-    linux-pam \
-    openssh \
-    s6 \
-    sqlite \
-    su-exec \
-    gnupg \
-    && rm -rf /var/cache/apk/*
-
-RUN addgroup \
-    -S -g 1000 \
-    git && \
-  adduser \
-    -S -H -D \
-    -h /data/git \
-    -s /bin/bash \
-    -u 1000 \
-    -G git \
-    git && \
-  echo "git:*" | chpasswd -e
-
-ENV USER=git
-ENV GITEA_CUSTOM=/data/gitea
-
-VOLUME ["/data"]
-
-ENTRYPOINT ["/usr/bin/entrypoint"]
-CMD ["/bin/s6-svscan", "/etc/s6"]
-
-COPY --from=build-env /tmp/local /
-COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
-COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
-COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh
--- a/Dockerfile.devContainer
+++ b/Dockerfile.devContainer
@@ -0,0 +1,15 @@
+# prepare base dev environment for Gitea
+
+FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
+
+# Build deps
+RUN apk --no-cache add \
+    build-base \
+    git \
+    icu-data-full \
+    nodejs \
+    npm \
+    && rm -rf /var/cache/apk/*
+
+# To acquire Gitea dev container:
+#  $ docker build -t gitea-devstar-dev-container -f Dockerfile.devContainer .
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -1,29 +1,47 @@
-# Build stage
-FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
+ARG DOCKER_REGISTRY_ADDRESS="www.mengning.net"
+ARG DOCKER_REGISTRY_USERNAME="devstar"
+
+ARG DEV_CONTAINER="gitea-dev-container:v1.0"
+ARG RUNTIME_CONTAINER="gitea-runtime-container:v1.0"
+
+
+###########################################################
+# stage1: Building Stage
+FROM ${DOCKER_REGISTRY_ADDRESS}/${DOCKER_REGISTRY_USERNAME}/${DEV_CONTAINER} AS build-env
+
+ARG GOPROXY="https://goproxy.cn"
+ARG NODEJS_PROXY="http://mirrors.cloud.tencent.com/nodejs-release/"

-ARG GOPROXY
 ENV GOPROXY=${GOPROXY:-direct}
+ENV NODE_MIRROR=${NODEJS_PROXY}

 ARG GITEA_VERSION
+# TODO: 适配 https://devstar.cn
+#       增加 MySQL, Redis - 测试通过后期上线改成 MySQL HA, Redis HA
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS="bindata timetzdata $TAGS"
 ARG CGO_EXTRA_CFLAGS

-#Build deps
-RUN apk --no-cache add \
-    build-base \
-    git \
-    nodejs \
-    npm \
-    && rm -rf /var/cache/apk/*
-
 # Setup repo
-COPY . ${GOPATH}/src/code.gitea.io/gitea
-WORKDIR ${GOPATH}/src/code.gitea.io/gitea
+COPY . /go/src/code.gitea.io/gitea
+WORKDIR /go/src/code.gitea.io/gitea
+
+# Bypass Root User Check in dev container (otherwise, 'make test' phase is to be failed): 
+#    modules/setting/setting.go::loadRunModeFrom:"Gitea is not supposed to be run as root."
+ENV GITEA_I_AM_BEING_UNSAFE_RUNNING_AS_ROOT=1

 # Checkout version if set
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
- && make clean-all build
+RUN if [ -n "${GITEA_VERSION}" ]; then \
+        git checkout "${GITEA_VERSION}"; \
+    fi \
+    && make clean-all test \
+    && echo "--------------------" \
+    && echo "  PASSED ALL TESTS" \
+    && echo "--------------------" \
+    && make clean-all build \
+    && echo "-------------------" \
+    && echo "   BUILD SUCCESS" \
+    && echo "-------------------"

 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go
@@ -39,21 +57,13 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \
              /go/src/code.gitea.io/gitea/environment-to-ini
 RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete

-FROM docker.io/library/alpine:3.20
-LABEL maintainer="maintainers@gitea.io"
+
+###########################################################
+# stage2: Prepare Gitea runtime environment
+FROM ${DOCKER_REGISTRY_ADDRESS}/${DOCKER_REGISTRY_USERNAME}/${RUNTIME_CONTAINER} AS runtime-env

 EXPOSE 2222 3000

-RUN apk --no-cache add \
-    bash \
-    ca-certificates \
-    dumb-init \
-    gettext \
-    git \
-    curl \
-    gnupg \
-    && rm -rf /var/cache/apk/*
-
 RUN addgroup \
    -S -g 1000 \
    git && \
--- a/Dockerfile.runtimeContainer
+++ b/Dockerfile.runtimeContainer
@@ -0,0 +1,21 @@
+# prepare base runtime environment for Gitea
+
+FROM docker.io/library/alpine:3.20
+
+RUN apk --no-cache add \
+    bash \
+    ca-certificates \
+    curl \
+    gettext \
+    git \
+    linux-pam \
+    openssh \
+    s6 \
+    dumb-init \
+    sqlite \
+    su-exec \
+    gnupg \
+    && rm -rf /var/cache/apk/*
+
+# To acquire Gitea base runtime container:
+#  $ docker build -t gitea-devstar-runtime-container -f Dockerfile.runtimeContainer .
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -980,7 +980,8 @@ generate-manpage:

 .PHONY: docker
 docker:
-	docker build --disable-content-trust=false -t $(DOCKER_REF) .
+	docker build -t devstar-studio:latest -f Dockerfile.rootless .
+#	 docker build --disable-content-trust=false -t $(DOCKER_REF) .
 # support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify"  .

 # This endif closes the if at the top of the file
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -1,31 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="main_outline" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640;" xml:space="preserve">
-<g>
-	<path id="teabag" style="fill:#FFFFFF" d="M395.9,484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5,21.2-17.9,33.8-11.8
-		c17.2,8.3,27.1,13,27.1,13l-0.1-109.2l16.7-0.1l0.1,117.1c0,0,57.4,24.2,83.1,40.1c3.7,2.3,10.2,6.8,12.9,14.4
-		c2.1,6.1,2,13.1-1,19.3l-61,126.9C423.6,484.9,408.4,490.3,395.9,484.2z"/>
-	<g>
-		<g>
-			<path style="fill:#609926" d="M622.7,149.8c-4.1-4.1-9.6-4-9.6-4s-117.2,6.6-177.9,8c-13.3,0.3-26.5,0.6-39.6,0.7c0,39.1,0,78.2,0,117.2
-				c-5.5-2.6-11.1-5.3-16.6-7.9c0-36.4-0.1-109.2-0.1-109.2c-29,0.4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5
-				c-9.8-0.6-22.5-2.1-39,1.5c-8.7,1.8-33.5,7.4-53.8,26.9C-4.9,212.4,6.6,276.2,8,285.8c1.7,11.7,6.9,44.2,31.7,72.5
-				c45.8,56.1,144.4,54.8,144.4,54.8s12.1,28.9,30.6,55.5c25,33.1,50.7,58.9,75.7,62c63,0,188.9-0.1,188.9-0.1s12,0.1,28.3-10.3
-				c14-8.5,26.5-23.4,26.5-23.4s12.9-13.8,30.9-45.3c5.5-9.7,10.1-19.1,14.1-28c0,0,55.2-117.1,55.2-231.1
-				C633.2,157.9,624.7,151.8,622.7,149.8z M125.6,353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6,321.8,60,295.4
-				c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5,38.5-30c13.8-3.7,31-3.1,31-3.1s7.1,59.4,15.7,94.2c7.2,29.2,24.8,77.7,24.8,77.7
-				S142.5,359.9,125.6,353.9z M425.9,461.5c0,0-6.1,14.5-19.6,15.4c-5.8,0.4-10.3-1.2-10.3-1.2s-0.3-0.1-5.3-2.1l-112.9-55
-				c0,0-10.9-5.7-12.8-15.6c-2.2-8.1,2.7-18.1,2.7-18.1L322,273c0,0,4.8-9.7,12.2-13c0.6-0.3,2.3-1,4.5-1.5c8.1-2.1,18,2.8,18,2.8
-				l110.7,53.7c0,0,12.6,5.7,15.3,16.2c1.9,7.4-0.5,14-1.8,17.2C474.6,363.8,425.9,461.5,425.9,461.5z"/>
-			<path style="fill:#609926" d="M326.8,380.1c-8.2,0.1-15.4,5.8-17.3,13.8c-1.9,8,2,16.3,9.1,20c7.7,4,17.5,1.8,22.7-5.4
-				c5.1-7.1,4.3-16.9-1.8-23.1l24-49.1c1.5,0.1,3.7,0.2,6.2-0.5c4.1-0.9,7.1-3.6,7.1-3.6c4.2,1.8,8.6,3.8,13.2,6.1
-				c4.8,2.4,9.3,4.9,13.4,7.3c0.9,0.5,1.8,1.1,2.8,1.9c1.6,1.3,3.4,3.1,4.7,5.5c1.9,5.5-1.9,14.9-1.9,14.9
-				c-2.3,7.6-18.4,40.6-18.4,40.6c-8.1-0.2-15.3,5-17.7,12.5c-2.6,8.1,1.1,17.3,8.9,21.3c7.8,4,17.4,1.7,22.5-5.3
-				c5-6.8,4.6-16.3-1.1-22.6c1.9-3.7,3.7-7.4,5.6-11.3c5-10.4,13.5-30.4,13.5-30.4c0.9-1.7,5.7-10.3,2.7-21.3
-				c-2.5-11.4-12.6-16.7-12.6-16.7c-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3c4.7-9.7,9.4-19.3,14.1-29
-				c-4.1-2-8.1-4-12.2-6.1c-4.8,9.8-9.7,19.7-14.5,29.5c-6.7-0.1-12.9,3.5-16.1,9.4c-3.4,6.3-2.7,14.1,1.9,19.8
-				C343.2,346.5,335,363.3,326.8,380.1z"/>
-		</g>
-	</g>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X7 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="41.7913mm" height="41.6859mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 1079 1076"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil1 {fill:#003CA8}
+    .fil0 {fill:#FF8812}
+   ]]>
+  </style>
+ </defs>
+ <g id="图层_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path class="fil0" d="M825 432l0 0c12,-2 19,13 10,21l0 0c-58,48 -84,124 -68,198l0 0c3,12 -13,20 -21,10l0 0c-45,-54 -115,-81 -185,-70 -108,58 -231,135 -303,214 -86,92 -100,229 49,248 -427,118 -464,-256 244,-492 49,-48 70,-119 55,-187l0 0c-2,-12 13,-19 21,-10l0 0c48,58 124,84 198,68z"/>
+  <path class="fil1" d="M636 0c102,0 187,30 253,80 75,55 127,135 158,226l0 0c11,32 19,65 24,98 5,35 8,70 7,105 0,34 -3,69 -8,103 -6,34 -14,67 -24,99 -32,94 -85,178 -160,236 -67,53 -150,84 -250,84l-267 0c-55,0 -91,-10 -112,-28 -19,-17 -25,-39 -22,-64 4,-24 15,-51 33,-78 60,-92 225,-230 320,-253 -101,59 -189,170 -231,243l279 0c57,0 105,-19 144,-51 44,-36 76,-88 95,-146 8,-23 14,-47 18,-71 4,-25 6,-50 6,-75 0,-25 -2,-50 -6,-74 -3,-24 -9,-48 -17,-70l0 0c-18,-55 -49,-103 -93,-136 -38,-30 -88,-47 -147,-47l0 0 -141 0 -68 0c-26,0 -51,4 -73,13 -22,9 -43,23 -61,42 -18,18 -32,38 -42,61 -9,22 -13,46 -13,72l0 213c135,-43 226,-51 307,-33 -160,29 -354,110 -474,221l-14 13 0 -19 0 -428 0 0 0 0c0,-94 38,-178 98,-238 61,-61 145,-98 238,-98l0 0 1 0 0 0 242 0 0 0z"/>
+ </g>
 </svg>
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -1,31 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="main_outline" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640;" xml:space="preserve">
-<g>
-	<path id="teabag" style="fill:#FFFFFF" d="M395.9,484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5,21.2-17.9,33.8-11.8
-		c17.2,8.3,27.1,13,27.1,13l-0.1-109.2l16.7-0.1l0.1,117.1c0,0,57.4,24.2,83.1,40.1c3.7,2.3,10.2,6.8,12.9,14.4
-		c2.1,6.1,2,13.1-1,19.3l-61,126.9C423.6,484.9,408.4,490.3,395.9,484.2z"/>
-	<g>
-		<g>
-			<path style="fill:#609926" d="M622.7,149.8c-4.1-4.1-9.6-4-9.6-4s-117.2,6.6-177.9,8c-13.3,0.3-26.5,0.6-39.6,0.7c0,39.1,0,78.2,0,117.2
-				c-5.5-2.6-11.1-5.3-16.6-7.9c0-36.4-0.1-109.2-0.1-109.2c-29,0.4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5
-				c-9.8-0.6-22.5-2.1-39,1.5c-8.7,1.8-33.5,7.4-53.8,26.9C-4.9,212.4,6.6,276.2,8,285.8c1.7,11.7,6.9,44.2,31.7,72.5
-				c45.8,56.1,144.4,54.8,144.4,54.8s12.1,28.9,30.6,55.5c25,33.1,50.7,58.9,75.7,62c63,0,188.9-0.1,188.9-0.1s12,0.1,28.3-10.3
-				c14-8.5,26.5-23.4,26.5-23.4s12.9-13.8,30.9-45.3c5.5-9.7,10.1-19.1,14.1-28c0,0,55.2-117.1,55.2-231.1
-				C633.2,157.9,624.7,151.8,622.7,149.8z M125.6,353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6,321.8,60,295.4
-				c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5,38.5-30c13.8-3.7,31-3.1,31-3.1s7.1,59.4,15.7,94.2c7.2,29.2,24.8,77.7,24.8,77.7
-				S142.5,359.9,125.6,353.9z M425.9,461.5c0,0-6.1,14.5-19.6,15.4c-5.8,0.4-10.3-1.2-10.3-1.2s-0.3-0.1-5.3-2.1l-112.9-55
-				c0,0-10.9-5.7-12.8-15.6c-2.2-8.1,2.7-18.1,2.7-18.1L322,273c0,0,4.8-9.7,12.2-13c0.6-0.3,2.3-1,4.5-1.5c8.1-2.1,18,2.8,18,2.8
-				l110.7,53.7c0,0,12.6,5.7,15.3,16.2c1.9,7.4-0.5,14-1.8,17.2C474.6,363.8,425.9,461.5,425.9,461.5z"/>
-			<path style="fill:#609926" d="M326.8,380.1c-8.2,0.1-15.4,5.8-17.3,13.8c-1.9,8,2,16.3,9.1,20c7.7,4,17.5,1.8,22.7-5.4
-				c5.1-7.1,4.3-16.9-1.8-23.1l24-49.1c1.5,0.1,3.7,0.2,6.2-0.5c4.1-0.9,7.1-3.6,7.1-3.6c4.2,1.8,8.6,3.8,13.2,6.1
-				c4.8,2.4,9.3,4.9,13.4,7.3c0.9,0.5,1.8,1.1,2.8,1.9c1.6,1.3,3.4,3.1,4.7,5.5c1.9,5.5-1.9,14.9-1.9,14.9
-				c-2.3,7.6-18.4,40.6-18.4,40.6c-8.1-0.2-15.3,5-17.7,12.5c-2.6,8.1,1.1,17.3,8.9,21.3c7.8,4,17.4,1.7,22.5-5.3
-				c5-6.8,4.6-16.3-1.1-22.6c1.9-3.7,3.7-7.4,5.6-11.3c5-10.4,13.5-30.4,13.5-30.4c0.9-1.7,5.7-10.3,2.7-21.3
-				c-2.5-11.4-12.6-16.7-12.6-16.7c-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3c4.7-9.7,9.4-19.3,14.1-29
-				c-4.1-2-8.1-4-12.2-6.1c-4.8,9.8-9.7,19.7-14.5,29.5c-6.7-0.1-12.9,3.5-16.1,9.4c-3.4,6.3-2.7,14.1,1.9,19.8
-				C343.2,346.5,335,363.3,326.8,380.1z"/>
-		</g>
-	</g>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X7 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="167.952mm" height="41.6859mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 17419 4323"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil1 {fill:#003CA8}
+    .fil0 {fill:#FF8812}
+    .fil2 {fill:#003CA8;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ <g id="图层_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path class="fil0" d="M3315 1737l0 0c48,-10 78,51 40,83l0 0c-232,194 -337,501 -273,796l0 0c11,49 -51,79 -83,41l0 0c-182,-219 -464,-325 -743,-283 -437,234 -929,545 -1221,860 -345,372 -399,922 201,999 -1718,474 -1865,-1028 977,-1978 197,-194 282,-477 223,-750l0 0c-10,-49 51,-79 83,-41l0 0c194,232 500,337 796,273z"/>
+  <path class="fil1" d="M2555 1c412,0 752,120 1020,320 299,222 509,544 632,909l0 0c43,127 75,259 96,395 22,138 32,278 31,419 0,140 -12,279 -34,416 -22,136 -55,270 -98,398 -127,379 -341,715 -640,949 -269,210 -606,337 -1007,337l-1073 0c-222,0 -365,-43 -447,-114 -78,-67 -103,-156 -89,-258 13,-96 60,-202 130,-311 241,-372 903,-925 1287,-1019 -407,237 -761,685 -930,977l1122 0c230,0 423,-77 579,-205 176,-143 304,-351 383,-585 31,-92 54,-189 70,-287 16,-99 25,-200 25,-301 1,-100 -7,-201 -22,-299 -15,-96 -38,-190 -68,-280l0 0c-74,-220 -199,-413 -374,-546 -156,-118 -353,-190 -593,-190l0 0 -567 1 -273 -1c-105,-1 -202,18 -292,55 -89,37 -171,92 -245,166 -75,74 -130,156 -167,245 -37,90 -56,187 -56,292l0 857c542,-176 910,-209 1236,-136 -642,116 -1423,443 -1906,889l-55 51 0 -75 0 -1719 0 -2 0 0c1,-375 151,-712 395,-956 243,-243 581,-393 956,-393l0 0 2 0 0 0 972 2 0 -1z"/>
+  <path class="fil2" d="M7222 2023c0,153 -12,287 -37,403 -14,66 -30,124 -48,175 -18,52 -45,108 -82,170 -102,175 -235,296 -398,361 -132,50 -313,75 -542,75l-1141 0 0 -2388 821 -7 282 0 212 14c324,0 567,119 729,358 136,205 204,485 204,839zm-1346 -679l-333 0 0 1356 320 3c266,0 454,-42 565,-126 128,-96 191,-278 191,-547 0,-264 -59,-447 -177,-549 -109,-92 -298,-137 -566,-137zm3132 1155l-1144 0c34,87 76,151 126,192 50,40 120,60 211,60l784 0 -249 456 -497 0 -147 0 -146 0c-241,0 -417,-93 -529,-280 -88,-151 -132,-360 -132,-629 0,-285 72,-507 218,-667 145,-159 360,-240 644,-240 308,0 533,79 674,236 132,149 198,381 198,695l0 64 0 79 -11 34zm-1154 -385l599 0c-9,-100 -33,-173 -71,-218 -21,-23 -49,-41 -84,-55 -35,-13 -78,-20 -128,-20 -190,0 -296,97 -316,293zm1772 -709l382 1097 371 -1097 603 0 -661 1802 -627 0 -674 -1802 606 0zm3644 -116l-1336 0c-202,0 -324,33 -324,223 0,187 257,216 429,210l276 -10c513,0 842,211 842,744 0,554 -293,751 -831,751l-1295 0 0 -470 1077 0c223,0 453,-2 453,-237 0,-186 -230,-220 -406,-213l-225 14c-286,0 -506,-31 -684,-184 -153,-132 -229,-330 -229,-594 0,-581 395,-704 934,-704l1678 0 -359 470zm1157 116l-233 463 -297 0 0 569c0,269 59,317 344,317l-251 464c-606,0 -662,-210 -662,-811l0 -539 -242 0 811 -1057 0 594 530 0zm1546 1063l0 739 -569 0 0 -354 -245 354 -201 0c-232,0 -403,-35 -515,-106 -138,-91 -207,-247 -207,-468 0,-214 56,-367 170,-457 102,-78 262,-117 480,-117l518 0 0 -37c0,-62 -14,-103 -42,-125 -29,-21 -77,-32 -145,-32l-821 0 231 -460 445 0c429,0 694,73 796,218 34,51 60,147 78,286 18,139 27,326 27,559zm-1158 150c0,39 18,71 54,99 41,22 108,34 201,34l55 0 279 0 0 -273 -395 0c-57,0 -103,10 -140,29 -36,20 -54,56 -54,111zm1868 -859l228 -354 508 0 -263 460 -204 0c-113,0 -190,31 -228,92 -27,48 -41,137 -41,267l0 983 -569 0 0 -1802 569 0 0 354z"/>
+ </g>
 </svg>
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -126,11 +126,19 @@ require (
 	xorm.io/xorm v1.3.8
 )

+require (
+	github.com/ArtisanCloud/PowerLibs/v3 v3.2.3 // indirect
+	github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7 // indirect
+	github.com/clbanning/mxj/v2 v2.7.0 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+)
+
 require (
 	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
+	github.com/ArtisanCloud/PowerWeChat/v3 v3.2.25
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
 	github.com/ClickHouse/ch-go v0.61.5 // indirect
 	github.com/ClickHouse/clickhouse-go/v2 v2.25.0 // indirect
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -36,6 +36,12 @@ github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 h1:r3qt8PCHnfjOv9PN3H
 github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121/go.mod h1:Ock8XgA7pvULhIaHGAk/cDnRfNrF9Jey81nPcc403iU=
 github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U=
 github.com/6543/go-version v1.3.1/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo=
+github.com/ArtisanCloud/PowerLibs/v3 v3.2.3 h1:B3IMBnn1IskBYte+7IIfKOcxjHVAm3hWvkkE/g3YiQo=
+github.com/ArtisanCloud/PowerLibs/v3 v3.2.3/go.mod h1:XFRnJA+D0b0IoeSk2ceZzBp9qxatMHOGtWdZCa/r/3U=
+github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7 h1:P+erNlErr+X2v7Et+yTWaTfIRhw+HfpAPdvNIEwk9Gw=
+github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7/go.mod h1:VZQNCvcK/rldF3QaExiSl1gJEAkyc5/I8RLOd3WFZq4=
+github.com/ArtisanCloud/PowerWeChat/v3 v3.2.25 h1:DYvqRh7x+PzJYNvLfOLqA2cufa1c8mF9pb/GswZwb7o=
+github.com/ArtisanCloud/PowerWeChat/v3 v3.2.25/go.mod h1:mJssuwvXsKmAfT9+YobJsb1V2qHoJOhrLNmEwomFL+0=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 h1:1nGuui+4POelzDwI7RG56yfQJHCnKvwfMoU7VsEp+Zg=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
@@ -194,6 +200,8 @@ github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moA
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
+github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
+github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/cloudflare/circl v1.3.9 h1:QFrlgFYf2Qpi8bSpVPK1HBvWpx16v/1TZivyo7pGuBE=
 github.com/cloudflare/circl v1.3.9/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
@@ -634,6 +642,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU=
 github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
--- a/models/asymkey/gpg_key_test.go
+++ b/models/asymkey/gpg_key_test.go
@@ -1,405 +0,0 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package asymkey
-
-import (
-	"testing"
-	"time"
-
-	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/unittest"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/timeutil"
-	"code.gitea.io/gitea/modules/util"
-
-	"github.com/keybase/go-crypto/openpgp/packet"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCheckArmoredGPGKeyString(t *testing.T) {
-	testGPGArmor := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFh91QoBCADciaDd7aqegYkn4ZIG7J0p1CRwpqMGjxFroJEMg6M1ZiuEVTRv
-z49P4kcr1+98NvFmcNc+x5uJgvPCwr/N8ZW5nqBUs2yrklbFF4MeQomyZJJegP8m
-/dsRT3BwIT8YMUtJuCj0iqD9vuKYfjrztcMgC1sYwcE9E9OlA0pWBvUdU2i0TIB1
-vOq6slWGvHHa5l5gPfm09idlVxfH5+I+L1uIMx5ovbiVVU5x2f1AR1T18f0t2TVN
-0agFTyuoYE1ATmvJHmMcsfgM1Gpd9hIlr9vlupT2kKTPoNzVzsJsOU6Ku/Lf/bac
-mF+TfSbRCtmG7dkYZ4metLj7zG/WkW8IvJARABEBAAG0HUFudG9pbmUgR0lSQVJE
-IDxzYXBrQHNhcGsuZnI+iQFUBBMBCAA+FiEEEIOwJg/1vpF1itJ4roJVuKDYKOQF
-Alh91QoCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQroJVuKDY
-KORreggAlIkC2QjHP5tb7b0+LksB2JMXdY+UzZBcJxtNmvA7gNQaGvWRrhrbePpa
-MKDP+3A4BPDBsWFbbB7N56vQ5tROpmWbNKuFOVER4S1bj0JZV0E+xkDLqt9QwQtQ
-ojd7oIZJwDUwdud1PvCza2mjgBqqiFE+twbc3i9xjciCGspMniUul1eQYLxRJ0w+
-sbvSOUnujnq5ByMSz9ij00O6aiPfNQS5oB5AALfpjYZDvWAAljLVrtmlQJWZ6dZo
-T/YNwsW2dECPuti8+Nmu5FxPGDTXxdbnRaeJTQ3T6q1oUVAv7yTXBx5NXfXkMa5i
-iEayQIH8Joq5Ev5ja/lRGQQhArMQ2bkBDQRYfdUKAQgAv7B3coLSrOQbuTZSlgWE
-QeT+7DWbmqE1LAQA1pQPcUPXLBUVd60amZJxF9nzUYcY83ylDi0gUNJS+DJGOXpT
-pzX2IOuOMGbtUSeKwg5s9O4SUO7f2yCc3RGaegER5zgESxelmOXG+b/hoNt7JbdU
-JtxcnLr91Jw2PBO/Xf0ZKJ01CQG2Yzdrrj6jnrHyx94seHy0i6xH1o0OuvfVMLfN
-/Vbb/ZHh6ym2wHNqRX62b0VAbchcJXX/MEehXGknKTkO6dDUd+mhRgWMf9ZGRFWx
-ag4qALimkf1FXtAyD0vxFYeyoWUQzrOvUsm2BxIN/986R08fhkBQnp5nz07mrU02
-cQARAQABiQE8BBgBCAAmFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAlh91QoCGwwF
-CQPCZwAACgkQroJVuKDYKOT32wf/UZqMdPn5OhyhffFzjQx7wolrf92WkF2JkxtH
-6c3Htjlt/p5RhtKEeErSrNAxB4pqB7dznHaJXiOdWEZtRVXXjlNHjrokGTesqtKk
-lHWtK62/MuyLdr+FdCl68F3ewuT2iu/MDv+D4HPqA47zma9xVgZ9ZNwJOpv3fCOo
-RfY66UjGEnfgYifgtI5S84/mp2jaSc9UNvlZB6RSf8cfbJUL74kS2lq+xzSlf0yP
-Av844q/BfRuVsJsK1NDNG09LC30B0l3LKBqlrRmRTUMHtgchdX2dY+p7GPOoSzlR
-MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
-=i9b7
-----END PGP PUBLIC KEY BLOCK-----`
-
-	key, err := checkArmoredGPGKeyString(testGPGArmor)
-	assert.NoError(t, err, "Could not parse a valid GPG public armored rsa key", key)
-	// TODO verify value of key
-}
-
-func TestCheckArmoredbrainpoolP256r1GPGKeyString(t *testing.T) {
-	testGPGArmor := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-mFMEV6HwkhMJKyQDAwIIAQEHAgMEUsvJO/j5dFMRRj67qeZC9fSKBsGZdOHRj2+6
-8wssmbUuLTfT/ZjIbExETyY8hFnURRGpD2Ifyz0cKjXcbXfJtrQTRm9vYmFyIDxm
-b29AYmFyLmRlPoh/BBMTCAAnBQJZOsDIAhsDBQkJZgGABQsJCAcCBhUICQoLAgQW
-AgMBAh4BAheAAAoJEGuJTd/DBMzmNVQA/2beUrv1yU4gyvCiPDEm3pK42cSfaL5D
-muCtPCUg9hlWAP4yq6M78NW8STfsXgn6oeziMYiHSTmV14nOamLuwwDWM7hXBFeh
-8JISCSskAwMCCAEBBwIDBG3A+XfINAZp1CTse2mRNgeUE5DbUtEpO8ALXKA1UQsQ
-DLKq27b7zTgawgXIGUGP6mWsJ5oH7MNAJ/uKTsYmX40DAQgHiGcEGBMIAA8FAleh
-8JICGwwFCQlmAYAACgkQa4lN38MEzOZwKAD/QKyerAgcvzzLaqvtap3XvpYcw9tc
-OyjLLnFQiVmq7kEA/0z0CQe3ZQiQIq5zrs7Nh1XRkFAo8GlU/SGC9XFFi722
-=ZiSe
-----END PGP PUBLIC KEY BLOCK-----`
-
-	key, err := checkArmoredGPGKeyString(testGPGArmor)
-	assert.NoError(t, err, "Could not parse a valid GPG public armored brainpoolP256r1 key", key)
-	// TODO verify value of key
-}
-
-func TestExtractSignature(t *testing.T) {
-	testGPGArmor := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFh91QoBCADciaDd7aqegYkn4ZIG7J0p1CRwpqMGjxFroJEMg6M1ZiuEVTRv
-z49P4kcr1+98NvFmcNc+x5uJgvPCwr/N8ZW5nqBUs2yrklbFF4MeQomyZJJegP8m
-/dsRT3BwIT8YMUtJuCj0iqD9vuKYfjrztcMgC1sYwcE9E9OlA0pWBvUdU2i0TIB1
-vOq6slWGvHHa5l5gPfm09idlVxfH5+I+L1uIMx5ovbiVVU5x2f1AR1T18f0t2TVN
-0agFTyuoYE1ATmvJHmMcsfgM1Gpd9hIlr9vlupT2kKTPoNzVzsJsOU6Ku/Lf/bac
-mF+TfSbRCtmG7dkYZ4metLj7zG/WkW8IvJARABEBAAG0HUFudG9pbmUgR0lSQVJE
-IDxzYXBrQHNhcGsuZnI+iQFUBBMBCAA+FiEEEIOwJg/1vpF1itJ4roJVuKDYKOQF
-Alh91QoCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQroJVuKDY
-KORreggAlIkC2QjHP5tb7b0+LksB2JMXdY+UzZBcJxtNmvA7gNQaGvWRrhrbePpa
-MKDP+3A4BPDBsWFbbB7N56vQ5tROpmWbNKuFOVER4S1bj0JZV0E+xkDLqt9QwQtQ
-ojd7oIZJwDUwdud1PvCza2mjgBqqiFE+twbc3i9xjciCGspMniUul1eQYLxRJ0w+
-sbvSOUnujnq5ByMSz9ij00O6aiPfNQS5oB5AALfpjYZDvWAAljLVrtmlQJWZ6dZo
-T/YNwsW2dECPuti8+Nmu5FxPGDTXxdbnRaeJTQ3T6q1oUVAv7yTXBx5NXfXkMa5i
-iEayQIH8Joq5Ev5ja/lRGQQhArMQ2bkBDQRYfdUKAQgAv7B3coLSrOQbuTZSlgWE
-QeT+7DWbmqE1LAQA1pQPcUPXLBUVd60amZJxF9nzUYcY83ylDi0gUNJS+DJGOXpT
-pzX2IOuOMGbtUSeKwg5s9O4SUO7f2yCc3RGaegER5zgESxelmOXG+b/hoNt7JbdU
-JtxcnLr91Jw2PBO/Xf0ZKJ01CQG2Yzdrrj6jnrHyx94seHy0i6xH1o0OuvfVMLfN
-/Vbb/ZHh6ym2wHNqRX62b0VAbchcJXX/MEehXGknKTkO6dDUd+mhRgWMf9ZGRFWx
-ag4qALimkf1FXtAyD0vxFYeyoWUQzrOvUsm2BxIN/986R08fhkBQnp5nz07mrU02
-cQARAQABiQE8BBgBCAAmFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAlh91QoCGwwF
-CQPCZwAACgkQroJVuKDYKOT32wf/UZqMdPn5OhyhffFzjQx7wolrf92WkF2JkxtH
-6c3Htjlt/p5RhtKEeErSrNAxB4pqB7dznHaJXiOdWEZtRVXXjlNHjrokGTesqtKk
-lHWtK62/MuyLdr+FdCl68F3ewuT2iu/MDv+D4HPqA47zma9xVgZ9ZNwJOpv3fCOo
-RfY66UjGEnfgYifgtI5S84/mp2jaSc9UNvlZB6RSf8cfbJUL74kS2lq+xzSlf0yP
-Av844q/BfRuVsJsK1NDNG09LC30B0l3LKBqlrRmRTUMHtgchdX2dY+p7GPOoSzlR
-MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
-=i9b7
-----END PGP PUBLIC KEY BLOCK-----`
-	keys, err := checkArmoredGPGKeyString(testGPGArmor)
-	if !assert.NotEmpty(t, keys) {
-		return
-	}
-	ekey := keys[0]
-	assert.NoError(t, err, "Could not parse a valid GPG armored key", ekey)
-
-	pubkey := ekey.PrimaryKey
-	content, err := base64EncPubKey(pubkey)
-	assert.NoError(t, err, "Could not base64 encode a valid PublicKey content", ekey)
-
-	key := &GPGKey{
-		KeyID:             pubkey.KeyIdString(),
-		Content:           content,
-		CreatedUnix:       timeutil.TimeStamp(pubkey.CreationTime.Unix()),
-		CanSign:           pubkey.CanSign(),
-		CanEncryptComms:   pubkey.PubKeyAlgo.CanEncrypt(),
-		CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
-		CanCertify:        pubkey.PubKeyAlgo.CanSign(),
-	}
-
-	cannotsignkey := &GPGKey{
-		KeyID:             pubkey.KeyIdString(),
-		Content:           content,
-		CreatedUnix:       timeutil.TimeStamp(pubkey.CreationTime.Unix()),
-		CanSign:           false,
-		CanEncryptComms:   false,
-		CanEncryptStorage: false,
-		CanCertify:        false,
-	}
-
-	testGoodSigArmor := `-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEEIOwJg/1vpF1itJ4roJVuKDYKOQFAljAiQIACgkQroJVuKDY
-KORvCgf6A/Ehh0r7QbO2tFEghT+/Ab+bN7jRN3zP9ed6/q/ophYmkrU0NibtbJH9
-AwFVdHxCmj78SdiRjaTKyevklXw34nvMftmvnOI4lBNUdw6KWl25/n/7wN0l2oZW
-rW3UawYpZgodXiLTYarfEimkDQmT67ArScjRA6lLbkEYKO0VdwDu+Z6yBUH3GWtm
-45RkXpnsF6AXUfuD7YxnfyyDE1A7g7zj4vVYUAfWukJjqow/LsCUgETETJOqj9q3
-52/oQDs04fVkIEtCDulcY+K/fKlukBPJf9WceNDEqiENUzN/Z1y0E+tJ07cSy4bk
-yIJb+d0OAaG8bxloO7nJq4Res1Qa8Q==
-=puvG
-----END PGP SIGNATURE-----`
-	testGoodPayload := `tree 56ae8d2799882b20381fc11659db06c16c68c61a
-parent c7870c39e4e6b247235ca005797703ec4254613f
-author Antoine GIRARD <sapk@sapk.fr> 1489012989 +0100
-committer Antoine GIRARD <sapk@sapk.fr> 1489012989 +0100
-
-Goog GPG
-`
-
-	testBadSigArmor := `-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEE5yr4rn9ulbdMxJFiPYI/ySNrtNkFAljAiYkACgkQPYI/ySNr
-tNmDdQf+NXhVRiOGt0GucpjJCGrOnK/qqVUmQyRUfrqzVUdb/1/Ws84V5/wE547I
-6z3oxeBKFsJa1CtIlxYaUyVhYnDzQtphJzub+Aw3UG0E2ywiE+N7RCa1Ufl7pPxJ
-U0SD6gvNaeTDQV/Wctu8v8DkCtEd3N8cMCDWhvy/FQEDztVtzm8hMe0Vdm0ozEH6
-P0W93sDNkLC5/qpWDN44sFlYDstW5VhMrnF0r/ohfaK2kpYHhkPk7WtOoHSUwQSg
-c4gfhjvXIQrWFnII1Kr5jFGlmgNSR02qpb31VGkMzSnBhWVf2OaHS/kI49QHJakq
-AhVDEnoYLCgoDGg9c3p1Ll2452/c6Q==
-=uoGV
-----END PGP SIGNATURE-----`
-	testBadPayload := `tree 3074ff04951956a974e8b02d57733b0766f7cf6c
-parent fd3577542f7ad1554c7c7c0eb86bb57a1324ad91
-author Antoine GIRARD <sapk@sapk.fr> 1489013107 +0100
-committer Antoine GIRARD <sapk@sapk.fr> 1489013107 +0100
-
-Unknown GPG key with good email
-`
-	// Reading Sign
-	goodSig, err := extractSignature(testGoodSigArmor)
-	assert.NoError(t, err, "Could not parse a valid GPG armored signature", testGoodSigArmor)
-	badSig, err := extractSignature(testBadSigArmor)
-	assert.NoError(t, err, "Could not parse a valid GPG armored signature", testBadSigArmor)
-
-	// Generating hash of commit
-	goodHash, err := populateHash(goodSig.Hash, []byte(testGoodPayload))
-	assert.NoError(t, err, "Could not generate a valid hash of payload", testGoodPayload)
-	badHash, err := populateHash(badSig.Hash, []byte(testBadPayload))
-	assert.NoError(t, err, "Could not generate a valid hash of payload", testBadPayload)
-
-	// Verify
-	err = verifySign(goodSig, goodHash, key)
-	assert.NoError(t, err, "Could not validate a good signature")
-	err = verifySign(badSig, badHash, key)
-	assert.Error(t, err, "Validate a bad signature")
-	err = verifySign(goodSig, goodHash, cannotsignkey)
-	assert.Error(t, err, "Validate a bad signature with a kay that can not sign")
-}
-
-func TestCheckGPGUserEmail(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	_ = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-
-	testEmailWithUpperCaseLetters := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQENBFlEBvMBCADe+EQcfv/aKbMFy7YB8e/DE+hY39sfjvdvSgeXtNhfmYvIOUjT
-ORMCvce2Oxzb3HTI0rjYsJpzo9jEQ53dB3vdr0ne5Juby6N7QPjof3NR+ko50Ki2
-0ilOjYuA0v6VHLIn70UBa9NEf+XDuE7P+Lbtl2L9B9OMXtcTAZoA3cJySgtNFNIG
-AVefPi8LeOcekL39wxJEA8OzdCyO5oENEwAG1tzjy9DDNJf74/dBBh2NiXeSeMxZ
-RYeYzqEa2UTDP1fkUl7d2/hV36cKZWZr+l4SQ5bM7HeLj2SsfabLfqKoVWgkfAzQ
-VwtkbRpzMiDLMte2ZAyTJUc+77YbFoyAmOcjABEBAAG0HFVzZXIgT25lIDxVc2Vy
-MUBFeGFtcGxlLmNvbT6JATgEEwECACIFAllEBvMCGwMGCwkIBwMCBhUIAgkKCwQW
-AgMBAh4BAheAAAoJEFMOzOY274DFw5EIAKc4jiYaMb1HDKrSv0tphgNxPFEY83/J
-9CZggO7BINxlb7z/lH1i0U2h2Ha9E3VJTJQF80zBCaIvtU2UNrgVmSKoc0BdE/2S
-rS9MAl29sXxf1BfvXHu12Suvo8O/ZFP45Vm/3kkHuasHyOV1GwUWnynt1qo0zUEn
-WMIcB8USlmMT1TnSb10YKBd/BpGF3crFDJLfAHRumZUk4knDDWUOWy5RCOG8cedc
-VTAhfdoKRRO3PchOfz6Rls/hew12mRNayqxuLQl2+BX+BWu+25dR3qyiS+twLbk6
-Rjpb0S+RQTkYIUoI0SEZpxcTZso11xF5KNpKZ9aAoiLJqkNF5h4oPSe5AQ0EWUQG
-8wEIALiMMqh3NF3ON/z7hQfeU24bCl/WdfJwCR9CWU/jx4X4gZq2C2aGtytGN5g/
-qoYQ3poTOPzh/4Dvs+r6CtHqi0CvPiEOfSxzmaK+F+vA0GMn2i3Sx5gq/VB0mr+j
-RIYMCjf68Tifo2RAT0VDzn6t304l5+VPr4OgbobMRH+wDe7Hhd2pZXl7ty8DooBn
-vqaqoKgdiccUXGBKe4Oihl/oZ4qrYH6K4ACP1Sco1rs4mNeKDAW8k/Y7zLjg6d59
-g0YQ1YI+CX/bKB7/cpMHLupyMLqvCcqIpjBXRJNMdjuMHgKckjr89DwnqXqgXz7W
-u0B39MZQn9nn6vq8BdkoDFgrTQ8AEQEAAYkBHwQYAQIACQUCWUQG8wIbDAAKCRBT
-DszmNu+Axf4IB/0S9NTc6kpwW+ZPZQNTWR5oKDEaXVCRLccOlkt33txMvk/z2jNM
-trEke99ss5L1bRyWB5fRA+XVsPmW9kIk8pmGFmxqp2nSxr9m9rlL5oTYH8u6dfSm
-zwGhqkfITjPI7hyNN52PLANwoS0o4dLzIE65ewigx6cnRlrT2IENObxG/tlxaYg1
-NHahJX0uFlVk0W0bLBrs3fTDw1lS/N8HpyQb+5ryQmiIb2a48aygCS/h2qeRlX1d
-Q0KHb+QcycSgbDx0ZAvdIacuKvBBcbxrsmFUI4LR+oIup0G9gUc0roPvr014jYQL
-7f8r/8fpcN8t+I/41QHCs6L/BEIdTHW3rTQ6
-=zHo9
-----END PGP PUBLIC KEY BLOCK-----`
-
-	keys, err := AddGPGKey(db.DefaultContext, 1, testEmailWithUpperCaseLetters, "", "")
-	assert.NoError(t, err)
-	if assert.NotEmpty(t, keys) {
-		key := keys[0]
-		if assert.Len(t, key.Emails, 1) {
-			assert.Equal(t, "user1@example.com", key.Emails[0].Email)
-		}
-	}
-}
-
-func TestCheckGParseGPGExpire(t *testing.T) {
-	testIssue6599 := `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-epiDVQ==
-=VSKJ
-----END PGP PUBLIC KEY BLOCK-----
-`
-	keys, err := checkArmoredGPGKeyString(testIssue6599)
-	assert.NoError(t, err)
-	if assert.NotEmpty(t, keys) {
-		ekey := keys[0]
-		expire := getExpiryTime(ekey)
-		assert.Equal(t, time.Unix(1586105389, 0), expire)
-	}
-}
-
-func TestTryGetKeyIDFromSignature(t *testing.T) {
-	assert.Empty(t, tryGetKeyIDFromSignature(&packet.Signature{}))
-	assert.Equal(t, "038D1A3EADDBEA9C", tryGetKeyIDFromSignature(&packet.Signature{
-		IssuerKeyId: util.ToPointer(uint64(0x38D1A3EADDBEA9C)),
-	}))
-	assert.Equal(t, "038D1A3EADDBEA9C", tryGetKeyIDFromSignature(&packet.Signature{
-		IssuerFingerprint: []uint8{0xb, 0x23, 0x24, 0xc7, 0xe6, 0xfe, 0x4f, 0x3a, 0x6, 0x26, 0xc1, 0x21, 0x3, 0x8d, 0x1a, 0x3e, 0xad, 0xdb, 0xea, 0x9c},
-	}))
-}
--- a/models/asymkey/ssh_key_test.go
+++ b/models/asymkey/ssh_key_test.go
@@ -1,505 +0,0 @@
-// Copyright 2016 The Gogs Authors. All rights reserved.
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package asymkey
-
-import (
-	"bytes"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/42wim/sshsig"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_SSHParsePublicKey(t *testing.T) {
-	testCases := []struct {
-		name          string
-		skipSSHKeygen bool
-		keyType       string
-		length        int
-		content       string
-	}{
-		{"dsa-1024", false, "dsa", 1024, "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
-		{"rsa-1024", false, "rsa", 1024, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
-		{"rsa-2048", false, "rsa", 2048, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
-		{"ecdsa-256", false, "ecdsa", 256, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
-		{"ecdsa-384", false, "ecdsa", 384, "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
-		{"ecdsa-sk", true, "ecdsa-sk", 256, "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
-		{"ed25519-sk", true, "ed25519-sk", 256, "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Run("Native", func(t *testing.T) {
-				keyTypeN, lengthN, err := SSHNativeParsePublicKey(tc.content)
-				assert.NoError(t, err)
-				assert.Equal(t, tc.keyType, keyTypeN)
-				assert.EqualValues(t, tc.length, lengthN)
-			})
-			if tc.skipSSHKeygen {
-				return
-			}
-			t.Run("SSHKeygen", func(t *testing.T) {
-				keyTypeK, lengthK, err := SSHKeyGenParsePublicKey(tc.content)
-				if err != nil {
-					// Some servers do not support ecdsa format.
-					if !strings.Contains(err.Error(), "line 1 too long:") {
-						assert.FailNow(t, "%v", err)
-					}
-				}
-				assert.Equal(t, tc.keyType, keyTypeK)
-				assert.EqualValues(t, tc.length, lengthK)
-			})
-			t.Run("SSHParseKeyNative", func(t *testing.T) {
-				keyTypeK, lengthK, err := SSHNativeParsePublicKey(tc.content)
-				if err != nil {
-					assert.FailNow(t, "%v", err)
-				}
-				assert.Equal(t, tc.keyType, keyTypeK)
-				assert.EqualValues(t, tc.length, lengthK)
-			})
-		})
-	}
-}
-
-func Test_CheckPublicKeyString(t *testing.T) {
-	oldValue := setting.SSH.MinimumKeySizeCheck
-	setting.SSH.MinimumKeySizeCheck = false
-	for _, test := range []struct {
-		content string
-	}{
-		{"ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
-		{"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
-		{"ssh-rsa AAAAB3NzaC1yc2EA\r\nAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+\r\nBZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNx\r\nfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\r\n\r\n"},
-		{"ssh-rsa AAAAB3NzaC1yc2EA\r\nAAADAQABAAAAgQDAu7tvI\nvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+\r\nBZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvW\nqIwC4prx/WVk2wLTJjzBAhyNx\r\nfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\r\n\r\n"},
-		{"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICV0MGX/W9IvLA4FXpIuUcdDcbj5KX4syHgsTy7soVgf"},
-		{"\r\nssh-ed25519 \r\nAAAAC3NzaC1lZDI1NTE5AAAAICV0MGX/W9IvLA4FXpIuUcdDcbj5KX4syHgsTy7soVgf\r\n\r\n"},
-		{"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
-		{"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
-		{`---- BEGIN SSH2 PUBLIC KEY ----
-Comment: "1024-bit DSA, converted by andrew@phaedra from OpenSSH"
-AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3
-ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/
-YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL
-+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8
-A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb
-0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgP
-aguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxc
-Ns4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd6429
-82daopE7zQ/NPAnJfag=
---- END SSH2 PUBLIC KEY ----
-`},
-		{`---- BEGIN SSH2 PUBLIC KEY ----
-Comment: "1024-bit RSA, converted by andrew@phaedra from OpenSSH"
-AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxB
-cQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIV
-j0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ==
---- END SSH2 PUBLIC KEY ----
-`},
-		{`-----BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMC7u28i9fpketFe5k1+RHdcsdKy4Ir1mfdfnyXEFxDO6jnFmAHq9HDC
-b9C0m4X7Nk+1jmGxAgsEuYX4FnlakpmnWMF5KMfYbuXF632Rtwf6QhWPS08USjIo
-j3C9aojALimvH9ZWTbAtMmPMECHI3F8SrsL0J6Jf2lARsSol+QoJAgMBAAE=
-----END RSA PUBLIC KEY-----
-`},
-		{`-----BEGIN PUBLIC KEY-----
-MIIBtzCCASsGByqGSM44BAEwggEeAoGBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn5
-9NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczW
-OVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQse
-cdKktISwTakzAhUAsyrDtiYTSpS/sMMCxjnC336AJpMCgYBpK7/3xvduajLBD/9v
-ASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g
-+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTL
-zIyMtkHf/IrPCwlM+pV/M/96YgOBhQACgYEAqQcGn9CKgzgPaguIZooTAOQdvBLM
-I5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2
-PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982da
-opE7zQ/NPAnJfag=
-----END PUBLIC KEY-----
-`},
-		{`-----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAu7tvIvX6ZHrRXuZNfkR3XLHS
-suCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jB
-eSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C
-9CeiX9pQEbEqJfkKCQIDAQAB
-----END PUBLIC KEY-----
-`},
-		{`-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGV4ftTgVMEh/Q+OcE2s
-RK0CDfSKAvcZezCiZKr077+juUUfWFvyCvRW3414F7KaWBobAmaNYRTjrFxzJ3zj
-karv8TA8eMj7sryqcOC3jxHIOEw4qWgxbsW1jqnPwVGUWXF7uNUAFnwy6yJ8LJbV
-mR0nhu4Y4aWnJeBa1b/VdaUujnOUNTccRM087jS0v/HYma05v2AEEP/gfps1iN8x
-LReJomY4wJY1ndS0wT71Nt3dvQ3AZphWoXGeONV2bE3gMBsRv0Oo/DYDV4/VsTHl
-sMV1do3gF/xAUqWawlZQkNcibME+sQqfE7gZ04hlmDATU2zmbzwuHtFiNv8mVv7O
-RQIDAQAB
-----END PUBLIC KEY-----
-`},
-		{`---- BEGIN SSH2 PUBLIC KEY ----
-Comment: "256-bit ED25519, converted by andrew@phaedra from OpenSSH"
-AAAAC3NzaC1lZDI1NTE5AAAAICV0MGX/W9IvLA4FXpIuUcdDcbj5KX4syHgsTy7soVgf
---- END SSH2 PUBLIC KEY ----
-`},
-	} {
-		_, err := CheckPublicKeyString(test.content)
-		assert.NoError(t, err)
-	}
-	setting.SSH.MinimumKeySizeCheck = oldValue
-	for _, invalidKeys := range []struct {
-		content string
-	}{
-		{"test"},
-		{"---- NOT A REAL KEY ----"},
-		{"bad\nkey"},
-		{"\t\t:)\t\r\n"},
-		{"\r\ntest \r\ngitea\r\n\r\n"},
-	} {
-		_, err := CheckPublicKeyString(invalidKeys.content)
-		assert.Error(t, err)
-	}
-}
-
-func Test_calcFingerprint(t *testing.T) {
-	testCases := []struct {
-		name          string
-		skipSSHKeygen bool
-		fp            string
-		content       string
-	}{
-		{"dsa-1024", false, "SHA256:fSIHQlpKMDsGPVAXI8BPYfRp+e2sfvSt1sMrPsFiXrc", "ssh-dss AAAAB3NzaC1kc3MAAACBAOChCC7lf6Uo9n7BmZ6M8St19PZf4Tn59NriyboW2x/DZuYAz3ibZ2OkQ3S0SqDIa0HXSEJ1zaExQdmbO+Ux/wsytWZmCczWOVsaszBZSl90q8UnWlSH6P+/YA+RWJm5SFtuV9PtGIhyZgoNuz5kBQ7K139wuQsecdKktISwTakzAAAAFQCzKsO2JhNKlL+wwwLGOcLffoAmkwAAAIBpK7/3xvduajLBD/9vASqBQIHrgK2J+wiQnIb/Wzy0UsVmvfn8A+udRbBo+csM8xrSnlnlJnjkJS3qiM5g+eTwsLIV1IdKPEwmwB+VcP53Cw6lSyWyJcvhFb0N6s08NZysLzvj0N+ZC/FnhKTLzIyMtkHf/IrPCwlM+pV/M/96YgAAAIEAqQcGn9CKgzgPaguIZooTAOQdvBLMI5y0bQjOW6734XOpqQGf/Kra90wpoasLKZjSYKNPjE+FRUOrStLrxcNs4BeVKhy2PYTRnybfYVk1/dmKgH6P1YSRONsGKvTsH6c5IyCRG0ncCgYeF8tXppyd642982daopE7zQ/NPAnJfag= nocomment"},
-		{"rsa-1024", false, "SHA256:vSnDkvRh/xM6kMxPidLgrUhq3mCN7CDaronCEm2joyQ", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n"},
-		{"rsa-2048", false, "SHA256:ZHD//a1b9VuTq9XSunAeYjKeU1xDa2tBFZYrFr2Okkg", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
-		{"ecdsa-256", false, "SHA256:Bqx/xgWqRKLtkZ0Lr4iZpgb+5lYsFpSwXwVZbPwuTRw", "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
-		{"ecdsa-384", false, "SHA256:4qfJOgJDtUd8BrEjyVNdI8IgjiZKouztVde43aDhe1E", "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
-		{"ecdsa-sk", true, "SHA256:4wcIu4z+53gHc+db85OPfy8IydyNzPLCr6kHIs625LQ", "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment"},
-		{"ed25519-sk", true, "SHA256:RB4ku1OeWKN7fLMrjxz38DK0mp1BnOPBx4BItjTvJ0g", "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIE7kM1R02+4ertDKGKEDcKG0s+2vyDDcIvceJ0Gqv5f1AAAABHNzaDo= nocomment"},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Run("Native", func(t *testing.T) {
-				fpN, err := calcFingerprintNative(tc.content)
-				assert.NoError(t, err)
-				assert.Equal(t, tc.fp, fpN)
-			})
-			if tc.skipSSHKeygen {
-				return
-			}
-			t.Run("SSHKeygen", func(t *testing.T) {
-				fpK, err := calcFingerprintSSHKeygen(tc.content)
-				assert.NoError(t, err)
-				assert.Equal(t, tc.fp, fpK)
-			})
-		})
-	}
-}
-
-var (
-	// Generated with "ssh-keygen -C test@rekor.dev -f id_rsa"
-	sshPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
-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
-----END OPENSSH PRIVATE KEY-----
-`
-	sshPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXofkiahE7uavjWvxnwkUF27qMgz7pdTwzSv0XzVG6EtirOv3PDWct4YKoXE9c0EqbxnIfYEKwEextdvB7zkgwczdJSHxf/18jQumLn/FuoCmugVSk1H5Qli/qzwBpaTnOk3WuakGuoYUl8ZAokKKgOKLA0aZJ1WRQ2ZCZggA3EkwNZiY17y9Q6HqdgQcH6XN8aAMADNVJdMAJb33hSRJjjsAPTmzBTishP8lYDoGRSsSE7/8XRBCEV5E4I8mI9GElcZwV/1KJx98mpH8QvMzXM1idFcwPRtt1NTAOshwgUU0Fu1x8lU5RQIa6ZKW36qNQLvLxy/BscC7B/mdLptoDs/ot9NimUXZcgCR1a2Q3o7Wi6jIgcgJcyV10Nba81ol4RdN4qPHnVZIzuo+dBkqwG3CMtB4Rj84+Qi+7zyU01hIPreoxQDXaayiGPBUUIiAlW9gsiuRWJzNnu3cvuWDLVfQIkjh7Wug58z+v2NOJ7IMdyERillhzDcvVHaq14+U= test@rekor.dev
-`
-	// Generated with "ssh-keygen -C other-test@rekor.dev -f id_rsa"
-	otherSSHPrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
-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
-----END OPENSSH PRIVATE KEY-----
-`
-	otherSSHPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD9YJJYL1MS8JA7A75PrwS81rc5Ii/VjT6xPy5K/KM/IQ7T6nS3wKD/PLru87GJClTmM3owi2NcCMyZ4KbwYoy3qCT5wOhoB6/9l+O7NIvtFrITGmaEGV6HZfcYouSRcX0AEU1yGVOpIs5mISMOg2lsW/XopPWwToKpbwOPFdCRCT0krrmEsf4HF5Yw0IQlVoKZrhfThomYLvMkCLnIZ55PRIpWoyiFq8X3Q7peJgUJAe7Bc8/Id+hyqC52ZeejPP7oPprEkpkzBCw2ndYq6Y6OXNafEEIIHWXaM3pFqDxonbbvuIwVdHCNMv/yNoSxbgqTKwN/QaNXb+KpuvSrlvRqsNhu/sKsYFH64fTAbP9miDXHmJkA05uFlQukOstUmJ0QxzbsdcFvs8yw0PLsEZhEHXJzR3TLzenyZSq86VZICvGfVacBk7TikCBOtyWuESHhlc6SfZKfzZ67cOlDyKeSiVjgh+eEh9s4h56ahQ2rW05Sq6GjD0YtEzog2J4csE= other-test@rekor.dev
-`
-
-	// Generated with ssh-keygen -C test@rekor.dev -t ed25519 -f id_ed25519
-	ed25519PrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACBB45zRHxPPFtabwS3Vd6Lb9vMe+tIHZj2qN5VQ+bgLfQAAAJgyRa3cMkWt
-3AAAAAtzc2gtZWQyNTUxOQAAACBB45zRHxPPFtabwS3Vd6Lb9vMe+tIHZj2qN5VQ+bgLfQ
-AAAED7y4N/DsVnRQiBZNxEWdsJ9RmbranvtQ3X9jnb6gFed0HjnNEfE88W1pvBLdV3otv2
-8x760gdmPao3lVD5uAt9AAAADnRlc3RAcmVrb3IuZGV2AQIDBAUGBw==
-----END OPENSSH PRIVATE KEY-----
-`
-	ed25519PublicKey = `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHjnNEfE88W1pvBLdV3otv28x760gdmPao3lVD5uAt9 test@rekor.dev
-`
-)
-
-func TestFromOpenSSH(t *testing.T) {
-	for _, tt := range []struct {
-		name string
-		pub  string
-		priv string
-	}{
-		{
-			name: "rsa",
-			pub:  sshPublicKey,
-			priv: sshPrivateKey,
-		},
-		{
-			name: "ed25519",
-			pub:  ed25519PublicKey,
-			priv: ed25519PrivateKey,
-		},
-	} {
-		if _, err := exec.LookPath("ssh-keygen"); err != nil {
-			t.Skip("skip TestFromOpenSSH: missing ssh-keygen in PATH")
-		}
-		t.Run(tt.name, func(t *testing.T) {
-			tt := tt
-
-			// Test that a signature from the cli can validate here.
-			td := t.TempDir()
-
-			data := []byte("hello, ssh world")
-			dataPath := write(t, data, td, "data")
-
-			privPath := write(t, []byte(tt.priv), td, "id")
-			write(t, []byte(tt.pub), td, "id.pub")
-
-			sigPath := dataPath + ".sig"
-			run(t, nil, "ssh-keygen", "-Y", "sign", "-n", "file", "-f", privPath, dataPath)
-
-			sigBytes, err := os.ReadFile(sigPath)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := sshsig.Verify(bytes.NewReader(data), sigBytes, []byte(tt.pub), "file"); err != nil {
-				t.Error(err)
-			}
-
-			// It should not verify if we check against another public key
-			if err := sshsig.Verify(bytes.NewReader(data), sigBytes, []byte(otherSSHPublicKey), "file"); err == nil {
-				t.Error("expected error with incorrect key")
-			}
-
-			// It should not verify if the data is tampered
-			if err := sshsig.Verify(strings.NewReader("bad data"), sigBytes, []byte(sshPublicKey), "file"); err == nil {
-				t.Error("expected error with incorrect data")
-			}
-		})
-	}
-}
-
-func TestToOpenSSH(t *testing.T) {
-	for _, tt := range []struct {
-		name string
-		pub  string
-		priv string
-	}{
-		{
-			name: "rsa",
-			pub:  sshPublicKey,
-			priv: sshPrivateKey,
-		},
-		{
-			name: "ed25519",
-			pub:  ed25519PublicKey,
-			priv: ed25519PrivateKey,
-		},
-	} {
-		if _, err := exec.LookPath("ssh-keygen"); err != nil {
-			t.Skip("skip TestToOpenSSH: missing ssh-keygen in PATH")
-		}
-		t.Run(tt.name, func(t *testing.T) {
-			tt := tt
-			// Test that a signature from here can validate in the CLI.
-			td := t.TempDir()
-
-			data := []byte("hello, ssh world")
-			write(t, data, td, "data")
-
-			armored, err := sshsig.Sign([]byte(tt.priv), bytes.NewReader(data), "file")
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			sigPath := write(t, armored, td, "oursig")
-
-			// Create an allowed_signers file with two keys to check against.
-			allowedSigner := "test@rekor.dev " + tt.pub + "\n"
-			allowedSigner += "othertest@rekor.dev " + otherSSHPublicKey + "\n"
-			allowedSigners := write(t, []byte(allowedSigner), td, "allowed_signer")
-
-			// We use the correct principal here so it should work.
-			run(t, data, "ssh-keygen", "-Y", "verify", "-f", allowedSigners,
-				"-I", "test@rekor.dev", "-n", "file", "-s", sigPath)
-
-			// Just to be sure, check against the other public key as well.
-			runErr(t, data, "ssh-keygen", "-Y", "verify", "-f", allowedSigners,
-				"-I", "othertest@rekor.dev", "-n", "file", "-s", sigPath)
-
-			// It should error if we run it against other data
-			data = []byte("other data!")
-			runErr(t, data, "ssh-keygen", "-Y", "check-novalidate", "-n", "file", "-s", sigPath)
-		})
-	}
-}
-
-func TestRoundTrip(t *testing.T) {
-	data := []byte("my good data to be signed!")
-
-	// Create one extra signature for all the tests.
-	otherSig, err := sshsig.Sign([]byte(otherSSHPrivateKey), bytes.NewReader(data), "file")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, tt := range []struct {
-		name string
-		pub  string
-		priv string
-	}{
-		{
-			name: "rsa",
-			pub:  sshPublicKey,
-			priv: sshPrivateKey,
-		},
-		{
-			name: "ed25519",
-			pub:  ed25519PublicKey,
-			priv: ed25519PrivateKey,
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			tt := tt
-			sig, err := sshsig.Sign([]byte(tt.priv), bytes.NewReader(data), "file")
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Check the signature against that data and public key
-			if err := sshsig.Verify(bytes.NewReader(data), sig, []byte(tt.pub), "file"); err != nil {
-				t.Error(err)
-			}
-
-			// Now check it against invalid data.
-			if err := sshsig.Verify(strings.NewReader("invalid data!"), sig, []byte(tt.pub), "file"); err == nil {
-				t.Error("expected error!")
-			}
-
-			// Now check it against the wrong key.
-			if err := sshsig.Verify(bytes.NewReader(data), sig, []byte(otherSSHPublicKey), "file"); err == nil {
-				t.Error("expected error!")
-			}
-
-			// Now check it against an invalid signature data.
-			if err := sshsig.Verify(bytes.NewReader(data), []byte("invalid signature!"), []byte(tt.pub), "file"); err == nil {
-				t.Error("expected error!")
-			}
-
-			// Once more, use the wrong signature and check it against the original (wrong public key)
-			if err := sshsig.Verify(bytes.NewReader(data), otherSig, []byte(tt.pub), "file"); err == nil {
-				t.Error("expected error!")
-			}
-			// It should work against the correct public key.
-			if err := sshsig.Verify(bytes.NewReader(data), otherSig, []byte(otherSSHPublicKey), "file"); err != nil {
-				t.Error(err)
-			}
-		})
-	}
-}
-
-func write(t *testing.T, d []byte, fp ...string) string {
-	p := filepath.Join(fp...)
-	if err := os.WriteFile(p, d, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	return p
-}
-
-func run(t *testing.T, stdin []byte, args ...string) {
-	t.Helper()
-	/* #nosec */
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Stdin = bytes.NewReader(stdin)
-	out, err := cmd.CombinedOutput()
-	t.Logf("cmd %v: %s", cmd, string(out))
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func runErr(t *testing.T, stdin []byte, args ...string) {
-	t.Helper()
-	/* #nosec */
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Stdin = bytes.NewReader(stdin)
-	out, err := cmd.CombinedOutput()
-	t.Logf("cmd %v: %s", cmd, string(out))
-	if err == nil {
-		t.Fatal("expected error")
-	}
-}
--- a/modules/git/blame_sha256_test.go
+++ b/modules/git/blame_sha256_test.go
@@ -1,145 +0,0 @@
-// Copyright 2024 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package git
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestReadingBlameOutputSha256(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	t.Run("Without .git-blame-ignore-revs", func(t *testing.T) {
-		repo, err := OpenRepository(ctx, "./tests/repos/repo5_pulls_sha256")
-		assert.NoError(t, err)
-		defer repo.Close()
-
-		commit, err := repo.GetCommit("0b69b7bb649b5d46e14cabb6468685e5dd721290acc7ffe604d37cde57927345")
-		assert.NoError(t, err)
-
-		parts := []*BlamePart{
-			{
-				Sha: "1e35a51dc00fd7de730344c07061acfe80e8117e075ac979b6a29a3a045190ca",
-				Lines: []string{
-					"# test_repo",
-					"Test repository for testing migration from github to gitea",
-				},
-			},
-			{
-				Sha:          "0b69b7bb649b5d46e14cabb6468685e5dd721290acc7ffe604d37cde57927345",
-				Lines:        []string{"", "Do not make any changes to this repo it is used for unit testing"},
-				PreviousSha:  "1e35a51dc00fd7de730344c07061acfe80e8117e075ac979b6a29a3a045190ca",
-				PreviousPath: "README.md",
-			},
-		}
-
-		for _, bypass := range []bool{false, true} {
-			blameReader, err := CreateBlameReader(ctx, Sha256ObjectFormat, "./tests/repos/repo5_pulls_sha256", commit, "README.md", bypass)
-			assert.NoError(t, err)
-			assert.NotNil(t, blameReader)
-			defer blameReader.Close()
-
-			assert.False(t, blameReader.UsesIgnoreRevs())
-
-			for _, part := range parts {
-				actualPart, err := blameReader.NextPart()
-				assert.NoError(t, err)
-				assert.Equal(t, part, actualPart)
-			}
-
-			// make sure all parts have been read
-			actualPart, err := blameReader.NextPart()
-			assert.Nil(t, actualPart)
-			assert.NoError(t, err)
-		}
-	})
-
-	t.Run("With .git-blame-ignore-revs", func(t *testing.T) {
-		repo, err := OpenRepository(ctx, "./tests/repos/repo6_blame_sha256")
-		assert.NoError(t, err)
-		defer repo.Close()
-
-		full := []*BlamePart{
-			{
-				Sha:   "ab2b57a4fa476fb2edb74dafa577caf918561abbaa8fba0c8dc63c412e17a7cc",
-				Lines: []string{"line", "line"},
-			},
-			{
-				Sha:          "9347b0198cd1f25017579b79d0938fa89dba34ad2514f0dd92f6bc975ed1a2fe",
-				Lines:        []string{"changed line"},
-				PreviousSha:  "ab2b57a4fa476fb2edb74dafa577caf918561abbaa8fba0c8dc63c412e17a7cc",
-				PreviousPath: "blame.txt",
-			},
-			{
-				Sha:   "ab2b57a4fa476fb2edb74dafa577caf918561abbaa8fba0c8dc63c412e17a7cc",
-				Lines: []string{"line", "line", ""},
-			},
-		}
-
-		cases := []struct {
-			CommitID       string
-			UsesIgnoreRevs bool
-			Bypass         bool
-			Parts          []*BlamePart
-		}{
-			{
-				CommitID:       "e2f5660e15159082902960af0ed74fc144921d2b0c80e069361853b3ece29ba3",
-				UsesIgnoreRevs: true,
-				Bypass:         false,
-				Parts: []*BlamePart{
-					{
-						Sha:   "ab2b57a4fa476fb2edb74dafa577caf918561abbaa8fba0c8dc63c412e17a7cc",
-						Lines: []string{"line", "line", "changed line", "line", "line", ""},
-					},
-				},
-			},
-			{
-				CommitID:       "e2f5660e15159082902960af0ed74fc144921d2b0c80e069361853b3ece29ba3",
-				UsesIgnoreRevs: false,
-				Bypass:         true,
-				Parts:          full,
-			},
-			{
-				CommitID:       "9347b0198cd1f25017579b79d0938fa89dba34ad2514f0dd92f6bc975ed1a2fe",
-				UsesIgnoreRevs: false,
-				Bypass:         false,
-				Parts:          full,
-			},
-			{
-				CommitID:       "9347b0198cd1f25017579b79d0938fa89dba34ad2514f0dd92f6bc975ed1a2fe",
-				UsesIgnoreRevs: false,
-				Bypass:         false,
-				Parts:          full,
-			},
-		}
-
-		objectFormat, err := repo.GetObjectFormat()
-		assert.NoError(t, err)
-		for _, c := range cases {
-			commit, err := repo.GetCommit(c.CommitID)
-			assert.NoError(t, err)
-			blameReader, err := CreateBlameReader(ctx, objectFormat, "./tests/repos/repo6_blame_sha256", commit, "blame.txt", c.Bypass)
-			assert.NoError(t, err)
-			assert.NotNil(t, blameReader)
-			defer blameReader.Close()
-
-			assert.Equal(t, c.UsesIgnoreRevs, blameReader.UsesIgnoreRevs())
-
-			for _, part := range c.Parts {
-				actualPart, err := blameReader.NextPart()
-				assert.NoError(t, err)
-				assert.Equal(t, part, actualPart)
-			}
-
-			// make sure all parts have been read
-			actualPart, err := blameReader.NextPart()
-			assert.Nil(t, actualPart)
-			assert.NoError(t, err)
-		}
-	})
-}
--- a/modules/git/commit_sha256_test.go
+++ b/modules/git/commit_sha256_test.go
@@ -1,198 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-//go:build !gogit
-
-package git
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCommitsCountSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare_sha256")
-
-	commitsCount, err := CommitsCount(DefaultContext,
-		CommitsCountOptions{
-			RepoPath: bareRepo1Path,
-			Revision: []string{"f004f41359117d319dedd0eaab8c5259ee2263da839dcba33637997458627fdc"},
-		})
-
-	assert.NoError(t, err)
-	assert.Equal(t, int64(3), commitsCount)
-}
-
-func TestCommitsCountWithoutBaseSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare_sha256")
-
-	commitsCount, err := CommitsCount(DefaultContext,
-		CommitsCountOptions{
-			RepoPath: bareRepo1Path,
-			Not:      "main",
-			Revision: []string{"branch1"},
-		})
-
-	assert.NoError(t, err)
-	assert.Equal(t, int64(2), commitsCount)
-}
-
-func TestGetFullCommitIDSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare_sha256")
-
-	id, err := GetFullCommitID(DefaultContext, bareRepo1Path, "f004f4")
-	assert.NoError(t, err)
-	assert.Equal(t, "f004f41359117d319dedd0eaab8c5259ee2263da839dcba33637997458627fdc", id)
-}
-
-func TestGetFullCommitIDErrorSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare_sha256")
-
-	id, err := GetFullCommitID(DefaultContext, bareRepo1Path, "unknown")
-	assert.Empty(t, id)
-	if assert.Error(t, err) {
-		assert.EqualError(t, err, "object does not exist [id: unknown, rel_path: ]")
-	}
-}
-
-func TestCommitFromReaderSha256(t *testing.T) {
-	commitString := `9433b2a62b964c17a4485ae180f45f595d3e69d31b786087775e28c6b6399df0 commit 1114
-tree e7f9e96dd79c09b078cac8b303a7d3b9d65ff9b734e86060a4d20409fd379f9e
-parent 26e9ccc29fad747e9c5d9f4c9ddeb7eff61cc45ef6a8dc258cbeb181afc055e8
-author Adam Majer <amajer@suse.de> 1698676906 +0100
-committer Adam Majer <amajer@suse.de> 1698676906 +0100
-gpgsig-sha256 -----BEGIN PGP SIGNATURE-----
-` + " " + `
- iQIrBAABCgAtFiEES+fB08xlgTrzSdQvhkUIsBsmec8FAmU/wKoPHGFtYWplckBz
- dXNlLmRlAAoJEIZFCLAbJnnP4s4PQIJATa++WPzR6/H4etT7bsOGoMyguEJYyWOd
- aTybplzT7QAL7h2to0QszGabtzMJPIA39xSFZNYNN30voK5YyyYibXluPKgjemfK
- WNXwF+gkwgZI38gSvKf+vlqI+EYyIFe19wOhiju0m8SIlB5NEPiWHa17q2mqmqqx
- 1FWa2JdqLPYjAtSLFXeSZegrY5V1FxdemyMUONkg8YO9OSIMZiE0GsnnOXQ3xcT4
- JTCnmlUxIKw689UiEY80JopUIq+Wl7+qq9507IYYSUCyB6JazL42AKMzVCbD+qBP
- oOzh/hafYgk9H9qCQXaLbmvs17zXRpicig1bAzqgAy1FDelvpERyRTydEajSLIG6
- U1cRCkgXCZ0NfsYNPPmBa8b3+rnstypXYTbyMwTln7FfUAaGo6o9JYiPMkzxlmsy
- zfp/tcaY8+LlBL9aOJjtv+a0p+HrpCGd6CCa4ARfphTLq8QRSSh8uzlB9N+6HnRI
- VAEUo6ecdDxSpyt2naeg9pKus/BRi7P6g4B1hkk/zZstUX/QP4IQuAJbXjkvsC+X
- HKRr3NlRM/DygzTyj0gN74uoa0goCIbyAQhiT42nm0cuhM7uN/W0ayrlZjGF1cbR
- 8NCJUL2Nwj0ywKIavC99Ipkb8AsFwpVT6U6effs6
- =xybZ
- -----END PGP SIGNATURE-----
-
-signed commit`
-
-	sha := &Sha256Hash{
-		0x94, 0x33, 0xb2, 0xa6, 0x2b, 0x96, 0x4c, 0x17, 0xa4, 0x48, 0x5a, 0xe1, 0x80, 0xf4, 0x5f, 0x59,
-		0x5d, 0x3e, 0x69, 0xd3, 0x1b, 0x78, 0x60, 0x87, 0x77, 0x5e, 0x28, 0xc6, 0xb6, 0x39, 0x9d, 0xf0,
-	}
-	gitRepo, err := openRepositoryWithDefaultContext(filepath.Join(testReposDir, "repo1_bare_sha256"))
-	assert.NoError(t, err)
-	assert.NotNil(t, gitRepo)
-	defer gitRepo.Close()
-
-	commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
-	assert.NoError(t, err)
-	if !assert.NotNil(t, commitFromReader) {
-		return
-	}
-	assert.EqualValues(t, sha, commitFromReader.ID)
-	assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
-
-iQIrBAABCgAtFiEES+fB08xlgTrzSdQvhkUIsBsmec8FAmU/wKoPHGFtYWplckBz
-dXNlLmRlAAoJEIZFCLAbJnnP4s4PQIJATa++WPzR6/H4etT7bsOGoMyguEJYyWOd
-aTybplzT7QAL7h2to0QszGabtzMJPIA39xSFZNYNN30voK5YyyYibXluPKgjemfK
-WNXwF+gkwgZI38gSvKf+vlqI+EYyIFe19wOhiju0m8SIlB5NEPiWHa17q2mqmqqx
-1FWa2JdqLPYjAtSLFXeSZegrY5V1FxdemyMUONkg8YO9OSIMZiE0GsnnOXQ3xcT4
-JTCnmlUxIKw689UiEY80JopUIq+Wl7+qq9507IYYSUCyB6JazL42AKMzVCbD+qBP
-oOzh/hafYgk9H9qCQXaLbmvs17zXRpicig1bAzqgAy1FDelvpERyRTydEajSLIG6
-U1cRCkgXCZ0NfsYNPPmBa8b3+rnstypXYTbyMwTln7FfUAaGo6o9JYiPMkzxlmsy
-zfp/tcaY8+LlBL9aOJjtv+a0p+HrpCGd6CCa4ARfphTLq8QRSSh8uzlB9N+6HnRI
-VAEUo6ecdDxSpyt2naeg9pKus/BRi7P6g4B1hkk/zZstUX/QP4IQuAJbXjkvsC+X
-HKRr3NlRM/DygzTyj0gN74uoa0goCIbyAQhiT42nm0cuhM7uN/W0ayrlZjGF1cbR
-8NCJUL2Nwj0ywKIavC99Ipkb8AsFwpVT6U6effs6
-=xybZ
-----END PGP SIGNATURE-----
-`, commitFromReader.Signature.Signature)
-	assert.EqualValues(t, `tree e7f9e96dd79c09b078cac8b303a7d3b9d65ff9b734e86060a4d20409fd379f9e
-parent 26e9ccc29fad747e9c5d9f4c9ddeb7eff61cc45ef6a8dc258cbeb181afc055e8
-author Adam Majer <amajer@suse.de> 1698676906 +0100
-committer Adam Majer <amajer@suse.de> 1698676906 +0100
-
-signed commit`, commitFromReader.Signature.Payload)
-	assert.EqualValues(t, "Adam Majer <amajer@suse.de>", commitFromReader.Author.String())
-
-	commitFromReader2, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString+"\n\n"))
-	assert.NoError(t, err)
-	commitFromReader.CommitMessage += "\n\n"
-	commitFromReader.Signature.Payload += "\n\n"
-	assert.EqualValues(t, commitFromReader, commitFromReader2)
-}
-
-func TestHasPreviousCommitSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare_sha256")
-
-	repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
-	assert.NoError(t, err)
-	defer repo.Close()
-
-	commit, err := repo.GetCommit("f004f41359117d319dedd0eaab8c5259ee2263da839dcba33637997458627fdc")
-	assert.NoError(t, err)
-
-	objectFormat, err := repo.GetObjectFormat()
-	assert.NoError(t, err)
-
-	parentSHA := MustIDFromString("b0ec7af4547047f12d5093e37ef8f1b3b5415ed8ee17894d43a34d7d34212e9c")
-	notParentSHA := MustIDFromString("42e334efd04cd36eea6da0599913333c26116e1a537ca76e5b6e4af4dda00236")
-	assert.Equal(t, objectFormat, parentSHA.Type())
-	assert.Equal(t, objectFormat.Name(), "sha256")
-
-	haz, err := commit.HasPreviousCommit(parentSHA)
-	assert.NoError(t, err)
-	assert.True(t, haz)
-
-	hazNot, err := commit.HasPreviousCommit(notParentSHA)
-	assert.NoError(t, err)
-	assert.False(t, hazNot)
-
-	selfNot, err := commit.HasPreviousCommit(commit.ID)
-	assert.NoError(t, err)
-	assert.False(t, selfNot)
-}
-
-func TestGetCommitFileStatusMergesSha256(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo6_merge_sha256")
-
-	commitFileStatus, err := GetCommitFileStatus(DefaultContext, bareRepo1Path, "d2e5609f630dd8db500f5298d05d16def282412e3e66ed68cc7d0833b29129a1")
-	assert.NoError(t, err)
-
-	expected := CommitFileStatus{
-		[]string{
-			"add_file.txt",
-		},
-		[]string{},
-		[]string{
-			"to_modify.txt",
-		},
-	}
-
-	assert.Equal(t, expected.Added, commitFileStatus.Added)
-	assert.Equal(t, expected.Removed, commitFileStatus.Removed)
-	assert.Equal(t, expected.Modified, commitFileStatus.Modified)
-
-	expected = CommitFileStatus{
-		[]string{},
-		[]string{
-			"to_remove.txt",
-		},
-		[]string{},
-	}
-
-	commitFileStatus, err = GetCommitFileStatus(DefaultContext, bareRepo1Path, "da1ded40dc8e5b7c564171f4bf2fc8370487decfb1cb6a99ef28f3ed73d09172")
-	assert.NoError(t, err)
-
-	assert.Equal(t, expected.Added, commitFileStatus.Added)
-	assert.Equal(t, expected.Removed, commitFileStatus.Removed)
-	assert.Equal(t, expected.Modified, commitFileStatus.Modified)
-}
--- a/modules/hcaptcha/hcaptcha_test.go
+++ b/modules/hcaptcha/hcaptcha_test.go
@@ -1,106 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package hcaptcha
-
-import (
-	"net/http"
-	"os"
-	"strings"
-	"testing"
-	"time"
-)
-
-const (
-	dummySiteKey = "10000000-ffff-ffff-ffff-000000000001"
-	dummySecret  = "0x0000000000000000000000000000000000000000"
-	dummyToken   = "10000000-aaaa-bbbb-cccc-000000000001"
-)
-
-func TestMain(m *testing.M) {
-	os.Exit(m.Run())
-}
-
-func TestCaptcha(t *testing.T) {
-	tt := []struct {
-		Name   string
-		Secret string
-		Token  string
-		Error  ErrorCode
-	}{
-		{
-			Name:   "Success",
-			Secret: dummySecret,
-			Token:  dummyToken,
-		},
-		{
-			Name:  "Missing Secret",
-			Token: dummyToken,
-			Error: ErrMissingInputSecret,
-		},
-		{
-			Name:   "Missing Token",
-			Secret: dummySecret,
-			Error:  ErrMissingInputResponse,
-		},
-		{
-			Name:   "Invalid Token",
-			Secret: dummySecret,
-			Token:  "test",
-			Error:  ErrInvalidInputResponse,
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.Name, func(t *testing.T) {
-			client, err := New(tc.Secret, WithHTTP(&http.Client{
-				Timeout: time.Second * 5,
-			}))
-			if err != nil {
-				// The only error that can be returned from creating a client
-				if tc.Error == ErrMissingInputSecret && err == ErrMissingInputSecret {
-					return
-				}
-				t.Log(err)
-				t.FailNow()
-			}
-
-			resp, err := client.Verify(tc.Token, PostOptions{
-				Sitekey: dummySiteKey,
-			})
-			if err != nil {
-				// The only error that can be returned prior to the request
-				if tc.Error == ErrMissingInputResponse && err == ErrMissingInputResponse {
-					return
-				}
-				t.Log(err)
-				t.FailNow()
-			}
-
-			if tc.Error.String() != "" {
-				if resp.Success {
-					t.Log("Verification should fail.")
-					t.Fail()
-				}
-				if len(resp.ErrorCodes) == 0 {
-					t.Log("hCaptcha should have returned an error.")
-					t.Fail()
-				}
-				var hasErr bool
-				for _, err := range resp.ErrorCodes {
-					if strings.EqualFold(err.String(), tc.Error.String()) {
-						hasErr = true
-						break
-					}
-				}
-				if !hasErr {
-					t.Log("hCaptcha did not return the error being tested")
-					t.Fail()
-				}
-			} else if !resp.Success {
-				t.Log("Verification should succeed.")
-				t.Fail()
-			}
-		})
-	}
-}
--- a/modules/setting/i18n.go
+++ b/modules/setting/i18n.go
@@ -7,31 +7,6 @@ package setting
 var defaultI18nLangNames = []string{
 	"en-US", "English",
 	"zh-CN", "简体中文",
-	"zh-HK", "繁體中文（香港）",
-	"zh-TW", "繁體中文（台灣）",
-	"de-DE", "Deutsch",
-	"fr-FR", "Français",
-	"nl-NL", "Nederlands",
-	"lv-LV", "Latviešu",
-	"ru-RU", "Русский",
-	"uk-UA", "Українська",
-	"ja-JP", "日本語",
-	"es-ES", "Español",
-	"pt-BR", "Português do Brasil",
-	"pt-PT", "Português de Portugal",
-	"pl-PL", "Polski",
-	"bg-BG", "Български",
-	"it-IT", "Italiano",
-	"fi-FI", "Suomi",
-	"tr-TR", "Türkçe",
-	"cs-CZ", "Čeština",
-	"sv-SE", "Svenska",
-	"ko-KR", "한국어",
-	"el-GR", "Ελληνικά",
-	"fa-IR", "فارسی",
-	"hu-HU", "Magyar nyelv",
-	"id-ID", "Bahasa Indonesia",
-	"ml-IN", "മലയാളം",
 }

 func defaultI18nLangs() (res []string) {
--- a/modules/setting/other.go
+++ b/modules/setting/other.go
@@ -14,8 +14,8 @@ type OtherConfig struct {
 }

 var Other = OtherConfig{
-	ShowFooterVersion:          true,
-	ShowFooterTemplateLoadTime: true,
+	ShowFooterVersion:          false,
+	ShowFooterTemplateLoadTime: false,
 	ShowFooterPoweredBy:        true,
 	EnableSitemap:              true,
 	EnableFeed:                 true,
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -162,8 +162,8 @@ func loadServiceFrom(rootCfg ConfigProvider) {
 	Service.EnableReverseProxyAutoRegister = sec.Key("ENABLE_REVERSE_PROXY_AUTO_REGISTRATION").MustBool()
 	Service.EnableReverseProxyEmail = sec.Key("ENABLE_REVERSE_PROXY_EMAIL").MustBool()
 	Service.EnableReverseProxyFullName = sec.Key("ENABLE_REVERSE_PROXY_FULL_NAME").MustBool()
-	Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool(false)
-	Service.RequireCaptchaForLogin = sec.Key("REQUIRE_CAPTCHA_FOR_LOGIN").MustBool(false)
+	Service.EnableCaptcha = sec.Key("ENABLE_CAPTCHA").MustBool(true)
+	Service.RequireCaptchaForLogin = sec.Key("REQUIRE_CAPTCHA_FOR_LOGIN").MustBool(true)
 	Service.RequireExternalRegistrationCaptcha = sec.Key("REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA").MustBool(Service.EnableCaptcha)
 	Service.RequireExternalRegistrationPassword = sec.Key("REQUIRE_EXTERNAL_REGISTRATION_PASSWORD").MustBool()
 	Service.CaptchaType = sec.Key("CAPTCHA_TYPE").MustString(ImageCaptcha)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -216,6 +216,7 @@ func LoadSettings() {
 	loadProjectFrom(CfgProvider)
 	loadMimeTypeMapFrom(CfgProvider)
 	loadFederationFrom(CfgProvider)
+	loadWechatSettingsFrom(CfgProvider)
 }

 // LoadSettingsForInstall initializes the settings for install
--- a/modules/setting/wechat.go
+++ b/modules/setting/wechat.go
@@ -0,0 +1,65 @@
+/**
+  微信参数设置
+*/
+
+package setting
+
+import (
+	"code.gitea.io/gitea/modules/log"
+	"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount"
+)
+
+var Wechat = struct {
+	OfficialAccount OfficialAccountType
+}{}
+
+type OfficialAccountType struct {
+	AppID               string
+	AppSecret           string
+	TempQrExpireSeconds int
+	PowerWechat         PowerWechatOfficialAccountUtilType
+}
+
+type PowerWechatOfficialAccountUtilType *officialAccount.OfficialAccount
+
+/**
+ * 从配置文件中加载微信公众号配置信息，并创建PowerWechat全局工具类实例
+ *    配置文件： custom/conf/app.ini
+ *    全局工具类实例：Wechat.OfficialAccount.PowerWechat
+ */
+func loadWechatSettingsFrom(rootCfg ConfigProvider) {
+	sec := rootCfg.Section("wechat")
+	AppID := sec.Key("WECHAT_OFFICIAL_ACCOUNT_APP_ID").MustString("")
+	AppSecret := sec.Key("WECHAT_OFFICIAL_ACCOUNT_APP_SECRET").MustString("")
+
+	Wechat.OfficialAccount.AppID = AppID
+	Wechat.OfficialAccount.AppSecret = AppSecret
+	Wechat.OfficialAccount.PowerWechat = createPowerWechatApp(AppID, AppSecret)
+	Wechat.OfficialAccount.TempQrExpireSeconds = sec.Key("WECHAT_OFFICIAL_ACCOUNT_TEMP_QR_EXPIRE_SECONDS").MustInt(60)
+}
+
+/**
+ * 创建微信公众号工具类
+ *
+ * @param AppID 微信公众号AppID，详见 `custom/conf/app.ini`
+ * @param AppSecret 微信公众号 AppSecret，详见 `custom/conf/app.ini`
+ * @return PowerWechat app实例
+ */
+func createPowerWechatApp(AppID, AppSecret string) PowerWechatOfficialAccountUtilType {
+	PowerWechatOfficialAccountUtil, err := officialAccount.NewOfficialAccount(&officialAccount.UserConfig{
+		AppID:  AppID,
+		Secret: AppSecret,
+		Log: officialAccount.Log{
+			Level: "debug",
+			File:  "./wechat.log",
+		},
+		HttpDebug: false,
+		Debug:     false,
+	})
+	if err != nil {
+		log.Warn("创建微信工具类 PowerWechat 失败，请检查 modules/setting/wechat.go ")
+		return nil
+	}
+
+	return PowerWechatOfficialAccountUtil
+}
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -10,8 +10,10 @@ sign_out = Sign Out
 sign_up = Register
 link_account = Link Account
 register = Register
+register_or_sign_in_with_provider = Register or Sign in with %s
 version = Version
 powered_by = Powered by %s
+mofified_from= Modified from %s
 page = Page
 template = Template
 language = Language
@@ -759,6 +761,20 @@ password_incorrect = The current password is incorrect.
 change_password_success = Your password has been updated. Sign in using your new password from now on.
 password_change_disabled = Non-local users cannot update their password through the Gitea web interface.

+change_phone= Update Phone Number
+phone_number = Phone Number
+phone_new_number= New Phone Number
+phone_sms_code= Phone SMS Code
+phone_sms_send= Send SMS
+phone_sms_sent_success= SMS code sent, please check you phone message.
+phone_sms_code_incorrect= The SMS code you input is incorrect.
+change_phone_success= Phone updated successfully.
+
+change_wechat= Update WeChat Account
+wechat_official_account_qr_prompt=Scan QR with WeChat, and follow the Official Account.
+wechat_official_account_qr_expired=WeChat QR expired.
+change_wechat_success= Wechat account updated successfully.
+
 emails = Email Addresses
 manage_emails = Manage Email Addresses
 manage_themes = Select default theme
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
--- a/options/locale/locale_sk-SK.ini
+++ b/options/locale/locale_sk-SK.ini
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -4,14 +4,16 @@ explore=探索
 help=帮助
 logo=徽标
 sign_in=登录
-sign_in_with_provider=使用 %s 登录
+sign_in_with_provider=%s登录
 sign_in_or=或
 sign_out=退出
 sign_up=注册
 link_account=链接账户
 register=注册
+register_or_sign_in_with_provider = %s 注册/登录
 version=当前版本
 powered_by=Powered by %s
+mofified_from= Modified from %s
 page=页面
 template=模板
 language=语言选项
@@ -758,6 +760,20 @@ password_incorrect=当前密码不正确！
 change_password_success=您的密码已更新。从现在开始使用您的新密码登录。
 password_change_disabled=非本地帐户不能通过 Gitea 的 web 界面更改密码。

+change_phone=更新手机号
+phone_number = 手机号
+phone_new_number=新的手机号
+phone_sms_code=手机短信验证码
+phone_sms_send=发送短信
+phone_sms_sent_success=短信已发送，请查收
+phone_sms_code_incorrect=短信验证码不正确
+change_phone_success=手机号成功更新
+
+change_wechat=更新微信
+wechat_official_account_qr_prompt=使用微信扫描二维码，关注公众号
+wechat_official_account_qr_expired=微信二维码已过期
+change_wechat_success=微信成功更新
+
 emails=邮箱地址
 manage_emails=管理邮箱地址
 manage_themes=选择默认主题
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -1,995 +0,0 @@
-home=首頁
-dashboard=控制面版
-explore=探索
-help=說明
-sign_in=登入
-sign_in_or=或
-sign_out=登出
-link_account=連結帳戶
-register=註冊
-version=版本
-page=頁面
-template=樣板
-language=語言
-notifications=訊息
-
-password=密碼
-re_type=確認密碼
-passcode=驗證碼
-
-
-repository=儲存庫
-organization=組織
-mirror=鏡像
-new_repo=新增儲存庫
-new_migrate=遷移外部儲存庫
-new_mirror=新鏡像
-new_fork=Fork 新的儲存庫
-new_org=新增組織
-manage_org=管理組織
-account_settings=帳號設定
-settings=設定
-your_settings=組織設定
-
-all=所有
-sources=來源
-mirrors=鏡像
-collaborative=協同者
-forks=複製列表
-
-activities=活動
-pull_requests=合併請求
-issues=問題
-
-cancel=取消
-remove=移除成員
-edit=編輯
-
-enabled=已啟用
-
-
-
-
-
-
-
-
-
-concept_code_repository=儲存庫
-
-
-
-name=組織名稱
-
-filter.is_template=樣板
-filter.private=私有庫
-
-
-[search]
-
-[aria]
-
-[heatmap]
-
-[editor]
-
-[filter]
-
-[error]
-
-[startpage]
-
-[install]
-install=安裝頁面
-db_title=資料庫設定
-db_type=資料庫類型
-host=主機
-password=密碼
-db_name=資料庫名稱
-path=資料庫文件路徑
-
-repo_path=儲存庫的根目錄
-log_root_path=日誌路徑
-
-optional_title=可選設定
-smtp_addr=SMTP 主機地址
-smtp_port=SMTP 主機端口
-disable_gravatar=禁用 Gravatar 頭像
-federated_avatar_lookup=開啟聯合頭像
-federated_avatar_lookup_popup=開啟聯合頭像查詢並使用基於開放源碼的 libravatar 服務
-enable_captcha_popup=要求在用戶註冊時輸入驗證碼
-admin_password=管理員密碼
-confirm_password=確認密碼
-install_btn_confirm=立即安裝
-test_git_failed=無法識別 'git' 命令：%v
-save_config_failed=儲存設定失敗：%v
-
-[home]
-password_holder=密碼
-switch_dashboard_context=切換控制面版用戶
-my_repos=儲存庫管理
-collaborative_repos=參與協作的儲存庫
-my_orgs=我的組織
-my_mirrors=我的鏡像
-view_home=訪問 %s
-
-
-show_private=私有庫
-
-issues.in_your_repos=屬於該用戶儲存庫的
-
-[explore]
-repos=儲存庫
-users=使用者
-organizations=組織
-
-[auth]
-register_helper_msg=已經註冊？立即登錄！
-forgot_password_title=忘記密碼
-forgot_password=忘記密碼？
-active_your_account=啟用您的帳戶
-has_unconfirmed_mail=%s 您好，您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到啟用郵件，或需要重新發送，請單擊下方的按鈕。
-resend_mail=單擊此處重新發送確認郵件
-email_not_associate=此電子郵件地址未與任何帳戶連結
-verify=驗證
-scratch_code=備用碼
-use_scratch_code=使用備用碼
-twofa_scratch_used=你已經使用了你的備用碼。你將會被轉到兩步驟驗證設定頁面以便移除你已註冊設備或重新產生新的備用碼。
-twofa_scratch_token_incorrect=您的備用碼不正確
-login_userpass=登入
-oauth_signin_submit=連結帳戶
-openid_connect_submit=連接
-openid_connect_title=連接到現有帳戶
-openid_register_title=建立新帳戶
-
-[mail]
-
-activate_account=請啟用您的帳戶
-
-activate_email=請驗證您的郵箱地址
-
-register_notify=歡迎來到 Gitea
-
-
-register_success=註冊成功
-
-
-
-
-
-
-
-[modal]
-yes=確認操作
-no=取消操作
-cancel=取消
-
-[form]
-UserName=使用者名稱
-RepoName=儲存庫名稱
-Email=郵箱地址
-Password=密碼
-Retype=確認密碼
-SSHTitle=SSH 金鑰名稱
-HttpsUrl=HTTPS URL 地址
-PayloadUrl=推送地址
-TeamName=團隊名稱
-AuthName=認證名稱
-AdminEmail=管理員郵箱
-
-NewBranchName=新的分支名稱
-CommitSummary=提交摘要
-CommitMessage=提交訊息
-CommitChoice=提交選擇
-TreeName=檔案路徑
-Content=內容
-
-
-require_error=不能為空。
-size_error=長度必須為 %s。
-min_size_error=長度最小為 %s 個字符。
-max_size_error=長度最大為 %s 個字符。
-email_error=不是一個有效的郵箱地址。
-unknown_error=未知錯誤：
-
-user_not_exist=該使用者名稱並不存在
-
-auth_failed=授權驗證失敗：%v
-
-
-target_branch_not_exist=目標分支不存在
-
-
-[user]
-repositories=儲存庫列表
-activity=公開活動
-followers=關註者
-following=關註中
-follow=關注
-unfollow=取消關注
-
-
-
-[settings]
-profile=個人訊息
-password=修改密碼
-avatar=頭像
-ssh_gpg_keys=SSH / GPG 金鑰
-social=社交帳號綁定
-orgs=管理組織
-repos=儲存庫管理
-delete=刪除帳戶
-twofa=兩步驟驗證
-organization=組織管理
-
-public_profile=公開訊息
-full_name=自定義名稱
-website=個人網站
-location=所在地區
-update_profile=更新訊息
-update_profile_success=您的個人資料已被更新
-continue=繼續操作
-cancel=取消操作
-language=語言
-comment_type_group_title=標題
-
-federated_avatar_lookup=Federated Avatar 查詢
-enable_custom_avatar=啟動自定義頭像
-choose_new_avatar=選擇新的頭像
-delete_current_avatar=刪除當前頭像
-
-old_password=當前密碼
-new_password=新的密碼
-
-emails=電子郵件地址
-primary=主要
-activated=已啟用
-delete_email=移除成員
-add_openid=新增 OpenID URI
-
-manage_ssh_keys=管理 SSH 金鑰
-manage_gpg_keys=管理 GPG 金鑰
-add_key=增加金鑰
-ssh_helper=<strong>需要協助?</strong> 查詢GitHub的文件以 <a href="%s">您自有SSH金鑰</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
-gpg_helper=<strong>需要協助嗎？</strong>建議可看看 GitHub 的 <a href="%s">about GPG</a> 文件。
-add_new_key=增加 SSH 金鑰
-add_new_gpg_key=新增 GPG 金鑰
-gpg_key_verify=驗證
-gpg_token=令牌
-ssh_key_verify=驗證
-ssh_token=令牌
-subkeys=次金鑰
-key_id=金鑰 ID
-key_name=金鑰名稱
-key_content=金鑰內容
-principal_content=金鑰文本
-delete_key=移除成員
-valid_forever=永遠有效
-last_used=上次使用在
-no_activity=沒有最近活動
-can_read_info=已讀
-key_state_desc=該金鑰在 7 天內被使用過
-token_state_desc=此 token 在過去七天內曾經被使用過
-show_openid=在設定檔顯示
-hide_openid=從設定檔隱藏
-manage_social=管理關聯社交帳戶
-
-generate_new_token=生成新的令牌
-token_name=令牌名稱
-generate_token=生成令牌
-delete_token=删除令牌
-access_token_deletion_cancel_action=取消
-permission_read=已讀
-
-oauth2_client_secret=用戶端金鑰
-oauth2_application_edit=編輯
-
-
-twofa_is_enrolled=您的帳號已經<strong>啟用</strong>兩步驟驗證。
-twofa_not_enrolled=您的帳號目前尚未啟用兩步驟驗證。
-twofa_disabled=兩步驟驗證已經被關閉。
-scan_this_image=使用您的授權應用程式來掃瞄圖片:
-or_enter_secret=或者輸入密碼: %s
-
-
-link_account=連結帳戶
-
-
-orgs_none=您尚未成為任一組織的成員。
-
-delete_account=刪除當前帳戶
-confirm_delete_account=確認刪除帳戶
-
-
-visibility.private=私有庫
-
-[repo]
-owner=擁有者
-repo_name=儲存庫名稱
-template=樣板
-visibility=可見度
-fork_repo=複製儲存庫
-fork_from=複製自
-repo_desc=儲存庫描述
-repo_lang=儲存庫語言
-license=授權許可
-create_repo=建立儲存庫
-default_branch=默認分支
-mirror_prune=裁減
-watchers=關注者
-stargazers=稱讚者
-forks=複製儲存庫
-
-
-
-desc.private=私有庫
-desc.template=樣板
-
-template.avatar=頭像
-
-
-
-migrate_items_issues=問題數
-migrate_items_pullrequests=合併請求
-migrate_items_releases=版本發佈
-migrate_repo=遷移儲存庫
-migrate.permission_denied=您並沒有導入本地儲存庫的權限。
-migrate.failed=遷移失敗：%v
-
-mirror_from=镜像来自
-forked_from=複製自
-unwatch=取消關注
-watch=關註
-unstar=取消收藏
-star=收藏
-fork=複製
-
-quick_guide=快速幫助
-clone_this_repo=複製當前儲存庫
-create_new_repo_command=從命令列建立新儲存庫。
-push_exist_repo=從命令列推送已存在的儲存庫
-
-code=程式碼
-branch=分支
-tree=目錄樹
-filter_branch_and_tag=過濾分支或標籤
-branches=分支列表
-tags=標籤列表
-issues=問題管理
-pulls=合併請求
-labels=標籤
-
-milestones=里程碑
-commits=提交歷史
-releases=版本發佈
-file_raw=原始文件
-file_history=文件歷史
-file_view_raw=查看原始文件
-file_permalink=永久連結
-
-stored_lfs=儲存到到 Git LFS
-
-editor.preview_changes=預覽更改
-editor.or=或
-editor.cancel_lower=取消
-editor.commit_changes=提交更改嗎？
-editor.commit_directly_to_this_branch=直接提交到 <strong class="branch-name">%s</strong> 分支。
-editor.create_new_branch=建立 <strong>新的分支</strong> 為此提交和開始合併請求。
-editor.cancel=取消
-editor.no_changes_to_show=沒有可以顯示的變更。
-
-commits.commits=次程式碼提交
-commits.author=作者
-commits.message=備註
-commits.date=提交日期
-commits.older=更舊的提交
-commits.newer=更新的提交
-commits.signed_by=簽署人
-
-
-
-
-projects.description_placeholder=組織描述
-projects.title=標題
-projects.template.desc=樣板
-projects.column.edit_title=組織名稱
-projects.column.new_title=組織名稱
-
-issues.new=建立問題
-issues.new.labels=標籤
-issues.new.no_label=未選擇標籤
-issues.new.clear_labels=清除已選取標籤
-issues.new.milestone=里程碑
-issues.new.no_milestone=未選擇里程碑
-issues.new.clear_milestone=清除已選取里程碑
-issues.new.open_milestone=開啟中的里程碑
-issues.new.closed_milestone=已關閉的里程碑
-issues.create=建立問題
-issues.new_label=建立標籤
-issues.new_label_desc_placeholder=組織描述
-issues.create_label=建立標籤
-issues.label_templates.title=載入一組預定義的標籤
-issues.label_templates.helper=選擇一個標籤集
-issues.add_milestone_at=`新增至<b>%s</b> 里程碑 %s`
-issues.change_milestone_at=`%[3]s 修改了里程碑 <b>%[1]s</b> 到 <b>%[2]s</b>`
-issues.remove_milestone_at=`從里程碑 %[2]s 刪除 <b>%[1]s</b>`
-issues.deleted_milestone=`（已刪除）`
-issues.deleted_project=`（已刪除）`
-issues.self_assign_at=將 %s 指派給自己
-issues.add_assignee_at=`被<b>%s</b> %s指派`
-issues.delete_branch_at=`刪除分支 <b>%s</b> %s`
-issues.filter_label=標籤篩選
-issues.filter_milestone=里程碑篩選
-issues.filter_assignee=指派人篩選
-issues.filter_assginee_no_assignee=無負責人
-issues.filter_type=類型篩選
-issues.filter_type.all_issues=所有問題
-issues.filter_type.assigned_to_you=指派給您的
-issues.filter_type.created_by_you=由您建立的
-issues.filter_type.mentioning_you=提及您的
-issues.filter_sort=排序
-issues.filter_sort.latest=最新建立
-issues.filter_sort.oldest=最早建立
-issues.filter_sort.recentupdate=最近更新
-issues.filter_sort.leastupdate=最少更新
-issues.filter_sort.mostcomment=最多評論
-issues.filter_sort.leastcomment=最少評論
-issues.action_open=開啟
-issues.action_close=關閉
-issues.action_label=標籤
-issues.action_milestone=里程碑
-issues.action_milestone_no_select=無里程碑
-issues.action_assignee=負責人
-issues.action_assignee_no_select=無負責人
-issues.opened_by=由 <a href="%[2]s">%[3]s</a> 於 %[1]s建立
-issues.previous=上一頁
-issues.next=下一頁
-issues.open_title=開啟中
-issues.closed_title=已關閉
-issues.draft_title=草稿
-issues.num_comments=%d 條評論
-issues.commented_at=` 評論 <a href="#%s"> %s</a>`
-issues.delete_comment_confirm=您確定要刪除該條評論嗎？
-issues.context.edit=編輯
-issues.reopen_issue=重新開啟
-issues.create_comment=評論
-issues.commit_ref_at=`在代碼提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中引用了該問題`
-issues.role.owner=管理員
-issues.role.member=普通成員
-issues.sign_in_require_desc=<a href="%s"> 登入</a> 才能加入這對話。
-issues.edit=編輯
-issues.cancel=取消
-issues.save=儲存
-issues.label_title=標籤名稱
-issues.label_description=組織描述
-issues.label_color=標籤顏色
-issues.label_count=%d 個標籤
-issues.label_open_issues=%d 個開啓的問題
-issues.label_edit=編輯
-issues.label_delete=刪除
-issues.label.filter_sort.alphabetically=按字母顺序排序
-issues.label.filter_sort.reverse_alphabetically=按字母反向排序
-issues.num_participants=%d 參與者
-issues.attachment.open_tab=`在新的標籤頁中查看 '%s'`
-issues.attachment.download=`點擊下載 '%s'`
-issues.subscribe=訂閱
-issues.unsubscribe=取消訂閱
-issues.add_time_cancel=取消
-issues.due_date_form_edit=編輯
-issues.due_date_form_remove=移除成員
-issues.dependency.cancel=取消
-issues.dependency.remove=移除成員
-
-
-pulls.new=建立合併請求
-pulls.compare_changes=建立合併請求
-pulls.filter_branch=過濾分支
-pulls.create=建立合併請求
-pulls.merged_title_desc=於 %[4]s 將 %[1]d 次代碼提交從 <code>%[2]s</code>合併至 <code>%[3]s</code>
-pulls.tab_conversation=對話內容
-pulls.tab_commits=程式碼提交
-pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。
-pulls.merged=已合併
-pulls.can_auto_merge_desc=這個拉請求可以自動合併。
-
-
-
-
-
-
-
-
-
-
-milestones.new=新的里程碑
-milestones.closed=於 %s關閉
-milestones.no_due_date=暫無截止日期
-milestones.open=開啟
-milestones.close=關閉
-milestones.create=建立里程碑
-milestones.title=標題
-milestones.desc=描述
-milestones.due_date=截止日期（可選）
-milestones.clear=清除
-milestones.edit=編輯里程碑
-milestones.cancel=取消
-milestones.filter_sort.least_complete=完成度由低到高
-milestones.filter_sort.most_complete=完成度由高到低
-milestones.filter_sort.most_issues=問題由多到少
-milestones.filter_sort.least_issues=問題由少到多
-
-
-
-wiki.page=頁面
-wiki.filter_page=過濾頁面
-wiki.new_page=頁面
-wiki.default_commit_message=關於此次頁面修改的說明(非必要)。
-wiki.save_page=儲存頁面
-wiki.last_commit_info=%s 於 %s 修改了此頁面
-wiki.edit_page_button=修改
-wiki.new_page_button=新的頁面
-wiki.delete_page_button=刪除頁面
-wiki.page_already_exists=相同名稱的 Wiki 頁面已經存在。
-wiki.pages=所有頁面
-wiki.last_updated=最後更新於 %s
-
-activity.period.daily=1 天
-activity.period.weekly=1 周
-activity.period.monthly=1 月
-activity.period.yearly=1 年
-activity.merged_prs_label=已合併
-activity.closed_issue_label=已關閉
-activity.new_issues_count_1=建立問題
-
-contributors.contribution_type.commits=提交歷史
-
-settings=儲存庫設定
-settings.desc=設定是您可以管理儲存庫設定的地方
-settings.options=儲存庫
-settings.collaboration.write=可寫權限
-settings.collaboration.read=可讀權限
-settings.collaboration.owner=管理員
-settings.collaboration.undefined=未定義
-settings.hooks=管理 Webhooks
-settings.githooks=管理 Git Hooks
-settings.basic_settings=基本設定
-settings.mirror_settings=鏡像設定
-
-settings.site=官方網站
-settings.update_settings=更新儲存庫設定
-settings.advanced_settings=高級設定
-settings.external_wiki_url=外部 Wiki 連結
-settings.external_tracker_url=外部 Issue 追蹤網址
-settings.tracker_url_format=外部問題管理系統的 URL 格式
-settings.tracker_issue_style.numeric=數字
-settings.tracker_issue_style.alphanumeric=字母及數字
-settings.danger_zone=危險操作區
-settings.new_owner_has_same_repo=新的儲存庫擁有者已經存在同名儲存庫！
-settings.transfer=轉移儲存庫所有權
-settings.transfer_owner=新擁有者
-settings.delete=刪除本儲存庫
-settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滾。
-settings.delete_collaborator=移除成員
-settings.teams=組織團隊
-settings.add_webhook=建立 Webhook
-settings.webhook.test_delivery=測試推送
-settings.webhook.request=請求內容
-settings.webhook.response=響應內容
-settings.webhook.headers=標題
-settings.webhook.payload=金鑰文本
-settings.webhook.body=響應內容
-settings.githook_edit_desc=如果 Hook 未啟動，則會顯示樣例文件中的內容。如果想要刪除某個 Hook，則提交空白文本即可。
-settings.githook_name=Hook 名稱
-settings.githook_content=Hook 內容
-settings.update_githook=更新 Hook 設定
-settings.secret=金鑰文本
-settings.slack_username=服務名稱
-settings.slack_icon_url=圖標 URL
-settings.event_create=建立
-settings.event_fork=複製
-settings.event_push=推送
-settings.event_repository=儲存庫
-settings.event_issues=問題數
-settings.event_pull_request=合併請求
-settings.update_webhook=更新 Webhook
-settings.recent_deliveries=最近推送記錄
-settings.hook_type=Hook 類型
-settings.slack_token=令牌
-settings.slack_domain=域名
-settings.slack_channel=頻道
-settings.deploy_keys=管理部署金鑰
-settings.add_deploy_key=新增部署金鑰
-settings.title=標題
-settings.deploy_key_content=金鑰文本
-settings.branches=分支列表
-settings.protected_branch=分支保護
-settings.protected_branch_can_push=允許推送？
-settings.protected_branch_can_push_yes=你可以推送
-settings.protected_branch_can_push_no=你不能推送
-settings.add_protected_branch=啟用保護
-settings.delete_protected_branch=停用保護
-settings.edit_protected_branch=編輯
-
-diff.browse_source=瀏覽代碼
-diff.parent=父節點
-diff.commit=當前提交
-diff.data_not_available=沒有內容比較可以使用
-diff.show_split_view=分割檢視
-diff.show_unified_view=統一視圖
-diff.stats_desc=共有 <strong> %d 個文件被更改</strong>，包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong>
-diff.bin=二進制
-diff.view_file=查看文件
-diff.file_byte_size=大小
-diff.file_suppressed=文件差異過大導致無法顯示
-
-release.releases=版本發佈
-release.new_release=發佈新版本
-release.draft=草稿
-release.prerelease=預發佈版本
-release.stable=穩定
-release.edit=編輯
-release.source_code=程式碼
-release.tag_name=標籤名稱
-release.target=目標分支
-release.cancel=取消
-release.publish=發佈版本
-release.save_draft=儲存草稿
-release.deletion_success=已刪除此版本發佈。
-release.downloads=下載附件
-
-
-
-
-
-
-
-[graphs]
-
-[org]
-org_name_holder=組織名稱
-org_full_name_holder=組織全名
-create_org=建立組織
-repo_updated=最後更新於
-members=成員數
-teams=組織團隊
-lower_members=名成員
-lower_repositories=個儲存庫
-org_desc=組織描述
-team_name=團隊名稱
-team_desc=團隊描述
-
-
-settings=組織設定
-settings.full_name=組織全名
-settings.website=官方網站
-settings.location=所在地區
-settings.visibility.private_shortname=私有庫
-
-settings.update_settings=更新組織設定
-settings.update_setting_success=組織設定已更新。
-settings.delete=刪除組織
-settings.delete_account=刪除當前組織
-settings.confirm_delete_account=確認刪除組織
-settings.delete_org_title=刪除組織
-settings.hooks_desc=新增 webhooks 將觸發在這個組織下 <strong>全部的儲存庫</strong> 。
-
-
-members.membership_visibility=成員可見性：
-members.member_role=成員角色：
-members.owner=管理員
-members.member=普通成員
-members.remove=移除成員
-members.leave=離開組織
-members.invite_desc=邀請新的用戶加入 %s：
-members.invite_now=立即邀請
-
-teams.join=加入團隊
-teams.leave=離開團隊
-teams.read_access=已讀
-teams.no_desc=該團隊暫無描述
-teams.settings=團隊設定
-teams.members=團隊成員
-teams.update_settings=更新團隊設定
-teams.add_team_member=新增團隊成員
-teams.delete_team_success=該團隊已被刪除。
-teams.repositories=團隊儲存庫
-
-[admin]
-dashboard=控制面版
-organizations=組織管理
-repositories=儲存庫管理
-config=應用設定管理
-config_settings=組織設定
-notices=系統提示管理
-monitor=應用監控面版
-first_page=首頁
-last_page=末頁
-total=總計：%d
-
-dashboard.operation_name=操作名稱
-dashboard.operation_switch=開關
-dashboard.operation_run=執行
-dashboard.clean_unbind_oauth=清理未綁定OAuth的連結
-dashboard.clean_unbind_oauth_success=所有未綁定 OAuth 的連結已刪除。
-dashboard.reinit_missing_repos=重新初始化所有遺失具已存在記錄的Git 儲存庫
-dashboard.sync_external_users=同步外部使用者資料
-dashboard.server_uptime=服務執行時間
-dashboard.current_goroutine=當前 Goroutines 數量
-dashboard.current_memory_usage=當前內存使用量
-dashboard.total_memory_allocated=所有被分配的內存
-dashboard.memory_obtained=內存佔用量
-dashboard.pointer_lookup_times=指針查找次數
-dashboard.current_heap_usage=當前 Heap 內存使用量
-dashboard.heap_memory_obtained=Heap 內存佔用量
-dashboard.heap_memory_idle=Heap 內存空閒量
-dashboard.heap_memory_in_use=正在使用的 Heap 內存
-dashboard.heap_memory_released=被釋放的 Heap 內存
-dashboard.heap_objects=Heap 對象數量
-dashboard.bootstrap_stack_usage=啟動 Stack 使用量
-dashboard.stack_memory_obtained=被分配的 Stack 內存
-dashboard.mspan_structures_usage=MSpan 結構內存使用量
-dashboard.mspan_structures_obtained=被分配的 MSpan 結構內存
-dashboard.mcache_structures_usage=MCache 結構內存使用量
-dashboard.mcache_structures_obtained=被分配的 MCache 結構內存
-dashboard.profiling_bucket_hash_table_obtained=被分配的剖析哈希表內存
-dashboard.gc_metadata_obtained=被分配的垃圾收集元資料內存
-dashboard.other_system_allocation_obtained=其它被分配的系統內存
-dashboard.next_gc_recycle=下次垃圾收集內存回收量
-dashboard.last_gc_time=距離上次垃圾收集時間
-dashboard.total_gc_time=垃圾收集執行時間總量
-dashboard.total_gc_pause=垃圾收集暫停時間總量
-dashboard.last_gc_pause=上次垃圾收集暫停時間
-dashboard.gc_times=垃圾收集執行次數
-
-users.full_name=組織全名
-users.activated=已啟用
-users.admin=管理員
-users.repos=儲存庫數
-users.created=建立時間
-users.edit=編輯
-users.auth_source=認證源
-users.local=本地
-users.list_status_filter.is_admin=管理員
-
-emails.activated=已啟用
-
-orgs.org_manage_panel=組織管理
-orgs.name=組織名稱
-orgs.teams=團隊數
-orgs.members=成員數
-
-repos.repo_manage_panel=儲存庫管理
-repos.owner=所有者
-repos.name=儲存庫名稱
-repos.private=私有庫
-repos.issues=問題數
-repos.size=大小
-
-packages.owner=管理員
-packages.name=組織名稱
-packages.type=認證類型
-packages.repository=儲存庫
-packages.size=大小
-
-
-
-auths.name=認證名稱
-auths.type=認證類型
-auths.enabled=已啟用
-auths.updated=最後更新時間
-auths.auth_type=認證類型
-auths.auth_name=認證名稱
-auths.security_protocol=安全協定
-auths.domain=域名
-auths.host=主機地址
-auths.port=主機端口
-auths.bind_dn=綁定DN
-auths.bind_password=綁定密碼
-auths.user_base=用戶搜尋基準
-auths.user_dn=用戶 DN
-auths.filter=使用者篩選器
-auths.admin_filter=管理者篩選器
-auths.smtp_auth=SMTP 驗證類型
-auths.smtphost=SMTP 主機地址
-auths.smtpport=SMTP 主機端口
-auths.allowed_domains=域名白名單
-auths.skip_tls_verify=忽略 TLS 驗證
-auths.pam_service_name=PAM 服務名稱
-auths.oauth2_provider=OAuth2 提供者
-auths.oauth2_clientID=用戶端 ID (金鑰)
-auths.oauth2_clientSecret=用戶端金鑰
-auths.openIdConnectAutoDiscoveryURL=OpenID 連接自動探索 URL
-auths.oauth2_authURL=授權 URL
-auths.oauth2_profileURL=個人訊息 URL
-auths.oauth2_emailURL=電子郵件 URL
-auths.enable_auto_register=允許授權用戶自動註冊
-auths.tips=幫助提示
-auths.tips.oauth2.general=OAuth2 認證
-auths.tip.oauth2_provider=OAuth2 提供者
-auths.tip.dropbox=建立新 App 在 https://www.dropbox.com/developers/apps
-auths.tip.facebook=`在 https://developers.facebook.com/apps 註冊一個新的應用，並且新增一個產品 "Facebook Login"`
-auths.tip.github=在 https://github.com/settings/applications/new 註冊一個新的 OAuth 應用程式
-auths.delete=刪除認證來源
-auths.delete_auth_title=刪除認證來源
-
-config.server_config=伺服器設定
-config.custom_conf=設定檔案路徑
-config.disable_router_log=關閉路由日誌
-config.run_mode=執行模式
-config.git_version=Git 版本
-config.repo_root_path=儲存庫目錄
-config.lfs_root_path=LFS 根目錄
-config.script_type=腳本類型
-config.reverse_auth_user=反向代理認證
-
-config.ssh_config=SSH 設定
-config.ssh_enabled=已啟用
-config.ssh_port=埠
-config.ssh_listen_port=監聽埠
-config.ssh_root_path=根路徑
-config.ssh_key_test_path=金鑰測試路徑
-config.ssh_keygen_path=金鑰產生 (' ssh-keygen ') 路徑
-config.ssh_minimum_key_size_check=金鑰最小大小檢查
-config.ssh_minimum_key_sizes=金鑰最小大小
-
-config.lfs_enabled=已啟用
-
-config.db_config=資料庫設定
-config.db_type=資料庫類型
-config.db_host=主機地址
-config.db_name=資料庫名稱
-config.db_path=資料庫路徑
-
-config.service_config=服務設定
-config.show_registration_button=顯示註冊按鈕
-config.active_code_lives=啟用用戶連結有效期
-
-config.webhook_config=Webhook 設定
-config.queue_length=隊列長度
-config.deliver_timeout=推送超時
-config.skip_tls_verify=略過 TLS 驗證
-
-config.mailer_enabled=啟用服務
-config.mailer_name=發送者名稱
-config.mailer_smtp_port=SMTP 主機端口
-config.mailer_user=發送者帳號
-
-config.oauth_config=社交帳號設定
-config.oauth_enabled=啟用服務
-
-config.cache_config=Cache 設定
-config.cache_adapter=Cache 適配器
-config.cache_interval=Cache 周期
-config.cache_conn=Cache 連接字符串
-
-config.session_config=Session 設定
-config.session_provider=Session 提供者
-config.provider_config=提供者設定
-config.cookie_name=Cookie 名稱
-config.gc_interval_time=垃圾收集周期
-config.session_life_time=Session 生命周期
-config.https_only=僅限 HTTPS
-config.cookie_life_time=Cookie 生命周期
-
-config.picture_service=圖片服務
-config.disable_gravatar=禁用 Gravatar 頭像
-config.enable_federated_avatar=開啟聯合頭像
-
-config.git_config=Git 設定
-config.git_disable_diff_highlight=禁用比較語法高亮
-config.git_max_diff_lines=Max Diff 線 （對於單個檔）
-config.git_max_diff_line_characters=最大比較的字元 （單行）
-config.git_max_diff_files=Max Diff 檔 （顯示）
-config.git_gc_args=GC 參數
-config.git_migrate_timeout=移動超時
-config.git_mirror_timeout=鏡像更新超時
-config.git_clone_timeout=複製操作超時
-config.git_pull_timeout=操作超時
-config.git_gc_timeout=GC 操作超時
-
-config.log_config=日誌設定
-
-
-
-monitor.cron=Cron 任務
-monitor.name=任務名稱
-monitor.schedule=任務安排
-monitor.next=下次執行時間
-monitor.previous=上次執行時間
-monitor.process=執行中進程
-monitor.desc=進程描述
-monitor.start=開始時間
-monitor.execute_time=已執行時間
-
-monitor.queue.name=組織名稱
-monitor.queue.type=認證類型
-monitor.queue.settings.submit=更新組織設定
-
-notices.system_notice_list=系統提示管理
-notices.view_detail_header=查看提示細節
-notices.select_all=選取全部
-notices.deselect_all=取消所有選取
-notices.inverse_selection=反向選取
-notices.delete_selected=刪除選取項
-notices.delete_all=刪除所有提示
-notices.type=提示類型
-notices.type_1=儲存庫
-notices.desc=描述
-notices.op=操作
-notices.delete_success=已刪除系統提示。
-
-
-[action]
-create_repo=建立了儲存庫 <a href="%s">%s</a>
-rename_repo=重新命名儲存庫 <code>%[1]s</code> 為 <a href="%[2]s">%[3]s</a>
-transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
-compare_commits=比較 %d 提交
-
-[tool]
-now=現在
-future=未來
-1s=1 秒
-1m=1 分鐘
-1h=1 小時
-1d=1 天
-1w=1 周
-1mon=1 月
-1y=1 年
-seconds=%d 秒
-minutes=%d 分
-hours=%d 小時
-days=%d 天
-weeks=%d 週
-months=%d 月
-years=%d 年
-raw_seconds=秒
-raw_minutes=分鐘
-
-[dropzone]
-file_too_big=檔案大小({{filesize}} MB) 超過了最大允許大小({{maxFilesize}} MB)
-remove_file=移除文件
-
-[notification]
-notifications=訊息
-unread=未讀
-read=已讀
-pin=固定通知
-mark_as_read=標記為已讀
-mark_as_unread=標記為未讀
-
-[gpg]
-error.extract_sign=無法提取簽署
-error.generate_hash=無法產生提交的雜湊值
-error.no_gpg_keys_found=沒有發現已知的金鑰在資料庫的簽署中
-error.not_signed_commit=未簽名的提交
-
-[units]
-
-[packages]
-filter.type=認證類型
-alpine.repository.branches=分支列表
-alpine.repository.repositories=儲存庫管理
-conan.details.repository=儲存庫
-owner.settings.cleanuprules.enabled=已啟用
-
-[secrets]
-
-[actions]
-
-
-
-runners.name=組織名稱
-runners.owner_type=認證類型
-runners.description=組織描述
-runners.task_list.run=執行
-runners.task_list.repository=儲存庫
-
-
-
-
-
-[projects]
-
-[git.filemode]
-; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", …
-
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
--- a/public/assets/img/apple-touch-icon.png
+++ b/public/assets/img/apple-touch-icon.png
--- a/public/assets/img/avatar_default.png
+++ b/public/assets/img/avatar_default.png
--- a/public/assets/img/favicon.png
+++ b/public/assets/img/favicon.png
--- a/public/assets/img/favicon.svg
+++ b/public/assets/img/favicon.svg
@@ -1 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 640 640" width="32" height="32"><path d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12" style="fill:#fff"/><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6M125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1m300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1" style="fill:#609926"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8s2 16.3 9.1 20c7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3s17.4 1.7 22.5-5.3c5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8z" style="fill:#609926"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X7 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="41.7913mm" height="41.6859mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 1079 1076"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil1 {fill:#003CA8}
+    .fil0 {fill:#FF8812}
+   ]]>
+  </style>
+ </defs>
+ <g id="图层_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path class="fil0" d="M825 432l0 0c12,-2 19,13 10,21l0 0c-58,48 -84,124 -68,198l0 0c3,12 -13,20 -21,10l0 0c-45,-54 -115,-81 -185,-70 -108,58 -231,135 -303,214 -86,92 -100,229 49,248 -427,118 -464,-256 244,-492 49,-48 70,-119 55,-187l0 0c-2,-12 13,-19 21,-10l0 0c48,58 124,84 198,68z"/>
+  <path class="fil1" d="M636 0c102,0 187,30 253,80 75,55 127,135 158,226l0 0c11,32 19,65 24,98 5,35 8,70 7,105 0,34 -3,69 -8,103 -6,34 -14,67 -24,99 -32,94 -85,178 -160,236 -67,53 -150,84 -250,84l-267 0c-55,0 -91,-10 -112,-28 -19,-17 -25,-39 -22,-64 4,-24 15,-51 33,-78 60,-92 225,-230 320,-253 -101,59 -189,170 -231,243l279 0c57,0 105,-19 144,-51 44,-36 76,-88 95,-146 8,-23 14,-47 18,-71 4,-25 6,-50 6,-75 0,-25 -2,-50 -6,-74 -3,-24 -9,-48 -17,-70l0 0c-18,-55 -49,-103 -93,-136 -38,-30 -88,-47 -147,-47l0 0 -141 0 -68 0c-26,0 -51,4 -73,13 -22,9 -43,23 -61,42 -18,18 -32,38 -42,61 -9,22 -13,46 -13,72l0 213c135,-43 226,-51 307,-33 -160,29 -354,110 -474,221l-14 13 0 -19 0 -428 0 0 0 0c0,-94 38,-178 98,-238 61,-61 145,-98 238,-98l0 0 1 0 0 0 242 0 0 0z"/>
+ </g>
+</svg>
--- a/public/assets/img/logo.png
+++ b/public/assets/img/logo.png
--- a/public/assets/img/logo.svg
+++ b/public/assets/img/logo.svg
@@ -1 +1,22 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 640 640" width="32" height="32"><path d="m395.9 484.2-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5 21.2-17.9 33.8-11.8 17.2 8.3 27.1 13 27.1 13l-.1-109.2 16.7-.1.1 117.1s57.4 24.2 83.1 40.1c3.7 2.3 10.2 6.8 12.9 14.4 2.1 6.1 2 13.1-1 19.3l-61 126.9c-6.2 12.7-21.4 18.1-33.9 12" style="fill:#fff"/><path d="M622.7 149.8c-4.1-4.1-9.6-4-9.6-4s-117.2 6.6-177.9 8c-13.3.3-26.5.6-39.6.7v117.2c-5.5-2.6-11.1-5.3-16.6-7.9 0-36.4-.1-109.2-.1-109.2-29 .4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5c-9.8-.6-22.5-2.1-39 1.5-8.7 1.8-33.5 7.4-53.8 26.9C-4.9 212.4 6.6 276.2 8 285.8c1.7 11.7 6.9 44.2 31.7 72.5 45.8 56.1 144.4 54.8 144.4 54.8s12.1 28.9 30.6 55.5c25 33.1 50.7 58.9 75.7 62 63 0 188.9-.1 188.9-.1s12 .1 28.3-10.3c14-8.5 26.5-23.4 26.5-23.4S547 483 565 451.5c5.5-9.7 10.1-19.1 14.1-28 0 0 55.2-117.1 55.2-231.1-1.1-34.5-9.6-40.6-11.6-42.6M125.6 353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6 321.8 60 295.4c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5 38.5-30c13.8-3.7 31-3.1 31-3.1s7.1 59.4 15.7 94.2c7.2 29.2 24.8 77.7 24.8 77.7s-26.1-3.1-43-9.1m300.3 107.6s-6.1 14.5-19.6 15.4c-5.8.4-10.3-1.2-10.3-1.2s-.3-.1-5.3-2.1l-112.9-55s-10.9-5.7-12.8-15.6c-2.2-8.1 2.7-18.1 2.7-18.1L322 273s4.8-9.7 12.2-13c.6-.3 2.3-1 4.5-1.5 8.1-2.1 18 2.8 18 2.8L467.4 315s12.6 5.7 15.3 16.2c1.9 7.4-.5 14-1.8 17.2-6.3 15.4-55 113.1-55 113.1" style="fill:#609926"/><path d="M326.8 380.1c-8.2.1-15.4 5.8-17.3 13.8s2 16.3 9.1 20c7.7 4 17.5 1.8 22.7-5.4 5.1-7.1 4.3-16.9-1.8-23.1l24-49.1c1.5.1 3.7.2 6.2-.5 4.1-.9 7.1-3.6 7.1-3.6 4.2 1.8 8.6 3.8 13.2 6.1 4.8 2.4 9.3 4.9 13.4 7.3.9.5 1.8 1.1 2.8 1.9 1.6 1.3 3.4 3.1 4.7 5.5 1.9 5.5-1.9 14.9-1.9 14.9-2.3 7.6-18.4 40.6-18.4 40.6-8.1-.2-15.3 5-17.7 12.5-2.6 8.1 1.1 17.3 8.9 21.3s17.4 1.7 22.5-5.3c5-6.8 4.6-16.3-1.1-22.6 1.9-3.7 3.7-7.4 5.6-11.3 5-10.4 13.5-30.4 13.5-30.4.9-1.7 5.7-10.3 2.7-21.3-2.5-11.4-12.6-16.7-12.6-16.7-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3 4.7-9.7 9.4-19.3 14.1-29-4.1-2-8.1-4-12.2-6.1-4.8 9.8-9.7 19.7-14.5 29.5-6.7-.1-12.9 3.5-16.1 9.4-3.4 6.3-2.7 14.1 1.9 19.8z" style="fill:#609926"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X7 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="167.952mm" height="41.6859mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 17419 4323"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <style type="text/css">
+   <![CDATA[
+    .fil1 {fill:#003CA8}
+    .fil0 {fill:#FF8812}
+    .fil2 {fill:#003CA8;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ <g id="图层_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path class="fil0" d="M3315 1737l0 0c48,-10 78,51 40,83l0 0c-232,194 -337,501 -273,796l0 0c11,49 -51,79 -83,41l0 0c-182,-219 -464,-325 -743,-283 -437,234 -929,545 -1221,860 -345,372 -399,922 201,999 -1718,474 -1865,-1028 977,-1978 197,-194 282,-477 223,-750l0 0c-10,-49 51,-79 83,-41l0 0c194,232 500,337 796,273z"/>
+  <path class="fil1" d="M2555 1c412,0 752,120 1020,320 299,222 509,544 632,909l0 0c43,127 75,259 96,395 22,138 32,278 31,419 0,140 -12,279 -34,416 -22,136 -55,270 -98,398 -127,379 -341,715 -640,949 -269,210 -606,337 -1007,337l-1073 0c-222,0 -365,-43 -447,-114 -78,-67 -103,-156 -89,-258 13,-96 60,-202 130,-311 241,-372 903,-925 1287,-1019 -407,237 -761,685 -930,977l1122 0c230,0 423,-77 579,-205 176,-143 304,-351 383,-585 31,-92 54,-189 70,-287 16,-99 25,-200 25,-301 1,-100 -7,-201 -22,-299 -15,-96 -38,-190 -68,-280l0 0c-74,-220 -199,-413 -374,-546 -156,-118 -353,-190 -593,-190l0 0 -567 1 -273 -1c-105,-1 -202,18 -292,55 -89,37 -171,92 -245,166 -75,74 -130,156 -167,245 -37,90 -56,187 -56,292l0 857c542,-176 910,-209 1236,-136 -642,116 -1423,443 -1906,889l-55 51 0 -75 0 -1719 0 -2 0 0c1,-375 151,-712 395,-956 243,-243 581,-393 956,-393l0 0 2 0 0 0 972 2 0 -1z"/>
+  <path class="fil2" d="M7222 2023c0,153 -12,287 -37,403 -14,66 -30,124 -48,175 -18,52 -45,108 -82,170 -102,175 -235,296 -398,361 -132,50 -313,75 -542,75l-1141 0 0 -2388 821 -7 282 0 212 14c324,0 567,119 729,358 136,205 204,485 204,839zm-1346 -679l-333 0 0 1356 320 3c266,0 454,-42 565,-126 128,-96 191,-278 191,-547 0,-264 -59,-447 -177,-549 -109,-92 -298,-137 -566,-137zm3132 1155l-1144 0c34,87 76,151 126,192 50,40 120,60 211,60l784 0 -249 456 -497 0 -147 0 -146 0c-241,0 -417,-93 -529,-280 -88,-151 -132,-360 -132,-629 0,-285 72,-507 218,-667 145,-159 360,-240 644,-240 308,0 533,79 674,236 132,149 198,381 198,695l0 64 0 79 -11 34zm-1154 -385l599 0c-9,-100 -33,-173 -71,-218 -21,-23 -49,-41 -84,-55 -35,-13 -78,-20 -128,-20 -190,0 -296,97 -316,293zm1772 -709l382 1097 371 -1097 603 0 -661 1802 -627 0 -674 -1802 606 0zm3644 -116l-1336 0c-202,0 -324,33 -324,223 0,187 257,216 429,210l276 -10c513,0 842,211 842,744 0,554 -293,751 -831,751l-1295 0 0 -470 1077 0c223,0 453,-2 453,-237 0,-186 -230,-220 -406,-213l-225 14c-286,0 -506,-31 -684,-184 -153,-132 -229,-330 -229,-594 0,-581 395,-704 934,-704l1678 0 -359 470zm1157 116l-233 463 -297 0 0 569c0,269 59,317 344,317l-251 464c-606,0 -662,-210 -662,-811l0 -539 -242 0 811 -1057 0 594 530 0zm1546 1063l0 739 -569 0 0 -354 -245 354 -201 0c-232,0 -403,-35 -515,-106 -138,-91 -207,-247 -207,-468 0,-214 56,-367 170,-457 102,-78 262,-117 480,-117l518 0 0 -37c0,-62 -14,-103 -42,-125 -29,-21 -77,-32 -145,-32l-821 0 231 -460 445 0c429,0 694,73 796,218 34,51 60,147 78,286 18,139 27,326 27,559zm-1158 150c0,39 18,71 54,99 41,22 108,34 201,34l55 0 279 0 0 -273 -395 0c-57,0 -103,10 -140,29 -36,20 -54,56 -54,111zm1868 -859l228 -354 508 0 -263 460 -204 0c-113,0 -190,31 -228,92 -27,48 -41,137 -41,267l0 983 -569 0 0 -1802 569 0 0 354z"/>
+ </g>
+</svg>
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -38,7 +38,10 @@ import (
 )

 const (
-	tplSignIn         base.TplName = "user/auth/signin"          // for sign in page
+	tplSignIn        base.TplName = "user/auth/signin"           // for sign in page
+	tplSignInSms     base.TplName = "user/auth/signin_sms"       // 短信登录
+	tplSignInWexinQr base.TplName = "user/auth/signin_wechat_qr" // 微信公众号二维码登录
+
 	tplSignUp         base.TplName = "user/auth/signup"          // for sign up page
 	TplActivate       base.TplName = "user/auth/activate"        // for activate user
 	TplActivatePrompt base.TplName = "user/auth/activate_prompt" // for showing a message for user activation
@@ -160,6 +163,7 @@ func CheckAutoLogin(ctx *context.Context) bool {
 	return false
 }

+// 密码登录页面渲染
 // SignIn render sign in page
 func SignIn(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_in")
@@ -185,6 +189,11 @@ func SignIn(ctx *context.Context) {
 	ctx.Data["PageIsLogin"] = true
 	ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx)

+	_, err = GenerateWechatQr(ctx)
+	if err != nil {
+		log.Warn("微信创建二维码失败，跳过")
+	}
+
 	if setting.Service.EnableCaptcha && setting.Service.RequireCaptchaForLogin {
 		context.SetCaptchaData(ctx)
 	}
@@ -304,6 +313,34 @@ func SignInPost(ctx *context.Context) {
 	ctx.Redirect(setting.AppSubURL + "/user/two_factor")
 }

+// 短信登录页面渲染
+func SignInSms(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("sign_in")
+	ctx.Data["SignInSmsLink"] = setting.AppSubURL + "/user/login/sms"
+	ctx.Data["PageIsSignIn"] = true
+	ctx.Data["PageIsSmsLogin"] = true
+	ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx)
+
+	_, err := GenerateWechatQr(ctx)
+	if err != nil {
+		log.Warn("微信创建二维码失败，跳过")
+	}
+
+	if setting.Service.EnableCaptcha && setting.Service.RequireCaptchaForLogin {
+		context.SetCaptchaData(ctx)
+	}
+
+	ctx.HTML(http.StatusOK, tplSignInSms)
+}
+
+// TODO: 短信登录 POST
+func SignInSmsPost(ctx *context.Context) {
+}
+
+// TODO: 扫描微信公众号二维码登录 POST
+func SignInWechatQrPost(ctx *context.Context) {
+}
+
 // This handles the final part of the sign-in process of the user.
 func handleSignIn(ctx *context.Context, u *user_model.User, remember bool) {
 	redirect := handleSignInFull(ctx, u, remember, true)
--- a/routers/web/auth/wechat_utils.go
+++ b/routers/web/auth/wechat_utils.go
@@ -0,0 +1,48 @@
+package auth
+
+import (
+	"strings"
+
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/services/context"
+	"github.com/google/uuid"
+)
+
+// Define a Wechat Error type message
+type WechatError struct {
+	message string
+}
+
+// Implement the Error() method for the `WechatError` type
+func (e *WechatError) Error() string {
+	return e.message
+}
+
+/**
+ * 生成微信临时二维码
+ *
+ * @param ctx 页面会话上下文环境
+ * @return string 生成的微信二维码的 ticket
+ * @return error 如果生成二维码过程中出现错误，则返回相应的错误信息
+ */
+func GenerateWechatQr(ctx *context.Context) (wechatQrTicket string, errorGenerateQr error) {
+
+	if setting.Wechat.OfficialAccount.PowerWechat == nil {
+		log.Warn("PowerWechat工具类配置错误, 不会生成公众号带参数二维码")
+		return "", &WechatError{message: "ERROR: PowerWechat 配置错误 (PowerWechat app instance has not yet been initialized!)"}
+	}
+
+	sceneStr := strings.ReplaceAll(uuid.New().String(), "-", "")
+	qrExpireSeconds := setting.Wechat.OfficialAccount.TempQrExpireSeconds
+	qrData, err := setting.Wechat.OfficialAccount.PowerWechat.QRCode.Temporary(ctx, sceneStr, qrExpireSeconds)
+	if err == nil {
+		wechatQrTicket = qrData.Ticket
+		ctx.Data["wechatQrTicket"] = wechatQrTicket
+		ctx.Data["wechatQrCodeUrl"] = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=" + wechatQrTicket
+		ctx.Data["wechatQrExpireSeconds"] = qrExpireSeconds
+	} else {
+		log.Warn(" [!] 无法生成微信公众号带参数临时二维码: %s", err.Error())
+	}
+	return wechatQrTicket, err
+}
--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -11,7 +11,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/setting"
@@ -23,11 +22,6 @@ import (
 	"code.gitea.io/gitea/services/context"
 )

-const (
-	// tplHome home page template
-	tplHome base.TplName = "home"
-)
-
 // Home render home page
 func Home(ctx *context.Context) {
 	if ctx.IsSigned {
@@ -47,21 +41,10 @@ func Home(ctx *context.Context) {
 			user.Dashboard(ctx)
 		}
 		return
-		// Check non-logged users landing page.
-	} else if setting.LandingPageURL != setting.LandingPageHome {
-		ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL))
-		return
 	}

-	// Check auto-login.
-	if ctx.GetSiteCookie(setting.CookieRememberName) != "" {
-		ctx.Redirect(setting.AppSubURL + "/user/login")
-		return
-	}
-
-	ctx.Data["PageIsHome"] = true
-	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
-	ctx.HTML(http.StatusOK, tplHome)
+	// 未登录用户，重定向到登陆页面
+	ctx.Redirect(setting.AppSubURL + "/user/login")
 }

 // HomeSitemap renders the main sitemap
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -18,6 +18,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/web"
+	web_auth_utils "code.gitea.io/gitea/routers/web/auth"
 	"code.gitea.io/gitea/services/auth"
 	"code.gitea.io/gitea/services/auth/source/db"
 	"code.gitea.io/gitea/services/auth/source/smtp"
@@ -40,6 +41,12 @@ func Account(ctx *context.Context) {

 	loadAccountData(ctx)

+	// 界面原型：更新微信，展示公众号带参数二维码
+	_, err := web_auth_utils.GenerateWechatQr(ctx)
+	if err != nil {
+		log.Warn("微信创建二维码失败，跳过")
+	}
+
 	ctx.HTML(http.StatusOK, tplSettingsAccount)
 }

--- a/repo.diff.view_file
+++ b/repo.diff.view_file
@@ -505,6 +505,8 @@ func registerRoutes(m *web.Router) {
 	// ***** START: User *****
 	// "user/login" doesn't need signOut, then logged-in users can still access this route for redirection purposes by "/user/login?redirec_to=..."
 	m.Get("/user/login", auth.SignIn)
+	m.Get("/user/login/sms", auth.SignInSms)
+
 	m.Group("/user", func() {
 		m.Post("/login", web.Bind(forms.SignInForm{}), auth.SignInPost)
 		m.Group("", func() {
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,8 +1,5 @@
 <footer class="page-footer" role="group" aria-label="{{ctx.Locale.Tr "aria.footer"}}">
 	<div class="left-links" role="contentinfo" aria-label="{{ctx.Locale.Tr "aria.footer.software"}}">
-		{{if ShowFooterPoweredBy}}
-			<a target="_blank" rel="noopener noreferrer" href="https://about.gitea.com">{{ctx.Locale.Tr "powered_by" "Gitea"}}</a>
-		{{end}}
 		{{if (or .ShowFooterVersion .PageIsAdmin)}}
 			{{ctx.Locale.Tr "version"}}:
 			{{if .IsAdmin}}
@@ -15,6 +12,7 @@
 			{{ctx.Locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
 			{{ctx.Locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
 		{{end}}
+		<p> &copy; 2024 <a target="_blank" rel="noopener noreferrer" href="https://www.mengning.com.cn">Mengning Software</a>. All rights reserved.</p>
 	</div>
 	<div class="right-links" role="group" aria-label="{{ctx.Locale.Tr "aria.footer.links"}}">
 		<div class="ui dropdown upward language">
@@ -26,7 +24,11 @@
 			</div>
 		</div>
 		<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
+		{{if ShowFooterPoweredBy}}
+		<a target="_blank" rel="noopener noreferrer" href="https://about.gitea.com">{{ctx.Locale.Tr "mofified_from" "Gitea"}}</a>
+		{{end}}
 		{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
 		{{template "custom/extra_links_footer" .}}
+		<a href="https://beian.miit.gov.cn/" target="_blank" rel="noopener noreferrer">苏ICP备2024068144号-2</a>
 	</div>
 </footer>
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -7,7 +7,7 @@
 	<div class="navbar-left">
 		<!-- the logo -->
 		<a class="item" id="navbar-logo" href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home"}}{{end}}">
-			<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
+			<img width="auto" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
 		</a>

 		<!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
--- a/templates/user/auth/captcha.tmpl
+++ b/templates/user/auth/captcha.tmpl
@@ -1,3 +1,4 @@
+{{/* TODO: 解决 k8s 中 deployment 多个 replicas 时验证码无法在页面初次加载，只能手动刷新。 */}}
 {{if .EnableCaptcha}}{{if eq .CaptchaType "image"}}
 	<div class="inline field">
 		{{.Captcha.CreateHTML}}
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -6,5 +6,12 @@
 			{{template "user/auth/signin_inner" .}}
 		</div>
 	</div>
+	{{if .wechatQrTicket}}
+	<div class="ui middle very relaxed page grid">
+		<div class="ui container column fluid">
+			{{template "user/auth/signin_wechat_qr_inner" .}}
+		</div>
+	</div>
+	{{end}}
 </div>
 {{template "base/footer" .}}
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -5,7 +5,7 @@
 	{{if .LinkAccountMode}}
 		{{ctx.Locale.Tr "auth.oauth_signin_title"}}
 	{{else}}
-		{{ctx.Locale.Tr "auth.login_userpass"}}
+		{{ctx.Locale.Tr "sign_in_with_provider" (ctx.Locale.Tr "password")}} 
 	{{end}}
 </h4>
 <div class="ui attached segment">
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -1,24 +1,33 @@
-{{if or .EnableOpenIDSignIn .EnableSSPI}}
 <overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar secondary-nav">
 	<div class="overflow-menu-items tw-justify-center">
-		<a class="{{if .PageIsLogin}}active {{end}}item" rel="nofollow" href="{{AppSubUrl}}/user/login">
-			{{ctx.Locale.Tr "auth.login_userpass"}}
+		{{/* 1. 手机号+密码登录 */}}
+		<a class="{{if .PageIsLogin}} active {{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login">
+			{{ctx.Locale.Tr "password"}}
 		</a>
-		<a class="{{if .PageIsSignUp}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/sign_up">
-			{{ctx.Locale.Tr "auth.create_new_account"}}
-		</a>
-		{{if .EnableOpenIDSignIn}}
-		<a class="{{if .PageIsLoginOpenID}}active {{end}}item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid">
-			{{svg "fontawesome-openid"}}
-			&nbsp;OpenID
-		</a>
-		{{end}}
-		{{if .EnableSSPI}}
-		<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
-			{{svg "fontawesome-windows"}}
-			&nbsp;SSPI
+		{{/* 2. 短信登录 */}}
+		<a class="{{if .PageIsSmsLogin}} active {{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/sms">
+			{{ctx.Locale.Tr "settings.phone_sms_code"}} 
 		</a>
+
+		{{if or .EnableOpenIDSignIn .EnableSSPI}}
+			<a class="{{if .PageIsLogin}}active {{end}}item" rel="nofollow" href="{{AppSubUrl}}/user/login">
+				{{ctx.Locale.Tr "auth.login_userpass"}}
+			</a>
+			<a class="{{if .PageIsSignUp}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/sign_up">
+				{{ctx.Locale.Tr "auth.create_new_account"}}
+			</a>
+			{{if .EnableOpenIDSignIn}}
+			<a class="{{if .PageIsLoginOpenID}}active {{end}}item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid">
+				{{svg "fontawesome-openid"}}
+				&nbsp;OpenID
+			</a>
+			{{end}}
+			{{if .EnableSSPI}}
+			<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
+				{{svg "fontawesome-windows"}}
+				&nbsp;SSPI
+			</a>
+			{{end}}
 		{{end}}
 	</div>
 </overflow-menu>
-{{end}}
--- a/templates/user/auth/signin_sms.tmpl
+++ b/templates/user/auth/signin_sms.tmpl
@@ -0,0 +1,19 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
+	{{template "user/auth/signin_navbar" .}}
+
+	{{/* 短信登录页面表单项容器 */}}
+	<div class="ui middle very relaxed page grid">
+		<div class="ui container column fluid">
+			{{template "user/auth/signin_sms_inner" .}}
+		</div>
+	</div>
+	{{if .wechatQrTicket}}
+	<div class="ui middle very relaxed page grid">
+		<div class="ui container column fluid">
+			{{template "user/auth/signin_wechat_qr_inner" .}}
+		</div>
+	</div>
+	{{end}}
+</div>
+{{template "base/footer" .}}
--- a/templates/user/auth/signin_sms_inner.tmpl
+++ b/templates/user/auth/signin_sms_inner.tmpl
@@ -0,0 +1,37 @@
+<h4 class="ui top attached header center">
+    {{ctx.Locale.Tr "register_or_sign_in_with_provider" (ctx.Locale.Tr "settings.phone_sms_code")}} 
+</h4>
+
+<div class="ui attached segment">
+	<form class="ui form tw-max-w-2xl tw-m-auto" action="{{.SignInSmsLink}}" method="post">
+	{{.CsrfTokenHtml}}
+	<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
+		<label for="user_name">{{ctx.Locale.Tr "settings.phone_number"}}</label>
+		<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+	</div>
+
+	{{template "user/auth/captcha" .}}
+
+	<div class="required field">
+		<label for="smsCode">{{ctx.Locale.Tr "settings.phone_sms_code"}}</label>
+		<input id="smsCode" name="smsCode" type="text" value="{{.smsCode}}" required>
+	</div>
+	
+
+    <div class="inline field">
+        <button class="ui primary button" id="sendSms" name="sendSms">{{ctx.Locale.Tr "settings.phone_sms_send"}}</button>
+        <button class="ui primary button" id="loginViaSms">{{ctx.Locale.Tr "sign_in"}}</button>
+    </div>
+
+
+	{{if not .LinkAccountMode}}
+	<div class="inline field">
+		<div class="ui checkbox">
+			<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
+			<input name="remember" type="checkbox">
+		</div>
+	</div>
+	{{end}}
+
+	</form>
+</div>
--- a/templates/user/auth/signin_wechat_qr.tmpl
+++ b/templates/user/auth/signin_wechat_qr.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
+	{{template "user/auth/signin_navbar" .}}
+
+	{{/* 登录页面表单项容器 */}}
+	<div class="ui middle very relaxed page grid">
+		<div class="ui container column fluid">
+			{{template "user/auth/signin_wechat_qr_inner" .}}
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
--- a/templates/user/auth/signin_wechat_qr_inner.tmpl
+++ b/templates/user/auth/signin_wechat_qr_inner.tmpl
@@ -0,0 +1,53 @@
+
+{{if .PageIsSignIn}}
+<h4 class="ui top attached header center">
+    {{ctx.Locale.Tr "settings.wechat_official_account_qr_prompt"}}
+</h4>
+{{end}}
+
+<div class="ui attached segment">
+	<form class="ui form tw-max-w-2xl tw-m-auto" method="post">
+        <div class="wechat-qr-container">
+            <img id="idWechatQr" class="wechat-qr-container" src="{{.wechatQrCodeUrl}}" alt="Wechat Official Accout QR Code Ticket {{.wechatQrTicket}}" />
+        </div>
+	</form>
+</div>
+
+
+<style>
+.wechat-qr-container {
+    text-align: center; /* 将文本内容居中 */
+}
+
+.wechat-qr-container img {
+    display: inline-block; /* 设置为行内块级元素 */
+    vertical-align: middle; /* 垂直居中对齐 */
+    width: 132px;
+    height: 132px;
+}
+
+img.expire-mask {
+    filter: blur(4px); /* 调整像素值以达到合适的模糊效果 */
+}
+
+</style>
+
+
+<script>
+document.addEventListener('DOMContentLoaded', () => {
+    setTimeout(
+        () => {
+            // 对过期微信二维码进行高斯模糊处理
+            const qrImageElement = document.getElementById('idWechatQr')
+            qrImageElement.classList.add('expire-mask');
+            
+            /* 创建新的pre标签并插入DOM树中二维码图片下方，提示用户微信二维码已经过期 */
+            const qrExpirationMessage = document.createElement('pre');
+            qrImageElement.insertAdjacentElement('afterend', qrExpirationMessage);
+
+            qrExpirationMessage.textContent = {{ctx.Locale.Tr "settings.wechat_official_account_qr_expired"}};
+        },
+        {{.wechatQrExpireSeconds}} * 1000 // 过期时间毫秒值
+    );
+});
+</script>
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,42 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
 	<div class="user-setting-content">
+		{{/* 界面原型：用户设置 -> 账号 -> 更改手机号 */}}
+		<h4 class="ui top attached header">
+			{{ctx.Locale.Tr "settings.change_phone"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/account/phone" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<div class="required field {{if .Err_Phone}}error{{end}}">
+					<label for="phone">{{ctx.Locale.Tr "settings.phone_new_number"}}</label>
+					<input id="phone" name="phone" type="text" required />
+				</div>
+				<div class="required field {{if .Err_SMS_Code}}error{{end}}">
+					<label for="smsCode">{{ctx.Locale.Tr "settings.phone_sms_code"}}</label>
+					<input id="smsCode" name="smsCode" type="text" required />
+				</div>
+
+				<div class="field">
+					<button class="ui primary button">{{ctx.Locale.Tr "settings.phone_sms_send"}}</button>
+					<button class="ui primary button">{{ctx.Locale.Tr "settings.change_phone"}}</button>
+				</div>
+			</form>
+		</div>
+
+		{{/* 界面原型：用户设置 -> 账号 -> 更改微信 */}}
+		{{if .wechatQrTicket}}
+		<h4 class="ui top attached header">
+			{{ctx.Locale.Tr "settings.change_wechat"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui container column fluid">
+				<label for="wechat_qr">{{ctx.Locale.Tr "settings.wechat_official_account_qr_prompt"}}</label> <br />
+				{{template "user/auth/signin_wechat_qr_inner" .}}
+			</div>
+		</div>
+		{{end}}
+
 		<h4 class="ui top attached header">
 			{{ctx.Locale.Tr "settings.password"}}
 		</h4>