From 9334c8b308436e5f698c89893ad47aca4dfabaa5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java | 2 +-
screen-api/src/main/resources/application-qa.yml | 2 +-
screen-api/src/main/resources/application-cjl.yml | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
index 1fdde7a..6b8804e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
@@ -100,7 +100,7 @@
}
private String getFilePath(String sysCode) {
- return sysCode.concat(StringUtils.SLASH).concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
+ return sysCode.concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
}
public void storageFile(MultipartFile file, String originalFilename, String targetFolder) {
diff --git a/screen-api/src/main/resources/application-cjl.yml b/screen-api/src/main/resources/application-cjl.yml
index 3f6305d..e2ff30e 100644
--- a/screen-api/src/main/resources/application-cjl.yml
+++ b/screen-api/src/main/resources/application-cjl.yml
@@ -125,10 +125,14 @@
- /webjars/**
- /verificationCode/**
- /static/**
+ - /doc.html
+ - /file/preview/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
TOKEN:
KEY:
- foh3wi2ooghiCh5
\ No newline at end of file
+ foh3wi2ooghiCh5
+file:
+ path: E:/upload
\ No newline at end of file
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 6777caa..3e5baa9 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -140,4 +140,4 @@
foh3wi2ooghiCh5
file:
- path: E:\upload
\ No newline at end of file
+ path: E:/upload
\ No newline at end of file
--
Gitblit v1.8.0