p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

消息组件-邮件

This commit is contained in:
wyldusername 2019-10-16 16:42:44 +08:00
parent a33cb19f4b
commit ee51fca98c
90 changed files with 479 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dibo-commons-excel/build.gradle → diboot-component-file-excel/build.gradle
View File

@ -3,7 +3,7 @@ plugins {
id 'org.springframework.boot'
}
group 'com-commons-excel'
group 'com-component-excel'
version '2.0-SNAPSHOT'
sourceCompatibility = 1.8
@ -17,7 +17,7 @@ mybatisStarterVersion = "2.0.1"
mybatisPlusVersion = "3.1.1"
}
dependencies {
compile project(":dibo-commons-file")
compile project(":diboot-component-file")
compile project(":diboot-core")
//easyexcel

34
dibo-commons-excel/src/main/java/com/diboot/excel/controller/BaseExcelImportController.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/controller/BaseExcelImportController.java
View File

@ -1,22 +1,22 @@
package com.diboot.excel.controller;
package com.diboot.component.excel.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.diboot.commons.entity.BaseFile;
import com.diboot.commons.file.FileHelper;
import com.diboot.commons.service.BaseFileService;
import com.diboot.commons.utils.S;
import com.diboot.commons.utils.V;
import com.diboot.commons.vo.JsonResult;
import com.diboot.commons.vo.Pagination;
import com.diboot.commons.vo.Status;
import com.diboot.component.file.entity.BaseFile;
import com.diboot.component.file.file.FileHelper;
import com.diboot.component.file.service.BaseFileService;
import com.diboot.component.file.utils.S;
import com.diboot.component.file.utils.V;
import com.diboot.component.file.vo.JsonResult;
import com.diboot.component.file.vo.Pagination;
import com.diboot.component.file.vo.Status;
import com.diboot.core.entity.BaseEntity;
import com.diboot.core.service.BaseService;
import com.diboot.excel.entity.BaseExcelDataEntity;
import com.diboot.excel.entity.ExcelColumn;
import com.diboot.excel.listener.BaseExcelDataListener;
import com.diboot.excel.service.ExcelColumnService;
import com.diboot.excel.service.ExcelImportRecordService;
import com.diboot.excel.utils.EasyExcelHelper;
import com.diboot.component.excel.entity.BaseExcelDataEntity;
import com.diboot.component.excel.entity.ExcelColumn;
import com.diboot.component.excel.listener.BaseExcelDataListener;
import com.diboot.component.excel.service.ExcelColumnService;
import com.diboot.component.excel.service.ExcelImportRecordService;
import com.diboot.component.excel.utils.EasyExcelHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -75,7 +75,7 @@ public abstract class BaseExcelImportController <T extends BaseExcelDataEntity>
*/
protected abstract BaseExcelDataListener getExcelDataListener();
protected com.diboot.commons.service.BaseService getService() {
protected com.diboot.component.file.service.BaseService getService() {
return baseFileService;
}
@ -90,7 +90,7 @@ public abstract class BaseExcelImportController <T extends BaseExcelDataEntity>
// 查询当前页的数据
List entityList = getService().getEntityList(queryWrapper, pagination);
// 返回结果
return new JsonResult(com.diboot.commons.vo.Status.OK, entityList).bindPagination(pagination);
return new JsonResult(com.diboot.component.file.vo.Status.OK, entityList).bindPagination(pagination);
}
/***

2
dibo-commons-excel/src/main/java/com/diboot/excel/converter/BooleanConverter.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/converter/BooleanConverter.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.converter;
package com.diboot.component.excel.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
dibo-commons-excel/src/main/java/com/diboot/excel/converter/DateConverter.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/converter/DateConverter.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.converter;
package com.diboot.component.excel.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
dibo-commons-excel/src/main/java/com/diboot/excel/converter/DoubleConverter.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/converter/DoubleConverter.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.converter;
package com.diboot.component.excel.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
dibo-commons-excel/src/main/java/com/diboot/excel/converter/IntegerConverter.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/converter/IntegerConverter.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.converter;
package com.diboot.component.excel.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
dibo-commons-excel/src/main/java/com/diboot/excel/converter/StringConverter.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/converter/StringConverter.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.converter;
package com.diboot.component.excel.converter;
import com.alibaba.excel.converters.Converter;
import com.alibaba.excel.enums.CellDataTypeEnum;

2
dibo-commons-excel/src/main/java/com/diboot/excel/entity/BaseExcelDataEntity.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/entity/BaseExcelDataEntity.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.entity;
package com.diboot.component.excel.entity;
import lombok.Data;

2
dibo-commons-excel/src/main/java/com/diboot/excel/entity/ExcelColumn.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/entity/ExcelColumn.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.entity;
package com.diboot.component.excel.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.diboot.core.entity.BaseEntity;

2
dibo-commons-excel/src/main/java/com/diboot/excel/entity/ExcelImportRecord.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/entity/ExcelImportRecord.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.entity;
package com.diboot.component.excel.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.diboot.core.entity.BaseEntity;

8
dibo-commons-excel/src/main/java/com/diboot/excel/listener/BaseExcelDataListener.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/listener/BaseExcelDataListener.java
View File

@ -1,4 +1,4 @@
package com.diboot.excel.listener;
package com.diboot.component.excel.listener;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
@ -9,9 +9,9 @@ import com.diboot.core.service.BaseService;
import com.diboot.core.util.BeanUtils;
import com.diboot.core.util.JSON;
import com.diboot.core.util.V;
import com.diboot.excel.entity.BaseExcelDataEntity;
import com.diboot.excel.entity.ExcelColumn;
import com.diboot.excel.service.ExcelColumnService;
import com.diboot.component.excel.entity.BaseExcelDataEntity;
import com.diboot.component.excel.entity.ExcelColumn;
import com.diboot.component.excel.service.ExcelColumnService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

4
dibo-commons-excel/src/main/java/com/diboot/excel/mapper/ExcelColumnMapper.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/mapper/ExcelColumnMapper.java
View File

@ -1,7 +1,7 @@
package com.diboot.excel.mapper;
package com.diboot.component.excel.mapper;
import com.diboot.core.mapper.BaseCrudMapper;
import com.diboot.excel.entity.ExcelColumn;
import com.diboot.component.excel.entity.ExcelColumn;
/**
* @author Lishuaifei

2
dibo-commons-excel/src/main/java/com/diboot/excel/mapper/ExcelColumnMapper.xml → diboot-component-file-excel/src/main/java/com/diboot/component/excel/mapper/ExcelColumnMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"./mybatis-3-mapper.dtd">
<mapper namespace="com.diboot.excel.mapper.ExcelColumnMapper">
<mapper namespace="com.diboot.component.excel.mapper.ExcelColumnMapper">
</mapper>

4
dibo-commons-excel/src/main/java/com/diboot/excel/mapper/ExcelImportRecordMapper.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/mapper/ExcelImportRecordMapper.java
View File

@ -1,7 +1,7 @@
package com.diboot.excel.mapper;
package com.diboot.component.excel.mapper;
import com.diboot.core.mapper.BaseCrudMapper;
import com.diboot.excel.entity.ExcelImportRecord;
import com.diboot.component.excel.entity.ExcelImportRecord;
/**
* @author Lishuaifei

2
dibo-commons-excel/src/main/java/com/diboot/excel/mapper/ExcelImportRecordMapper.xml → diboot-component-file-excel/src/main/java/com/diboot/component/excel/mapper/ExcelImportRecordMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"./mybatis-3-mapper.dtd">
<mapper namespace="com.diboot.excel.mapper.ExcelImportRecordMapper">
<mapper namespace="com.diboot.component.excel.mapper.ExcelImportRecordMapper">
</mapper>

4
dibo-commons-excel/src/main/java/com/diboot/excel/service/ExcelColumnService.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/service/ExcelColumnService.java
View File

@ -1,7 +1,7 @@
package com.diboot.excel.service;
package com.diboot.component.excel.service;
import com.diboot.core.service.BaseService;
import com.diboot.excel.entity.ExcelColumn;
import com.diboot.component.excel.entity.ExcelColumn;
/**
* @author Lishuaifei

4
dibo-commons-excel/src/main/java/com/diboot/excel/service/ExcelImportRecordService.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/service/ExcelImportRecordService.java
View File

@ -1,8 +1,8 @@
package com.diboot.excel.service;
package com.diboot.component.excel.service;
import com.diboot.core.entity.BaseEntity;
import com.diboot.core.service.BaseService;
import com.diboot.excel.entity.ExcelImportRecord;
import com.diboot.component.excel.entity.ExcelImportRecord;
import java.util.List;

8
dibo-commons-excel/src/main/java/com/diboot/excel/service/impl/ExcelColumnServiceImpl.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/service/impl/ExcelColumnServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.diboot.excel.service.impl;
package com.diboot.component.excel.service.impl;
import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.excel.entity.ExcelColumn;
import com.diboot.excel.mapper.ExcelColumnMapper;
import com.diboot.excel.service.ExcelColumnService;
import com.diboot.component.excel.entity.ExcelColumn;
import com.diboot.component.excel.mapper.ExcelColumnMapper;
import com.diboot.component.excel.service.ExcelColumnService;
import org.springframework.stereotype.Service;
/**

10
dibo-commons-excel/src/main/java/com/diboot/excel/service/impl/ExcelImportRecordServiceImpl.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/service/impl/ExcelImportRecordServiceImpl.java
View File

@ -1,11 +1,11 @@
package com.diboot.excel.service.impl;
package com.diboot.component.excel.service.impl;
import com.diboot.core.entity.BaseEntity;
import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.excel.entity.ExcelImportRecord;
import com.diboot.excel.mapper.ExcelImportRecordMapper;
import com.diboot.excel.service.ExcelImportRecordService;
import com.diboot.commons.utils.V;
import com.diboot.component.excel.entity.ExcelImportRecord;
import com.diboot.component.excel.mapper.ExcelImportRecordMapper;
import com.diboot.component.excel.service.ExcelImportRecordService;
import com.diboot.component.file.utils.V;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

6
dibo-commons-excel/src/main/java/com/diboot/excel/utils/EasyExcelHelper.java → diboot-component-file-excel/src/main/java/com/diboot/component/excel/utils/EasyExcelHelper.java
View File

@ -1,9 +1,9 @@
package com.diboot.excel.utils;
package com.diboot.component.excel.utils;
import com.alibaba.excel.EasyExcel;
import com.diboot.core.util.V;
import com.diboot.excel.entity.BaseExcelDataEntity;
import com.diboot.excel.listener.BaseExcelDataListener;
import com.diboot.component.excel.entity.BaseExcelDataEntity;
import com.diboot.component.excel.listener.BaseExcelDataListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/build.gradle → diboot-component-file/build.gradle
View File

@ -28,7 +28,7 @@ dependencies {
compile("org.apache.httpcomponents:httpclient:4.5.9")
// apache commons
compile("commons-fileupload:commons-fileupload:1.3.3",
"org.apache.commons:commons-lang3:3.6",
"org.apache.commons:commons-lang3:3.8.1",
"commons-io:commons-io:2.6")
// 引入validator jar

4
dibo-commons-file/src/main/java/com/diboot/commons/config/BaseConfig.java → diboot-component-file/src/main/java/com/diboot/component/file/config/BaseConfig.java
View File

@ -1,6 +1,6 @@
package com.diboot.commons.config;
package com.diboot.component.file.config;
import com.diboot.commons.utils.PropertiesUtils;
import com.diboot.component.file.utils.PropertiesUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/src/main/java/com/diboot/commons/config/BaseCons.java → diboot-component-file/src/main/java/com/diboot/component/file/config/BaseCons.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.config;
package com.diboot.component.file.config;
public class BaseCons {

6
dibo-commons-file/src/main/java/com/diboot/commons/entity/BaseEntity.java → diboot-component-file/src/main/java/com/diboot/component/file/entity/BaseEntity.java
View File

@ -1,18 +1,16 @@
package com.diboot.commons.entity;
package com.diboot.component.file.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.diboot.commons.utils.JSON;
import com.diboot.commons.utils.V;
import com.diboot.component.file.utils.JSON;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
/**

2
dibo-commons-file/src/main/java/com/diboot/commons/entity/BaseFile.java → diboot-component-file/src/main/java/com/diboot/component/file/entity/BaseFile.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.entity;
package com.diboot.component.file.entity;
import javax.validation.constraints.NotNull;

8
dibo-commons-file/src/main/java/com/diboot/commons/file/FileHelper.java → diboot-component-file/src/main/java/com/diboot/component/file/file/FileHelper.java
View File

@ -1,8 +1,8 @@
package com.diboot.commons.file;
package com.diboot.component.file.file;
import com.diboot.commons.file.http.CustomSSLSocketFactory;
import com.diboot.commons.utils.PropertiesUtils;
import com.diboot.commons.utils.S;
import com.diboot.component.file.file.http.CustomSSLSocketFactory;
import com.diboot.component.file.utils.PropertiesUtils;
import com.diboot.component.file.utils.S;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.io.FileUtils;

4
dibo-commons-file/src/main/java/com/diboot/commons/file/audio/AudioHelper.java → diboot-component-file/src/main/java/com/diboot/component/file/file/audio/AudioHelper.java
View File

@ -1,6 +1,6 @@
package com.diboot.commons.file.audio;
package com.diboot.component.file.file.audio;
import com.diboot.commons.utils.RuntimeHelper;
import com.diboot.component.file.utils.RuntimeHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/src/main/java/com/diboot/commons/file/http/CustomSSLSocketFactory.java → diboot-component-file/src/main/java/com/diboot/component/file/file/http/CustomSSLSocketFactory.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.file.http;
package com.diboot.component.file.file.http;
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;

4
dibo-commons-file/src/main/java/com/diboot/commons/file/image/ImageHandler.java → diboot-component-file/src/main/java/com/diboot/component/file/file/image/ImageHandler.java
View File

@ -1,6 +1,6 @@
package com.diboot.commons.file.image;
package com.diboot.component.file.file.image;
import com.diboot.commons.utils.Base64;
import com.diboot.component.file.utils.Base64;
import net.coobird.thumbnailator.Thumbnails;
import net.coobird.thumbnailator.geometry.Positions;
import org.apache.commons.io.FileUtils;

2
dibo-commons-file/src/main/java/com/diboot/commons/file/zip/ZipHelper.java → diboot-component-file/src/main/java/com/diboot/component/file/file/zip/ZipHelper.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.file.zip;
package com.diboot.component.file.file.zip;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;

4
dibo-commons-file/src/main/java/com/diboot/commons/mapper/BaseFileMapper.java → diboot-component-file/src/main/java/com/diboot/component/file/mapper/BaseFileMapper.java
View File

@ -1,9 +1,9 @@
package com.diboot.commons.mapper;
package com.diboot.component.file.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.diboot.commons.entity.BaseFile;
import com.diboot.component.file.entity.BaseFile;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

2
dibo-commons-file/src/main/java/com/diboot/commons/mapper/BaseFileMapper.xml → diboot-component-file/src/main/java/com/diboot/component/file/mapper/BaseFileMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"./mybatis-3-mapper.dtd">
<mapper namespace="com.diboot.commons.mapper.BaseFileMapper">
<mapper namespace="com.diboot.component.file.mapper.BaseFileMapper">
<sql id="setValues">
<set>

0
dibo-commons-file/src/main/java/com/diboot/commons/mapper/mybatis-3-mapper.dtd → diboot-component-file/src/main/java/com/diboot/component/file/mapper/mybatis-3-mapper.dtd
View File

7
dibo-commons-file/src/main/java/com/diboot/commons/service/BaseFileService.java → diboot-component-file/src/main/java/com/diboot/component/file/service/BaseFileService.java
View File

@ -1,10 +1,7 @@
package com.diboot.commons.service;
package com.diboot.component.file.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.diboot.commons.entity.BaseFile;
import com.diboot.component.file.entity.BaseFile;
import org.springframework.stereotype.Component;
/**

6
dibo-commons-file/src/main/java/com/diboot/commons/service/BaseService.java → diboot-component-file/src/main/java/com/diboot/component/file/service/BaseService.java
View File

@ -1,8 +1,8 @@
package com.diboot.commons.service;
package com.diboot.component.file.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.diboot.commons.vo.KeyValue;
import com.diboot.commons.vo.Pagination;
import com.diboot.component.file.vo.KeyValue;
import com.diboot.component.file.vo.Pagination;
import java.io.Serializable;
import java.util.Collection;

8
dibo-commons-file/src/main/java/com/diboot/commons/service/impl/BaseFileServiceImpl.java → diboot-component-file/src/main/java/com/diboot/component/file/service/impl/BaseFileServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.diboot.commons.service.impl;
package com.diboot.component.file.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.diboot.commons.entity.BaseFile;
import com.diboot.commons.mapper.BaseFileMapper;
import com.diboot.commons.service.BaseFileService;
import com.diboot.component.file.entity.BaseFile;
import com.diboot.component.file.mapper.BaseFileMapper;
import com.diboot.component.file.service.BaseFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

16
dibo-commons-file/src/main/java/com/diboot/commons/service/impl/BaseServiceImpl.java → diboot-component-file/src/main/java/com/diboot/component/file/service/impl/BaseServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.service.impl;
package com.diboot.component.file.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.diboot.commons.config.BaseConfig;
import com.diboot.commons.config.BaseCons;
import com.diboot.commons.service.BaseService;
import com.diboot.commons.utils.S;
import com.diboot.commons.utils.V;
import com.diboot.commons.vo.KeyValue;
import com.diboot.commons.vo.Pagination;
import com.diboot.component.file.config.BaseConfig;
import com.diboot.component.file.config.BaseCons;
import com.diboot.component.file.service.BaseService;
import com.diboot.component.file.utils.S;
import com.diboot.component.file.utils.V;
import com.diboot.component.file.vo.KeyValue;
import com.diboot.component.file.vo.Pagination;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/Base64.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/Base64.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import java.util.Arrays;

6
dibo-commons-file/src/main/java/com/diboot/commons/utils/BeanUtils.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/BeanUtils.java
View File

@ -1,7 +1,7 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import com.diboot.commons.config.BaseCons;
import com.diboot.commons.entity.BaseEntity;
import com.diboot.component.file.config.BaseCons;
import com.diboot.component.file.entity.BaseEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanWrapper;

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/D.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/D.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import org.apache.commons.lang3.StringUtils;

4
dibo-commons-file/src/main/java/com/diboot/commons/utils/Encryptor.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/Encryptor.java
View File

@ -1,6 +1,6 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import com.diboot.commons.config.BaseConfig;
import com.diboot.component.file.config.BaseConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/JSON.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/JSON.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializeConfig;

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/PropertiesUtils.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/PropertiesUtils.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/RuntimeHelper.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/RuntimeHelper.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
dibo-commons-file/src/main/java/com/diboot/commons/utils/S.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/S.java
View File

@ -1,12 +1,9 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import com.diboot.commons.config.BaseConfig;
import com.diboot.commons.config.BaseCons;
import com.diboot.component.file.config.BaseConfig;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.UUID;
/***

2
dibo-commons-file/src/main/java/com/diboot/commons/utils/V.java → diboot-component-file/src/main/java/com/diboot/component/file/utils/V.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.utils;
package com.diboot.component.file.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
dibo-commons-file/src/main/java/com/diboot/commons/vo/JsonResult.java → diboot-component-file/src/main/java/com/diboot/component/file/vo/JsonResult.java
View File

@ -1,6 +1,6 @@
package com.diboot.commons.vo;
package com.diboot.component.file.vo;
import com.diboot.commons.utils.V;
import com.diboot.component.file.utils.V;
import java.io.Serializable;

2
dibo-commons-file/src/main/java/com/diboot/commons/vo/KeyValue.java → diboot-component-file/src/main/java/com/diboot/component/file/vo/KeyValue.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.vo;
package com.diboot.component.file.vo;
import java.io.Serializable;

10
dibo-commons-file/src/main/java/com/diboot/commons/vo/Pagination.java → diboot-component-file/src/main/java/com/diboot/component/file/vo/Pagination.java
View File

@ -1,9 +1,9 @@
package com.diboot.commons.vo;
package com.diboot.component.file.vo;
import com.diboot.commons.config.BaseConfig;
import com.diboot.commons.config.BaseCons;
import com.diboot.commons.utils.S;
import com.diboot.commons.utils.V;
import com.diboot.component.file.config.BaseConfig;
import com.diboot.component.file.config.BaseCons;
import com.diboot.component.file.utils.S;
import com.diboot.component.file.utils.V;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dibo-commons-file/src/main/java/com/diboot/commons/vo/PagingJsonResult.java → diboot-component-file/src/main/java/com/diboot/component/file/vo/PagingJsonResult.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.vo;
package com.diboot.component.file.vo;
/**
* JSON返回结果

2
dibo-commons-file/src/main/java/com/diboot/commons/vo/Status.java → diboot-component-file/src/main/java/com/diboot/component/file/vo/Status.java
View File

@ -1,4 +1,4 @@
package com.diboot.commons.vo;
package com.diboot.component.file.vo;
/**
* 状态码定义

2
diboot-components-msg/build.gradle → diboot-component-msg-email/build.gradle
View File

@ -1,6 +1,6 @@
apply plugin: 'org.springframework.boot'
dependencies {
compile project(":diboot-core")
compile project(":diboot-component-msg")
// java mail
compile("javax.mail:mail:1.4.7",

7
diboot-component-msg-email/src/main/java/com/diboot/component/msg/email/service/EmailSendService.java Normal file
View File

@ -0,0 +1,7 @@
package com.diboot.component.msg.email.service;
import com.diboot.component.msg.service.BaseSendService;
public interface EmailSendService extends BaseSendService {
}

26
diboot-component-msg-email/src/main/java/com/diboot/component/msg/email/service/EmailSendServiceImpl.java Normal file
View File

@ -0,0 +1,26 @@
package com.diboot.component.msg.email.service;
import com.diboot.component.msg.email.utils.EmailUtil;
import com.diboot.component.msg.entity.Message;
import com.diboot.component.msg.service.impl.BaseSendServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class EmailSendServiceImpl extends BaseSendServiceImpl implements EmailSendService {
private static final Logger logger = LoggerFactory.getLogger(EmailSendServiceImpl.class);
@Override
public boolean sendMsg(Message message) throws Exception {
String to = message.getReceiver();
String toName = String.valueOf(message.getFromExt("toName"));
String title = message.getTitle();
String content = message.getContent();
String[] ccEmails = (String[])message.getFromExt("ccEmails");
String[] filePaths = (String[])message.getFromExt("filePaths");
return EmailUtil.send(to, toName, title, content, ccEmails, filePaths);
}
}

73
diboot-component-msg-email/src/main/java/com/diboot/component/msg/email/utils/EmailUtil.java Normal file
View File

@ -0,0 +1,73 @@
package com.diboot.component.msg.email.utils;
import com.diboot.core.config.Cons;
import com.diboot.core.util.PropertiesUtils;
import com.diboot.core.util.V;
import org.apache.commons.mail.EmailAttachment;
import org.apache.commons.mail.HtmlEmail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
public class EmailUtil {
private static final Logger logger = LoggerFactory.getLogger(EmailUtil.class);
private static final String EMAIL_NAME = PropertiesUtils.get("email.name");// 发送方称呼
private static final String EMAIL_ADDRESS = PropertiesUtils.get("email.address");// 发送方email地址
private static final String EMAIL_PASSWORD = PropertiesUtils.get("email.password");// 发送方授权码
private static final String EMAIL_HOST = PropertiesUtils.get("email.host");//发送方smptHost
private static final String EMAIL_SSLPORT = PropertiesUtils.get("email.sslport");// 发送端口
/*
* 邮件发送
* */
public static boolean send(String to, String toName, String title, String content, String[] ccEmails, String... filePaths) throws Exception{
if(logger.isDebugEnabled()){
logger.debug(">>>发送邮件开始, 收件人:" + to);
}
// Create the email message
HtmlEmail email = new HtmlEmail();
email.setHostName(EMAIL_HOST);
email.setCharset(Cons.CHARSET_UTF8);
email.setSSLOnConnect(true);
if(V.notEmpty(EMAIL_SSLPORT)){
email.setSslSmtpPort(EMAIL_SSLPORT);
}
email.setAuthentication(EMAIL_ADDRESS, EMAIL_PASSWORD);
email.addTo(to, toName);
if(V.notEmpty(ccEmails)){
for(String cc : ccEmails){
email.addCc(cc);
}
}
email.setFrom(EMAIL_ADDRESS, EMAIL_NAME);
email.setSubject(title);
// set the html message
email.setHtmlMsg(content);
// 发送附件
if(V.notEmpty(filePaths)){
for(String path : filePaths){
File file = new File(path);
if(!file.exists()){
logger.warn("附件文件不存在，无法发送！path="+path);
return false;
}
EmailAttachment attachment = new EmailAttachment();
attachment.setName(file.getName());
attachment.setPath(path);
attachment.setDisposition(EmailAttachment.ATTACHMENT);
email.attach(attachment);
}
}
// send the email
email.send();
if(logger.isDebugEnabled()){
logger.debug("<<<发送邮件结束");
}
return true;
}
}

