diff --git a/ct/src/main/java/com/ccsens/ct/config/SpringConfig.java b/ct/src/main/java/com/ccsens/ct/config/SpringConfig.java index bd24e547..b701c3e8 100644 --- a/ct/src/main/java/com/ccsens/ct/config/SpringConfig.java +++ b/ct/src/main/java/com/ccsens/ct/config/SpringConfig.java @@ -111,7 +111,7 @@ public class SpringConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/tall/uploads/"); + .addResourceLocations("file:///home/cloud/ct/uploads/"); //super.addResourceHandlers(registry); } diff --git a/game/src/main/java/com/ccsens/game/config/SpringConfig.java b/game/src/main/java/com/ccsens/game/config/SpringConfig.java index 8bd9c3a1..77036f1c 100644 --- a/game/src/main/java/com/ccsens/game/config/SpringConfig.java +++ b/game/src/main/java/com/ccsens/game/config/SpringConfig.java @@ -116,7 +116,7 @@ public class SpringConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/tall/uploads/"); + .addResourceLocations("file:///home/cloud/game/uploads/"); //super.addResourceHandlers(registry); } diff --git a/health/src/main/java/com/ccsens/health/config/SpringConfig.java b/health/src/main/java/com/ccsens/health/config/SpringConfig.java index 59f4b660..a7a7a70f 100644 --- a/health/src/main/java/com/ccsens/health/config/SpringConfig.java +++ b/health/src/main/java/com/ccsens/health/config/SpringConfig.java @@ -111,7 +111,7 @@ public class SpringConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/tall/uploads/"); + .addResourceLocations("file:///home/cloud/health/uploads/"); //super.addResourceHandlers(registry); } diff --git a/mt/src/main/java/com/ccsens/mt/api/FileController.java b/mt/src/main/java/com/ccsens/mt/api/FileController.java index dfb13075..6f711826 100644 --- a/mt/src/main/java/com/ccsens/mt/api/FileController.java +++ b/mt/src/main/java/com/ccsens/mt/api/FileController.java @@ -38,7 +38,7 @@ public class FileController { private TallFeignClient tallFeignClient; - @ApiOperation(value = "上传交付物文件") + @ApiOperation(value = "上传文件") @ApiImplicitParams({ }) @RequestMapping(value = "upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/mt/src/main/java/com/ccsens/mt/config/SpringConfig.java b/mt/src/main/java/com/ccsens/mt/config/SpringConfig.java index c477f308..a98c3a3f 100644 --- a/mt/src/main/java/com/ccsens/mt/config/SpringConfig.java +++ b/mt/src/main/java/com/ccsens/mt/config/SpringConfig.java @@ -111,7 +111,7 @@ public class SpringConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/tall/uploads/"); + .addResourceLocations("file:///home/cloud/mt/uploads/"); //super.addResourceHandlers(registry); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 873d5c78..a2724531 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -216,7 +216,7 @@ public class CompeteService implements ICompeteService{ team.setCertificate(params.getParam().getCertificate()); team.setGenderGroup(player.getGender()); String qrCode = PropUtil.signUpUrl + "home&teamId=" + team.getId(); - String qrCodeVisit = QrCodeUtil.urlToQRCode(qrCode, PropUtil.path + "qrCode"); + String qrCodeVisit = QrCodeUtil.urlToQRCode(qrCode, PropUtil.path); team.setQrCode(qrCodeVisit); competeTeamDao.insertSelective(team); // 加入团队 @@ -263,6 +263,7 @@ public class CompeteService implements ICompeteService{ List competeTeamProjects = competeTeamDao.queryTeam(userId, competeTimeId); //封装队员信息和总队员数 competeTeamProjects.forEach(team -> { + team.setQrCode(PropUtil.imgDomain + team.getQrCode()); List members = competeTeamDao.queryMembers(team.getTeamId()); team.setMembers(members); team.setMemberNums(members.size()); diff --git a/mt/src/main/java/com/ccsens/mt/service/FileService.java b/mt/src/main/java/com/ccsens/mt/service/FileService.java index 5fee1229..aaa34977 100644 --- a/mt/src/main/java/com/ccsens/mt/service/FileService.java +++ b/mt/src/main/java/com/ccsens/mt/service/FileService.java @@ -3,6 +3,7 @@ package com.ccsens.mt.service; import cn.hutool.core.lang.Snowflake; import com.ccsens.mt.bean.po.CommonFile; import com.ccsens.mt.persist.mapper.CommonFileMapper; +import com.ccsens.mt.util.Constant; import com.ccsens.util.NotSupportedFileTypeException; import com.ccsens.util.PropUtil; import com.ccsens.util.UploadFileUtil_Servlet3; @@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.Part; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -48,7 +50,7 @@ public class FileService implements IFileService { fileDo.setLocation(dir + java.io.File.separator + path); fileDo.setUserId(userId); if (WebConstant.IMG_TYPE.contains(name.substring(name.lastIndexOf(".") + 1))) { - fileDo.setVisitLocation(PropUtil.imgDomain + path); + fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path); } else { fileDo.setVisitLocation(PropUtil.domain + "file/download/"+fileDo.getId()); } diff --git a/mt/src/main/resources/application-dev.yml b/mt/src/main/resources/application-dev.yml index 0865be50..9a8614f5 100644 --- a/mt/src/main/resources/application-dev.yml +++ b/mt/src/main/resources/application-dev.yml @@ -29,3 +29,5 @@ swagger: file: path: /home/cloud/mt/uploads/ signUpUrl: https://test.tall.wiki/signup/ + domain: https://test.tall.wiki/gateway/mt/ + imgDomain: https://test.tall.wiki/gateway/mt/uploads/ diff --git a/mt/src/main/resources/application-prod.yml b/mt/src/main/resources/application-prod.yml index 2976c702..c59b315c 100644 --- a/mt/src/main/resources/application-prod.yml +++ b/mt/src/main/resources/application-prod.yml @@ -34,4 +34,6 @@ gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ file: path: /home/cloud/mt/uploads/ - signUpUrl: https://www.tall.wiki/signup/ \ No newline at end of file + signUpUrl: https://www.tall.wiki/signup/ + domain: https://test.tall.wiki/gateway/mt/ + imgDomain: https://test.tall.wiki/gateway/mt/uploads/ \ No newline at end of file diff --git a/mt/src/main/resources/application-test.yml b/mt/src/main/resources/application-test.yml index 7f8a933b..82bdbc40 100644 --- a/mt/src/main/resources/application-test.yml +++ b/mt/src/main/resources/application-test.yml @@ -32,3 +32,5 @@ eureka: file: path: /home/cloud/mt/uploads/ signUpUrl: https://test.tall.wiki/signup/ + domain: https://test.tall.wiki/gateway/mt/ + imgDomain: https://test.tall.wiki/gateway/mt/uploads/ diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/pims/src/main/java/com/ccsens/pims/config/SpringConfig.java b/pims/src/main/java/com/ccsens/pims/config/SpringConfig.java index c8d02d73..2b00edcf 100644 --- a/pims/src/main/java/com/ccsens/pims/config/SpringConfig.java +++ b/pims/src/main/java/com/ccsens/pims/config/SpringConfig.java @@ -111,7 +111,7 @@ public class SpringConfig implements WebMvcConfigurer { .addResourceLocations("classpath:/META-INF/resources/webjars/"); registry.addResourceHandler("/uploads/**") - .addResourceLocations("file:///home/cloud/tall/uploads/"); + .addResourceLocations("file:///home/cloud/pims/uploads/"); //super.addResourceHandlers(registry); }