优化图片上传和显示

liujun001
1 parent 94b83dba
Showing 15 changed files with 388 additions and 41 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/equipment/controller/EquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/application-druid-lingangTest.yml
Bsth-common/src/main/java/com/ruoyi/common/constant/Constants.java
Bsth-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
Bsth-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
Bsth-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -103,7 +103,7 @@ public class DssEquipmentController extends BaseController {
         //LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         LoginUser loginUser = new LoginUser();
         loginUser.setUserId(Convert.toLong(equipment.getId()));
-        loginUser.setDeptId(Convert.toLong(equipment.getDeviceId()));
+        loginUser.setDeviceId(equipment.getDeviceId());
         loginUser.setUser(new SysUser());
@@ -3,6 +3,7 @@ package com.ruoyi.driver.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.global.Result;
@@ -13,9 +14,11 @@ import com.ruoyi.pojo.request.DriverRequestVo;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
+import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 /**
  * 驾驶员信息Controller
@@ -37,6 +41,8 @@ import java.util.List;
 public class DriverController extends BaseController {
     @Autowired
     private IDriverService driverService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
     /**
@@ -106,7 +112,14 @@ public class DriverController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾驶员信息详细信息")
     public AjaxResult getInfo(@ApiParam(value = "id", required = true) @PathVariable("id") Long id) {
-        return success(driverService.selectDriverById(id));
+        Driver driver = driverService.selectDriverById(id);
+        if (Objects.nonNull(driver)) {
+            SysDictData source = sysDictDataService.getResourceBaseUrl();
+            if (source.isCombationVal()) {
+                driver.setImage(sysDictDataService.combationValue(driver.getImage(), source));
+            }
+        }
+        return success(driver);
     }
     /**
@@ -117,6 +130,7 @@ public class DriverController extends BaseController {
     @PostMapping
     @ApiOperation("新增驾驶员信息（后台）")
     public AjaxResult add(@ApiParam @RequestBody Driver driver) {
+        driver.setImage(sysDictDataService.splitURL(driver.getImage()));
         return toAjax(driverService.insertDriver(driver));
     }
@@ -139,9 +153,12 @@ public class DriverController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:edit')")
 //    @Log(title = "驾驶员信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     @ApiOperation("修改驾驶员信息")
     public AjaxResult edit(@ApiParam("driver") @RequestBody Driver driver) {
+        if (StringUtils.isNotEmpty(driver.getImage())) {
+            driver.setImage(sysDictDataService.splitURL(driver.getImage()));
+        }
         return toAjax(driverService.updateDriver(driver) + 1);
     }
@@ -191,7 +208,17 @@ public class DriverController extends BaseController {
     @ApiOperation("驾驶员人脸上传接口")
     public AjaxResult uploadImage(MultipartFile file) {
         try {
-            return driverService.uploadImage(file);
+            return driverService.uploadImage(file, null);
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    @PostMapping("/upload/{id}")
+    @ApiOperation("驾驶员人脸上传接口")
+    public AjaxResult uploadImage(MultipartFile file, @PathVariable("id") Integer id) {
+        try {
+            return driverService.uploadImage(file, id);
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
@@ -88,7 +88,7 @@ public interface IDriverService  extends IService&lt;Driver&gt;
     AjaxResult checkJobCode(Driver jobCode);
-    AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException;
+    AjaxResult uploadImage(MultipartFile file,Integer id) throws InvalidExtensionException, IOException;
     void downloadHeadImage(String jobCode, HttpServletResponse response);
@@ -45,6 +45,7 @@ import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -269,9 +270,11 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         // 修改排班表scheduling  以及缓存信息
         List<DriverScheduling> driverSchedulings = cache.getCacheScheduling(ConstDateUtil.getStringNowLocalDate("-")).get(driver.getJobCode());
         // 只改变车队信息 其他信息由调度接口 和 人事系统决定  本来是不修改的但是人事数据有问题
-        for (DriverScheduling scheduling : driverSchedulings) {
-            if (StringUtil.isNotEmpty(driver.getFleetName())) {
-                scheduling.setFleetName(driver.getFleetName());
+        if(CollectionUtils.isNotEmpty(driverSchedulings)) {
+            for (DriverScheduling scheduling : driverSchedulings) {
+                if (StringUtil.isNotEmpty(driver.getFleetName())) {
+                    scheduling.setFleetName(driver.getFleetName());
+                }
             }
         }
         return driverMapper.updateDriver(driver);
@@ -356,7 +359,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     }
     @Override
-    public AjaxResult uploadImage(MultipartFile file) throws InvalidExtensionException, IOException {
+    public AjaxResult uploadImage(MultipartFile file,Integer id) throws InvalidExtensionException, IOException {
         // 上传并返回新文件名称
         // 上传文件路径
         String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
@@ -364,13 +367,23 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
         FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         // 后期可以通过请求头拿到对应的工号
         String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "." + FileUploadUtils.getExtension(file);
+        if(Objects.nonNull(id)){
+            fileName = StringUtils.join(id,"/",fileName);
+        }else{
+            fileName = StringUtils.join("head/", RandomUtils.nextInt(1,90000),"/",fileName);
+        }
+        String urlFileName = fileName;
         String absPath = FileUploadUtils.getAbsoluteFile(baseUrl, fileName).getAbsolutePath();
         fileName = FileUploadUtils.getPathFileName(baseUrl, fileName);
         file.transferTo(Paths.get(absPath));
-        String url = serverConfig.getUrl() + fileName;
+
+        SysDictData source = sysDictDataService.getResourceBaseUrl();
+        String  url = sysDictDataService.combationValue(urlFileName,source);
+
+
         AjaxResult ajax = AjaxResult.success();
         ajax.put("url", url);
-        ajax.put("fileName", fileName);
+        ajax.put("fileName", url);
         ajax.put("newFileName", FileUtils.getName(fileName));
         ajax.put("originalFilename", file.getOriginalFilename());
         return ajax;
@@ -3,6 +3,7 @@ package com.ruoyi.equipment.controller;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -11,6 +12,7 @@ import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
@@ -38,6 +40,8 @@ public class EquipmentController extends BaseController {
     private IEquipmentService equipmentService;
     @Autowired
     private LinggangVenueInfoService venueInfoService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
     /**
      * 查询设备信息列表
@@ -49,18 +53,21 @@ public class EquipmentController extends BaseController {
         startPage();
         List<Equipment> list = equipmentService.selectEquipmentList(equipment);
         if (CollectionUtils.isNotEmpty(list)) {
+            SysDictData sysDictData = sysDictDataService.getResourceBaseUrl();
             Collection<Integer> yarIds = list.stream().map(Equipment::getYardId).collect(Collectors.toSet());
             List<LinggangVenueInfo> venueInfos = venueInfoService.listOfIds(yarIds);
-            if (CollectionUtils.isNotEmpty(venueInfos)) {
-                list = list.stream().map(eq -> {
+            list = list.stream().map(eq -> {
+                if (CollectionUtils.isNotEmpty(venueInfos)) {
                     Optional<LinggangVenueInfo> optional = venueInfos.stream().filter(v -> Objects.equals(v.getId(), eq.getYardId())).findFirst();
                     if (optional.isPresent()) {
                         eq.setYardName(optional.get().getName());
                     }
+                }
+                eq.setImage(sysDictDataService.combationValue(eq.getImage(),sysDictData));
+
+                return eq;
+            }).collect(Collectors.toList());
-                    return eq;
-                }).collect(Collectors.toList());
-            }
         }
         return getDataTable(list);
@@ -104,7 +111,11 @@ public class EquipmentController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiOperation("获取设备信息详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(equipmentService.selectEquipmentById(id));
+       Equipment equipment = equipmentService.selectEquipmentById(id);
+       if(Objects.nonNull(equipment)){
+           equipment.setImage(sysDictDataService.combationValue(equipment.getImage()));
+       }
+        return success(equipment);
     }
     /**
@@ -115,6 +126,7 @@ public class EquipmentController extends BaseController {
     @PostMapping
     @ApiOperation("新增设备信息")
     public AjaxResult add(@RequestBody Equipment equipment) {
+        equipment.setImage(sysDictDataService.splitURL(equipment.getImage()));
         return toAjax(equipmentService.insertEquipment(equipment));
     }
@@ -126,6 +138,7 @@ public class EquipmentController extends BaseController {
     @PutMapping
     @ApiOperation("修改设备信息")
     public AjaxResult edit(@RequestBody Equipment equipment) {
+        equipment.setImage(sysDictDataService.splitURL(equipment.getImage()));
         return toAjax(equipmentService.updateEquipment(equipment));
     }
@@ -232,6 +232,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
             if (opt.isPresent()) {
                 d.setId(opt.get().getId());
                 d.setImage(null);
+                d.setPosts(opt.get().getPosts());
             }
             return d;
         }).collect(Collectors.toList());
 package com.ruoyi.web.controller.common;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.system.service.ISysDictDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +18,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * 通用请求处理
@@ -37,6 +40,10 @@ public class CommonController
     private static final String FILE_DELIMETER = ",";
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private SpringUtils springUtils;
+
     /**
      * 通用下载请求
      * 
@@ -78,13 +85,17 @@ public class CommonController
         try
         {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = org.apache.commons.lang3.StringUtils.join(RuoYiConfig.getUploadPath(),"/image");
+
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            fileName = org.apache.commons.lang3.StringUtils.substringAfter(fileName, "upload/image");
+            String url = getSysDictDataService().combationValue(fileName);
             AjaxResult ajax = AjaxResult.success();
+
+            log.info("filePath:[{}],fileName:[{}]", filePath, fileName);
             ajax.put("url", url);
-            ajax.put("fileName", fileName);
+            ajax.put("fileName", url);
             ajax.put("newFileName", FileUtils.getName(fileName));
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
@@ -95,6 +106,13 @@ public class CommonController
         }
     }
+    public ISysDictDataService getSysDictDataService(){
+        if(sysDictDataService == null){
+            sysDictDataService = SpringUtils.getBean(ISysDictDataService.class);
+        }
+        return sysDictDataService;
+    }
+
     /**
      * 通用上传请求（多个）
      */
@@ -174,7 +174,7 @@ api:
     apk:
         path: /apk/dev
     # 用户头像存放位置
-    headImage: /head/image
+    headImage: /image
     sign:
         image: /image
     video:
@@ -221,5 +221,5 @@ bsth:
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     skip:
-        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/test/**;/login/no/code;/actuator/health;
+        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/test/**;/login/no/code;/actuator/health;/upload/image/**;
@@ -173,8 +173,8 @@ api:
         nonce: adfsad
     apk:
         path: /apk/dev
-    # 用户头像存放位置
-    headImage: /head/image
+    # 用户头像存放位置f
+    headImage: /image
     sign:
         image: /image
     video:
@@ -215,4 +215,4 @@ bsth:
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     skip:
-        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/login/no/code
+        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/login/no/code;/uploadPath/**
+
+# 数据源配置
+spring:
+    # 邮箱配置
+    mail:
+        # 只发送不接收
+        host: smtp.163.com
+        # 自己的邮箱
+        username: m18980249160@163.com
+        # 提供的密码  不是自己的登录密码
+        password: RZHJXWXPCALIAOCG1
+        # 占用端口号
+        port: 465
+        nickname: 酒精测试异常通知
+        form: m18980249160@163.com
+        protocol: smtp
+        properties:
+          mail:
+              smtp:
+                  ssl:
+                      enable: true
+                  socketFactory:
+                      class: javax.net.ssl.SSLSocketFactory
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                # 测试地址
+               # url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                #url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+               # url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: guzijian
+               # password: 1
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+        # 文件上传
+        servlet:
+            multipart:
+                # 单个文件大小
+                max-file-size: 100MB
+                # 设置总上传的文件大小
+                max-request-size: 100MB
+        # 服务模块
+        devtools:
+            restart:
+                # 热部署开关
+                enabled: true
+        # redis 配置
+    redis:
+        # 地址
+#            host: 121.41.83.61
+        host: localhost
+        database: 4
+#            password: "guzijian"
+        port: 6379
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxyz
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.8.5
+    # 版权年份
+    copyrightYear: 2023
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /data/test/bath-alcoho-sign/apache-tomcat-8.5.61/webapps/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: true
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
+api:
+    template: 车队与线路匹配模板
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://dsh.bdo2o.com:6280/shr
+        # 获取公司编码下的员工信息 暂时没用
+        getCompanyInfo:
+        # 获取排班信息
+        getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
+    apk:
+        path: /apk/dev
+    # 用户头像存放位置
+    headImage: /head/image
+    sign:
+        image: /image
+    video:
+        basePath: /video
+
+    personnel:
+        token:
+            tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+            appKey: dingsclwvxui5zilg1xk
+            appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+        people:
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: logs
+server:
+    port: 8102
+netty:
+    # 是否开启netty服务
+    enabled: true
+    socket:
+        # 相对路径 classpath
+        catalogue:
+            image: device/image
+            speech: device/speech
+        port: 8989
+
+
+bsth:
+    face:
+        app:
+            id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
+        sdk:
+             key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+           # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+        lib:
+             path: /data/test/bath-alcoho-sign/LINUX64
+           # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
+        faceFeature:
+            url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    skip:
+        url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/login/no/code
@@ -116,7 +116,7 @@ public class Constants {
     /**
      * 资源映射路径 前缀
      */
-    public static final String RESOURCE_PREFIX = "/profile";
+    public static final String RESOURCE_PREFIX = "";
     /**
      * RMI 远程方法调用
@@ -72,6 +72,16 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
+    private String deviceId;
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public Long getUserId()
     {
         return userId;
@@ -62,7 +62,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
             return  "没有登陆信息";
         }
-        if(org.apache.commons.lang3.StringUtils.equals(device,Convert.toStr(loginUser.getDeptId()))){
+        if(org.apache.commons.lang3.StringUtils.equals(device,Convert.toStr(loginUser.getDeviceId()))){
             return null;
         }
@@ -30,6 +30,10 @@ public interface ISysDictDataService extends IService&lt;SysDictData&gt; {
     String combationValue(String url,SysDictData dictData);
+    String combationValue(String url);
+
+    String splitURL(String url);
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
 package com.ruoyi.system.service.impl;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -8,7 +9,10 @@ import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import java.util.Collection;
@@ -24,6 +28,10 @@ import java.util.Objects;
 public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
     @Autowired
     private SysDictDataMapper dictDataMapper;
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SysDictDataServiceImpl.class);
     /**
      * 根据条件分页查询字典数据
@@ -59,9 +67,13 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
     @Override
     public SysDictData getResourceBaseUrl() {
-        SysDictData source = new SysDictData();
-        source.setDictType("resource_base_url");
-        List<SysDictData> sysDictDatas = queryDictDateList(source);
+        List<SysDictData> sysDictDatas = getDataOfRedis("resource_base_url");
+        if (CollectionUtils.isEmpty(sysDictDatas)) {
+            SysDictData source = new SysDictData();
+            source.setDictType("resource_base_url");
+            sysDictDatas = queryDictDateList(source);
+        }
+
         String url1 = "";
         String flag1 = null;
@@ -87,6 +99,18 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
         return target;
     }
+    public List<SysDictData> getDataOfRedis(String dicType) {
+        try {
+            String key = StringUtils.join("sys_dict:", dicType);
+            String json = redisTemplate.opsForValue().get(key);
+            return JSON.parseArray(json, SysDictData.class);
+        } catch (Exception e) {
+            LOGGER.info("从redis中获取数据异常:[{}]", dicType, e);
+        }
+        return null;
+    }
+
+
     @Override
     public String combationValue(String url, SysDictData dictData) {
         if (Objects.isNull(dictData) || StringUtils.isEmpty(url)) {
@@ -106,6 +130,25 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
         return url;
     }
+    @Override
+    public String combationValue(String url) {
+        SysDictData source = getResourceBaseUrl();
+        return combationValue(url, source);
+    }
+
+    @Override
+    public String splitURL(String url) {
+        if (StringUtils.isEmpty(url)) {
+            return url;
+        }
+
+        SysDictData sysDictData = getResourceBaseUrl();
+        if (Objects.nonNull(sysDictData) && StringUtils.isNotEmpty(sysDictData.getDictValueStr())) {
+            return StringUtils.substringAfter(url, sysDictData.getDictValueStr());
+        }
+        return url;
+    }
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *