Merge branch 'master' into release/V1.0.0/test

src/components/VersionsBut/src/VersionBut.vue

@@ -2,7 +2,7 @@
  * @Author: 半生瓜 1515706227@qq.com
  * @Date: 2024-05-08 15:04:53
  * @LastEditors: 半生瓜 1515706227@qq.com
- * @LastEditTime: 2024-05-22 10:21:23
+ * @LastEditTime: 2024-06-05 16:38:48
  * @FilePath: \vue-element-plus-admin-mini\src\components\VersionsBut\src\Screenfull.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -16,6 +16,7 @@ const dialogVisible = ref(false)
 
 const v1 = ref('')
 const v2 = ref('')
+const v3 = ref('')
 
 const btnClick = async () => {
   console.log('点击版本====')
@@ -26,6 +27,7 @@ const btnClick = async () => {
       if (item.configKey == 'jarVersion') {
         v1.value = JSON.parse(item.configValue).app
         v2.value = JSON.parse(item.configValue).manger
+        v3.value = JSON.parse(item.configValue).java
       }
     })
   }
@@ -37,6 +39,7 @@ const btnClick = async () => {
   <ElButton type="primary" @click="btnClick">版本</ElButton>
   <Dialog v-model="dialogVisible" maxHeight="80px" width="35rem" title="版本信息">
     <div> 客户端版本：{{ v1 }}</div>
-    <div style="margin-top: 10px"> Web后台管理系统：{{ v2 }}</div>
+    <div style="margin-top: 10px"> Web后台管理系统版本：{{ v2 }}</div>
+    <div style="margin-top: 10px"> 后端服务版本：{{ v3 }}</div>
   </Dialog>
 </template>

src/views/Login/components/LoginForm.vue

@@ -2,7 +2,7 @@
  * @Author: 半生瓜 1515706227@qq.com
  * @Date: 2024-04-21 17:20:21
  * @LastEditors: 半生瓜 1515706227@qq.com
- * @LastEditTime: 2024-05-28 14:10:29
+ * @LastEditTime: 2024-06-05 16:55:24
  * @FilePath: \vue-element-plus-admin-mini\src\views\Login\components\LoginForm.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -218,7 +218,7 @@ const signIn = async () => {
               if (item.configKey == 'jarVersion') {
                 a1 = item
                 a1.configValue = JSON.parse(a1.configValue)
-                a1.configValue.manger = 'v1.0.0'
+                a1.configValue.manger = 'V1.0.0.20240606'
                 a1.configValue = JSON.stringify(a1.configValue)
 
                 saveSystem([a1]).then(() => {})