From 9c0db5c9545d2d67ee0a0e3b4cf7a7bb14ff9e54 Mon Sep 17 00:00:00 2001 From: ludj Date: Thu, 30 May 2024 18:09:52 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/common/enums/wms/PointStatusEnum.java | 23 ------------------ .../src/main/resources/banner.txt | 12 ++++----- .../src/main/resources/config/application.yml | 23 ++++++++++++++++++ .../src/main/resources/logback-spring.xml | 3 +-- nladmin-ui/src/assets/images/logo.png | Bin 3280 -> 122451 bytes nladmin-ui/src/assets/images/nl.png | Bin 122451 -> 0 bytes nladmin-ui/src/assets/logo/logo.63028018.png | Bin 3280 -> 0 bytes nladmin-ui/src/assets/logo/logo.png | Bin 5663 -> 0 bytes nladmin-ui/src/assets/wms/1.png | Bin 170 -> 0 bytes nladmin-ui/src/assets/wms/2.png | Bin 1022 -> 0 bytes nladmin-ui/src/assets/wms/3.png | Bin 404 -> 0 bytes nladmin-ui/src/assets/wms/4.png | Bin 3006 -> 0 bytes .../src/layout/components/Sidebar/Logo.vue | 2 +- 13 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java delete mode 100644 nladmin-ui/src/assets/images/nl.png delete mode 100644 nladmin-ui/src/assets/logo/logo.63028018.png delete mode 100644 nladmin-ui/src/assets/logo/logo.png delete mode 100644 nladmin-ui/src/assets/wms/1.png delete mode 100644 nladmin-ui/src/assets/wms/2.png delete mode 100644 nladmin-ui/src/assets/wms/3.png delete mode 100644 nladmin-ui/src/assets/wms/4.png diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java deleted file mode 100644 index de9b5e2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.nl.common.enums.wms; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @Author: lyd - * @Description: - * @Date: 2023/5/15 - */ -@Getter -@AllArgsConstructor -public enum PointStatusEnum { - // 空位 - EMPTY_PLACE("1", "空位"), - // 有料 - FULL_MATERIAL("2", "有料"), - // 空载具 - EMPTY_VEHICLE("3", "空载具"); - - private final String value; - private final String description; -} diff --git a/nladmin-system/nlsso-server/src/main/resources/banner.txt b/nladmin-system/nlsso-server/src/main/resources/banner.txt index 8be4ead..bec72fe 100644 --- a/nladmin-system/nlsso-server/src/main/resources/banner.txt +++ b/nladmin-system/nlsso-server/src/main/resources/banner.txt @@ -1,8 +1,8 @@ - _ _ ___________ _ _____ _ ___________ _____ -| \ | | _ | ___ \ | | ___| | | ___| ___|_ _| -| \| | | | | |_/ / | | |__ | | | |__ | |_ | | -| . ` | | | | ___ \ | | __|| | | __|| _| | | -| |\ \ \_/ / |_/ / |____| |___| |____| |___| | | | -\_| \_/\___/\____/\_____/\____/\_____/\____/\_| \_/ + _ _ ___________ _ _____ _ ___________ _____ +| \ | | _ | ___ \ | | ___| | |_ _| ___|_ _| +| \| | | | | |_/ / | | |__ | | | | | |_ | | +| . ` | | | | ___ \ | | __|| | | | | _| | | +| |\ \ \_/ / |_/ / |____| |___| |_____| |_| | | | +\_| \_/\___/\____/\_____/\____/\_____/\___/\_| \_/ :: Spring Boot :: (v2.1.0.RELEASE) \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index e7700dc..df18aef 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -184,3 +184,26 @@ jetcache: lucene: index: path: D:\lucene\index +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 + # token 前缀 + token-prefix: + cookie: + # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com + domain: + is-read-cookie: false + is-print: false \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index f3a3f80..aaedad5 100644 --- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -12,8 +12,7 @@ https://juejin.cn/post/6844903775631572999 nlAdmin - + value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>