6
diboot-component-msg/build.gradle Normal file
View File

@ -0,0 +1,6 @@
apply plugin: 'org.springframework.boot'
dependencies {
compile project(":diboot-core")
testCompile group: 'junit', name: 'junit', version: '4.12'
}

7
diboot-components-msg/src/main/java/com/diboot/components/msg/config/MsgCons.java → diboot-component-msg/src/main/java/com/diboot/component/msg/config/MsgCons.java
View File

@ -1,10 +1,13 @@
package com.diboot.components.msg.config;
package com.diboot.component.msg.config;
public class MsgCons {
/*
* 消息类型
* */
public enum MSG_TYPE{
EMAIL, //邮件消息
SMS, //短信消息
SMS, //短信消息
WECHAT //微信消息
}
}

18
diboot-components-msg/src/main/java/com/diboot/components/msg/controller/MessageController.java → diboot-component-msg/src/main/java/com/diboot/component/msg/controller/MessageController.java
View File

@ -1,9 +1,9 @@
package com.diboot.components.msg.controller;
package com.diboot.component.msg.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.diboot.components.msg.entity.Message;
import com.diboot.components.msg.service.MessageService;
import com.diboot.components.msg.vo.MessageVO;
import com.diboot.component.msg.entity.Message;
import com.diboot.component.msg.service.MessageService;
import com.diboot.component.msg.vo.MessageVO;
import com.diboot.core.binding.RelationsBinder;
import com.diboot.core.controller.BaseCrudRestController;
import com.diboot.core.service.BaseService;
@ -88,14 +88,4 @@ public class MessageController extends BaseCrudRestController {
return super.deleteEntity(id);
}
/***
* 创建并发送消息
* @throws Exception
*/
@PostMapping("/createAndSendMsg")
public JsonResult createAndSendMsg(@RequestBody Message message, HttpServletRequest request) throws Exception{
boolean success = messageService.createAndSendMsg(message);
return new JsonResult(success);
}
}

