Merge remote-tracking branch 'origin/admin' into admin

nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java

@@ -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;
-}

nladmin-system/nlsso-server/src/main/resources/banner.txt

@@ -1,8 +1,8 @@
- _   _ ___________ _      _____ _      ___________ _____
+ _   _ ___________ _      _____ _     ___________ _____
-| \ | |  _  | ___ \ |    |  ___| |    |  ___|  ___|_   _|
+| \ | |  _  | ___ \ |    |  ___| |   |_   _|  ___|_   _|
-|  \| | | | | |_/ / |    | |__ | |    | |__ | |_    | |
+|  \| | | | | |_/ / |    | |__ | |     | | | |_    | |
-| . ` | | | | ___ \ |    |  __|| |    |  __||  _|   | |
+| . ` | | | | ___ \ |    |  __|| |     | | |  _|   | |
-| |\  \ \_/ / |_/ / |____| |___| |____| |___| |     | |
+| |\  \ \_/ / |_/ / |____| |___| |_____| |_| |     | |
-\_| \_/\___/\____/\_____/\____/\_____/\____/\_|     \_/
+\_| \_/\___/\____/\_____/\____/\_____/\___/\_|     \_/
 
  :: Spring Boot ::       (v2.1.0.RELEASE)

nladmin-system/nlsso-server/src/main/resources/config/application.yml

@@ -186,3 +186,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

nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -12,8 +12,7 @@ https://juejin.cn/post/6844903775631572999
     <contextName>nlAdmin</contextName>
     <property name="log.charset" value="utf-8"/>
     <property name="log.pattern"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %cyan(%msg%n)"/>
+              value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %blue(%msg%n)"/>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
     <!--<include resource="log/XrToMes.xml"/>

nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/nl.png'
+import Logo from '@/assets/images/logo.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',