diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java index d079f4de..2cc70f78 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java @@ -158,9 +158,9 @@ public class ArticleService extends CrudService { articleDataDao.update(article.getArticleData()); } // 保存上传图片 - FileUploadUtils.saveFileUpload(article.getId(), "article_image"); + FileUploadUtils.saveFileUpload(article, article.getId(), "article_image"); // // 保存上传附件 -// FileUploadUtils.saveFileUpload(article.getId(), "article_file"); +// FileUploadUtils.saveFileUpload(article, article.getId(), "article_file"); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java index 4234dbb1..59d503ad 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java @@ -66,7 +66,7 @@ public class CategoryService extends TreeService { super.save(category); CmsUtils.removeCache("mainNavList_"+category.getSite().getId()); // 保存上传图片 - FileUploadUtils.saveFileUpload(category.getId(), "category_image"); + FileUploadUtils.saveFileUpload(category, category.getId(), "category_image"); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java index 576dede1..6b8b89aa 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CommentService.java @@ -51,9 +51,9 @@ public class CommentService extends CrudService { public void save(Comment comment) { super.save(comment); // 保存上传图片 - FileUploadUtils.saveFileUpload(comment.getId(), "comment_image"); + FileUploadUtils.saveFileUpload(comment, comment.getId(), "comment_image"); // 保存上传附件 - FileUploadUtils.saveFileUpload(comment.getId(), "comment_file"); + FileUploadUtils.saveFileUpload(comment, comment.getId(), "comment_file"); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java index d651d298..91874295 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ReportService.java @@ -51,9 +51,9 @@ public class ReportService extends CrudService { public void save(Report report) { super.save(report); // 保存上传图片 - FileUploadUtils.saveFileUpload(report.getId(), "report_image"); + FileUploadUtils.saveFileUpload(report, report.getId(), "report_image"); // 保存上传附件 - FileUploadUtils.saveFileUpload(report.getId(), "report_file"); + FileUploadUtils.saveFileUpload(report, report.getId(), "report_file"); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java index 95b7009b..776344ff 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/SiteService.java @@ -53,7 +53,7 @@ public class SiteService extends CrudService { super.save(site); CmsUtils.removeCache("siteList"); // 保存logo - FileUploadUtils.saveFileUpload(site.getId(), "site_logo"); + FileUploadUtils.saveFileUpload(site, site.getId(), "site_logo"); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java index 43f4f2a9..1df1a542 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/VisitLogService.java @@ -51,9 +51,9 @@ public class VisitLogService extends CrudService { public void save(VisitLog visitLog) { super.save(visitLog); // 保存上传图片 - FileUploadUtils.saveFileUpload(visitLog.getId(), "visitLog_image"); + FileUploadUtils.saveFileUpload(visitLog, visitLog.getId(), "visitLog_image"); // 保存上传附件 - FileUploadUtils.saveFileUpload(visitLog.getId(), "visitLog_file"); + FileUploadUtils.saveFileUpload(visitLog, visitLog.getId(), "visitLog_file"); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java index 14bfb59e..0caa1a19 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java @@ -95,7 +95,7 @@ public class MsgInnerService extends CrudService { msgInner.setIsAttac(StringUtils.isNotBlank(ServletUtils.getParameter("msgInner_file"))?Global.YES:Global.NO); super.save(msgInner); // 保存上传附件 - FileUploadUtils.saveFileUpload(msgInner.getId(), "msgInner_file"); + FileUploadUtils.saveFileUpload(msgInner, msgInner.getId(), "msgInner_file"); // 发送内部消息 if (MsgInner.STATUS_NORMAL.equals(msgInner.getStatus())){ this.updateStatus(msgInner); // 更新状态 diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml index 2b12540d..54305447 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml @@ -160,11 +160,11 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv <% } %> <% if(toBoolean(table.optionMap['isImageUpload'])){ %> // 保存上传图片 - FileUploadUtils.saveFileUpload(${className}.getId(), "${className}_image"); + FileUploadUtils.saveFileUpload(${className}, ${className}.getId(), "${className}_image"); <% } %> <% if(toBoolean(table.optionMap['isFileUpload'])){ %> // 保存上传附件 - FileUploadUtils.saveFileUpload(${className}.getId(), "${className}_file"); + FileUploadUtils.saveFileUpload(${className}, ${className}.getId(), "${className}_file"); <% } %> <% for (child in table.childList) { %> // 保存 ${ClassName}子表 diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml index ce495ae9..63043c4d 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml @@ -164,11 +164,11 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv <% } %> <% if(toBoolean(table.optionMap['isImageUpload'])){ %> // 保存上传图片 - FileUploadUtils.saveFileUpload(${className}.getId(), "${className}_image"); + FileUploadUtils.saveFileUpload(${className}, ${className}.getId(), "${className}_image"); <% } %> <% if(toBoolean(table.optionMap['isFileUpload'])){ %> // 保存上传附件 - FileUploadUtils.saveFileUpload(${className}.getId(), "${className}_file"); + FileUploadUtils.saveFileUpload(${className}, ${className}.getId(), "${className}_file"); <% } %> <% for (child in table.childList) { %> // 保存 ${ClassName}子表 diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java index 8e1455e2..ad819887 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java @@ -88,9 +88,9 @@ public class TestDataService extends CrudService { public void save(TestData testData) { super.save(testData); // 保存上传图片 - FileUploadUtils.saveFileUpload(testData.getId(), "testData_image"); + FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_image"); // 保存上传附件 - FileUploadUtils.saveFileUpload(testData.getId(), "testData_file"); + FileUploadUtils.saveFileUpload(testData, testData.getId(), "testData_file"); // 保存 TestData子表 int index = 0; for (TestDataChild testDataChild : testData.getTestDataChildList()){ @@ -107,7 +107,7 @@ public class TestDataService extends CrudService { testDataChildDao.delete(testDataChild); } // 保存上传附件 - FileUploadUtils.saveFileUpload(testDataChild.getId(), + FileUploadUtils.saveFileUpload(testDataChild, testDataChild.getId(), "testDataChildList["+index+"].testDataChild_file"); index++; } diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java b/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java index 1dd2ece2..a7a022d2 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java @@ -51,9 +51,9 @@ public class TestTreeService extends TreeService { public void save(TestTree testTree) { super.save(testTree); // 保存上传图片 - FileUploadUtils.saveFileUpload(testTree.getId(), "testTree_image"); + FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_image"); // 保存上传附件 - FileUploadUtils.saveFileUpload(testTree.getId(), "testTree_file"); + FileUploadUtils.saveFileUpload(testTree, testTree.getId(), "testTree_file"); } /**