From e5e68ed8a8d1cba1786a1a44b7c2b765f4beebb7 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:26:03 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/api/user.ts            | 10 +++++++++-
 ui/src/stores/modules/user.ts | 12 +++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/src/api/user.ts b/ui/src/api/user.ts
index 3dbe9211..a49646d6 100644
--- a/ui/src/api/user.ts
+++ b/ui/src/api/user.ts
@@ -124,6 +124,13 @@ const getUserList: (email_or_username: string, loading?: Ref<boolean>) => Promis
   return get('/user/list', { email_or_username }, loading)
 }
 
+/**
+ * 获取version
+ */
+const getVersion: (loading?: Ref<boolean>) => Promise<Result<any>> = (loading) => {
+  return get('/api/profile', undefined, loading)
+}
+
 export default {
   login,
   register,
@@ -134,5 +141,6 @@ export default {
   sendEmailToCurrent,
   resetCurrentUserPassword,
   logout,
-  getUserList
+  getUserList,
+  getVersion
 }
diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts
index ecdc0776..471542cc 100644
--- a/ui/src/stores/modules/user.ts
+++ b/ui/src/stores/modules/user.ts
@@ -6,6 +6,7 @@ export interface userStateTypes {
   userType: number // 1 系统操作者 2 对话用户
   userInfo: User | null
   token: any
+  version?: string
 }
 
 const useUserStore = defineStore({
@@ -13,7 +14,8 @@ const useUserStore = defineStore({
   state: (): userStateTypes => ({
     userType: 1,
     userInfo: null,
-    token: ''
+    token: '',
+    version: ''
   }),
   actions: {
     getToken(): String | null {
@@ -42,9 +44,17 @@ const useUserStore = defineStore({
     changeUserType(num: number) {
       this.userType = num
     },
+
+    async asyncGetVersion() {
+      return UserApi.getVersion().then((ok) => {
+        this.version = ok.data
+      })
+    },
+
     async profile() {
       return UserApi.profile().then((ok) => {
         this.userInfo = ok.data
+        this.asyncGetVersion()
       })
     },
 

From 389e620913c49db1b76d502602b2ac2edff32d0c Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:33:13 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E5=85=B3=E4=BA=8E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/api/user.ts                                      | 2 +-
 ui/src/layout/components/top-bar/avatar/AboutDialog.vue | 7 +++++--
 ui/src/stores/modules/user.ts                           | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/src/api/user.ts b/ui/src/api/user.ts
index a49646d6..e11d7016 100644
--- a/ui/src/api/user.ts
+++ b/ui/src/api/user.ts
@@ -128,7 +128,7 @@ const getUserList: (email_or_username: string, loading?: Ref<boolean>) => Promis
  * 获取version
  */
 const getVersion: (loading?: Ref<boolean>) => Promise<Result<any>> = (loading) => {
-  return get('/api/profile', undefined, loading)
+  return get('/profile', undefined, loading)
 }
 
 export default {
diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index 6f15aba8..97f742fe 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -31,7 +31,7 @@
           <span>论坛求助</span>
         </div>
       </el-card>
-      <div class="text-center">当前版本号：{{ PackageJSON.version }}</div>
+      <div class="text-center">当前版本号：{{ version }}</div>
     </div>
     <!-- <ul class="about-ui">
       <li class="flex mb-16">
@@ -52,9 +52,12 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue'
-import PackageJSON from '../../../../../package.json'
+import useStore from '@/stores'
 const defaultTitle = import.meta.env.VITE_APP_TITLE
 
+const { user } = useStore()
+const version = user.version
+
 const aboutDialogVisible = ref(false)
 
 const open = () => {
diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts
index 471542cc..5d8c0f5c 100644
--- a/ui/src/stores/modules/user.ts
+++ b/ui/src/stores/modules/user.ts
@@ -47,7 +47,7 @@ const useUserStore = defineStore({
 
     async asyncGetVersion() {
       return UserApi.getVersion().then((ok) => {
-        this.version = ok.data
+        this.version = ok.data?.version || '0.9.0'
       })
     },
 

From 598576fedc84c067178f6a369b8e69a7a589edca Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:35:06 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=E5=85=B3=E4=BA=8E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/stores/modules/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts
index 5d8c0f5c..f4c0a146 100644
--- a/ui/src/stores/modules/user.ts
+++ b/ui/src/stores/modules/user.ts
@@ -47,7 +47,7 @@ const useUserStore = defineStore({
 
     async asyncGetVersion() {
       return UserApi.getVersion().then((ok) => {
-        this.version = ok.data?.version || '0.9.0'
+        this.version = ok.data?.version || '-'
       })
     },
 

From 0252134d66149e5492c4344c18d0d06447be0f73 Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:39:47 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-and-push.yml | 4 ++--
 installer/Dockerfile                 | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 7a6f51de..69fd2027 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -60,7 +60,7 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -115,7 +115,7 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
             ${DOCKER_IMAGE_TAGS} .
           env
       - name: Set up QEMU
diff --git a/installer/Dockerfile b/installer/Dockerfile
index d2066601..8513c81f 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -8,6 +8,8 @@ RUN cd ui && \
     rm -rf ./node_modules
 
 FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3
+ARG MAXKB_VERSION=dev
+ENV MAXKB_VERSION=${MAXKB_VERSION}
 # 创建工作目录
 RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf
 # 拷贝项目

From 232ebb01a58fe5151ef4e413312932494f896b49 Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Thu, 21 Mar 2024 16:47:55 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-and-push.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 69fd2027..fffa4bfd 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -60,7 +60,7 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION='"${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"' --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -115,7 +115,7 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION='"${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"' --no-cache \
             ${DOCKER_IMAGE_TAGS} .
           env
       - name: Set up QEMU

From 2b239cfb1f30d02e6c4770900ef76f36d5d694b8 Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Thu, 21 Mar 2024 17:01:33 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-and-push.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index fffa4bfd..ab0073df 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -60,7 +60,8 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION='"${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"' --no-cache \
+          MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${MAXKB_VERSION}" --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -115,9 +116,9 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION='"${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"' --no-cache \
+          MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${MAXKB_VERSION}" --no-cache \
             ${DOCKER_IMAGE_TAGS} .
-          env
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx

From 529bc38dc1b4e39224ab74c5a40ab71ee25aba4f Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Thu, 21 Mar 2024 17:16:45 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-and-push.yml | 8 ++++----
 installer/Dockerfile                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index ab0073df..b2a397e1 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -60,8 +60,8 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${MAXKB_VERSION}" --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -116,8 +116,8 @@ jobs:
           else
             DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           fi
-          MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'), commit: ${GITHUB_SHA::8})"
-          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${MAXKB_VERSION}" --no-cache \
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/installer/Dockerfile b/installer/Dockerfile
index 8513c81f..f55b9453 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -8,8 +8,8 @@ RUN cd ui && \
     rm -rf ./node_modules
 
 FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3
-ARG MAXKB_VERSION=dev
-ENV MAXKB_VERSION=${MAXKB_VERSION}
+
+ENV MAXKB_VERSION=${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_COMMIT})
 # 创建工作目录
 RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf
 # 拷贝项目

From 40608781c3282fb8e91142b719cca22587daf5f4 Mon Sep 17 00:00:00 2001
From: liqiang-fit2cloud <liqiang@fit2cloud.com>
Date: Thu, 21 Mar 2024 17:28:15 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/installer/Dockerfile b/installer/Dockerfile
index f55b9453..86a23b84 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -8,8 +8,10 @@ RUN cd ui && \
     rm -rf ./node_modules
 
 FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3
-
-ENV MAXKB_VERSION=${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_COMMIT})
+ARG DOCKER_IMAGE_TAG=dev
+ARG BUILD_AT
+ARG GITHUB_COMMIT
+ENV MAXKB_VERSION ${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_COMMIT})
 # 创建工作目录
 RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf
 # 拷贝项目

From c4a25a0f52d79af777dbf731761c395541f9edc2 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 18:01:04 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/top-bar/avatar/AboutDialog.vue | 24 +++++--------------
 .../user-manage/component/UserDialog.vue      | 16 +++++++++----
 .../user-manage/component/UserPwdDialog.vue   |  2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index 97f742fe..5ab485ef 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -31,23 +31,10 @@
           <span>论坛求助</span>
         </div>
       </el-card>
-      <div class="text-center">当前版本号：{{ version }}</div>
     </div>
-    <!-- <ul class="about-ui">
-      <li class="flex mb-16">
-        <span class="label text-right">授权数量：</span><span class="text-center">-</span>
-      </li>
-      <li class="flex mb-16">
-        <span class="label text-right">过期时间：</span><span class="text-center">-</span>
-      </li>
-      <li class="flex mb-16">
-        <span class="label text-right">版本：</span><span class="text-center">-</span>
-      </li>
-      <li class="flex">
-        <span class="label text-right">版本号：</span
-        ><span class="text-center">{{ PackageJSON.version }}</span>
-      </li>
-    </ul> -->
+    <div class="text-center">
+      当前版本号：v1.0.0-dev (build at 2024-03-21T17:32, commit: 40608781)
+    </div>
   </el-dialog>
 </template>
 <script setup lang="ts">
@@ -72,9 +59,10 @@ defineExpose({ open })
 </script>
 <style lang="scss" scope>
 .about-dialog {
-  padding: 0;
+  padding: 0 0 24px 0;
   border-radius: 4px;
   width: 600px;
+  font-weight: 400;
   .el-dialog__header {
     background: var(--app-header-bg-color);
     margin-right: 0;
@@ -95,11 +83,11 @@ defineExpose({ open })
     height: 59px;
   }
   .about-ui {
-    padding: 24px;
     width: 360px;
     margin: 0 auto;
     font-weight: 400;
     font-size: 16px;
+    margin-top: 24px;
     .label {
       width: 180px;
       text-align: left;
diff --git a/ui/src/views/user-manage/component/UserDialog.vue b/ui/src/views/user-manage/component/UserDialog.vue
index 41357a76..48cb70f5 100644
--- a/ui/src/views/user-manage/component/UserDialog.vue
+++ b/ui/src/views/user-manage/component/UserDialog.vue
@@ -12,7 +12,7 @@
         <el-input
           v-model="userForm.username"
           placeholder="请输入用户名"
-          maxlength="64"
+          maxlength="20"
           show-word-limit
         >
         </el-input>
@@ -73,8 +73,16 @@ const userForm = ref<any>({
 })
 
 const rules = reactive({
-  username: [{ required: true, message: '请输入用户名' }],
-  email: [{ required: true, message: '请输入邮箱' }],
+  username: [
+    { required: true, message: '请输入用户名', trigger: 'blur' },
+    {
+      min: 6,
+      max: 20,
+      message: '长度在 6 到 20 个字符',
+      trigger: 'blur'
+    }
+  ],
+  email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }],
   password: [
     {
       required: true,
@@ -102,8 +110,8 @@ watch(dialogVisible, (bool) => {
       phone: '',
       nick_name: ''
     }
-    userFormRef.value?.clearValidate()
     isEdit.value = false
+    userFormRef.value?.clearValidate()
   }
 })
 
diff --git a/ui/src/views/user-manage/component/UserPwdDialog.vue b/ui/src/views/user-manage/component/UserPwdDialog.vue
index 7249e3e4..298a7153 100644
--- a/ui/src/views/user-manage/component/UserPwdDialog.vue
+++ b/ui/src/views/user-manage/component/UserPwdDialog.vue
@@ -99,13 +99,13 @@ watch(dialogVisible, (bool) => {
       password: '',
       re_password: ''
     }
-    userFormRef.value?.clearValidate()
   }
 })
 
 const open = (data: any) => {
   userId.value = data.id
   dialogVisible.value = true
+  userFormRef.value?.clearValidate()
 }
 
 const submit = async (formEl: FormInstance | undefined) => {

From ff7734f5502fd66e1521fe6e0c8d3a5924e704f5 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 18:07:10 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/layout/components/top-bar/avatar/AboutDialog.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index 5ab485ef..f4564e93 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -32,9 +32,7 @@
         </div>
       </el-card>
     </div>
-    <div class="text-center">
-      当前版本号：v1.0.0-dev (build at 2024-03-21T17:32, commit: 40608781)
-    </div>
+    <div class="text-center">当前版本号：{{ version }}</div>
   </el-dialog>
 </template>
 <script setup lang="ts">

From 12eb777d55f13dfb8c1a8ae5b3d28767388107fc Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 21 Mar 2024 18:12:48 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E5=85=B3=E4=BA=8E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/layout/components/top-bar/avatar/AboutDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
index f4564e93..f72ecab6 100644
--- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
+++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue
@@ -32,7 +32,7 @@
         </div>
       </el-card>
     </div>
-    <div class="text-center">当前版本号：{{ version }}</div>
+    <div class="text-center">版本号：{{ version }}</div>
   </el-dialog>
 </template>
 <script setup lang="ts">