Skip to content

Commit

Permalink
更新
Browse files Browse the repository at this point in the history
  • Loading branch information
@diyhi
diyhi committed Mar 4, 2025
1 parent 84f5783 commit 1a00ac5
Show file tree
Hide file tree
Showing 17 changed files with 117 additions and 128 deletions.
4 changes: 0 additions & 4 deletions src/main/java/cms/web/action/common/AnswerFormAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import cms.service.user.UserService;
import cms.utils.Base64;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.RefererCompare;
Expand Down Expand Up @@ -1011,8 +1010,6 @@ public String uploadImage(ModelMap model,Long questionId,String fileName,
if(systemSetting.getCloseSite().equals(2)){
errorMessage = "只读模式不允许提交数据";
}else{
fileName = HtmlEscape.escape(fileName);

//是否有当前功能操作权限
boolean flag_permission = userRoleManage.isPermission(ResourceEnum._2002000,null);
if(flag_permission){
Expand Down Expand Up @@ -1087,7 +1084,6 @@ public String uploadImage(ModelMap model,Long questionId,String fileName,

//当前图片文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);
//当前图片类型
// String imgType = file.getContentType();
//文件大小
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/cms/web/action/common/CommentFormAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import cms.service.user.UserService;
import cms.utils.Base64;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.RefererCompare;
Expand Down Expand Up @@ -512,7 +511,6 @@ public String uploadImage(ModelMap model,Long topicId,String fileName,
if(flag_permission == false){
errorMessage = "权限不足";
}else{
fileName = HtmlEscape.escape(fileName);
//文件上传
int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
Expand Down Expand Up @@ -577,8 +575,6 @@ public String uploadImage(ModelMap model,Long topicId,String fileName,

//当前图片文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//当前图片类型
// String imgType = file.getContentType();
//文件大小
Expand Down
1 change: 1 addition & 0 deletions src/main/java/cms/web/action/common/HomeManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1513,6 +1513,7 @@ public String updateAvatar(ModelMap model,MultipartFile imgFile,
if(error.size()==0 && imgFile != null && !imgFile.isEmpty()){
//当前文件名称
String fileName = imgFile.getOriginalFilename();

//文件大小
Long size = imgFile.getSize();

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/cms/web/action/common/QuestionFormAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import cms.service.user.UserService;
import cms.utils.Base64;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.RefererCompare;
Expand Down Expand Up @@ -1099,7 +1098,7 @@ public String upload(ModelMap model,String dir,String fileName,
if(flag){
DateTime dateTime = new DateTime();
String date = dateTime.toString("yyyy-MM-dd");
fileName = HtmlEscape.escape(fileName);


//文件上传
int fileSystem = fileManage.getFileSystem();
Expand Down Expand Up @@ -1174,7 +1173,7 @@ public String upload(ModelMap model,String dir,String fileName,

//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/cms/web/action/common/ReportFormAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import cms.service.topic.TopicService;
import cms.utils.Base64;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.RefererCompare;
Expand Down Expand Up @@ -271,7 +270,6 @@ public String add(ModelMap model,String reportTypeId,String reason,String parame
if(authentication){
//取得文件后缀
String ext = FileUtil.getExtension(image.getOriginalFilename());
ext = HtmlEscape.escape(ext);
//文件保存目录;分多目录主要是为了分散图片目录,提高检索速度
String pathDir = "file"+File.separator+"report"+File.separator + date +File.separator;;
//构建文件名称
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/cms/web/action/common/TopicFormAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import cms.service.user.UserService;
import cms.utils.Base64;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.RefererCompare;
Expand Down Expand Up @@ -1665,7 +1664,7 @@ public String upload(ModelMap model,String dir,String fileName,
if(flag){
DateTime dateTime = new DateTime();
String date = dateTime.toString("yyyy-MM-dd");
fileName = HtmlEscape.escape(fileName);


int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
Expand Down Expand Up @@ -1824,7 +1823,7 @@ public String upload(ModelMap model,String dir,String fileName,

//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down Expand Up @@ -1884,7 +1883,7 @@ public String upload(ModelMap model,String dir,String fileName,

//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down Expand Up @@ -1918,7 +1917,7 @@ public String upload(ModelMap model,String dir,String fileName,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", Configuration.getUrl(request)+"file/topic/"+date+"/file/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "文件超出允许上传大小";
Expand All @@ -1943,7 +1942,7 @@ public String upload(ModelMap model,String dir,String fileName,

//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down Expand Up @@ -1977,7 +1976,7 @@ public String upload(ModelMap model,String dir,String fileName,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", Configuration.getUrl(request)+"file/topic/"+date+"/media/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "文件超出允许上传大小";
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/cms/web/action/help/HelpManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import cms.service.setting.SettingService;
import cms.utils.CommentedProperties;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.JsonUtils;
import cms.utils.SecureLink;
import cms.utils.UUIDUtil;
Expand Down Expand Up @@ -400,7 +399,6 @@ public String upload(ModelMap model,Long helpTypeId,String dir,String fileName,

int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
fileName = HtmlEscape.escape(fileName);
if(fileName != null && !"".equals(fileName.trim())){
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
Expand Down Expand Up @@ -532,7 +530,7 @@ public String upload(ModelMap model,Long helpTypeId,String dir,String fileName,
if(file != null && !file.isEmpty()){
//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

String suffix = FileUtil.getExtension(sourceFileName).toLowerCase();

if(dir.equals("image")){
Expand Down Expand Up @@ -662,7 +660,7 @@ public String upload(ModelMap model,Long helpTypeId,String dir,String fileName,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/help/"+helpTypeId+"/"+date+"/file/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/cms/web/action/membershipCard/MembershipCardManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import cms.utils.CommentedProperties;
import cms.utils.FileType;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.JsonUtils;
import cms.utils.UUIDUtil;
import cms.utils.Verification;
Expand Down Expand Up @@ -1089,7 +1088,6 @@ public String upload(ModelMap model,String dir,String fileName,

int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
fileName = HtmlEscape.escape(fileName);
if(fileName != null && !"".equals(fileName.trim())){
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
Expand Down Expand Up @@ -1219,7 +1217,7 @@ public String upload(ModelMap model,String dir,String fileName,
if(file != null && !file.isEmpty()){
//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

String suffix = FileUtil.getExtension(sourceFileName).toLowerCase();

if(dir.equals("image")){
Expand Down Expand Up @@ -1350,7 +1348,7 @@ public String upload(ModelMap model,String dir,String fileName,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/membershipCard/"+date+"/file/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/cms/web/action/question/AnswerManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import cms.service.setting.SettingService;
import cms.service.user.UserService;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.UUIDUtil;
Expand Down Expand Up @@ -537,7 +536,6 @@ public String uploadImage(ModelMap model,Long questionId,String userName, Boolea
int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
if(fileName != null && !"".equals(fileName.trim()) && questionId != null && questionId >0L && number != null && !"".equals(number.trim())){
fileName = HtmlEscape.escape(fileName);
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
EditorTag editorSiteObject = settingManage.readAnswerEditorTag();
Expand Down Expand Up @@ -589,7 +587,6 @@ public String uploadImage(ModelMap model,Long questionId,String userName, Boolea
if(editorSiteObject.isImage()){//允许上传图片
//当前图片文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);
//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/cms/web/action/question/QuestionManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import cms.utils.CommentedProperties;
import cms.utils.FileType;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.UUIDUtil;
Expand Down Expand Up @@ -880,7 +879,6 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,

int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
fileName = HtmlEscape.escape(fileName);
if(fileName != null && !"".equals(fileName.trim())){
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
Expand Down Expand Up @@ -1006,7 +1004,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,

//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//取得文件后缀
String suffix = FileUtil.getExtension(sourceFileName).toLowerCase();

Expand Down Expand Up @@ -1138,7 +1136,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/question/"+date+"/file/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/cms/web/action/topic/CommentManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import cms.service.topic.TopicService;
import cms.service.user.UserService;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.UUIDUtil;
Expand Down Expand Up @@ -510,7 +509,6 @@ public String uploadImage(ModelMap model,Long topicId,String userName, Boolean i

int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
fileName = HtmlEscape.escape(fileName);
if(fileName != null && !"".equals(fileName.trim()) && topicId != null && topicId >0L && number != null && !"".equals(number.trim())){
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
Expand Down Expand Up @@ -560,7 +558,6 @@ public String uploadImage(ModelMap model,Long topicId,String userName, Boolean i
if(editorSiteObject.isImage()){//允许上传图片
//当前图片文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);
//文件大小
Long size = file.getSize();
//取得文件后缀
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/cms/web/action/topic/TopicManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
import cms.utils.CommentedProperties;
import cms.utils.FileType;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.IpAddress;
import cms.utils.JsonUtils;
import cms.utils.SecureLink;
Expand Down Expand Up @@ -847,7 +846,6 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,

int fileSystem = fileManage.getFileSystem();
if(fileSystem ==10 || fileSystem == 20 || fileSystem == 30){//10.SeaweedFS 20.MinIO 30.阿里云OSS
fileName = HtmlEscape.escape(fileName);
if(fileName != null && !"".equals(fileName.trim())){
//取得文件后缀
String suffix = FileUtil.getExtension(fileName.trim()).toLowerCase();
Expand Down Expand Up @@ -976,7 +974,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
if(file != null && !file.isEmpty()){
//当前文件名称
String sourceFileName = file.getOriginalFilename();
sourceFileName = HtmlEscape.escape(sourceFileName);

//取得文件后缀
String suffix = FileUtil.getExtension(sourceFileName).toLowerCase();

Expand Down Expand Up @@ -1009,7 +1007,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/topic/"+date+"/image/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down Expand Up @@ -1044,7 +1042,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/topic/"+date+"/flash/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down Expand Up @@ -1077,7 +1075,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/topic/"+date+"/media/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down Expand Up @@ -1109,7 +1107,7 @@ public String upload(ModelMap model,String dir,String userName, Boolean isStaff,
//上传成功
returnJson.put("error", 0);//0成功 1错误
returnJson.put("url", fileManage.fileServerAddress(request)+"file/topic/"+date+"/file/"+newFileName);
returnJson.put("title", sourceFileName);//旧文件名称
returnJson.put("title", file.getOriginalFilename());//旧文件名称
return JsonUtils.toJSONString(returnJson);
}else{
errorMessage = "当前文件类型不允许上传";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cms/web/action/user/UserManageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
import cms.service.user.UserRoleService;
import cms.service.user.UserService;
import cms.utils.FileUtil;
import cms.utils.HtmlEscape;
import cms.utils.JsonUtils;
import cms.utils.SHA;
import cms.utils.UUIDUtil;
Expand Down Expand Up @@ -1966,6 +1965,7 @@ public String updateAvatar(ModelMap model,MultipartFile file,Long id,
if(user != null){
//当前文件名称
String fileName = file.getOriginalFilename();

//文件大小
Long size = file.getSize();

Expand Down
Loading

0 comments on commit 1a00ac5

Please sign in to comment.