add:增加后台管理系统

nl-web-app/pom.xml

@@ -68,6 +68,11 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alicp.jetcache</groupId>
+            <artifactId>jetcache-starter-redis</artifactId>
+        </dependency>
     </dependencies>
 
 

nl-web-app/src/main/java/org/nl/Application.java

@@ -12,6 +12,8 @@
  */
 package org.nl;
 
+import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
+import com.alicp.jetcache.anno.config.EnableMethodCache;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -35,6 +37,8 @@ import org.springframework.web.bind.annotation.RestController;
 @SpringBootApplication
 @EnableScheduling
 @EnableTransactionManagement
+@EnableMethodCache(basePackages = "org.nl")
+@EnableCreateCacheAnnotation
 @MapperScan("org.nl.**.mapper")
 public class Application {
 

nl-web-app/src/main/resources/config/application-dev.yml

@@ -59,18 +59,32 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+  data:
+    redis:
+      #数据库索引
+      database: 2
+      host: 192.168.29.130
+      port: 6379
+      password: 123456
+
+# IP 本地解析
+ip:
+  local-parsing: true
 
 # 文件存储路径
 file:
   mac:
     path: ~/file/
-    qrcode: ~/avatar/
+    qrcode: ~/qrcode/
+    avatar: ~/avatar/
   linux:
     path: /home/eladmin/file/
     qrcode: /home/eladmin/qrcode/
+    avatar: /home/eladmin/avatar/
   windows:
-    path: C:\eladmin\file\
+    path: C:\eladmin\file\currentMap\
     qrcode: C:\eladmin\qrcode\
+    avatar: C:\eladmin\avatar\
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
@@ -82,7 +96,7 @@ sa-token:
   # token有效期，单位s 默认30天, -1代表永不过期
   timeout: 2592000
   # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  activity-timeout: -1
+  active-timeout: -1
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
@@ -90,4 +104,59 @@ sa-token:
   # token风格
   token-style: random-128
   # 是否输出操作日志
-  is-log: true
+  is-log: true
+  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
+  # token 前缀
+  token-prefix: Bearer
+  sso:
+    # Ticket有效期 (单位: 秒)，默认五分钟
+    ticket-timeout: 300
+    # 所有允许的授权回调地址
+    allow-url: "*"
+    # 是否打开单点注销功能
+    is-slo: true
+
+    # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
+    # 是否打开模式三
+    isHttp: true
+    # 接口调用秘钥（用于SSO模式三的单点注销功能）
+    secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+    # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
+  is-read-cookie: true
+  is-print: false
+  #  未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
+  token-session-check-login: false
+  alone-redis:
+    # Redis数据库索引（默认为0）
+    database: 2
+    # Redis服务器地址
+    host: 192.168.29.130
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: 123456
+    # 连接超时时间
+    timeout: 10s
+
+# 登录相关配置
+login:
+  # 登录缓存
+  cache-enable: true
+  #  是否限制单用户登录
+  single-login: false
+  #  验证码
+  login-code:
+    #  验证码类型配置 查看 LoginProperties 类
+    code-type: arithmetic
+    #  登录图形验证码有效时间/分钟
+    expiration: 2
+    #  验证码高度
+    width: 111
+    #  验证码宽度
+    heigth: 36
+    # 内容长度
+    length: 2
+    # 字体名称，为空则使用默认字体
+    font-name:
+    # 字体大小
+    font-size: 25

nl-web-app/src/main/resources/config/application-prod.yml

@@ -55,18 +55,32 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+  data:
+    redis:
+      #数据库索引
+      database: 2
+      host: 192.168.29.130
+      port: 6379
+      password: 123456
+
+# IP 本地解析
+ip:
+  local-parsing: true
 
 # 文件存储路径
 file:
   mac:
     path: ~/file/
     qrcode: ~/qrcode/
+    avatar: ~/avatar/
   linux:
     path: /home/pi/nl_robot/map/
     qrcode: /home/pi/nl_robot/qrcode/
+    avatar: /home/pi/nl_robot/avatar/
   windows:
     path: C:\eladmin\file\currentMap\
     qrcode: C:\eladmin\qrcode\currentMap\
+    avatar: C:\eladmin\avatar\
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
@@ -78,7 +92,7 @@ sa-token:
   # token有效期，单位s 默认30天, -1代表永不过期
   timeout: 2592000
   # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  activity-timeout: -1
+  active-timeout: -1
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)

nl-web-app/src/main/resources/config/application.yml

