mt修改上传文件的路径

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);
     }
 

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);
     }
 

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);
     }
 

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"})

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);
     }
 

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<CompeteVo.CompeteTeamProject> competeTeamProjects = competeTeamDao.queryTeam(userId, competeTimeId);
         //封装队员信息和总队员数
         competeTeamProjects.forEach(team -> {
+            team.setQrCode(PropUtil.imgDomain + team.getQrCode());
             List<CompeteVo.CompeteTeamProjectMember> members = competeTeamDao.queryMembers(team.getTeamId());
             team.setMembers(members);
             team.setMemberNums(members.size());

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());
             }

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/

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/
+  signUpUrl: https://www.tall.wiki/signup/
+  domain: https://test.tall.wiki/gateway/mt/
+  imgDomain: https://test.tall.wiki/gateway/mt/uploads/

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/

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test

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);
     }