From 506144998c650f0df6dadfeccf9610268add9e8a Mon Sep 17 00:00:00 2001
From: lipeng <lipeng@wodcloud.com>
Date: Tue, 11 Apr 2023 17:53:10 +0800
Subject: [PATCH] interface connection

---
 src/page/main/config/preference/index.vue     | 156 +++++++++---------
 .../develop/systemApproval/approval/index.vue |   2 +-
 2 files changed, 77 insertions(+), 81 deletions(-)

diff --git a/src/page/main/config/preference/index.vue b/src/page/main/config/preference/index.vue
index 4634cdc..441c6ce 100644
--- a/src/page/main/config/preference/index.vue
+++ b/src/page/main/config/preference/index.vue
@@ -28,16 +28,21 @@
             <el-input disabled v-model="authorizeFormData.system_version" />
           </el-form-item>
           <el-form-item label="User" prop="system_user">
-            <el-input placeholder="统一管理用户认证平台" v-model="authorizeFormData.system_user" />
+            <el-input placeholder="统一管理用户认证平台" v-model="authorizeFormData.system_user" maxlength="30" />
           </el-form-item>
           <el-form-item label="Key" prop="license">
-            <el-input placeholder="请输入" rows="5" v-model="authorizeFormData.license" type="textarea" />
+            <el-input
+              placeholder="请输入"
+              rows="5"
+              v-model="authorizeFormData.license"
+              type="textarea"
+              @blur="getLicenseInfo" />
           </el-form-item>
           <el-form-item label="有效期至" prop="license_dead_date">
             <el-input disabled v-model="authorizeFormData.license_dead_date" />
           </el-form-item>
           <el-form-item label="剩余有效期提醒" prop="license_inform_day">
-            <el-input placeholder="请输入" v-model="authorizeFormData.license_inform_day">
+            <el-input placeholder="请输入" v-model.trim.number="authorizeFormData.license_inform_day">
               <template #append>天</template>
             </el-input>
             <el-tooltip placement="top-start" effect="light">
@@ -69,11 +74,11 @@
                   <br />
                   <span>密码长度应至少8位字符</span>
                   <br />
-                  <span>弱：包含两种或两种以下的组合。</span>
+                  <span>弱：至少包含一种组合。</span>
                   <br />
-                  <span>中：包含三种的组合。</span>
+                  <span>中：至少包含两种组合。</span>
                   <br />
-                  <span>强：包含四种的组合。</span>
+                  <span>强：至少包含三种及以上组合。</span>
                 </template>
                 <div class="tip-image"></div>
               </el-tooltip>
@@ -86,7 +91,7 @@
             </el-form-item>
           </div>
           <el-form-item label="密码有效期" prop="pwd_validity">
-            <el-input placeholder="请输入" v-model.number="secureFormData.pwd_validity">
+            <el-input placeholder="请输入" v-model.trim.number="secureFormData.pwd_validity" maxlength="3">
               <template #append>天</template>
             </el-input>
             <el-tooltip placement="top-start" effect="light">
@@ -101,7 +106,7 @@
             </el-tooltip>
           </el-form-item>
           <el-form-item label="会话有效期" prop="session_validity">
-            <el-input placeholder="请输入" v-model.number="secureFormData.session_validity">
+            <el-input placeholder="请输入" v-model.trim.number="secureFormData.session_validity">
               <template #append>分钟</template>
             </el-input>
             <el-tooltip placement="top-start" effect="light">
@@ -148,18 +153,35 @@
           <div class="input_password_config" v-if="registerFormData.login_config_state == 1">
             <span>在</span>
             <el-form-item prop="login_limit_time" label-width="0">
-              <el-input placeholder="请输入小时数" v-model.number="registerFormData.login_limit_time"></el-input>
+              <el-input
+                placeholder="请输入小时数"
+                v-model.trim.number="registerFormData.login_limit_time"
+                maxlength="3"></el-input>
             </el-form-item>
             <span>小时内</span>
             <el-form-item prop="login_pwd_error" label-width="0">
