优化新增用户时默认密码问题

sgzb-ui/src/store/modules/user.js

@@ -44,8 +44,12 @@ const user = {
       const password = encrypt(userInfo.password)
       const code = userInfo.code
       const uuid = userInfo.uuid
+      const textCode = undefined
+      if (userInfo.textCode) {
+        textCode = userInfo.textCode
+      }
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(username, password, code, uuid, textCode).then(res => {
           let data = res.data
           localStorage.setItem('isCode', res.data.code)
           setToken(data.access_token)

sgzb-ui/src/views/newLogin.vue

@@ -24,6 +24,39 @@
                   <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
                 </el-input>
               </el-form-item>
+
+              <!-- 5.29 新增双因子验证 -->
+              <!-- <el-form-item prop="textCode" class="code-container" v-if="loginForm.username === 'admin'">
+                <el-input
+                  v-model="phoneLoginParams.textCode"
+                  auto-complete="off"
+                  placeholder="短信验证码"
+                  style="width: 67%"
+                >
+                  <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                </el-input>
+                <div class="login-code">
+                  <div
+                    class="login-code-img"
+                    style="border: 1px solid rgb(220, 223, 230)"
+                    v-show="show === 1"
+                    @click="getTextCode"
+                  >
+                    获取验证码
+                  </div>
+                  <div class="login-code-img" style="border: 1px solid rgb(220, 223, 230)" v-show="show === 2">
+                    {{ count }} s
+                  </div>
+                  <div
+                    class="login-code-img"
+                    style="border: 1px solid rgb(220, 223, 230)"
+                    v-show="show === 3"
+                    @click="getTextCode"
+                  >
+                    重发
+                  </div>
+                </div>
+              </el-form-item> -->
               <el-form-item prop="code" v-if="captchaEnabled" class="code-container">
                 <el-input
                   v-model="loginForm.code"

sgzb-ui/src/views/system/user/index.vue

@@ -4,38 +4,77 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-                    <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small"
+          <el-input
-                        prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-                    <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+          <el-tree
-                        :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            :data="deptOptions"
-                        @node-click="handleNodeClick" />
+            :props="defaultProps"
+            :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"
+        <el-form
-                    label-width="68px">
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="用户名称" prop="userName">
-                        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+            <el-input
-                            @keyup.enter.native="handleQuery" />
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-                        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+            <el-input
-                            @keyup.enter.native="handleQuery" />
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-                        <el-select v-model="queryParams.status" placeholder="用户状态" clearable filterable
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable filterable style="width: 240px">
-                            style="width: 240px">
+              <el-option
-                            <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
+                v-for="dict in dict.type.sys_normal_disable"
-                                :label="dict.label" :value="dict.value" />
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-                        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+            <el-date-picker
-                            type="daterange" range-separator="-" start-placeholder="开始日期"
+              v-model="dateRange"
-                            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>
@@ -45,83 +84,175 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            <el-button
-                            v-hasPermi="['system:user:add']">新增</el-button>
+              type="primary"
+              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 type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+            <el-button
-                            @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+              type="success"
+              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 type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+            <el-button
-                            @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+              type="danger"
+              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 type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+            <el-button
-                            v-hasPermi="['system:user:import']">导入</el-button>
+              type="info"
+              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 type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+            <el-button
-                            v-hasPermi="['system:user:export']">导出</el-button>
+              type="warning"
+              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"
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-                        :columns="columns"></right-toolbar>
         </el-row>
 
         <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" type="index" width="50" /> -->
           <el-table-column label="序号" align="center" width="80" type="index">
-                        <template scope="scope">
+            <template slot-scope="scope">
               <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-                    <el-table-column label="用户名称" align="center" key="userName" prop="userName"
+          <el-table-column
-                        v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            label="用户名称"
-                    <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName"
+            align="center"
-                        v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            key="userName"
-                    <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName"
+            prop="userName"
-                        v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            v-if="columns[1].visible"
-                    <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+            :show-overflow-tooltip="true"
-                        v-if="columns[4].visible" width="120" />
+          />
+          <el-table-column
+            label="用户昵称"
+            align="center"
+            key="nickName"
+            prop="nickName"
+            v-if="columns[2].visible"
+            :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 v-model="scope.row.status" active-value="0" inactive-value="1"
+              <el-switch
-                                @change="handleStatusChange(scope.row)"></el-switch>
+                v-model="scope.row.status"
+                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"
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-                        width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-                            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button
-                                v-hasPermi="['system:user:edit']">修改</el-button>
+                size="mini"
-                            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                type="text"
-                                v-hasPermi="['system:user:remove']">删除</el-button>
+                icon="el-icon-edit"
-                            <el-dropdown size="mini" @command="(command) =>
+                @click="handleUpdate(scope.row)"
-                                    handleCommand(command, scope.row)
+                v-hasPermi="['system:user:edit']"
-                                " v-hasPermi="[
+              >
-                                    'system:user:resetPwd',
+                修改
-                                    '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"
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">
-                                        v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                    重置密码
-                                    <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                  </el-dropdown-item>
-                                        v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                  <el-dropdown-item
+                    command="handleAuthRole"
+                    icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']"
+                  >
+                    分配角色
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
 
-                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination
-                    :limit.sync="queryParams.pageSize" @pagination="getList" />
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -136,8 +267,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-                            <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true"
+              <treeselect
-                                placeholder="请选择归属部门" />
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                placeholder="请选择归属部门"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -161,8 +296,13 @@
           </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"
+              <el-input
-                                show-password />
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -170,17 +310,21 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" filterable placeholder="请选择性别">
-                                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                <el-option
-                                    :value="dict.value"></el-option>
+                  v-for="dict in dict.type.sys_user_sex"
+                  :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 v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
-                                    :label="dict.value">{{
+                  {{ dict.label }}
-                                    dict.label }}</el-radio>
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -189,16 +333,26 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
-                                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
+                <el-option
-                                    :value="item.postId" :disabled="item.status == 1"></el-option>
+                  v-for="item in postOptions"
+                  :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-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
-                                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName"
+                <el-option
-                                    :value="item.roleId" :disabled="item.status == 1"></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>
@@ -206,8 +360,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="100"></el-input>
-                                maxlength="100"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -220,19 +373,37 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-            <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+      <el-upload
-                :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        ref="upload"
-                :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        :limit="1"
+        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__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
             <el-checkbox v-model="upload.updateSupport" />
             是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+          <el-link
-                        @click="importTemplate">下载模板</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">
@@ -258,6 +429,7 @@ import { getToken } from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { validPassword } from '@/utils/validate'
+import { encrypt } from '@/utils/jsencrypt'
 
 export default {
   name: 'User',
@@ -314,9 +486,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
-                url:
+        url: process.env.VUE_APP_BASE_API + '/system/user/importData',
-                    process.env.VUE_APP_BASE_API +
-                    '/system/user/importData',
       },
       // 查询参数
       queryParams: {
@@ -383,17 +553,13 @@ export default {
             required: true,
             validator: (rule, value, callback) => {
               if (!validPassword(value)) {
-                                callback(
+                callback(new Error('密码须包含数字、字母、特殊符号中的两种以上'))
-                                    new Error(
-                                        '密码须包含数字、字母、特殊符号中的两种以上',
-                                    )
-                                )
               } else {
                 callback()
               }
             },
             trigger: 'blur',
-                    }
+          },
         ],
         email: [
           {
@@ -410,7 +576,6 @@ export default {
           },
         ],
       },
-            secretKey: 'CCNWrpassWordKey'
     }
   },
   watch: {
@@ -422,22 +587,15 @@ export default {
   created() {
     this.getList()
     this.getDeptTree()
-        this.getConfigKey('sys.user.initPassword').then((response) => {
+    this.getConfigKey('sys.user.initPassword').then(response => {
-            this.decryptData(response.msg, this.secretKey).then((data) => {
+      this.initPassword = encrypt(response.msg)
-                console.log('🚀 ~ this.getConfigKey ~ data:', data);
-                this.initPassword = data
-            }).catch((error) => {
-                console.log('🚀 ~ this.getConfigKey ~ error:', error);
-            })
     })
   },
   methods: {
     /** 查询用户列表 */
     getList() {
       this.loading = true
-            listUser(
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-                this.addDateRange(this.queryParams, this.dateRange),
-            ).then((response) => {
         this.userList = response.rows
         this.total = response.total
         this.loading = false
@@ -445,7 +603,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-            deptTreeSelect().then((response) => {
+      deptTreeSelect().then(response => {
         this.deptOptions = response.data
       })
     },
@@ -463,9 +621,7 @@ export default {
     handleStatusChange(row) {
       let text = row.status === '0' ? '启用' : '停用'
       this.$modal
-                .confirm(
+        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
-                    '确认要"' + text + '""' + row.userName + '"用户吗？',
-                )
         .then(function () {
           return changeUserStatus(row.userId, row.status)
         })
@@ -514,9 +670,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-            this.ids = this.queryParams.dataCondition = selection.map(
+      this.ids = this.queryParams.dataCondition = selection.map(item => item.userId)
-                (item) => item.userId,
-            )
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
@@ -536,7 +690,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
-            getUser().then((response) => {
+      getUser().then(response => {
         this.postOptions = response.posts
         this.roleOptions = response.roles
         this.open = true
@@ -548,7 +702,7 @@ export default {
     handleUpdate(row) {
       this.reset()
       const userId = row.userId || this.ids
-            getUser(userId).then((response) => {
+      getUser(userId).then(response => {
         this.form = response.data
         this.postOptions = response.posts
         this.roleOptions = response.roles
@@ -569,10 +723,8 @@ export default {
         inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
       })
         .then(({ value }) => {
-                    resetUserPwd(row.userId, value).then((response) => {
+          resetUserPwd(row.userId, value).then(response => {
-                        this.$modal.msgSuccess(
+            this.$modal.msgSuccess('修改成功，新密码是：' + value)
-                            '修改成功，新密码是：' + value,
-                        )
           })
         })
         .catch(() => {})
@@ -584,16 +736,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-            this.$refs['form'].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-                        updateUser(this.form).then((response) => {
+            updateUser(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
               this.getList()
             })
           } else {
-                        addUser(this.form).then((response) => {
+            addUser(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
               this.getList()
@@ -606,9 +758,7 @@ export default {
     handleDelete(row) {
       const userIds = row.userId || this.ids
       this.$modal
-                .confirm(
+        .confirm('是否确认删除所选择的数据项？')
-                    '是否确认删除所选择的数据项？',
-                )
         .then(function () {
           return delUser(userIds)
         })
@@ -625,7 +775,7 @@ export default {
         {
           ...this.queryParams,
         },
-                `user_${new Date().getTime()}.xlsx`,
+        `user_${new Date().getTime()}.xlsx`
       )
     },
     /** 导入按钮操作 */
@@ -635,11 +785,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-            this.download(
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
-                'system/user/importTemplate',
-                {},
-                `user_template_${new Date().getTime()}.xlsx`,
-            )
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -656,15 +802,16 @@ export default {
             response.msg +
             '</div>',
           '导入结果',
-                    { dangerouslyUseHTMLString: true },
+          { dangerouslyUseHTMLString: true }
         )
       } else {
         this.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-                    '导入失败: ' + '请检查导入数据是否符合导入模板' +
+            '导入失败: ' +
+            '请检查导入数据是否符合导入模板' +
             '</div>',
           '导入结果',
-                    { dangerouslyUseHTMLString: true },
+          { dangerouslyUseHTMLString: true }
         )
       }
 
@@ -676,32 +823,22 @@ export default {
     },
     // 加密
     async encryptData(data, keyStr) {
-            const keyUint8 = new TextEncoder().encode(keyStr);
+      const keyUint8 = new TextEncoder().encode(keyStr)
-            const key = await crypto.subtle.importKey(
+      const key = await crypto.subtle.importKey('raw', keyUint8, { name: 'AES-CBC', length: 256 }, false, ['encrypt'])
-                'raw',
-                keyUint8,
-                { name: 'AES-CBC', length: 256 },
-                false,
-                ['encrypt']
-            );
 
-            const iv = crypto.getRandomValues(new Uint8Array(16));
+      const iv = crypto.getRandomValues(new Uint8Array(16))
-            const cipherTextBuffer = await crypto.subtle.encrypt(
+      const cipherTextBuffer = await crypto.subtle.encrypt({ name: 'AES-CBC', iv }, key, new TextEncoder().encode(data))
-                { name: 'AES-CBC', iv },
-                key,
-                new TextEncoder().encode(data)
-            );
 
-            const combined = new Uint8Array(iv.length + cipherTextBuffer.byteLength);
+      const combined = new Uint8Array(iv.length + cipherTextBuffer.byteLength)
-            combined.set(iv, 0);
+      combined.set(iv, 0)
-            combined.set(new Uint8Array(cipherTextBuffer), iv.length);
+      combined.set(new Uint8Array(cipherTextBuffer), iv.length)
 
-            return btoa(String.fromCharCode.apply(null, combined));
+      return btoa(String.fromCharCode.apply(null, combined))
     },
     // 解密
     async decryptData(encryptedData, keyStr) {
-            const keyUint8 = new TextEncoder().encode(keyStr);
+      const keyUint8 = new TextEncoder().encode(keyStr)
-            const encryptedBytes = Uint8Array.from(atob(encryptedData), c => c.charCodeAt(0));
+      const encryptedBytes = Uint8Array.from(atob(encryptedData), c => c.charCodeAt(0))
 
       const key = await crypto.subtle.importKey(
         'raw',
@@ -709,16 +846,16 @@ export default {
         { name: 'AES-CBC', length: 256 }, // 假设后端使用了CBC模式，需要调整为实际使用的模式
         false,
         ['decrypt']
-            );
+      )
 
       const decryptedData = await crypto.subtle.decrypt(
         { name: 'AES-CBC', iv: new Uint8Array(16) }, // 实际使用时需要正确的IV，这里仅为示例
         key,
         encryptedBytes
-            );
+      )
 
-            return new TextDecoder().decode(decryptedData);
+      return new TextDecoder().decode(decryptedData)
-        }
+    },
   },
 }
 </script>

sgzb-ui/vue.config.js

@@ -46,7 +46,7 @@ module.exports = {
         // target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://10.40.92.136:8080`, //帅
+        target: `http://10.40.92.136:28080`, //帅
         // target: `http://10.40.92.5:28080`, //福
 
         //******** 注意事项  ********* */