From 3e95e29b150e727c600632653e1fa226d3fec95e Mon Sep 17 00:00:00 2001 From: Turbolisten <188029906@qq.com> Date: Mon, 7 Sep 2020 18:30:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=AF=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF;=E4=BF=AE=E6=94=B9Date=E4=B8=BALocalDateTime?= =?UTF-8?q?;=E4=BF=AE=E6=94=B9PageUtil=E5=B7=A5=E5=85=B7=E7=B1=BB;?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0.gitignore;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smart-admin-service/.gitignore | 31 +++++++++++++++++++ .../smartadmin/common/domain/BaseEntity.java | 5 +-- .../config/SmartDruidDataSourceConfig.java | 2 +- .../OrderOperateLogService.java | 3 +- .../module/business/notice/NoticeManage.java | 9 +++--- .../module/business/notice/NoticeService.java | 5 +-- .../support/file/service/FileService.java | 3 +- .../idgenerator/domain/IdGeneratorEntity.java | 2 -- .../support/quartz/service/QuartzTask.java | 5 +-- .../quartz/service/QuartzTaskService.java | 11 ++++--- .../system/employee/EmployeeService.java | 5 +-- .../smartadmin/util/SmartPageUtil.java | 6 ++-- .../src/main/resources/banner.txt | 2 +- .../main/resources/dev/application.properties | 8 ++--- .../main/resources/pre/application.properties | 8 ++--- .../resources/prod/application.properties | 8 ++--- .../main/resources/sit/application.properties | 8 ++--- 17 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 smart-admin-service/.gitignore diff --git a/smart-admin-service/.gitignore b/smart-admin-service/.gitignore new file mode 100644 index 00000000..a2a3040a --- /dev/null +++ b/smart-admin-service/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java index 2d890064..5063b61e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.time.LocalDateTime; import java.util.Date; /** @@ -28,11 +29,11 @@ public class BaseEntity { /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java index f0107110..560bda2a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/config/SmartDruidDataSourceConfig.java @@ -65,7 +65,7 @@ public class SmartDruidDataSourceConfig { @Value("${spring.datasource.time-between-eviction-runs-millis}") long timeBetweenEvictionRunsMillis; - @Value("${spring.datasource.min-evictable-edle-time-millis}") + @Value("${spring.datasource.min-evictable-idle-time-millis}") long minEvictableIdleTimeMillis; @Value("${spring.datasource.filters}") diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java index be9ebf5b..9db6bc67 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java @@ -9,6 +9,7 @@ import net.lab1024.smartadmin.util.SmartStringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -41,7 +42,7 @@ public class OrderOperateLogService { } orderOperateLogEntity.setOperateRemark(e.getOperateRemark()); orderOperateLogEntity.setExtData(e.getExtData()); - orderOperateLogEntity.setCreateTime(new Date()); + orderOperateLogEntity.setCreateTime(LocalDateTime.now()); orderOperateLogEntity.setOrderType(e.getOrderType().getType()); entityList.add(orderOperateLogEntity); }); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java index eb159634..11698ceb 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Date; /** @@ -45,8 +46,8 @@ public class NoticeManage { NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setNoticeId(entity.getId()); - recordEntity.setCreateTime(new Date()); - recordEntity.setUpdateTime(new Date()); + recordEntity.setCreateTime(LocalDateTime.now()); + recordEntity.setUpdateTime(LocalDateTime.now()); noticeReceiveRecordDao.insert(recordEntity); } @@ -60,8 +61,8 @@ public class NoticeManage { NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setNoticeId(noticeId); - recordEntity.setCreateTime(new Date()); - recordEntity.setUpdateTime(new Date()); + recordEntity.setCreateTime(LocalDateTime.now()); + recordEntity.setUpdateTime(LocalDateTime.now()); noticeReceiveRecordDao.insert(recordEntity); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java index 224a28d3..22bfce47 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -108,8 +109,8 @@ public class NoticeService { */ public ResponseDTO add(NoticeAddDTO addDTO, RequestTokenBO requestToken) { NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class); - entity.setCreateTime(new Date()); - entity.setUpdateTime(new Date()); + entity.setCreateTime(LocalDateTime.now()); + entity.setUpdateTime(LocalDateTime.now()); entity.setCreateUser(requestToken.getRequestUserId()); entity.setSendStatus(JudgeEnum.NO.getValue()); entity.setDeleted(JudgeEnum.NO.getValue()); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java index b21e8cf7..7d1639f9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -190,7 +191,7 @@ public class FileService { public ResponseDTO saveFile(FileAddDTO addDTO, RequestTokenBO requestToken) { FileEntity entity = SmartBeanUtil.copy(addDTO,FileEntity.class); entity.setCreaterUser(requestToken.getRequestUserId()); - entity.setCreateTime(new Date()); + entity.setCreateTime(LocalDateTime.now()); fileDao.insert(entity); return ResponseDTO.succ(); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java index 051cca36..e1d64ffc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/idgenerator/domain/IdGeneratorEntity.java @@ -42,6 +42,4 @@ public class IdGeneratorEntity extends BaseEntity implements Serializable { * 备注 */ private String remark; - private Date updateTime; - private Date createTime; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java index c0e8beb8..e18a9860 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java @@ -17,6 +17,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean; import java.io.PrintWriter; import java.io.StringWriter; +import java.time.LocalDateTime; import java.util.Date; /** @@ -53,8 +54,8 @@ public class QuartzTask extends QuartzJobBean { paramsStr = params.toString(); taskLogEntity.setTaskParams(paramsStr); } - taskLogEntity.setUpdateTime(new Date()); - taskLogEntity.setCreateTime(new Date()); + taskLogEntity.setUpdateTime(LocalDateTime.now()); + taskLogEntity.setCreateTime(LocalDateTime.now()); //任务开始时间 long startTime = System.currentTimeMillis(); try { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java index bce68330..3381248d 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -82,7 +83,7 @@ public class QuartzTaskService { @Transactional(rollbackFor = Throwable.class) public ResponseDTO saveOrUpdateTask(QuartzTaskDTO quartzTaskDTO) throws Exception { ResponseDTO baseValid = this.baseValid(quartzTaskDTO); - if (! baseValid.isSuccess()) { + if (!baseValid.isSuccess()) { return baseValid; } Long taskId = quartzTaskDTO.getId(); @@ -103,7 +104,7 @@ public class QuartzTaskService { if (taskBean == null) { return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM, "taskBean 不存在"); } - if (! CronExpression.isValidExpression(quartzTaskDTO.getTaskCron())) { + if (!CronExpression.isValidExpression(quartzTaskDTO.getTaskCron())) { return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM, "请传入正确的正则表达式"); } return ResponseDTO.succ(); @@ -112,8 +113,8 @@ public class QuartzTaskService { private ResponseDTO saveTask(QuartzTaskDTO quartzTaskDTO) throws Exception { QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); taskEntity.setTaskStatus(TaskStatusEnum.NORMAL.getStatus()); - taskEntity.setUpdateTime(new Date()); - taskEntity.setCreateTime(new Date()); + taskEntity.setUpdateTime(LocalDateTime.now()); + taskEntity.setCreateTime(LocalDateTime.now()); quartzTaskDao.insert(taskEntity); this.createQuartzTask(scheduler, taskEntity); return ResponseDTO.succ(); @@ -127,7 +128,7 @@ public class QuartzTaskService { QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); //任务状态不能更新 taskEntity.setTaskStatus(updateEntity.getTaskStatus()); - taskEntity.setUpdateTime(new Date()); + taskEntity.setUpdateTime(LocalDateTime.now()); quartzTaskDao.updateById(taskEntity); this.updateQuartzTask(scheduler, taskEntity); return ResponseDTO.succ(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java index 5d10ec9b..fdd77a24 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java @@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -266,7 +267,7 @@ public class EmployeeService { updateDTO.setLoginPwd(employeeEntity.getLoginPwd()); } EmployeeEntity entity = SmartBeanUtil.copy(updateDTO, EmployeeEntity.class); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(LocalDateTime.now()); if (StringUtils.isEmpty(entity.getBirthday())) { entity.setBirthday(null); } @@ -280,7 +281,7 @@ public class EmployeeService { entity.setIsLeave(employeeEntity.getIsLeave()); entity.setCreateUser(employeeEntity.getCreateUser()); entity.setCreateTime(employeeEntity.getCreateTime()); - entity.setUpdateTime(new Date()); + entity.setUpdateTime(LocalDateTime.now()); employeeDao.updateById(entity); employeeCache.remove(employeeId); return ResponseDTO.succ(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java index 47340927..2e1352c6 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartPageUtil.java @@ -22,7 +22,7 @@ public class SmartPageUtil { PageResultDTO result = new PageResultDTO<>(); result.setPageNum(page.getCurrent()); result.setPageSize(page.getSize()); - result.setTotal(Long.valueOf(page.getTotal())); + result.setTotal(page.getTotal()); result.setPages(page.getPages()); result.setList(page.getRecords()); return result; @@ -33,7 +33,7 @@ public class SmartPageUtil { List orders = baseDTO.getOrders(); if (orders != null && !orders.isEmpty()) { - List orderItemList = orders.stream().map(e -> convertOrderItem(e)).collect(Collectors.toList()); + List orderItemList = orders.stream().map(SmartPageUtil::convertOrderItem).collect(Collectors.toList()); page.setOrders(orderItemList); } page.setCurrent(baseDTO.getPageNum()); @@ -90,7 +90,7 @@ public class SmartPageUtil { PageResultDTO pageResultDTO = new PageResultDTO(); pageResultDTO.setPageNum(page.getCurrent()); pageResultDTO.setPageSize(page.getSize()); - pageResultDTO.setTotal(Long.valueOf(page.getTotal())); + pageResultDTO.setTotal(page.getTotal()); pageResultDTO.setPages(page.getPages()); return pageResultDTO; } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/banner.txt b/smart-admin-service/smart-admin-api/src/main/resources/banner.txt index ee858a4d..d3187732 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/banner.txt +++ b/smart-admin-service/smart-admin-api/src/main/resources/banner.txt @@ -4,5 +4,5 @@ ____) | | | | | | (_| | | | |_ / ____ \ (_| | | | | | | | | | | |_____/|_| |_| |_|\__,_|_| \__/_/ \_\__,_|_| |_| |_|_|_| |_| -SmartAdmin v1.1.0 +SmartAdmin v1.2.0 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties index 00084918..6e0be9f5 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties @@ -31,7 +31,7 @@ spring.datasource.min-idle=1 spring.datasource.max-active=10 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 -spring.datasource.min-evictable-edle-time-millis=300000 +spring.datasource.min-evictable-idle-time-millis=300000 spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver spring.datasource.filters=stat spring.datasource.druid.username=druid @@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password= -spring.redis.lettuce..pool.max-active=100 +spring.redis.lettuce..pool.max-active=10 spring.redis.lettuce.pool.min-idle=5 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-wait=30000ms ########################## rest http pool ######################### #\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.max-total=100 +http.pool.max-total=10 #\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.default-max-per-route=25 +http.pool.default-max-per-route=5 #\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4 http.pool.socket-timeout=8000 #\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties index 0d6eb47c..d595e1a9 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties @@ -31,7 +31,7 @@ spring.datasource.min-idle=1 spring.datasource.max-active=10 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 -spring.datasource.min-evictable-edle-time-millis=300000 +spring.datasource.min-evictable-idle-time-millis=300000 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.filters=stat spring.datasource.druid.username=druid @@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password= -spring.redis.lettuce..pool.max-active=100 +spring.redis.lettuce..pool.max-active=10 spring.redis.lettuce.pool.min-idle=5 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-wait=30000ms ########################## rest http pool ######################### #\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.max-total=100 +http.pool.max-total=10 #\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.default-max-per-route=25 +http.pool.default-max-per-route=5 #\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4 http.pool.socket-timeout=8000 #\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index ddd497a2..7acf99ef 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -31,7 +31,7 @@ spring.datasource.min-idle=1 spring.datasource.max-active=10 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 -spring.datasource.min-evictable-edle-time-millis=300000 +spring.datasource.min-evictable-idle-time-millis=300000 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.filters=stat spring.datasource.druid.username=druid @@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password=Gq123456@ -spring.redis.lettuce..pool.max-active=100 +spring.redis.lettuce..pool.max-active=10 spring.redis.lettuce.pool.min-idle=5 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-wait=30000ms ########################## rest http pool ######################### #\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.max-total=100 +http.pool.max-total=10 #\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.default-max-per-route=25 +http.pool.default-max-per-route=5 #\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4 http.pool.socket-timeout=8000 #\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties index 4696bb19..0425a891 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties @@ -31,7 +31,7 @@ spring.datasource.min-idle=1 spring.datasource.max-active=10 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 -spring.datasource.min-evictable-edle-time-millis=300000 +spring.datasource.min-evictable-idle-time-millis=300000 spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver spring.datasource.filters=stat spring.datasource.druid.username=druid @@ -44,16 +44,16 @@ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password= -spring.redis.lettuce..pool.max-active=100 +spring.redis.lettuce..pool.max-active=10 spring.redis.lettuce.pool.min-idle=5 spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-wait=30000ms ########################## rest http pool ######################### #\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.max-total=100 +http.pool.max-total=10 #\u5355\u8DEF\u7531\u6700\u5927\u8FDE\u63A5\u6570 -http.pool.default-max-per-route=25 +http.pool.default-max-per-route=5 #\u670D\u52A1\u5668\u8FD4\u56DE\u6570\u636E(response)\u7684\u65F6\u95F4 http.pool.socket-timeout=8000 #\u8FDE\u63A5\u4E0A\u670D\u52A1\u5668(\u63E1\u624B\u6210\u529F)\u7684\u65F6\u95F4 From 68015d3e7fc475f1b9b497c12f2c33edeb00f7bf Mon Sep 17 00:00:00 2001 From: Turbolisten <188029906@qq.com> Date: Fri, 18 Sep 2020 17:35:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BBswagger=E6=B3=A8=E8=A7=A3ApiModelPropertyEnum=20-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=9A=90=E8=97=8F=E5=B1=9E?= =?UTF-8?q?=E6=80=A7hidden=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/anno/ApiModelPropertyEnum.java | 12 +++++++++++ .../SmartSwaggerApiModelEnumPlugin.java | 21 ++++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java index 40399a0f..c9babff3 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/anno/ApiModelPropertyEnum.java @@ -26,6 +26,18 @@ public @interface ApiModelPropertyEnum { String example() default ""; + /** + * 是否隐藏 + * + * @return + */ + boolean hidden() default false; + + /** + * 是否必须 + * + * @return + */ boolean required() default true; String dataType() default ""; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java index 15037fb8..dbc2d586 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java @@ -45,22 +45,23 @@ public class SmartSwaggerApiModelEnumPlugin implements ModelPropertyBuilderPlugi @Override public void apply(ModelPropertyContext context) { - Optional annotation = Optional.absent(); + Optional enumOptional = Optional.absent(); if (context.getAnnotatedElement().isPresent()) { - annotation = annotation.or(findApiModePropertyAnnotation(context.getAnnotatedElement().get())); + enumOptional = enumOptional.or(findApiModePropertyAnnotation(context.getAnnotatedElement().get())); } if (context.getBeanPropertyDefinition().isPresent()) { - annotation = annotation.or(findPropertyAnnotation(context.getBeanPropertyDefinition().get(), ApiModelPropertyEnum.class)); + enumOptional = enumOptional.or(findPropertyAnnotation(context.getBeanPropertyDefinition().get(), ApiModelPropertyEnum.class)); } - if (annotation.isPresent()) { - Class aClass = annotation.get().value(); - String enumInfo = BaseEnum.getInfo(aClass); - String enumDesc = annotation.get().enumDesc(); - context.getBuilder().required(annotation.transform(toIsRequired()).or(false)) - .description(enumDesc +":"+enumInfo) - .example(annotation.transform(toExample()).orNull()); + if (enumOptional.isPresent()) { + ApiModelPropertyEnum anEnum = enumOptional.get(); + String enumInfo = BaseEnum.getInfo(anEnum.value()); + context.getBuilder() + .required(enumOptional.transform(toIsRequired()).or(false)) + .description(anEnum.enumDesc() + ":" + enumInfo) + .example(enumOptional.transform(toExample()).orNull()) + .isHidden(anEnum.hidden()); } } From 2a72e341e66ac21172c6f63e8e510883e2f35733 Mon Sep 17 00:00:00 2001 From: Turbolisten <188029906@qq.com> Date: Fri, 18 Sep 2020 17:41:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=98=E5=8E=9Fdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/lab1024/smartadmin/common/domain/BaseEntity.java | 4 ++-- .../log/orderoperatelog/OrderOperateLogService.java | 2 +- .../smartadmin/module/business/notice/NoticeManage.java | 8 ++++---- .../smartadmin/module/business/notice/NoticeService.java | 4 ++-- .../module/support/file/service/FileService.java | 2 +- .../module/support/quartz/service/QuartzTask.java | 4 ++-- .../module/support/quartz/service/QuartzTaskService.java | 6 +++--- .../module/system/employee/EmployeeService.java | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java index 5063b61e..e6724c94 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java @@ -29,11 +29,11 @@ public class BaseEntity { /** * 更新时间 */ - private LocalDateTime updateTime; + private Date updateTime; /** * 创建时间 */ - private LocalDateTime createTime; + private Date createTime; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java index 9db6bc67..601b8cef 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java @@ -42,7 +42,7 @@ public class OrderOperateLogService { } orderOperateLogEntity.setOperateRemark(e.getOperateRemark()); orderOperateLogEntity.setExtData(e.getExtData()); - orderOperateLogEntity.setCreateTime(LocalDateTime.now()); + orderOperateLogEntity.setCreateTime(new Date()); orderOperateLogEntity.setOrderType(e.getOrderType().getType()); entityList.add(orderOperateLogEntity); }); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java index 11698ceb..7f65e416 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java @@ -46,8 +46,8 @@ public class NoticeManage { NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setNoticeId(entity.getId()); - recordEntity.setCreateTime(LocalDateTime.now()); - recordEntity.setUpdateTime(LocalDateTime.now()); + recordEntity.setCreateTime(new Date()); + recordEntity.setUpdateTime(new Date()); noticeReceiveRecordDao.insert(recordEntity); } @@ -61,8 +61,8 @@ public class NoticeManage { NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setNoticeId(noticeId); - recordEntity.setCreateTime(LocalDateTime.now()); - recordEntity.setUpdateTime(LocalDateTime.now()); + recordEntity.setCreateTime(new Date()); + recordEntity.setUpdateTime(new Date()); noticeReceiveRecordDao.insert(recordEntity); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java index 22bfce47..113c285c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java @@ -109,8 +109,8 @@ public class NoticeService { */ public ResponseDTO add(NoticeAddDTO addDTO, RequestTokenBO requestToken) { NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class); - entity.setCreateTime(LocalDateTime.now()); - entity.setUpdateTime(LocalDateTime.now()); + entity.setCreateTime(new Date()); + entity.setUpdateTime(new Date()); entity.setCreateUser(requestToken.getRequestUserId()); entity.setSendStatus(JudgeEnum.NO.getValue()); entity.setDeleted(JudgeEnum.NO.getValue()); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java index 7d1639f9..9f645620 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java @@ -191,7 +191,7 @@ public class FileService { public ResponseDTO saveFile(FileAddDTO addDTO, RequestTokenBO requestToken) { FileEntity entity = SmartBeanUtil.copy(addDTO,FileEntity.class); entity.setCreaterUser(requestToken.getRequestUserId()); - entity.setCreateTime(LocalDateTime.now()); + entity.setCreateTime(new Date()); fileDao.insert(entity); return ResponseDTO.succ(); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java index e18a9860..dbbdee2b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java @@ -54,8 +54,8 @@ public class QuartzTask extends QuartzJobBean { paramsStr = params.toString(); taskLogEntity.setTaskParams(paramsStr); } - taskLogEntity.setUpdateTime(LocalDateTime.now()); - taskLogEntity.setCreateTime(LocalDateTime.now()); + taskLogEntity.setUpdateTime(new Date()); + taskLogEntity.setCreateTime(new Date()); //任务开始时间 long startTime = System.currentTimeMillis(); try { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java index 3381248d..30408d5f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java @@ -113,8 +113,8 @@ public class QuartzTaskService { private ResponseDTO saveTask(QuartzTaskDTO quartzTaskDTO) throws Exception { QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); taskEntity.setTaskStatus(TaskStatusEnum.NORMAL.getStatus()); - taskEntity.setUpdateTime(LocalDateTime.now()); - taskEntity.setCreateTime(LocalDateTime.now()); + taskEntity.setUpdateTime(new Date()); + taskEntity.setCreateTime(new Date()); quartzTaskDao.insert(taskEntity); this.createQuartzTask(scheduler, taskEntity); return ResponseDTO.succ(); @@ -128,7 +128,7 @@ public class QuartzTaskService { QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); //任务状态不能更新 taskEntity.setTaskStatus(updateEntity.getTaskStatus()); - taskEntity.setUpdateTime(LocalDateTime.now()); + taskEntity.setUpdateTime(new Date()); quartzTaskDao.updateById(taskEntity); this.updateQuartzTask(scheduler, taskEntity); return ResponseDTO.succ(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java index fdd77a24..7e614e26 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java @@ -267,7 +267,7 @@ public class EmployeeService { updateDTO.setLoginPwd(employeeEntity.getLoginPwd()); } EmployeeEntity entity = SmartBeanUtil.copy(updateDTO, EmployeeEntity.class); - entity.setUpdateTime(LocalDateTime.now()); + entity.setUpdateTime(new Date()); if (StringUtils.isEmpty(entity.getBirthday())) { entity.setBirthday(null); } @@ -281,7 +281,7 @@ public class EmployeeService { entity.setIsLeave(employeeEntity.getIsLeave()); entity.setCreateUser(employeeEntity.getCreateUser()); entity.setCreateTime(employeeEntity.getCreateTime()); - entity.setUpdateTime(LocalDateTime.now()); + entity.setUpdateTime(new Date()); employeeDao.updateById(entity); employeeCache.remove(employeeId); return ResponseDTO.succ();