diff --git a/pom.xml b/pom.xml index 7ca46a6d..5925f198 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 2.7.3 3.0.2 3.0.0 + 1.9.6 1.6.2 1.27.2 2.3.2 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 7262ee2d..6e60f0fb 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -29,6 +29,10 @@ springfox-swagger2 ${swagger.fox.version} - + + com.github.xiaoymin + swagger-bootstrap-ui + ${swagger.bootstrap.ui.version} + diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 2aaa5dea..ee65766c 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -77,10 +77,15 @@ + + + + + - io.springfox - springfox-swagger-ui - ${swagger.fox.version} + com.github.xiaoymin + swagger-bootstrap-ui + ${swagger.bootstrap.ui.version} io.springfox diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index e1ddc092..a6611dcd 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -42,12 +42,11 @@ - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - + + + + + org.apache.velocity diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 97c47c63..6e978eb6 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -42,11 +42,11 @@ - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - + + + + + diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 4e03e587..9bc70155 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -42,12 +42,11 @@ - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - + + + + + mysql diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java index 03fb27aa..36730376 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionController.java @@ -29,6 +29,7 @@ import com.ruoyi.system.domain.vo.SmsResponse; import com.ruoyi.system.service.*; import com.ruoyi.system.utils.UtilTool; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.commons.lang3.RandomStringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ooxml.POIXMLDocumentPart; @@ -334,8 +335,8 @@ public class CompetitionController extends BaseController @ResponseBody @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)") public AjaxResult teamEnrollExcleImport( - @RequestParam(value = "competitionId", required = true) Long competitionId, - @RequestParam("file") MultipartFile file) throws Exception { + @ApiParam(value = "赛会ID", required = true) @RequestParam(value = "competitionId", required = true) Long competitionId, + @ApiParam(value = "文件流", required = true) @RequestPart MultipartFile file) throws Exception { CompetitionExcleVo excleVo = new CompetitionExcleVo(); String fileName = file.getOriginalFilename(); // 上传文件为空 @@ -377,8 +378,8 @@ public class CompetitionController extends BaseController @ResponseBody @ApiOperation(value = ApiTerminal.wxMiniProgram+"导入球队报名excel(包含图片)补充队员头像") public AjaxResult teamEnrollExcleImportUserPhone( - @RequestParam(value = "competitionId", required = true) Long competitionId, - @RequestParam("file") MultipartFile file) throws Exception { + @ApiParam(value = "赛会ID", required = true) @RequestParam(value = "competitionId", required = true) Long competitionId, + @RequestPart MultipartFile file) throws Exception { CompetitionExcleVo excleVo = new CompetitionExcleVo(); String fileName = file.getOriginalFilename(); // 上传文件为空 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxFileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxFileController.java index dd51f4ad..2ac62a1b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxFileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxFileController.java @@ -36,7 +36,7 @@ public class WxFileController extends BaseController { @ApiOperation("文件上传") @PostMapping(value = "/uploadMore") @ResponseBody - public TableDataInfo handleFileUpload(@RequestParam("files") MultipartFile[] fileList) { + public TableDataInfo handleFileUpload(@RequestPart("files") MultipartFile[] fileList) { if(fileList==null||fileList.length==0){ throw new CheckedException("请选择需要上传的文件！"); } @@ -56,7 +56,7 @@ public class WxFileController extends BaseController { String originalFilename=file.getOriginalFilename();//原文件名称 String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase(); String dest=filePath + newFileName; - File destFile = new File(filePath+newFileName); + File destFile = new File(dest); //文件目录不存在需要先创建 if(!destFile.getParentFile().exists()){ destFile.getParentFile().mkdirs(); @@ -76,7 +76,7 @@ public class WxFileController extends BaseController { @PostMapping(value = "/uploadMoreFiles") @ResponseBody @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){ throw new CheckedException("请选择需要上传的文件！"); } @@ -96,7 +96,7 @@ public class WxFileController extends BaseController { String originalFilename=file.getOriginalFilename();//原文件名称 String newFileName = UUID.randomUUID().toString()+"."+originalFilename.substring(originalFilename.lastIndexOf(".")+1).toLowerCase(); String dest=filePath + newFileName; - File destFile = new File(filePath+newFileName); + File destFile = new File(dest); //文件目录不存在需要先创建 if(!destFile.getParentFile().exists()){ destFile.getParentFile().mkdirs(); @@ -117,7 +117,7 @@ public class WxFileController extends BaseController { @PostMapping(value = "/uploadIdCardImg") @ResponseBody 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){ throw new CheckedException("请选择需要上传的文件！"); }if(fileList.length!=1){ @@ -167,7 +167,7 @@ public class WxFileController extends BaseController { @ApiResponse(code = 500, message = "上传失败！") }) 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(); if (!file.isEmpty()) { if (file.getContentType().contains("image")) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java index 79df8833..70e509e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionServiceImpl.java @@ -822,9 +822,9 @@ public class CompetitionServiceImpl extends ServiceImpl球队信息:" + JSON.toJSONString(team)); //todo 保存球队数据; if (ObjectUtil.isNotNull(team)&&ObjectUtil.isNotNull(team.getId())) { competitionOfTeamMapper.updateCompetitionOfTeam(team); @@ -864,8 +864,6 @@ public class CompetitionServiceImpl extends ServiceImpl