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

.env.base

@@ -10,7 +10,7 @@
 VITE_NODE_ENV=development
 
 # 接口前缀
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
+VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
 
 # 打包路径
 VITE_BASE_PATH=/

.env.dev

@@ -10,7 +10,7 @@
 VITE_NODE_ENV=production
 
 # 接口前缀
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
+VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
 
 # 打包路径
 VITE_BASE_PATH=./

.env.gitee

@@ -2,7 +2,7 @@
 VITE_NODE_ENV=production
 
 # 接口前缀
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
+VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
 
 # 打包路径
 VITE_BASE_PATH=/vue-element-plus-admin/

.env.pro

@@ -10,7 +10,7 @@
 VITE_NODE_ENV=production
 
 # 接口前缀
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
+VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
 # 打包路径
 VITE_BASE_PATH=./
 

.env.test

@@ -10,7 +10,7 @@
 VITE_NODE_ENV=production
 
 # 接口前缀
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
+VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
 
 # 打包路径
 VITE_BASE_PATH=./

index.html

@@ -14,7 +14,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title><%= title %></title>
     <script>
-     window.VITE_API_BASE_PATH='https://test.you07.com/link-server'
+     window.VITE_API_BASE_PATH='http://192.168.4.194:9099/link-server'
     </script>
 
   </head>

src/App.vue

@@ -5,7 +5,7 @@ import { ConfigGlobal } from '@/components/ConfigGlobal'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useUserStore } from '@/store/modules/user'
 import router from './router'
-import { loginApi, getRsaKey, getTestRoleApi, getAdminRoleApi, getRefreshToken } from '@/api/login'
+import { getRefreshToken } from '@/api/login'
 
 const { getPrefixCls } = useDesign()
 

src/hooks/web/useValidator.ts

@@ -35,6 +35,16 @@ export const useValidator = () => {
     }
   }
 
+  // 验证手机号码
+  const validateMobile = (val: string, callback: Callback, message: string) => {
+    const mobilePattern = /^1[3-9]\d{9}$/
+    if (!mobilePattern.test(val)) {
+      callback(new Error(message))
+    } else {
+      callback()
+    }
+  }
+
   const notSpace = (val: any, callback: Callback, message: string) => {
     // 用户名不能有空格
     if (val.indexOf(' ') !== -1) {
@@ -86,6 +96,7 @@ export const useValidator = () => {
     notSpace,
     notSpecialCharacters,
     onlyEnglish,
-    noSpaceOrSpecialChars
+    noSpaceOrSpecialChars,
+    validateMobile
   }
 }

src/views/Authority/User.vue

@@ -30,10 +30,9 @@ import { Form, FormSchema, RadioOption } from '@/components/Form'
 import { useForm } from '@/hooks/web/useForm'
 import { useValidator } from '@/hooks/web/useValidator'
 import { BaseButton } from '@/components/Button'
-import { Search, Edit, Delete } from '@element-plus/icons-vue'
 import { getRsaKey } from '@/api/login'
 import { cloneDeep } from 'lodash-es'
-const { required, noSpaceOrSpecialChars } = useValidator()
+const { required, noSpaceOrSpecialChars, validateMobile } = useValidator()
 
 defineOptions({
   name: 'TemplateManage'
@@ -47,6 +46,11 @@ const rules = reactive<{
       validator: (rule, value, callback) =>
         noSpaceOrSpecialChars(value, callback, '不包含中文、空格、特殊字符')
     }
+  ],
+  userCode: [
+    {
+      validator: (rule, value, callback) => validateMobile(value, callback, '请输入正确手机号')
+    }
   ]
 })
 
@@ -126,23 +130,23 @@ let schema = reactive<FormSchema[]>([
     },
     formItemProps: {}
   },
