1.修改成jar启动文件路径 docker部署后 可以看历史提交记录中的地址修改回去

master
862857010@qq.com 1 year ago
parent 3248f80c63
commit 9fbdb850cd
  1. 9
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IndividualMemberServiceImpl.java
  2. 8
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitMemberServiceImpl.java
  3. 2
      ruoyi-system/src/main/java/com/ruoyi/system/util/GenerateDocxUtil.java

@ -35,8 +35,8 @@ public class IndividualMemberServiceImpl implements IIndividualMemberService {
// private String docxPath="/Users/liangjiawei/Downloads/worddocx/file/";
// private String path = "/Users/liangjiawei/Downloads";
private static String path = "/upload/file";
private String rootPath = "/upload/file/upload/worddocx/";
private String docxPath = "/upload/file/upload/worddocx/file/";
private String rootPath = "/data/docker/sh_toilet/feiyi/upload/file/upload/worddocx/";
private String docxPath = "/data/docker/sh_toilet/feiyi/upload/file/upload/worddocx/file/";
@Autowired
private IndividualMemberMapper individualMemberMapper;
@ -288,7 +288,7 @@ public class IndividualMemberServiceImpl implements IIndividualMemberService {
public String personalExport(Long[] ids) throws IOException {
List<String> fileList = individualMemberMapper.getPersonalExport(ids);
List<String> updatedFileList = fileList.stream()
.map(item -> "/upload/file/upload" + item)
.map(item -> "/data/docker/sh_toilet/feiyi/upload/file/upload" + item)
.collect(Collectors.toList());
try {
ZipFilesUtils.compressFiles(updatedFileList, docxPath + "zip/个人会员.zip");
@ -302,11 +302,12 @@ public class IndividualMemberServiceImpl implements IIndividualMemberService {
public String personalAllExport() throws IOException {
List<String> fileList = individualMemberMapper.personalAllExport();
List<String> updatedFileList = fileList.stream()
.map(item -> "/upload/file/upload" + item)
.map(item -> "/data/docker/sh_toilet/feiyi/upload/file/upload" + item)
.collect(Collectors.toList());
try {
ZipFilesUtils.compressFiles(updatedFileList, docxPath + "zip/个人会员.zip");
return "/worddocx/file/zip/" + "个人会员.zip";
} catch (Exception e) {
return "导出失败";
}

@ -32,8 +32,8 @@ public class UnitMemberServiceImpl implements IUnitMemberService
// private String docxPath="/Users/liangjiawei/Downloads/worddocx/file/";
// private String path = "/Users/liangjiawei/Downloads";
private static String path = "/upload/file";
private String rootPath="/upload/file/upload/worddocx/";
private String docxPath="/upload/file/upload/worddocx/file/";
private String rootPath="/data/docker/sh_toilet/feiyi/upload/file/upload/worddocx/";
private String docxPath="/data/docker/sh_toilet/feiyi/upload/file/upload/worddocx/file/";
@Autowired
private UnitMemberMapper unitMemberMapper;
@Autowired
@ -208,7 +208,7 @@ public class UnitMemberServiceImpl implements IUnitMemberService
public String batchExport(Long[] ids) throws IOException {
List<String> fileList=unitMemberMapper.getBatchExportFile(ids);
List<String> updatedFileList = fileList.stream()
.map(item -> "/upload/file/upload" + item)
.map(item -> "/data/docker/sh_toilet/feiyi/upload/file/upload" + item)
.collect(Collectors.toList());
try {
ZipFilesUtils.compressFiles(updatedFileList,docxPath+"zip/单位会员.zip");
@ -223,7 +223,7 @@ public class UnitMemberServiceImpl implements IUnitMemberService
public String unitAllBatchExport() throws IOException {
List<String> fileList=unitMemberMapper.getAllBatchExportFile();
List<String> updatedFileList = fileList.stream()
.map(item -> "/upload/file/upload" + item)
.map(item -> "/data/docker/sh_toilet/feiyi/upload/file/upload" + item)
.collect(Collectors.toList());
try {
ZipFilesUtils.compressFiles(updatedFileList,docxPath+"zip/单位会员.zip");

@ -23,7 +23,7 @@ import java.util.zip.ZipOutputStream;
*/
public class GenerateDocxUtil {
private static String path = "/upload/file";
private static String path = "/data/docker/sh_toilet/feiyi/upload/file";
// private static String path = "/Users/liangjiawei/Downloads/upload/file";
private static Logger logger = LoggerFactory.getLogger(GenerateDocxUtil.class);
public static String freemarkerDocxTest(String reqName,String rootPath, Map<String,String> dataMap, String docxPath) throws Exception{

Loading…
Cancel
Save