@@ -7,7 +7,7 @@ spring:
     basename: language/task/task,language/error/error,language/buss/buss
     encoding: UTF-8
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
 
@@ -30,7 +30,7 @@ customize:
 
 #密码加密传输，前端公钥加密，后端私钥解密
 rsa:
-  private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMjhH5OmC7osPfdelXwkX1uTW1vuj8miZIU546Y6dy7TI2RF04rcW2eneBqrvF/8Ni1b+A+bqAJfMi01TDBmdyp+7vyZzUPRXv02HpI/ZM9dkQhv2m4VnTNnWOM0mY/7fJtDfLXhfDNmBMz7h57oDUFV0ESQtp5i4K7hlIVeezijAgMBAAECgYBVuPQfruksPnsHGB7UhjUHQD/pYEmN8zXQQJ7sLeD0Y3ej78RRaq268xVm1Eij8V4xRyD5kCRHNtaTwj3MHb3V68QC3amBR392yay4+S5ZOEPOjZ64hMSZWPezHbemLMjtUn1NR1k1aGfaiGPEk3npiXJHf9ZXU2GGglLJ50eP+QJBAPD3TTRtOVuTIPQS+m0PEeW6ALZDp3EONoqOMePuGLqj38QjwV+jGdxzA+Hhsf8oQo+QG2S3YPph09TFZc3dvj0CQQDVaY9TGeDyxf2DDL/oBFecIkixkV/AWRJb9CrDCZ8H9K1xWuEmhIW1pFJ+gmjbZccZQe/n1M+tRKq9DPaXsiBfAkANgE27GkOUdfHquwV9BtMh5AIWNEQ1eW5k5QK2mqiYDIaFHtu+2Ayi5W7aQSMQANl54cEnK38riD+uNEE3/6yhAkAN3ZfkTFAjNd3sv81QI8gVatzSPKG9+4uH0etdVKiyeaEzNjZerEmLrat2cL6jUo+HApO1ukvr9AQr2EXFQVt9AkEAoQcTx50AK6osp15kAoOQH5NV7TF2qoDbkNfp4xJReLlNpn9oPh2CNQOuVfna5gDQmkaEaJwwVuBvWN5RPrp2HA==
+  private_key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIMZaFRFRq8aS0CGAeyz+iR1sPUUuSyEtbIqyEhdY07Tk9z+iEkHc5wPiJWZ5ITkojRDOcD4qVh01z7kZ6pNC6gs2WpKG0foNF998cTlDRsro/O/ZnZgM+Amri3gYaN/atSoAQDwcgmEgzopyYFkm4y3nlE/Klv3wJEaJSATxe3DAgMBAAECgYAPIGeJ0FkothjNup35O7EBSPUglNdi5sh3j3kpjwujhO/QNYGbJOQhiHyi1QK+6gnkjDHbQrXOJ454dW6YAf4gqztPF+eTf2F+i4FOHwD4xS3MvlW4WIIqo+UrbbPLOX3ysikw42hd9fUh0GuI+1QSe1ia3CQsik7D3nPRY4/niQJBAMfLeRoiUImVJhl9FU2PFMRJFeqK/QiO5HxT3xf/XgW+sY2gmEE4+Sa+D/WVf5Ez25S2jjaW7rPlCSjhzx41fakCQQCn+rgHUbOW2qbzSUTsb14+pJNQUy0poWl8iChxCE5nMvdr+BdS413Nb2iXACJumi4/VZP2T3VUIY7i77C+FvuLAkEAx3QQbI+PGRplU5K0fp31HFLd5yxjmHSWEqvkDl/n7BJHzFxjQtFuoUeiRQe+tyUu81IfvM2GdN6T+1UZ4E2EKQJAMWrA2OZgPvD0TH4xmJzqzOL9s5PEpYqmzcwAmcAn0JRd1ZWWxvu8jMNJsaKIfqE9GcTDUqLtkWKN9pUtGb8JIQJBALj9byua7l6wI2YcPxau9I6q1LO7zsjOn+tW9shwoDPkLwOz34dIFhPiEyUQWO+Kl3nMUlsgY3AmTaNIH9O+7AQ=
 
 # sa-token白名单配置
 security:
@@ -45,10 +45,12 @@ security:
     - /vehicle/**
     - /webSocket/**
     - /file/**
+    - /qrcode/**
     - /routeInfo/**
     - /station/**
     # 静态资源
     - /*.html
     - /**/*.html
     - /**/*.css
-    - /**/*.js
+    - /**/*.js
+    - /**/*.png