merge code for encryption

src/api/system/user.js

@@ -104,6 +104,9 @@ export function updateUserPwd(oldPassword, newPassword) {
 export function uploadAvatar(data) {
   return request({
     url: '/system/user/profile/avatar',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
     method: 'post',
     data: data
   })

src/utils/aescbc.js

@@ -0,0 +1,47 @@
+import * as CryptoJS from 'crypto-js'
+const cbc_key = CryptoJS.enc.Utf8.parse('zhgd@bonus@zhgd@bonus@1234567890')
+const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678')
+/**
+ * 加解密开关
+ * 默认参数需要加密
+ * @type {boolean}
+ */
+const  jia_mi=true;
+/**
+ * 默认后台会自动加密
+ * @type {boolean}
+ */
+const  jie_mi=true;
+/**
+ * 加密
+ * @param word
+ * @returns {string}
+ */
+export const encryptCBC = function(word) {
+  if(!jia_mi){
+    return  word;
+  }
+  const srcs = CryptoJS.enc.Utf8.parse(word)
+  const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, {
+    iv: cbc_iv,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return encrypted.toString()
+}
+/**
+ * 解密
+ * @param word
+ * @returns {*}
+ */
+export const decryptCBC = function(word) {
+  if(!jie_mi){
+    return  word;
+  }
+  const encrypted = CryptoJS.AES.decrypt(word, cbc_key, {
+    iv: cbc_iv,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return encrypted.toString(CryptoJS.enc.Utf8)
+}

src/utils/request.js

@@ -6,11 +6,11 @@ import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/bonus";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
+import { encryptCBC, decryptCBC } from '@/utils/aescbc'
 
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
-
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
@@ -29,14 +29,20 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+//  return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
+      let param=tansParams(config.params);
-    url = url.slice(0, -1);
+      if(param){
+        param = param.slice(0, -1);
+        param=encryptCBC(param);
+      }
+      let url = config.url + '?' + param;
       config.params = {};
       config.url = url;
   }
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+
     const requestObj = {
       url: config.url,
       data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
@@ -65,6 +71,36 @@ service.interceptors.request.use(config => {
       }
     }
   }
+  console.log(config)
+
+  if( config.headers['Content-Type']=='application/json;charset=utf-8'){
+      if(typeof (config.data)=='object'){
+        config.data = encryptCBC(JSON.stringify(config.data))
+        config.headers['Content-Type']='application/json';
+      }
+  }
+  //对下载请求进行数据参数拦截加密
+  if(config.headers['Content-Type']=='application/x-www-form-urlencoded'){
+    console.log(config)
+    console.log(config.data)
+    if(typeof (config.data)=='object'){
+      console.log(config.data)
+      let formData=tansParams(config.data);
+      if(formData){
+        formData = formData.slice(0, -1);
+        let formdata={};
+        formdata.formData=encryptCBC(formData)
+        config.data=formdata;
+      }
+    }else{
+      config.data ="formData="+ encryptCBC(JSON.stringify(config.data))
+    }
+  }
+
+  if(config.headers['Content-Type']==null || config.headers['Content-Type']==''){
+      config.headers['Content-Type']='application/json';
+    console.warn("请求类型为空");
+  }
   return config
 }, error => {
     console.log(error)
@@ -73,6 +109,12 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+    //自动解密
+    console.log("res.data.decrypt=="+res.data.decrypt)
+    if(typeof res.data.decrypt!='undefined' && res.data.decrypt){
+      const resultData=decryptCBC(res.data.data);
+      res.data=JSON.parse(resultData);
+    }
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
@@ -127,7 +169,9 @@ export function download(url, params, filename, config) {
   downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
   return service.post(url, params, {
     transformRequest: [(params) => { return tansParams(params) }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded',
+            "encryption":"encryption"
+    },
     responseType: 'blob',
     ...config
   }).then(async (data) => {

src/utils/validate.js

@@ -78,3 +78,12 @@ export function isArray(arg) {
   }
   return Array.isArray(arg)
 }
+/**
+ * 密码的正则表达式 最少8个字符，最多20个字符，至少一个字母，一个数字和一个特殊字符：
+ * @param {string} password
+ * @returns {Boolean}
+ */
+export function validPwd(value) {
+  const reg = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,20}$/
+  return reg.test(value)
+}

src/views/system/menu/index.vue

@@ -263,6 +263,13 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="form.menuType == 'M'">
+            <el-form-item label="系统类型" prop="systemType">
+              <el-radio-group v-model="form.systemType">
+                <el-radio v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -281,7 +288,7 @@ import IconSelect from "@/components/IconSelect";
 
 export default {
   name: "Menu",
-  dicts: ['sys_show_hide', 'sys_normal_disable'],
+  dicts: ['sys_show_hide', 'sys_normal_disable','sys_login_type'],
   components: { Treeselect, IconSelect },
   data() {
     return {
@@ -318,7 +325,10 @@ export default {
         ],
         path: [
           { required: true, message: "路由地址不能为空", trigger: "blur" }
-        ]
+        ],
+        systemType: [
+          { required: true, message: "请选择系统类型", trigger: "change" }
+        ],
       }
     };
   },
@@ -375,7 +385,8 @@ export default {
         isFrame: "1",
         isCache: "0",
         visible: "0",
-        status: "0"
+        status: "0",
+        systemType:undefined
       };
       this.resetForm("form");
     },
@@ -390,6 +401,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
+      console.log();
       this.reset();
       this.getTreeselect();
       if (row != null && row.menuId) {

src/views/system/role/index.vue

@@ -119,7 +119,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+        <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"

src/views/system/user/index.vue

@@ -4,75 +4,36 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            v-model="deptName"
+            style="margin-bottom: 20px" />
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
         </div>
         <div class="head-container">
-          <el-tree
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :data="deptOptions"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-            :props="defaultProps"
+            @node-click="handleNodeClick" />
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
           <el-form-item label="用户名称" prop="userName">
-            <el-input
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
-              v-model="queryParams.userName"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
-              v-model="queryParams.phonenumber"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              v-model="queryParams.status"
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-              placeholder="用户状态"
+                :value="dict.value" />
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker
+            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              v-model="dateRange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -82,56 +43,24 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-              type="primary"
+              v-hasPermi="['system:user:add']">新增</el-button>
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-              type="success"
+              v-hasPermi="['system:user:edit']">修改</el-button>
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-              type="danger"
+              v-hasPermi="['system:user:remove']">删除</el-button>
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-              type="info"
+              v-hasPermi="['system:user:import']">导入</el-button>
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-              type="warning"
+              v-hasPermi="['system:user:export']">导出</el-button>
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -139,18 +68,18 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-switch
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-                v-model="scope.row.status"
+                @change="handleStatusChange(scope.row)"></el-switch>
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -158,28 +87,14 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            label="操作"
+            <template slot-scope="scope">
-            align="center"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            width="160"
+                v-hasPermi="['system:user:edit']">修改</el-button>
-            class-name="small-padding fixed-width"
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-          >
+                v-hasPermi="['system:user:remove']">删除</el-button>
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-              <el-button
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
@@ -192,13 +107,8 @@
           </el-table-column>
         </el-table>
 
-        <pagination
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          v-show="total>0"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
       </el-col>
     </el-row>
 
@@ -237,7 +147,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -245,23 +155,17 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                  v-for="dict in dict.type.sys_user_sex"
+                  :value="dict.value"></el-option>
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
-                  v-for="dict in dict.type.sys_normal_disable"
+                  dict.label
-                  :key="dict.value"
+                }}</el-radio>
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -270,30 +174,28 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                  v-for="item in postOptions"
+                  :disabled="item.status == 1"></el-option>
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleIds" multiple :multiple-limit = "multipleLimit" placeholder="请选择角色">
-                <el-option
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="登录权限" prop="loginTypeArr">
+              <el-checkbox-group v-model="loginTypeArr">
+                <el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -310,18 +212,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        ref="upload"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :limit="1"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -329,7 +222,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -345,10 +239,11 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { validPwd } from '@/utils/validate'
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ['sys_normal_disable', 'sys_user_sex','sys_login_type'],
   components: { Treeselect },
   data() {
     return {
@@ -382,6 +277,10 @@ export default {
       postOptions: [],
       // 角色选项
       roleOptions: [],
+      // 登录权限数组
+      loginTypeArr:[],
+      // 角色下拉多选限制数量
+      multipleLimit:1,
       // 表单参数
       form: {},
       defaultProps: {
@@ -431,11 +330,6 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
-        ],
         email: [
           {
             type: "email",
@@ -449,7 +343,18 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ],
+        loginTypeArr: [
+          { required: true, validator: this.validateLoginType, trigger: 'change' }
+        ],
+        password: [
+          { required: true, message: '密码不能为空', trigger: 'blur' },
+          { min: 8, max: 20, message: '密码长度在8到20个字符', trigger: 'blur' },
+          { validator: this.validatePwd, trigger: 'blur' }
+        ],
+        roleIds: [
+          { required: true, message: "请选择角色", trigger: "change" }
+        ],
       }
     };
   },
@@ -467,6 +372,22 @@ export default {
     });
   },
   methods: {
+    /* 表单用户密码自定义校验 */
+    validatePwd(rule, value, callback) {
+      if (validPwd(value)) {
+        callback()
+      } else {
+        callback(new Error('密码规则为：至少一个字母，一个数字和一个特殊字符'))
+      }
+    },
+    /* 表单登录权限自定义校验 */
+    validateLoginType(rule, value, callback) {
+      if (this.loginTypeArr.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请至少选择一个登录权限'))
+      }
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -496,11 +417,11 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0";
       });
     },
@@ -523,7 +444,9 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        roleId: null,
+        loginType: null
       };
       this.resetForm("form");
     },
@@ -562,6 +485,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.loginTypeArr.splice(0);
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -573,9 +497,14 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.loginTypeArr.splice(0);
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;
+        const loginType= response.data.loginType;
+        if(loginType){
+          this.loginTypeArr = loginType.split(',');
+        }
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
@@ -591,27 +520,28 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
+        inputPattern: /^.{8,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+        inputErrorMessage: "用户密码长度必须介于 8 和 20 之间",
         inputValidator: (value) => {
-          if (/<|>|"|'|\||\\/.test(value)) {
+          if (!/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,20}$/.test(value)) {
-            return "不能包含非法字符：< > \" ' \\\ |"
+            return "密码规则为：至少一个字母，一个数字和一个特殊字符"
           }
         },
       }).then(({ value }) => {
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
         });
-        }).catch(() => {});
+      }).catch(() => { });
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
+        this.form.loginType = this.loginTypeArr.toString();
         if (valid) {
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
@@ -632,12 +562,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
         return delUser(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {