From aea81128444acb8ca9a90bc7ef04758bf2cd284d Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期三, 23 八月 2023 14:44:22 +0800 Subject: [PATCH] 重构minio和mqtt配置信息获取 重构minio工具类 区分生产环境和开发环境配置信息 --- ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java index 69a7747..6c2d3a8 100644 --- a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java +++ b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java @@ -1,28 +1,19 @@ package com.ruoyi.app.position.controller; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.position.domain.ArdAppPosition; import com.ruoyi.app.position.service.IArdAppPositionService; -import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.device.hiksdk.util.minio.MinioUtils; +import com.ruoyi.storage.minio.utils.MinioUtils; import com.ruoyi.rongcloud.service.RongCloudService; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserOnlineService; import com.ruoyi.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -56,7 +47,7 @@ @Autowired private ISysUserService sysUserService; @Autowired - private RongCloudService rongCloudService; + private MinioUtils minioUtil; /** * 鏌ヨapp浣嶇疆鍒楄〃 @@ -210,7 +201,7 @@ @ApiOperation("涓婁紶鏂囦欢") public AjaxResult uploadFile(MultipartFile file,String type) { - String url = MinioUtils.putObjectAndGetUrl("app",type, file); + String url = minioUtil.putObjectAndGetUrl("app",type, file); return AjaxResult.success(url); } } -- Gitblit v1.9.3