43
diboot-components-msg/src/main/java/com/diboot/components/msg/controller/MessageTemplateController.java → diboot-component-msg/src/main/java/com/diboot/component/msg/controller/MessageTemplateController.java
View File

@ -1,20 +1,29 @@
package com.diboot.components.msg.controller;
package com.diboot.component.msg.controller;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.diboot.components.msg.entity.MessageTemplate;
import com.diboot.components.msg.service.MessageTemplateService;
import com.diboot.component.msg.entity.MessageTemplate;
import com.diboot.component.msg.service.MessageTemplateService;
import com.diboot.core.controller.BaseCrudRestController;
import com.diboot.core.service.BaseService;
import com.diboot.core.service.DictionaryService;
import com.diboot.core.util.V;
import com.diboot.core.vo.JsonResult;
import com.diboot.core.vo.KeyValue;
import com.diboot.core.vo.Pagination;
import com.diboot.core.vo.Status;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/*
* 消息模板相关service
* @author:wangyl
* */
@RestController
@RequestMapping("/messageTemplate")
public class MessageTemplateController extends BaseCrudRestController {
@ -22,6 +31,9 @@ public class MessageTemplateController extends BaseCrudRestController {
@Autowired
private MessageTemplateService messageTemplateService;
@Autowired
private DictionaryService dictionaryService;
@Override
protected BaseService getService() {
return messageTemplateService;
@ -84,4 +96,29 @@ public class MessageTemplateController extends BaseCrudRestController {
return super.deleteEntity(id);
}
/***
* 加载更多数据
* @param request
* @param modelMap
* @return
*/
@GetMapping("/attachMore")
public JsonResult attachMore(HttpServletRequest request, ModelMap modelMap){
Wrapper wrapper = null;
//消息模板元数据
List<KeyValue> msgTempCodeKvList = dictionaryService.getKeyValueList(MessageTemplate.METADATA_TYPE.MSG_TEMP_CODE.name());
modelMap.put("msgTempCodeKvList", msgTempCodeKvList);
return new JsonResult(modelMap);
}
@GetMapping("/getTemplateVaribles/{code}")
public JsonResult getTemplateVaribles(@PathVariable("code")String code, HttpServletRequest request) throws Exception{
String[] varibles = messageTemplateService.getTemplateVaribles(code);
if(V.isEmpty(varibles)){
return new JsonResult(Status.FAIL_OPERATION, "获取变量列表为空");
}
return new JsonResult(Status.OK, varibles,"获取变量列表成功");
}
}

2
diboot-components-msg/src/main/java/com/diboot/components/msg/entity/Message.java → diboot-component-msg/src/main/java/com/diboot/component/msg/entity/Message.java
View File

@ -1,4 +1,4 @@
package com.diboot.components.msg.entity;
package com.diboot.component.msg.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.diboot.core.entity.BaseExtEntity;

7
diboot-components-msg/src/main/java/com/diboot/components/msg/entity/MessageTemplate.java → diboot-component-msg/src/main/java/com/diboot/component/msg/entity/MessageTemplate.java
View File

@ -1,4 +1,4 @@
package com.diboot.components.msg.entity;
package com.diboot.component.msg.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.diboot.core.entity.BaseExtEntity;
@ -7,6 +7,11 @@ import lombok.Data;
@Data
public class MessageTemplate extends BaseExtEntity {
public static enum METADATA_TYPE{
MSG_TEMP_CODE, // 消息模板
MSG_TEMP_VARIBLES // 消息模板变量
}
@TableField
private String type;

4
diboot-components-msg/src/main/java/com/diboot/components/msg/mapper/MessageMapper.java → diboot-component-msg/src/main/java/com/diboot/component/msg/mapper/MessageMapper.java
View File

@ -1,6 +1,6 @@
package com.diboot.components.msg.mapper;
package com.diboot.component.msg.mapper;
import com.diboot.components.msg.entity.Message;
import com.diboot.component.msg.entity.Message;
import com.diboot.core.mapper.BaseCrudMapper;
public interface MessageMapper extends BaseCrudMapper<Message> {

2
diboot-components-msg/src/main/java/com/diboot/components/msg/mapper/MessageMapper.xml → diboot-component-msg/src/main/java/com/diboot/component/msg/mapper/MessageMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "./mybatis-3-mapper.dtd">
<mapper namespace="com.diboot.components.msg.mapper.MessageMapper">
<mapper namespace="com.diboot.component.msg.mapper.MessageMapper">
</mapper>

4
diboot-components-msg/src/main/java/com/diboot/components/msg/mapper/MessageTemplateMapper.java → diboot-component-msg/src/main/java/com/diboot/component/msg/mapper/MessageTemplateMapper.java
View File

@ -1,6 +1,6 @@
package com.diboot.components.msg.mapper;
package com.diboot.component.msg.mapper;
import com.diboot.components.msg.entity.MessageTemplate;
import com.diboot.component.msg.entity.MessageTemplate;
import com.diboot.core.mapper.BaseCrudMapper;
public interface MessageTemplateMapper extends BaseCrudMapper<MessageTemplate> {

2
diboot-components-msg/src/main/java/com/diboot/components/msg/mapper/MessageTemplateMapper.xml → diboot-component-msg/src/main/java/com/diboot/component/msg/mapper/MessageTemplateMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "./mybatis-3-mapper.dtd">
<mapper namespace="com.diboot.components.msg.mapper.MessageTemplateMapper">
<mapper namespace="com.diboot.component.msg.mapper.MessageTemplateMapper">
</mapper>

25
diboot-component-msg/src/main/java/com/diboot/component/msg/service/BaseSendService.java Normal file
View File

@ -0,0 +1,25 @@
package com.diboot.component.msg.service;
import com.diboot.component.msg.entity.Message;
/*
* 消息发送基础service
* @author:wangyl
* */
public interface BaseSendService {
/***
* 保存并发送消息
* @param msg
* @return
*/
boolean createAndSendMsg(Message msg) throws Exception;
/***
* 发送消息
* @param msg
* @return
*/
boolean sendMsg(Message msg) throws Exception;
}

12
diboot-component-msg/src/main/java/com/diboot/component/msg/service/MessageService.java Normal file
View File

@ -0,0 +1,12 @@
package com.diboot.component.msg.service;
import com.diboot.component.msg.entity.Message;
import com.diboot.core.service.BaseService;
/*
* 消息相关service
* @author:wangyl
* */
public interface MessageService extends BaseService<Message> {
}

26
diboot-component-msg/src/main/java/com/diboot/component/msg/service/MessageTemplateService.java Normal file
View File

@ -0,0 +1,26 @@
package com.diboot.component.msg.service;
import com.diboot.component.msg.entity.MessageTemplate;
import com.diboot.core.service.BaseService;
/*
* 消息模板相关service
* @author:wangyl
* */
public interface MessageTemplateService extends BaseService<MessageTemplate> {
/**
* 根据code获取唯一的消息模板
* @param code
* @return
*/
MessageTemplate getMessageTemplate(String code);
/**
* 根据code获取消息模板变量
* @param code
* @return
*/
String[] getTemplateVaribles(String code);
}

27
diboot-component-msg/src/main/java/com/diboot/component/msg/service/impl/BaseSendServiceImpl.java Normal file
View File

@ -0,0 +1,27 @@
package com.diboot.component.msg.service.impl;
import com.diboot.component.msg.entity.Message;
import com.diboot.component.msg.mapper.MessageMapper;
import com.diboot.component.msg.service.BaseSendService;
import com.diboot.core.service.impl.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/*
* 消息发送基础service
* @author:wangyl
* */
@Service
@Slf4j
public abstract class BaseSendServiceImpl extends BaseServiceImpl<MessageMapper, Message> implements BaseSendService {
@Override
public boolean createAndSendMsg(Message msg) throws Exception {
boolean success = super.createEntity(msg);
if(success){
success = sendMsg(msg);
}
return success;
}
}

18
diboot-component-msg/src/main/java/com/diboot/component/msg/service/impl/MessageServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package com.diboot.component.msg.service.impl;
import com.diboot.component.msg.entity.Message;
import com.diboot.component.msg.mapper.MessageMapper;
import com.diboot.component.msg.service.MessageService;
import com.diboot.core.service.impl.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/*
* 消息相关service实现
* @author:wangyl
* */
@Service
@Slf4j
public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message> implements MessageService {
}

52
diboot-component-msg/src/main/java/com/diboot/component/msg/service/impl/MessageTemplateServiceImpl.java Normal file
View File

@ -0,0 +1,52 @@
package com.diboot.component.msg.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.diboot.component.msg.entity.MessageTemplate;
import com.diboot.component.msg.mapper.MessageTemplateMapper;
import com.diboot.component.msg.service.MessageTemplateService;
import com.diboot.core.entity.Dictionary;
import com.diboot.core.service.DictionaryService;
import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.core.util.S;
import com.diboot.core.util.V;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/*
* 消息模板相关service
* @author:wangyl
* */
@Service
@Slf4j
public class MessageTemplateServiceImpl extends BaseServiceImpl<MessageTemplateMapper, MessageTemplate> implements MessageTemplateService {
private static final Logger logger = LoggerFactory.getLogger(MessageTemplateServiceImpl.class);
@Autowired
private DictionaryService dictionaryService;
@Override
public MessageTemplate getMessageTemplate(String code) {
LambdaQueryWrapper<MessageTemplate> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MessageTemplate::getCode, code);
List<MessageTemplate> list = this.getEntityList(wrapper);
return V.notEmpty(list)? list.get(0) : null;
}
@Override
public String[] getTemplateVaribles(String code) {
LambdaQueryWrapper<Dictionary> wrapper = new LambdaQueryWrapper<>();
wrapper.ne(Dictionary::getParentId, 0)
.eq(Dictionary::getItemName, code)
.eq(Dictionary::getType, MessageTemplate.METADATA_TYPE.MSG_TEMP_VARIBLES.name());
List<Dictionary> list = dictionaryService.getEntityList(wrapper);
if (V.isEmpty(list)){
return null;
}
return S.split(list.get(0).getItemValue());
}
}

6
diboot-components-msg/src/main/java/com/diboot/components/msg/vo/MessageVO.java → diboot-component-msg/src/main/java/com/diboot/component/msg/vo/MessageVO.java
View File

@ -1,7 +1,7 @@
package com.diboot.components.msg.vo;
package com.diboot.component.msg.vo;
import com.diboot.components.msg.entity.Message;
import com.diboot.components.msg.entity.MessageTemplate;
import com.diboot.component.msg.entity.Message;
import com.diboot.component.msg.entity.MessageTemplate;
import com.diboot.core.binding.annotation.BindDict;
import com.diboot.core.binding.annotation.BindEntity;
import lombok.Data;

11
diboot-components-msg/src/main/java/com/diboot/components/msg/config/BaseConfig.java
View File

@ -1,11 +0,0 @@
package com.diboot.components.msg.config;
/*
* 配置基类，之后的邮件，短信等实现时都需要需要继承此类
* 并在此基础上扩展
* */
public abstract class BaseConfig {
//关键配置是否为空
public abstract boolean isEmpty();
}

38
diboot-components-msg/src/main/java/com/diboot/components/msg/config/EmailConfig.java
View File

@ -1,38 +0,0 @@
package com.diboot.components.msg.config;
import com.diboot.core.util.V;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
/**
* @author : wangyongliang@dibo.ltd
* @version v2.0
* @Description: 读取配置文件类
* @Date 2019-07-8
*/
@Configuration
@EnableConfigurationProperties(EmailConfig.class)
@ConfigurationProperties("email.sender")
@Data
public class EmailConfig extends BaseConfig {
private String name;
private String address;
private String password;
private String host;
private String sslport;
@Override
public boolean isEmpty() {
if(V.notEmpty(address) && V.notEmpty(password)){
return false;
}
return true;
}
}

18
diboot-components-msg/src/main/java/com/diboot/components/msg/entity/BaseMessage.java
View File

@ -1,18 +0,0 @@
package com.diboot.components.msg.entity;
import lombok.Data;
/*
* 消息基类，之后的邮件，短信等实现时都需要需要继承此类
* 并在此基础上扩展
* */
@Data
public class BaseMessage {
//接收人
private String receiver;
//消息内容
private String content;
}

19
diboot-components-msg/src/main/java/com/diboot/components/msg/entity/EmailMessage.java
View File

@ -1,19 +0,0 @@
package com.diboot.components.msg.entity;
import lombok.Data;
/*
*
* */
@Data
public class EmailMessage extends BaseMessage {
private String receiverName;
private String[] ccEmails;
private String title;
private String[] filePaths;
}

17
diboot-components-msg/src/main/java/com/diboot/components/msg/service/BaseSendService.java
View File

@ -1,17 +0,0 @@
package com.diboot.components.msg.service;
import com.diboot.components.msg.entity.BaseMessage;
import com.diboot.components.msg.entity.Message;
public interface BaseSendService {
//发送消息
boolean send(BaseMessage message) throws Exception;
//转化为可发送的消息对象
BaseMessage parseToSendMessage(Message message);
//获取发送消息类型(邮件，短信，微信等类型)
String getType();
}

5
diboot-components-msg/src/main/java/com/diboot/components/msg/service/EmailSendService.java
View File

@ -1,5 +0,0 @@
package com.diboot.components.msg.service;
public interface EmailSendService extends BaseSendService {
}

26
diboot-components-msg/src/main/java/com/diboot/components/msg/service/MessageService.java
View File

@ -1,26 +0,0 @@
package com.diboot.components.msg.service;
import com.diboot.components.msg.entity.Message;
import com.diboot.core.service.BaseService;
public interface MessageService extends BaseService<Message> {
/***
* 保存并发送消息
* @param msg
* @return
*/
boolean createAndSendMsg(Message msg);
/***
* 发送消息
* @param msg
* @return
*/
boolean sendMsg(Message msg);
/***
* 根据消息类型获取对应的发送消息service
*/
BaseSendService getSendService(String type);
}

7
diboot-components-msg/src/main/java/com/diboot/components/msg/service/MessageTemplateService.java
View File

@ -1,7 +0,0 @@
package com.diboot.components.msg.service;
import com.diboot.components.msg.entity.MessageTemplate;
import com.diboot.core.service.BaseService;
public interface MessageTemplateService extends BaseService<MessageTemplate> {
}

106
diboot-components-msg/src/main/java/com/diboot/components/msg/service/impl/EmailSendServiceImpl.java
View File

@ -1,106 +0,0 @@
package com.diboot.components.msg.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.diboot.components.msg.config.EmailConfig;
import com.diboot.components.msg.config.MsgCons;
import com.diboot.components.msg.entity.BaseMessage;
import com.diboot.components.msg.entity.EmailMessage;
import com.diboot.components.msg.entity.Message;
import com.diboot.components.msg.service.EmailSendService;
import com.diboot.core.config.Cons;
import com.diboot.core.util.V;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.mail.EmailAttachment;
import org.apache.commons.mail.HtmlEmail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.util.List;
@Service
@Slf4j
public class EmailSendServiceImpl implements EmailSendService {
private static final Logger logger = LoggerFactory.getLogger(EmailSendServiceImpl.class);
@Autowired
EmailConfig emailConfig;
@Override
public boolean send(BaseMessage message) throws Exception {
EmailMessage emailMessage = (EmailMessage)message;
if(logger.isDebugEnabled()){
logger.debug("发送邮件开始, 收件人:" + message.getReceiver() + ", message=" + message.getContent());
}
if(emailConfig.isEmpty()){
logger.warn("发送邮件相关配置为空，发送失败");
return false;
}
// Create the email message
HtmlEmail email = new HtmlEmail();
email.setHostName(emailConfig.getHost());
email.setCharset(Cons.CHARSET_UTF8);
email.setSSLOnConnect(true);
if(V.notEmpty(emailConfig.getSslport())){
email.setSslSmtpPort(emailConfig.getSslport());
}
email.setAuthentication(emailConfig.getAddress(), emailConfig.getPassword());
email.addTo(emailMessage.getReceiver(), emailMessage.getReceiverName());
if(V.notEmpty(emailMessage.getCcEmails())){
for(String cc : emailMessage.getCcEmails()){
email.addCc(cc);
}
}
email.setFrom(emailConfig.getAddress(), emailConfig.getName());
email.setSubject(emailMessage.getTitle());
// set the html message
email.setHtmlMsg(message.getContent());
// 发送附件
if(V.notEmpty(emailMessage.getFilePaths())){
for(String path : emailMessage.getFilePaths()){
File file = new File(path);
if(!file.exists()){
logger.warn("附件文件不存在，无法发送！path="+path);
return false;
}
EmailAttachment attachment = new EmailAttachment();
attachment.setName(file.getName());
attachment.setPath(path);
attachment.setDisposition(EmailAttachment.ATTACHMENT);
email.attach(attachment);
}
}
// send the email
email.send();
if(logger.isDebugEnabled()){
logger.debug("发送邮件完成, 收件人:" + message.getReceiver());
}
return true;
}
@Override
public EmailMessage parseToSendMessage(Message message) {
EmailMessage email = new EmailMessage();
email.setReceiver(message.getReceiver());
email.setReceiverName(message.getReceiver());
email.setTitle(message.getTitle());
email.setContent(message.getContent());
JSONArray jsonArray = (JSONArray)message.getFromExt("filePaths");
List<String> filePathList = JSONArray.parseArray(jsonArray.toString(), String.class);
String[] filePaths = filePathList.toArray(new String[0]);
email.setFilePaths(filePaths);
return email;
}
@Override
public String getType() {
return MsgCons.MSG_TYPE.EMAIL.name();
}
}

67
diboot-components-msg/src/main/java/com/diboot/components/msg/service/impl/MessageServiceImpl.java
View File

@ -1,67 +0,0 @@
package com.diboot.components.msg.service.impl;
import com.diboot.components.msg.entity.BaseMessage;
import com.diboot.components.msg.entity.Message;
import com.diboot.components.msg.mapper.MessageMapper;
import com.diboot.components.msg.service.BaseSendService;
import com.diboot.components.msg.service.MessageService;
import com.diboot.core.service.impl.BaseServiceImpl;
import com.diboot.core.util.V;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
@Slf4j
public class MessageServiceImpl extends BaseServiceImpl<MessageMapper, Message> implements MessageService {
private static final Logger logger = LoggerFactory.getLogger(MessageServiceImpl.class);
@Autowired
private Map<String, BaseSendService> sendServiceMap;
@Override
public boolean createAndSendMsg(Message msg) {
boolean success = super.createEntity(msg);
if(success){
success = sendMsg(msg);
}
return success;
}
@Override
public boolean sendMsg(Message msg) {
boolean success = false;
try {
//根据消息类型获取发送消息service
BaseSendService sendService = getSendService(msg.getType());
if(V.isEmpty(sendService)){
logger.warn("没获取到相应发送消息的service");
return false;
}
//将Message对象转化为可发送的消息对象
BaseMessage baseMessage = sendService.parseToSendMessage(msg);
//发送消息
success = sendService.send(baseMessage);
} catch (Exception e) {
logger.warn("消息发送失败", e);
return false;
}
return success;
}
@Override
public BaseSendService getSendService(String type) {
if(V.notEmpty(sendServiceMap)){
for(BaseSendService sendService : sendServiceMap.values()){
if(type.equals(sendService.getType())){
return sendService;
}
}
}
return null;
}
}

13
diboot-components-msg/src/main/java/com/diboot/components/msg/service/impl/MessageTemplateServiceImpl.java
View File

@ -1,13 +0,0 @@
package com.diboot.components.msg.service.impl;
import com.diboot.components.msg.entity.MessageTemplate;
import com.diboot.components.msg.mapper.MessageTemplateMapper;
import com.diboot.components.msg.service.MessageTemplateService;
import com.diboot.core.service.impl.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class MessageTemplateServiceImpl extends BaseServiceImpl<MessageTemplateMapper, MessageTemplate> implements MessageTemplateService {
}

7
diboot-example/build.gradle
View File

@ -4,9 +4,10 @@ dependencies {
// compile("com.diboot:diboot-shiro:2.0.1")
compile project(":diboot-shiro-wx-mp")
// compile project(":diboot-shiro-wx-cp")
compile project(":diboot-components-msg")
compile project(":dibo-commons-file")
compile project(":dibo-commons-excel")
compile project(":diboot-component-msg")
compile project(":diboot-component-msg-email")
compile project(":diboot-component-file")
compile project(":diboot-component-file-excel")
// 七牛
compile ("com.qiniu:qiniu-java-sdk:7.2.7")

9
diboot-example/src/main/java/com/diboot/example/controller/FileUploadController.java
View File

@ -1,8 +1,9 @@
package com.diboot.example.controller;
import com.diboot.commons.entity.BaseFile;
import com.diboot.commons.file.FileHelper;
import com.diboot.commons.service.BaseFileService;
import com.diboot.component.file.entity.BaseFile;
import com.diboot.component.file.file.FileHelper;
import com.diboot.component.file.service.BaseFileService;
import com.diboot.core.util.S;
import com.diboot.core.util.V;
import com.diboot.core.vo.JsonResult;
import com.diboot.core.vo.Status;
@ -35,7 +36,7 @@ public class FileUploadController {
public JsonResult imageUpload(@RequestParam("image") MultipartFile image, ModelMap modelMap, HttpServletRequest request){
String fileName = image.getOriginalFilename();
String ext = fileName.substring(fileName.lastIndexOf(".")+1);
String newFileName = com.diboot.commons.utils.S.newUuid() + "." + ext;
String newFileName = S.newUuid() + "." + ext;
String filePath = FileHelper.saveImage(image, newFileName);
BaseFile file = new BaseFile();
file.setName(image.getOriginalFilename());

14
diboot-example/src/main/java/com/diboot/example/controller/RoleImportController.java
View File

@ -1,10 +1,10 @@
package com.diboot.example.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.diboot.commons.entity.BaseFile;
import com.diboot.commons.file.FileHelper;
import com.diboot.commons.vo.JsonResult;
import com.diboot.commons.vo.Pagination;
import com.diboot.component.file.entity.BaseFile;
import com.diboot.component.file.file.FileHelper;
import com.diboot.component.file.vo.JsonResult;
import com.diboot.component.file.vo.Pagination;
import com.diboot.core.entity.Dictionary;
import com.diboot.core.service.BaseService;
import com.diboot.core.service.DictionaryService;
@ -12,9 +12,9 @@ import com.diboot.core.util.BeanUtils;
import com.diboot.core.vo.Status;
import com.diboot.example.entity.DictionaryExcelData;
import com.diboot.example.listener.DictionaryExcelDataListener;
import com.diboot.excel.controller.BaseExcelImportController;
import com.diboot.excel.listener.BaseExcelDataListener;
import com.diboot.excel.utils.EasyExcelHelper;
import com.diboot.component.excel.controller.BaseExcelImportController;
import com.diboot.component.excel.listener.BaseExcelDataListener;
import com.diboot.component.excel.utils.EasyExcelHelper;
import com.diboot.shiro.service.RoleService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
diboot-example/src/main/java/com/diboot/example/entity/DictionaryExcelData.java
View File

@ -1,8 +1,8 @@
package com.diboot.example.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.diboot.excel.converter.StringConverter;
import com.diboot.excel.entity.BaseExcelDataEntity;
import com.diboot.component.excel.converter.StringConverter;
import com.diboot.component.excel.entity.BaseExcelDataEntity;
import lombok.Data;
/*
* dictionary数据导入导出实体类

2
diboot-example/src/main/java/com/diboot/example/listener/DictionaryExcelDataListener.java
View File

@ -6,7 +6,7 @@ import com.diboot.core.service.BaseService;
import com.diboot.core.service.DictionaryService;
import com.diboot.core.util.V;
import com.diboot.example.entity.DictionaryExcelData;
import com.diboot.excel.listener.BaseExcelDataListener;
import com.diboot.component.excel.listener.BaseExcelDataListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

10
diboot-example/src/main/resources/application.properties.default
View File

@ -77,15 +77,15 @@ logging.level.org.mybatis=debug
#邮件发送配置
#发送方邮箱
email.sender.address=
email.address=
#发送方授权码
email.sender.password=
email.password=
#SMTP发送服务器的名字
email.sender.host=smtp.163.com
email.host=smtp.163.com
#发送端口
email.sender.sslport=
email.sslport=
#发送方称呼
email.sender.name=
email.name=
#权限配置

7
settings.gradle
View File

@ -14,8 +14,9 @@ include 'diboot-shiro'
include 'diboot-shiro-wx-mp'
include 'diboot-docs'
include 'diboot-shiro-wx-cp'
include 'diboot-components-msg'
include 'diboot-component-msg'
include 'diboot-report'
include 'dibo-commons-file'
include 'dibo-commons-excel'
include 'diboot-component-file'
include 'diboot-component-file-excel'
include 'diboot-component-msg-email'