From 2fcab79f105fae726cfe1126eea59087a118e348 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Fri, 14 Oct 2022 09:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application.yml | 21 +++++++++++++++++++
 nladmin-ui/src/views/monitor/online/index.vue |  2 +-
 nladmin-ui/src/views/system/dept/index.vue    |  2 +-
 nladmin-ui/src/views/wms/sch/point/index.vue  | 14 +------------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/nladmin-system/src/main/resources/config/application.yml b/nladmin-system/src/main/resources/config/application.yml
index 7e3fbea7d..92c573466 100644
--- a/nladmin-system/src/main/resources/config/application.yml
+++ b/nladmin-system/src/main/resources/config/application.yml
@@ -78,3 +78,24 @@ security:
     - /api/localStorage/pictures
     # 参数
     - /api/param/getValueByCode
+# Sa-Token配置
+sa-token:
+  # token 名称 (同时也是cookie名称)
+  token-name: Authorization
+  # token 有效期，单位s 默认30天, -1代表永不过期
+  timeout: 2592000
+  # token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+  activity-timeout: -1
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # token风格
+  token-style: random-128
+  # 是否输出操作日志
+  is-log: false
+  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
+  #  是否在初始化配置时打印版本字符画
+  is-print: false
+  # token 前缀
+  token-prefix: Bearer
diff --git a/nladmin-ui/src/views/monitor/online/index.vue b/nladmin-ui/src/views/monitor/online/index.vue
index ccafe3e0d..6971df032 100644
--- a/nladmin-ui/src/views/monitor/online/index.vue
+++ b/nladmin-ui/src/views/monitor/online/index.vue
@@ -29,7 +29,7 @@
       <el-table-column prop="ip" label="登录IP" />
       <el-table-column show-overflow-tooltip prop="address" label="登录地点" />
       <el-table-column prop="browser" label="浏览器" width="145px" />
-      <el-table-column prop="loginTime" label="登录时间">
+      <el-table-column prop="loginTime" label="登录时间" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue
index e5c87df31..18b0db262 100644
--- a/nladmin-ui/src/views/system/dept/index.vue
+++ b/nladmin-ui/src/views/system/dept/index.vue
@@ -99,7 +99,7 @@
       @selection-change="crud.selectionChangeHandler"
     >
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-<!--      <el-table-column label="编码" prop="code" />-->
+      <!--      <el-table-column label="编码" prop="code" />-->
       <el-table-column label="名称" prop="name" />
       <el-table-column label="排序" prop="deptSort" />
       <el-table-column label="状态" align="center" prop="enabled">
diff --git a/nladmin-ui/src/views/wms/sch/point/index.vue b/nladmin-ui/src/views/wms/sch/point/index.vue
index a42d8cc15..079d2c864 100644
--- a/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -110,19 +110,7 @@
 
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="info"
-          :loading="syncLoading"
-          icon="el-icon-refresh"
-          size="mini"
-          @click="sync()"
-        >
-          仓位同步
-        </el-button>
-      </crudOperation>
+      <crudOperation :permission="permission" />
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"