opt:1.新增国际化准备工作。

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

@@ -17,9 +17,11 @@ import com.alicp.jetcache.anno.config.EnableMethodCache;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
+import org.nl.config.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -49,6 +51,11 @@ public class Application {
         System.setProperty("druid.mysql.usePingMethod","false");
     }
 
+    @Bean
+    public SpringContextHolder springContextHolder() {
+        return new SpringContextHolder();
+    }
+
     /**
      * 主启动函数
      *

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

@@ -79,7 +79,7 @@ file:
     avatar: /home/pi/nl_robot/avatar/
   windows:
     path: C:\eladmin\file\currentMap\
-    qrcode: C:\eladmin\qrcode\currentMap\
+    qrcode: C:\eladmin\qrcode\
     avatar: C:\eladmin\avatar\
   # 文件大小 /M
   maxSize: 100
@@ -100,4 +100,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.yml

@@ -7,7 +7,7 @@ spring:
     basename: language/task/task,language/error/error,language/buss/buss
     encoding: UTF-8
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
 
@@ -43,6 +43,9 @@ security:
     - /sys-user-do/**
     # frobot屏幕操作
     - /schedule/vehicle/**
+    - /task/**
+    - /mapinfo/**
+    - /security/**
     - /mapMonitor/**
     - /api/scheduleTask/**
     - /setting/**

nl-web-app/src/main/resources/language/error/error.properties

@@ -1,29 +1,2 @@
-error_request_vehicle = 访问车体接口异常:
-error_request_rcs = 访问RCS接口异常:
-error_starting_mapping = 开始建图失败
-error_cut_manually = 切手动失败
-error_cut_automatically = 切自动失败
-error_end_mapping = 结束建图失败
-error_set_station = 设置站点失败
-error_get_Maps = 获取地图列表失败
-error_deploy_maps = 部署地图失败
-error_app_maps = 应用地图失败
-error_get_map_pack = 获取地图包失败
-error_map_pack_isNull = "地图包数据为空，扫描失败。请重新建图"
-error_map_pgm = 地图PGM转换失败
-error_yaml_isNull = .YAML文件内容为空
-error_formatting_error = 格式错误
-error_parsing = YAML解析失败:
-error_process_map_pack = 处理地图包数据失败:
-error_png_convert_transparency = .png点云图将灰度图像转换为透明背景图像失败:
-error_p5 = 不支持的PGM格式，仅支持P5二进制格式
-error_invalid_size = 无效的尺寸格式
-error_pgm_parse = PGM解析错误:
-error_synchronized_map = 同步地图失败
-error_relocate = 重定位指令下发失败
-error_restart = 车体程序重启失败
-error_abandon_mapping = 放弃建图失败
-error_auto_back = 自动返回上一个点失败
-error_restart_system = 重启系统失败
-error_initializing_system = 初始化底层系统失败
-error_set_forkLegs= 操作叉腿避障失败
+error_schedule_point = 获取调度地图点位信息失败
+error_cannot_update = 不能修改他人资料

nl-web-app/src/main/resources/language/error/error_en_US.properties

@@ -1,28 +1,2 @@
-error_request_vehicle = Abnormal access to the vehicle body interface
-error_request_rcs = Accessing the RCS interface is abnormal
-error_starting_mapping = Failed to start mapping
-error_cut_manually = Cut manual failure
-error_cut_automatically = Cut automatically fails
-error_end_mapping = End mapping failed
-error_set_station = Setting up the site failed
-error_get_Maps = Failed to get the map list
-error_deploy_maps = Deploying the map failed
-error_app_maps = Applying the map failed
-error_get_map_pack = Failed to get the map package
-error_map_pack_isNull = The map package data is empty and the scan fails. Please rebuild the map
-error_map_pgm = Map PGM conversion failed
-error_yaml_isNull = .yaml file content is empty
-error_parsing = YAML parsing failed:
-error_process_map_pack = Failed to process map packet data:
-error_png_convert_transparency = Converting a grayscale image to a transparent background image .png a point cloud plot fails:
-error_p5 = PGM format is not supported, only P5 binary format is supported
-error_invalid_size = Invalid size format
-error_pgm_parse = PGM parsing error:
-error_synchronized_map = Syncing maps failed
-error_relocate = The relocation instruction failed to be issued
-error_restart = The body program restarts failed
-error_abandon_mapping = Abandoned mapping failed
-error_auto_back = Automatically returning to the previous point failed
-error_restart_system = Rebooting the system failed
-error_initializing_system = Initializing the underlying system failed
-error_set_forkLegs= The operation of the fork leg to avoid obstacles failed
+error_schedule_point = Failed to obtain the dispatch map location information
+error_cannot_update = You cannot modify other people's information

nl-web-app/src/main/resources/language/error/error_zh_CN.properties

@@ -1,28 +1,2 @@
-error_request_vehicle = 访问车体接口异常
-error_request_rcs = 访问RCS接口异常
-error_starting_mapping = 开始建图失败
-error_cut_manually = 切手动失败
-error_cut_automatically = 切自动失败
-error_end_mapping = 结束建图失败
-error_set_station = 设置站点失败
-error_get_Maps = 获取地图列表失败
-error_deploy_maps = 部署地图失败
-error_app_maps = 应用地图失败
-error_get_map_pack = 获取地图包失败
-error_map_pack_isNull = "地图包数据为空，扫描失败。请重新建图"
-error_map_pgm = 地图PGM转换失败
-error_yaml_isNull = .YAML文件内容为空
-error_parsing = YAML解析失败:
-error_process_map_pack = 处理地图包数据失败:
-error_png_convert_transparency = .png点云图将灰度图像转换为透明背景图像失败:
-error_p5 = 不支持的PGM格式，仅支持P5二进制格式
-error_invalid_size = 无效的尺寸格式
-error_pgm_parse = PGM解析错误:
-error_synchronized_map = 同步地图失败
-error_relocate = 重定位指令下发失败
-error_restart = 车体程序重启失败
-error_abandon_mapping = 放弃建图失败
-error_auto_back = 自动返回上一个点失败
-error_restart_system = 重启系统失败
-error_initializing_system = 初始化底层系统失败
-error_set_forkLegs= 操作叉腿避障失败
+error_schedule_point = 获取调度地图点位信息失败
+error_cannot_update = 不能修改他人资料