-              <el-input placeholder="请输入密码输错次数" v-model.number="registerFormData.login_pwd_error"></el-input>
+              <el-input
+                placeholder="请输入密码输错次数"
+                v-model.trim.number="registerFormData.login_pwd_error"
+                maxlength="3"></el-input>
             </el-form-item>
             <span>次输错密码，自动锁定</span>
             <el-form-item prop="login_lock_time" label-width="0">
-              <el-input placeholder="请输入分钟数" v-model.number="registerFormData.login_lock_time"></el-input>
+              <el-input
+                placeholder="请输入分钟数"
+                v-model.trim.number="registerFormData.login_lock_time"
+                maxlength="3"></el-input>
             </el-form-item>
             <span>分钟</span>
-            <el-button type="primary" @click="restoreLimited">一键还原受限</el-button>
+            <el-button type="primary" @click="restoreDialog = true">一键还原受限</el-button>
+            <el-tooltip placement="top-start" effect="light">
+              <template #content>
+                <span>必须为大于0的正整数且不能为空</span>
+                <br />
+                <span>一键还原按钮将所有锁定的账号解锁并将输错次数还原</span>
+              </template>
+              <div class="tip-image"></div>
+            </el-tooltip>
           </div>
           <bg-form-gap title="注册配置"></bg-form-gap>
           <el-form-item label="允许注册" prop="register_config_state">
@@ -174,11 +196,7 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      class="dialog_box"
-      title="提示"
-      v-model="restoreDialog"
-      width="420px">
+    <el-dialog class="dialog_box" title="提示" v-model="restoreDialog" width="420px">
       <div>该操作将还原所有锁定账号和输错次数，是否继续？</div>
       <template v-slot:footer>
         <div class="apaas_button">
@@ -195,38 +213,7 @@ import { reactive, toRefs, onBeforeMount, ref } from "vue";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 import { ElMessage } from "element-plus";
 import axios from "@/request/http.js";
-const check_time = (rule, value, callback) => {
-  let reg = /^(0|[1-9][0-9]*)$/;
-  setTimeout(() => {
-    if (!reg.test(value)) {
-      callback(new Error("请输入0到90以内的整数且不能以0开头"));
-    } else if (value > 90) {
-      callback(new Error("请输入0到90以内的整数且不能以0开头"));
-    } else {
-      callback();
-    }
-  });
-};
-const check_valid_time = (rule, value, callback) => {
-  let reg = /^(0|[1-9][0-9]*)$/;
-  setTimeout(() => {
-    if (!reg.test(value)) {
-      callback(new Error("请输入整数且不能以0开头"));
-    } else {
-      callback();
-    }
-  });
-};
-const check_value = (rule, value, callback) => {
-  let reg = /^([1-9][0-9]*)$/;
-  setTimeout(() => {
-    if (!reg.test(value)) {
-      callback(new Error("请输入正整数"));
-    } else {
-      callback();
-    }
-  });
-};
+
 const authorizeFormRef = ref(null);
 const secureFormRef = ref(null);
 const registerFormRef = ref(null);