-  {
-    field: 'authorizationCode',
-    label: '授权码',
-    component: 'Input',
-    colProps: {
-      span: 24
-    },
-    componentProps: {
-      style: {
-        width: '100%'
-      },
-      placeholder: '请输入授权码'
-    },
-    formItemProps: {
-      rules: [required()]
-    }
-  },
+  // {
+  //   field: 'authorizationCode',
+  //   label: '授权码',
+  //   component: 'Input',
+  //   colProps: {
+  //     span: 24
+  //   },
+  //   componentProps: {
+  //     style: {
+  //       width: '100%'
+  //     },
+  //     placeholder: '请输入授权码'
+  //   },
+  //   formItemProps: {
+  //     rules: [required()]
+  //   }
+  // },
   {
     field: 'hasManage',
     label: '是否进入后台',
@@ -209,7 +213,7 @@ const signIn = async () => {
       }
 
       nweformData.userCode = encryptedData(res2.data, formData.userCode)
-      nweformData.authorizationCode = encryptedData(res2.data, formData.authorizationCode)
+      // nweformData.authorizationCode = encryptedData(res2.data, formData.authorizationCode)
       let res = await saveUser(nweformData)
       if (res) {
         dialogVisible.value = false
@@ -317,7 +321,7 @@ const editUser = async (data) => {
         style: {
           width: '100%'
         },
-        placeholder: '请输入8位数字',
+        placeholder: '请输入电话号码',
         disabled: isedit.value === '添加用户' ? false : true
       },
       formItemProps: {
@@ -356,23 +360,23 @@ const editUser = async (data) => {
       },
       formItemProps: {}
     },
-    {
-      field: 'authorizationCode',
-      label: '授权码',
-      component: 'Input',
-      colProps: {
-        span: 24
-      },
-      componentProps: {
-        style: {
-          width: '100%'
-        },
-        placeholder: '请输入授权码'
-      },
-      formItemProps: {
-        rules: [required()]
-      }
-    },
+    // {
+    //   field: 'authorizationCode',
+    //   label: '授权码',
+    //   component: 'Input',
+    //   colProps: {
+    //     span: 24
+    //   },
+    //   componentProps: {
+    //     style: {
+    //       width: '100%'
+    //     },
+    //     placeholder: '请输入授权码'
+    //   },
+    //   formItemProps: {
+    //     rules: [required()]
+    //   }
+    // },
     {
       field: 'hasManage',
       label: '是否进入后台',
@@ -427,7 +431,7 @@ const editUser = async (data) => {
 
   let res = await getUserDetail(arr)
   res.data.userCode = decrypt(res.data.userCode, key2)
-  res.data.authorizationCode = decrypt(res.data.authorizationCode, key2)
+  // res.data.authorizationCode = decrypt(res.data.authorizationCode, key2)
   if (res) {
     dialogVisible.value = true
     const formRef = await getElFormExpose()
@@ -437,7 +441,7 @@ const editUser = async (data) => {
     formData.userCode = res.data.userCode
     formData.displayName = res.data.displayName
     formData.hasManage = res.data.hasManage
-    formData.authorizationCode = res.data.authorizationCode
+    // formData.authorizationCode = res.data.authorizationCode
     formData.roleIds = res.data.roleInfoList[0].roleName
     formData.userId = res.data.userId
   }
@@ -517,7 +521,7 @@ const tianjia = async () => {
         style: {
           width: '100%'
         },
-        placeholder: '请输入8位数字',
+        placeholder: '请输入电话号码',
         disabled: isedit.value === '添加用户' ? false : true
       },
       formItemProps: {
@@ -558,23 +562,23 @@ const tianjia = async () => {
         rules: [required()]
       }
     },
-    {
-      field: 'authorizationCode',
-      label: '授权码',
-      component: 'Input',
-      colProps: {
-        span: 24
-      },
-      componentProps: {
-        style: {
-          width: '100%'
-        },
-        placeholder: '请输入授权码'
-      },
-      formItemProps: {
-        rules: [required()]
-      }
-    },
+    // {
+    //   field: 'authorizationCode',
+    //   label: '授权码',
+    //   component: 'Input',
+    //   colProps: {
+    //     span: 24
+    //   },
+    //   componentProps: {
+    //     style: {
+    //       width: '100%'
+    //     },
+    //     placeholder: '请输入授权码'
+    //   },
+    //   formItemProps: {
+    //     rules: [required()]
+    //   }
+    // },
     {
       field: 'hasManage',
       label: '是否进入后台',
@@ -660,7 +664,7 @@ const tianjia = async () => {
     />
   </ContentWrap>
 
-  <Dialog v-model="dialogVisible" maxHeight="380px" width="35rem" :title="isedit">
+  <Dialog v-model="dialogVisible" maxHeight="250px" width="35rem" :title="isedit">
     <Form label-position="left" :rules="rules" :schema="schema" @register="formRegister" />
 
     <template #footer>

src/views/Login/components/LoginForm.vue

@@ -47,8 +47,8 @@ const { t } = useI18n()
 
 const rules = {
   username: [required()],
-  password: [required()],
-  authCode: [required()]
+  password: [required()]
+  // authCode: [required()]
 }
 
 const schema = reactive<FormSchema[]>([
@@ -96,21 +96,21 @@ const schema = reactive<FormSchema[]>([
       prefixIcon: <Icon icon="mdi:password-outline" />
     }
   },
-  {
-    field: 'authCode',
-    // value: 'admin',
-    component: 'InputPassword',
-    colProps: {
-      span: 24
-    },
-    componentProps: {
-      style: {
-        width: '100%'
-      },
-      placeholder: '请输入授权码',
-      prefixIcon: <Icon icon="tdesign:secured" />
-    }
-  },
+  // {
+  //   field: 'authCode',
+  //   // value: 'admin',
+  //   component: 'InputPassword',
+  //   colProps: {
+  //     span: 24
+  //   },
+  //   // componentProps: {
+  //   //   style: {
+  //   //     width: '100%'
+  //   //   },
+  //   //   placeholder: '请输入授权码',
+  //   //   prefixIcon: <Icon icon="tdesign:secured" />
+  //   // }
+  // },
   {
     field: 'login',
     colProps: {
@@ -121,7 +121,7 @@ const schema = reactive<FormSchema[]>([
         default: () => {
           return (
             <>
-              <div class="w-[100%]">
+              <div style="    margin-top: 50px;" class="w-[100%]">
                 <BaseButton
                   style="font-size: 1.3rem; height: 2.5rem; "
                   loading={loading.value}
@@ -193,7 +193,8 @@ const signIn = async () => {
 
         nweformData.password = encryptedData(res2.data, formData.password)
         nweformData.username = encryptedData(res2.data, formData.username)
-        nweformData.authCode = encryptedData(res2.data, formData.authCode)
+        // nweformData.authCode = encryptedData(res2.data, formData.authCode)
+
         const res = await loginApi(nweformData)
 
         if (res) {
@@ -291,7 +292,7 @@ const getRole = async () => {
       userStore.setRoleRouters([])
       formData.username = ''
       formData.password = ''
-      formData.authCode = ''
+      // formData.authCode = ''
       ElMessage.error('暂无权限，请联系管理员')
     }
   }

src/views/Resource/ResourceManage.vue

@@ -34,6 +34,8 @@ defineOptions({
   name: 'TemplateManage'
 })
 
+const compare = ref('')
+
 const { tableRegister, tableState, tableMethods } = useTable({
   fetchDataApi: async () => {
     const { currentPage, pageSize } = tableState
@@ -250,6 +252,7 @@ const edittab = async (data: TableSlotDefault) => {
   formData.categoryName = data.row.categoryName
   formData.compressFileName = data.row.compressFileName
   formData.compressFilePath = data.row.compressFilePath
+  compare.value = data.row.compressFilePath
   formData.icon = data.row.icon.replace(PATH_URL, '')
   imageUrl.value = data.row.icon
   formData.categoryId = data.row.categoryId
@@ -265,7 +268,11 @@ const signIn = async () => {
   const formRef = await getElFormExpose()
   const formData = await getFormData()
   console.log('lplplp', formData.compressFilePath)
-  if (formData.compressFilePath) {
+  if (
+    formData.compressFilePath !== compare.value &&
+    formData.compressFilePath !== '' &&
+    formData.compressFilePath
+  ) {
     formData.uploadCompress = true
   } else {
     formData.uploadCompress = false
@@ -325,6 +332,7 @@ const tianjia = async () => {
   isedit.value = '添加'
   schema[2].componentProps.fileList = []
   dialogVisible.value = true
+  compare.value = ''
 }
 </script>
 

src/views/Template/TemplateManage.vue

@@ -216,7 +216,7 @@ const schema = reactive<FormSchema[]>([
       },
       beforeUpload: (rawFile) => {
         console.log('kokokoko', rawFile)
-        if (rawFile.type !== 'application/x-zip-compressed') {
+        if (rawFile.type !== 'application/x-zip-compressed' || rawFile.type !== 'application/zip') {
           ElMessage.error('只能上传ZIP文件')
           return false
         } else if (rawFile.size / 1024 / 1024 > 2048) {