更新

2026-10-21 11:35:11 +00:00 · 2017-07-29 10:18:35 +08:00
parent 89dd96bf3d
commit d1444aed70
13 changed files with 17 additions and 217 deletions
@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;
@@ -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
@@ -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;

 /**
@@ -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;
@@ -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;

 /**
@@ -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;
-  }
-
-}
@@ -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;
-  }
-
-}
@@ -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;
@@ -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;

 /**