@@ -242,7 +229,7 @@ const state = reactive({
   },
   //授权表单校验规则
   authorizeRules: {
-    license_inform_day: [{ validator: check_time, trigger: "blur" }],
+    license_inform_day: [{ type: "number", min: 0, max: 90, message: "请输入0~90的整数", trigger: "blur" }],
   },
 
   //安全相关信息表单
@@ -259,19 +246,17 @@ const state = reactive({
   secureRules: {
     pwd_validity: [
       {
-        validator: check_valid_time,
+        type: "number",
+        message: "请输入大于或等于0的整数",
         trigger: "blur",
       },
     ],
     session_validity: [
       {
-        validator: (rule, value, callback) => {
-          if (value >= 10 && value <= 30) {
-            callback();
-          } else {
-            callback(new Error("请输入正整数，且会话有效期范围为10分钟至30分钟"));
-          }
-        },
+        type: "number",
+        min: 10,
+        max: 30,
+        message: "请输入10~30的整数",
         trigger: "blur",
       },
     ],
@@ -289,19 +274,25 @@ const state = reactive({
   registerRules: {
     login_limit_time: [
       {
-        validator: check_value,
+        type: "number",
+        min: 1,
+        message: "请输入正整数",
         trigger: "blur",
       },
     ],
     login_pwd_error: [
       {
-        validator: check_value,
+        type: "number",
+        min: 1,
+        message: "请输入正整数",
         trigger: "blur",
       },
     ],
     login_lock_time: [
       {
-        validator: check_value,
+        type: "number",
+        min: 1,
+        message: "请输入正整数",
         trigger: "blur",
       },
     ],
@@ -346,6 +337,23 @@ const getPreferenceConfig = () => {
     }
   });
 };
+//根据license获取授权信息
+const getLicenseInfo = () => {
+  if (!state.authorizeFormData.license) return;
+  axios
+    .post("/apaas/system/v5/sysOptions/getLicenseInfo", {
+      license: state.authorizeFormData.license,
+    })
+    .then((res) => {
+      if (res.data.code == 200) {
+        const data = res.data.data || {};
+        state.authorizeFormData.system_version = data.version;
+        state.authorizeFormData.license_dead_date = data.deadDate;
+      } else {
+        ElMessage.error(res.data.data);
+      }
+    });
+};
 //保存表单项
 const save = () => {
   let params = {};
@@ -356,8 +364,6 @@ const save = () => {
           ...state.authorizeFormData,
         };
         postData("/apaas/system/v5/sysOptions/licenseOpts", params);
-      } else {
-        ElMessage.error("请先将表单填写完整");
       }
     });
   } else if (state.activeIndex == 2) {
@@ -367,8 +373,6 @@ const save = () => {
           ...state.secureFormData,
         };
         postData("/apaas/system/v5/sysOptions/safeOpts", params);
-      } else {
-        ElMessage.error("请先将表单填写完整");
       }
     });
   } else {
@@ -383,8 +387,6 @@ const save = () => {
           params.login_lock_time = 0;
         }
         postData("/apaas/system/v5/sysOptions/loginOpts", params);
-      } else {
-        ElMessage.error("请先将表单填写完整");
       }
     });
   }
@@ -394,28 +396,22 @@ const postData = (url, params) => {
   axios.post(url, params).then((res) => {
     if (res.data.code == 200) {
       ElMessage.success(res.data.msg);
-      getPreferenceConfig();
     } else {
       ElMessage.error(res.data.data);
     }
   });
 };
 
-// 一键还原受限
-const restoreLimited = () => {
-  state.restoreDialog = true
-}
-
 const confirm = () => {
-  axios.post(`/apaas/system/v5/sysOptions/reStartConfig`).then(res => {
+  axios.post(`/apaas/system/v5/sysOptions/reStartConfig`).then((res) => {
     if (res.data.code == 200) {
-      ElMessage.success(res.data.msg)
-      state.restoreDialog = false
-    }else {
-      ElMessage.error(res.data.data)
+      ElMessage.success(res.data.msg);
+      state.restoreDialog = false;
+    } else {
+      ElMessage.error(res.data.data);
     }
-  })
-}
+  });
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/page/main/develop/systemApproval/approval/index.vue b/src/page/main/develop/systemApproval/approval/index.vue
index 3434aa8..98d7867 100644
--- a/src/page/main/develop/systemApproval/approval/index.vue
+++ b/src/page/main/develop/systemApproval/approval/index.vue
@@ -129,7 +129,7 @@ const instanceData = reactive({
     status: [
       {
         required: true,
-        message: "请选择状态",
+        message: "请选择",
       },
     ],
   },
-- 
2.26.0