wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prod

Browse Source
This commit is contained in:
wuyibo
2024-05-29 18:11:10 +08:00
parent 84ace22cff 59f69cf3f6
commit 9377cdeb3e
9 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@@ -26,6 +26,7 @@
<spring-boot-admin.version>2.7.3</spring-boot-admin.version> <spring-boot-admin.version>2.7.3</spring-boot-admin.version>
<spring-boot.mybatis>3.0.2</spring-boot.mybatis> <spring-boot.mybatis>3.0.2</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version> <swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.bootstrap.ui.version>1.9.6</swagger.bootstrap.ui.version>
<swagger.core.version>1.6.2</swagger.core.version> <swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version> <tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.2</kaptcha.version> <kaptcha.version>2.3.2</kaptcha.version>

6
ruoyi-common/ruoyi-common-swagger/pom.xml
View File

@@ -29,6 +29,10 @@
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>${swagger.fox.version}</version> <version>${swagger.fox.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.bootstrap.ui.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

11
ruoyi-gateway/pom.xml
View File

@@ -77,10 +77,15 @@
</dependency> </dependency>
<!-- Swagger --> <!-- Swagger -->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>${swagger.fox.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.fox.version}</version> <version>${swagger.bootstrap.ui.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>

11
ruoyi-modules/ruoyi-gen/pom.xml
View File

@@ -42,12 +42,11 @@
</dependency> </dependency>
<!-- Swagger UI --> <!-- Swagger UI -->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>io.springfox</groupId>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
<version>${swagger.fox.version}</version> <!-- <version>${swagger.fox.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- Apache Velocity --> <!-- Apache Velocity -->
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>

10
ruoyi-modules/ruoyi-job/pom.xml
View File

@@ -42,11 +42,11 @@
</dependency> </dependency>
<!-- Swagger UI --> <!-- Swagger UI -->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>io.springfox</groupId>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
<version>${swagger.fox.version}</version> <!-- <version>${swagger.fox.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- Quartz --> <!-- Quartz -->
<dependency> <dependency>

11
ruoyi-modules/ruoyi-system/pom.xml
View File

@@ -42,12 +42,11 @@
</dependency> </dependency>
<!-- Swagger UI --> <!-- Swagger UI -->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>io.springfox</groupId>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
<version>${swagger.fox.version}</version> <!-- <version>${swagger.fox.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- Mysql Connector --> <!-- Mysql Connector -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>

9
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java
View File

@@ -29,6 +29,7 @@ import com.ruoyi.system.domain.vo.SmsResponse;
import com.ruoyi.system.service.*; import com.ruoyi.system.service.*;
import com.ruoyi.system.utils.UtilTool; import com.ruoyi.system.utils.UtilTool;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.ooxml.POIXMLDocumentPart;
@@ -334,8 +335,8 @@ public class CompetitionController extends BaseController
@ResponseBody @ResponseBody
@ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)") @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)")
public AjaxResult teamEnrollExcleImport( public AjaxResult teamEnrollExcleImport(
@RequestParam(value = "competitionId", required = true) Long competitionId, @ApiParam(value = "赛会ID", required = true) @RequestParam(value = "competitionId", required = true) Long competitionId,
@RequestParam("file") MultipartFile file) throws Exception { @ApiParam(value = "文件流", required = true) @RequestPart MultipartFile file) throws Exception {
CompetitionExcleVo excleVo = new CompetitionExcleVo(); CompetitionExcleVo excleVo = new CompetitionExcleVo();
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
// 上传文件为空 // 上传文件为空
@@ -377,8 +378,8 @@ public class CompetitionController extends BaseController
@ResponseBody @ResponseBody
@ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)补充队员头像") @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)补充队员头像")
public AjaxResult teamEnrollExcleImportUserPhone( public AjaxResult teamEnrollExcleImportUserPhone(
@RequestParam(value = "competitionId", required = true) Long competitionId, @ApiParam(value = "赛会ID", required = true) @RequestParam(value = "competitionId", required = true) Long competitionId,
@RequestParam("file") MultipartFile file) throws Exception { @RequestPart MultipartFile file) throws Exception {
CompetitionExcleVo excleVo = new CompetitionExcleVo(); CompetitionExcleVo excleVo = new CompetitionExcleVo();
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
// 上传文件为空 // 上传文件为空

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxFileController.java
View File

@@ -36,7 +36,7 @@ public class WxFileController extends BaseController {
@ApiOperation("文件上传") @ApiOperation("文件上传")
@PostMapping(value = "/uploadMore") @PostMapping(value = "/uploadMore")
@ResponseBody @ResponseBody
public TableDataInfo handleFileUpload(@RequestParam("files") MultipartFile[] fileList) { public TableDataInfo handleFileUpload(@RequestPart("files") MultipartFile[] fileList) {
if(fileList==null||fileList.length==0){ if(fileList==null||fileList.length==0){
throw new CheckedException("请选择需要上传的文件！"); throw new CheckedException("请选择需要上传的文件！");
} }
@@ -56,7 +56,7 @@ public class WxFileController extends BaseController {
String originalFilename=file.getOriginalFilename();//原文件名称 String originalFilename=file.getOriginalFilename();//原文件名称
String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase(); String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase();
String dest=filePath + newFileName; String dest=filePath + newFileName;
File destFile = new File(filePath+newFileName); File destFile = new File(dest);
//文件目录不存在需要先创建 //文件目录不存在需要先创建
if(!destFile.getParentFile().exists()){ if(!destFile.getParentFile().exists()){
destFile.getParentFile().mkdirs(); destFile.getParentFile().mkdirs();
@@ -76,7 +76,7 @@ public class WxFileController extends BaseController {
@PostMapping(value = "/uploadMoreFiles") @PostMapping(value = "/uploadMoreFiles")
@ResponseBody @ResponseBody
@ApiImplicitParams(@ApiImplicitParam(name = "files",paramType = "formData",value = "图片",required = true,dataType = "file",allowMultiple=true)) @ApiImplicitParams(@ApiImplicitParam(name = "files",paramType = "formData",value = "图片",required = true,dataType = "file",allowMultiple=true))
public TableDataInfo uploadMoreFiles(@RequestParam("files") MultipartFile[] fileList) { public TableDataInfo uploadMoreFiles(@RequestPart("files") MultipartFile[] fileList) {
if(fileList==null||fileList.length==0){ if(fileList==null||fileList.length==0){
throw new CheckedException("请选择需要上传的文件！"); throw new CheckedException("请选择需要上传的文件！");
} }
@@ -96,7 +96,7 @@ public class WxFileController extends BaseController {
String originalFilename=file.getOriginalFilename();//原文件名称 String originalFilename=file.getOriginalFilename();//原文件名称
String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase(); String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase();
String dest=filePath + newFileName; String dest=filePath + newFileName;
File destFile = new File(filePath+newFileName); File destFile = new File(dest);
//文件目录不存在需要先创建 //文件目录不存在需要先创建
if(!destFile.getParentFile().exists()){ if(!destFile.getParentFile().exists()){
destFile.getParentFile().mkdirs(); destFile.getParentFile().mkdirs();
@@ -117,7 +117,7 @@ public class WxFileController extends BaseController {
@PostMapping(value = "/uploadIdCardImg") @PostMapping(value = "/uploadIdCardImg")
@ResponseBody @ResponseBody
public AjaxResult uploadIdCardImg(@RequestParam(value = "front：身份证含照片的一面；back：身份证带国徽的一面", required = true) String idCardSide, public AjaxResult uploadIdCardImg(@RequestParam(value = "front：身份证含照片的一面；back：身份证带国徽的一面", required = true) String idCardSide,
@RequestParam("files") MultipartFile[] fileList) { @RequestPart("files") MultipartFile[] fileList) {
if(fileList==null||fileList.length==0){ if(fileList==null||fileList.length==0){
throw new CheckedException("请选择需要上传的文件！"); throw new CheckedException("请选择需要上传的文件！");
}if(fileList.length!=1){ }if(fileList.length!=1){
@@ -167,7 +167,7 @@ public class WxFileController extends BaseController {
@ApiResponse(code = 500, message = "上传失败！") @ApiResponse(code = 500, message = "上传失败！")
}) })
public AjaxResult uploadIdCardImg1(@RequestParam(value = "front：身份证含照片的一面；back：身份证带国徽的一面", required = true) String idCardSide, public AjaxResult uploadIdCardImg1(@RequestParam(value = "front：身份证含照片的一面；back：身份证带国徽的一面", required = true) String idCardSide,
@ApiParam(value = "身份证照片", required = true) MultipartFile file) { @ApiParam(value = "身份证照片", required = true) @RequestPart("file") MultipartFile file) {
Map returnMap = new HashMap(); Map returnMap = new HashMap();
if (!file.isEmpty()) { if (!file.isEmpty()) {
if (file.getContentType().contains("image")) { if (file.getContentType().contains("image")) {

6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java
View File

@@ -822,9 +822,9 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
String newFileName = UUID.randomUUID() + "_5.jpg"; String newFileName = UUID.randomUUID() + "_5.jpg";
String uploadpath = UtilTool.getFileUploadPath(osPath); String uploadpath = UtilTool.getFileUploadPath(osPath);
File file2 = UtilTool.bytesToFile(data, uploadpath, newFileName); File file2 = UtilTool.bytesToFile(data, uploadpath, newFileName);
// team.setTeamLogo(domainName + datePath + newFileName); team.setTeamLogo(domainName + datePath + newFileName);
team.setStatus(0); team.setStatus(0);
System.out.println(JSON.toJSONString(team)); log.info("开始导入-->球队信息:" + JSON.toJSONString(team));
//todo 保存球队数据; //todo 保存球队数据;
if (ObjectUtil.isNotNull(team)&&ObjectUtil.isNotNull(team.getId())) { if (ObjectUtil.isNotNull(team)&&ObjectUtil.isNotNull(team.getId())) {
competitionOfTeamMapper.updateCompetitionOfTeam(team); competitionOfTeamMapper.updateCompetitionOfTeam(team);
@@ -864,8 +864,6 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
&& a.getCompetitionOfTeamId().equals(membersVo.getCompetitionOfTeamId())).findFirst(); && a.getCompetitionOfTeamId().equals(membersVo.getCompetitionOfTeamId())).findFirst();
if(opt.isPresent()){ if(opt.isPresent()){
membersVo.setId(opt.get().getId()); membersVo.setId(opt.get().getId());
}else {
continue;
} }
//球衣号码 //球衣号码
cell = row.getCell(2); cell = row.getCell(2);