From d1444aed70294ab9d253cbda7a0b115bde674ea3 Mon Sep 17 00:00:00 2001 From: wangkang Date: Wed, 31 May 2017 17:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../udf/core/domain/file}/FileInfo.java | 2 +- .../udf/core/domain/file}/FileParam.java | 2 +- .../udf/core/domain/mail}/AttachmentInfo.java | 2 +- .../udf/core/domain/mail}/InlineInfo.java | 2 +- .../udf/core/domain/mail}/MailInfo.java | 2 +- .../udf/file/service/FileService.java | 2 +- .../udf/file/web/FileController.java | 4 +- .../udf/file/web/IFileController.java | 4 +- .../udf/mail/service/MailService.java | 10 +- .../egridcloud/udf/mail/vo/file/FileInfo.java | 148 ------------------ .../udf/mail/vo/file/FileParam.java | 52 ------ .../udf/mail/web/IMailController.java | 2 +- .../udf/mail/web/MailController.java | 2 +- 13 files changed, 17 insertions(+), 217 deletions(-) rename {udf-starter-file/src/main/java/com/egridcloud/udf/file/domain => udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file}/FileInfo.java (93%) rename {udf-starter-file/src/main/java/com/egridcloud/udf/file/domain => udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file}/FileParam.java (90%) rename {udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain => udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail}/AttachmentInfo.java (91%) rename {udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain => udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail}/InlineInfo.java (91%) rename {udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain => udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail}/MailInfo.java (94%) delete mode 100644 udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileInfo.java delete mode 100644 udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileParam.java diff --git a/udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileInfo.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileInfo.java similarity index 93% rename from udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileInfo.java rename to udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileInfo.java index 757c28d..709384d 100644 --- a/udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileInfo.java +++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileInfo.java @@ -4,7 +4,7 @@ * Created by Administrator * Copyright (C) 2016 egridcloud.com, All rights reserved. */ -package com.egridcloud.udf.file.domain; +package com.egridcloud.udf.core.domain.file; import java.io.Serializable; diff --git a/udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileParam.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileParam.java similarity index 90% rename from udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileParam.java rename to udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileParam.java index 95d4406..b36f9af 100644 --- a/udf-starter-file/src/main/java/com/egridcloud/udf/file/domain/FileParam.java +++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/file/FileParam.java @@ -4,7 +4,7 @@ * Created by Administrator * Copyright (C) 2016 egridcloud.com, All rights reserved. */ -package com.egridcloud.udf.file.domain; +package com.egridcloud.udf.core.domain.file; import java.io.Serializable; diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/AttachmentInfo.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/AttachmentInfo.java similarity index 91% rename from udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/AttachmentInfo.java rename to udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/AttachmentInfo.java index f49e8b1..ea182e9 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/AttachmentInfo.java +++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/AttachmentInfo.java @@ -4,7 +4,7 @@ * Created by Administrator * Copyright (C) 2016 egridcloud.com, All rights reserved. */ -package com.egridcloud.udf.mail.domain; +package com.egridcloud.udf.core.domain.mail; import java.io.Serializable; diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/InlineInfo.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/InlineInfo.java similarity index 91% rename from udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/InlineInfo.java rename to udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/InlineInfo.java index 027076a..aa4f111 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/InlineInfo.java +++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/InlineInfo.java @@ -4,7 +4,7 @@ * Created by Administrator * Copyright (C) 2016 egridcloud.com, All rights reserved. */ -package com.egridcloud.udf.mail.domain; +package com.egridcloud.udf.core.domain.mail; import java.io.Serializable; diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/MailInfo.java b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/MailInfo.java similarity index 94% rename from udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/MailInfo.java rename to udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/MailInfo.java index 51fd24e..826378d 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/domain/MailInfo.java +++ b/udf-starter-core/src/main/java/com/egridcloud/udf/core/domain/mail/MailInfo.java @@ -4,7 +4,7 @@ * Created by Administrator * Copyright (C) 2016 egridcloud.com, All rights reserved. */ -package com.egridcloud.udf.mail.domain; +package com.egridcloud.udf.core.domain.mail; import java.io.Serializable; import java.util.List; diff --git a/udf-starter-file/src/main/java/com/egridcloud/udf/file/service/FileService.java b/udf-starter-file/src/main/java/com/egridcloud/udf/file/service/FileService.java index 21da4fc..133e7fc 100644 --- a/udf-starter-file/src/main/java/com/egridcloud/udf/file/service/FileService.java +++ b/udf-starter-file/src/main/java/com/egridcloud/udf/file/service/FileService.java @@ -21,9 +21,9 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.egridcloud.udf.core.ApplicationConfig; +import com.egridcloud.udf.core.domain.file.FileInfo; import com.egridcloud.udf.file.FileException; import com.egridcloud.udf.file.FileProperties; -import com.egridcloud.udf.file.domain.FileInfo; /** * 描述 : FileService diff --git a/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/FileController.java b/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/FileController.java index fa596d9..cb39174 100644 --- a/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/FileController.java +++ b/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/FileController.java @@ -20,9 +20,9 @@ import org.springframework.web.multipart.MultipartFile; import com.egridcloud.udf.core.ApplicationConfig; import com.egridcloud.udf.core.RestResponse; +import com.egridcloud.udf.core.domain.file.FileInfo; +import com.egridcloud.udf.core.domain.file.FileParam; import com.egridcloud.udf.file.FileProperties; -import com.egridcloud.udf.file.domain.FileInfo; -import com.egridcloud.udf.file.domain.FileParam; import com.egridcloud.udf.file.service.FileService; /** diff --git a/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/IFileController.java b/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/IFileController.java index fc9a899..f1557ba 100644 --- a/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/IFileController.java +++ b/udf-starter-file/src/main/java/com/egridcloud/udf/file/web/IFileController.java @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.multipart.MultipartFile; import com.egridcloud.udf.core.RestResponse; +import com.egridcloud.udf.core.domain.file.FileInfo; +import com.egridcloud.udf.core.domain.file.FileParam; import com.egridcloud.udf.file.FileProperties; -import com.egridcloud.udf.file.domain.FileInfo; -import com.egridcloud.udf.file.domain.FileParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/service/MailService.java b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/service/MailService.java index d160667..72f8d26 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/service/MailService.java +++ b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/service/MailService.java @@ -23,13 +23,13 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; import com.egridcloud.udf.core.RestResponse; +import com.egridcloud.udf.core.domain.file.FileInfo; +import com.egridcloud.udf.core.domain.file.FileParam; +import com.egridcloud.udf.core.domain.mail.AttachmentInfo; +import com.egridcloud.udf.core.domain.mail.InlineInfo; +import com.egridcloud.udf.core.domain.mail.MailInfo; import com.egridcloud.udf.mail.MailException; import com.egridcloud.udf.mail.MailProperties; -import com.egridcloud.udf.mail.domain.AttachmentInfo; -import com.egridcloud.udf.mail.domain.InlineInfo; -import com.egridcloud.udf.mail.domain.MailInfo; -import com.egridcloud.udf.mail.vo.file.FileInfo; -import com.egridcloud.udf.mail.vo.file.FileParam; import com.egridcloud.udf.rms.Rms; /** diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileInfo.java b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileInfo.java deleted file mode 100644 index 3c35955..0000000 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileInfo.java +++ /dev/null @@ -1,148 +0,0 @@ -/** - * FileInfo.java - * Created at 2017-05-27 - * Created by Administrator - * Copyright (C) 2016 egridcloud.com, All rights reserved. - */ -package com.egridcloud.udf.mail.vo.file; - -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * 描述 : FileInfo - * - * @author Administrator - * - */ -@ApiModel(description = "文件信息") -public class FileInfo implements Serializable { - - /** - * 描述 : ID - */ - private static final long serialVersionUID = 1L; - - /** - * 描述 : 文件ID - */ - @ApiModelProperty(value = "文件ID(相对路径的base64编码)", required = true, dataType = "string") - private String id; - - /** - * 描述 : 文件名称 - */ - @ApiModelProperty(value = "文件名称", required = true, dataType = "string") - private String name; - - /** - * 描述 : 文件相对路径 - */ - @ApiModelProperty(value = "文件相对路径", required = true, dataType = "string") - private String relativePath; - - /** - * 描述 : 上下文类型 - */ - @ApiModelProperty(value = "上下文类型", required = true, dataType = "string") - private String contentType; - - /** - * 描述 : 文件长度 - */ - @ApiModelProperty(value = "文件长度", required = true, dataType = "long") - private Long size; - - /** - * 描述 : 获取size - * - * @return the size - */ - public Long getSize() { - return size; - } - - /** - * 描述 : 设置size - * - * @param size the size to set - */ - public void setSize(Long size) { - this.size = size; - } - - /** - * 描述 : 获取contentType - * - * @return the contentType - */ - public String getContentType() { - return contentType; - } - - /** - * 描述 : 设置contentType - * - * @param contentType the contentType to set - */ - public void setContentType(String contentType) { - this.contentType = contentType; - } - - /** - * 描述 : 获取relativePath - * - * @return the relativePath - */ - public String getRelativePath() { - return relativePath; - } - - /** - * 描述 : 设置relativePath - * - * @param relativePath the relativePath to set - */ - public void setRelativePath(String relativePath) { - this.relativePath = relativePath; - } - - /** - * 描述 : 获取name - * - * @return the name - */ - public String getName() { - return name; - } - - /** - * 描述 : 设置name - * - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * 描述 : 获取id - * - * @return the id - */ - public String getId() { - return id; - } - - /** - * 描述 : 设置id - * - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - -} diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileParam.java b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileParam.java deleted file mode 100644 index 2386fe0..0000000 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/vo/file/FileParam.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * FileParam.java - * Created at 2017-05-27 - * Created by Administrator - * Copyright (C) 2016 egridcloud.com, All rights reserved. - */ -package com.egridcloud.udf.mail.vo.file; - -import java.io.Serializable; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * 描述 : FileParam - * - * @author Administrator - * - */ -@ApiModel(description = "文件参数") -public class FileParam implements Serializable { - - /** - * 描述 : ID - */ - private static final long serialVersionUID = 1L; - - /** - * 描述 : 文件ID - */ - @ApiModelProperty(value = "文件ID(相对路径的base64编码)", required = true, dataType = "string") - private String id; - - /** - * 描述 : 获取id - * - * @return the id - */ - public String getId() { - return id; - } - - /** - * 描述 : 设置id - * - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - -} diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/IMailController.java b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/IMailController.java index 12ada31..4863ca8 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/IMailController.java +++ b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/IMailController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import com.egridcloud.udf.core.RestResponse; -import com.egridcloud.udf.mail.domain.MailInfo; +import com.egridcloud.udf.core.domain.mail.MailInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/MailController.java b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/MailController.java index a232267..2f036e8 100644 --- a/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/MailController.java +++ b/udf-starter-mail/src/main/java/com/egridcloud/udf/mail/web/MailController.java @@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.egridcloud.udf.core.RestResponse; +import com.egridcloud.udf.core.domain.mail.MailInfo; import com.egridcloud.udf.core.exception.ErrorCode; import com.egridcloud.udf.core.exception.ParameterValidException; -import com.egridcloud.udf.mail.domain.MailInfo; import com.egridcloud.udf.mail.service.MailService; /**