ruoyi-admin/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OssController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-admin/src/main/resources/application-test.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/pom.xml
@@ -155,6 +155,12 @@ <version>2.0.10</version> </dependency> <!--腾讯云文件上传--> <dependency> <groupId>com.qcloud</groupId> <artifactId>cos_api</artifactId> <version>5.6.89</version> </dependency> </dependencies> <build> ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OssController.java
New file @@ -0,0 +1,40 @@ package com.ruoyi.web.controller.api; import com.ruoyi.common.core.domain.R; import com.ruoyi.web.controller.tool.TencentCosUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; /** * @author HJL * @version 1.0 * @since 2024-05-30 9:27 */ @RestController @RequestMapping("/oss") @Api(tags = "公共-文件上传") public class OssController { @Resource private TencentCosUtil tencentCosUtil; @PostMapping("/upload") @ApiOperation(value = "文件上传", tags = "公共-文件上传") @ApiImplicitParams({ @ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true) }) public R<String> upload(@RequestParam("file") MultipartFile file) { String s = tencentCosUtil.upLoadFile(file); return R.ok(s, s); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
New file @@ -0,0 +1,108 @@ package com.ruoyi.web.controller.tool; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; import com.qcloud.cos.auth.COSCredentials; import com.qcloud.cos.http.HttpProtocol; import com.qcloud.cos.model.ObjectMetadata; import com.qcloud.cos.model.PutObjectResult; import com.qcloud.cos.region.Region; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; import java.util.UUID; /** * @author HJL */ @Component public class TencentCosUtil { /** * COS的SecretId */ @Value("${cos.client.accessKey}") private String secretId; /** * COS的SecretKey */ @Value("${cos.client.secretKey}") private String secretKey; /** * 文件上传后访问路径的根路径,后面要最佳文件名字与类型 */ @Value("${cos.client.rootSrc}") private String rootSrc; /** * 上传的存储桶的地域 */ @Value("${cos.client.bucketAddr}") private String bucketAddr; /** * 存储桶的名字,是自己在存储空间自己创建的,我创建的名字是:qq-test-1303****** */ @Value("${cos.client.bucket}") private String bucketName; /** * 1.调用静态方法getCosClient()就会获得COSClient实例 * 2.本方法根据永久密钥初始化 COSClient的,官方是不推荐,官方推荐使用临时密钥,是可以限制密钥使用权限,创建cred时有些区别 * * @return COSClient实例 */ private COSClient getCosClient() { // 1 初始化用户身份信息(secretId, secretKey)。 COSCredentials cred = new BasicCOSCredentials(secretId, secretKey); // 2.1 设置存储桶的地域(上文获得) Region region = new Region(bucketAddr); ClientConfig clientConfig = new ClientConfig(region); // 2.2 使用https协议传输 clientConfig.setHttpProtocol(HttpProtocol.https); // 生成 cos 客户端 return new COSClient(cred, clientConfig); } /** * 只要调用静态方法upLoadFile(MultipartFile multipartFile)就可以获取上传后文件的全路径 * * @param file * @return 返回文件的浏览全路径 */ public String upLoadFile(MultipartFile file) { try { // 获取上传的文件的输入流 InputStream inputStream = file.getInputStream(); // 避免文件覆盖,获取文件的原始名称,如123.jpg,然后通过截取获得文件的后缀,也就是文件的类型 String originalFilename = file.getOriginalFilename(); //获取文件的类型 String fileType = originalFilename.substring(originalFilename.lastIndexOf(".")); //使用UUID工具 创建唯一名称,放置文件重名被覆盖,在拼接上上命令获取的文件类型 String fileName = UUID.randomUUID() + fileType; // 指定文件上传到 COS 上的路径,即对象键。最终文件会传到存储桶名字中的images文件夹下的fileName名字 String key = "finance/" + fileName; // 创建上传Object的Metadata ObjectMetadata objectMetadata = new ObjectMetadata(); // - 使用输入流存储,需要设置请求长度 objectMetadata.setContentLength(inputStream.available()); // - 设置缓存 objectMetadata.setCacheControl("no-cache"); // - 设置Content-Type objectMetadata.setContentType(fileType); //上传文件 PutObjectResult putResult = getCosClient().putObject(bucketName, key, inputStream, objectMetadata); // 创建文件的网络访问路径 String url = rootSrc + key; //关闭 cosClient,并释放 HTTP 连接的后台管理线程 getCosClient().shutdown(); return url; } catch (Exception e) { e.printStackTrace(); // 发生IO异常、COS连接异常等,返回空 return null; } } } ruoyi-admin/src/main/resources/application-prod.yml
@@ -197,4 +197,11 @@ location: /file/ qrLocation: /file/qrCode/ accessPath: /file/ allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar cos: client: accessKey: AKIDHVcchrvvtBiRJB25bHFFJc2Laq4NnHsY secretKey: pgUGwX4Z1SrAPXYk1PxgXVem2HlRJG9k bucketAddr: ap-nanjing bucket: huishou-1323682843 rootSrc: https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/ ruoyi-admin/src/main/resources/application-test.yml
@@ -190,4 +190,12 @@ location: /file/ qrLocation: /file/qrCode/ accessPath: /file/ allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar cos: client: accessKey: AKIDHVcchrvvtBiRJB25bHFFJc2Laq4NnHsY secretKey: pgUGwX4Z1SrAPXYk1PxgXVem2HlRJG9k bucketAddr: ap-nanjing bucket: huishou-1323682843 rootSrc: https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/ ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
@@ -12,7 +12,7 @@ public class SysUserQuery extends BasePage { @ApiModelProperty(value = "姓名") private String nickNameOrPhone; private String nickName; @ApiModelProperty(value = "角色id") private List<Integer> roleIds; ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -237,9 +237,8 @@ left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id WHERE u.del_flag = 0 <if test="query.nickNameOrPhone != null and query.nickNameOrPhone != ''"> AND (u.nick_name LIKE concat('%',#{query.nickNameOrPhone},'%') OR u.phonenumber LIKE concat('%',#{query.nickNameOrPhone},'%')) <if test="query.nickName != null and query.nickName != ''"> AND u.nick_name LIKE concat('%',#{query.nickName},'%') </if> <if test="query.status != null and query.status != ''"> AND u.status = #{query.status}