diff --git a/blade-auth/src/main/resources/application.yml b/blade-auth/src/main/resources/application.yml index 13f3ba5f..46d1af92 100644 --- a/blade-auth/src/main/resources/application.yml +++ b/blade-auth/src/main/resources/application.yml @@ -1,3 +1,23 @@ +# 在使用Spring默认数据源Hikari的情况下配置以下配置项 +spring: + datasource: + hikari: + # 自动提交从池中返回的连接 + auto-commit: true + # 连接池中维护的最小空闲连接数 + minimum-idle: 10 + # 连接池中允许的最大连接数。缺省值：10；推荐的公式：((core_count * 2) + effective_spindle_count) + maximum-pool-size: 60 + # 空闲连接超时时间，默认值600000（10分钟），大于等于max-lifetime且max-lifetime>0，会被重置为0；不等于0且小于10秒，会被重置为10秒。 + # 只有空闲连接数大于最大连接数且空闲时间超过该值，才会被释放 + idle-timeout: 30000 + # 连接最大存活时间.不等于0且小于30秒，会被重置为默认值30分钟.设置应该比mysql设置的超时时间短 + max-lifetime: 1800000 + # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 缺省:30秒 + connection-timeout: 30000 + # 连接测试查询 + connection-test-query: select 1 from dual + swagger: base-packages: - org.springblade diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index fd9187e4..97050023 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -47,11 +47,6 @@ blade-flow-api ${bladex.tool.version} - - org.mybatis - mybatis-spring - 2.0.0 - org.flowable diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 28b2226c..5c6697b8 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -47,4 +47,48 @@ + + + + com.spotify + docker-maven-plugin + ${docker.plugin.version} + + ${docker.registry.url}/blade/${project.artifactId}:${project.version} + ${project.basedir} + ${docker.registry.host} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + ${docker.registry.url} + ${docker.registry.url} + true + + + + org.apache.maven.plugins + maven-antrun-plugin + + + package + + run + + + + + + + + + + + + diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java index aec7895e..f596be7d 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java @@ -22,6 +22,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; import java.time.LocalDateTime; +import java.util.Date; /** * 实体类 @@ -62,7 +63,7 @@ public class User extends TenantEntity { /** * 生日 */ - private LocalDateTime birthday; + private Date birthday; /** * 性别 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java index 0bd9ee02..b3642c34 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/entity/ProcessLeave.java @@ -21,7 +21,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.flow.core.entity.FlowEntity; -import java.time.LocalDateTime; +import java.util.Date; /** * 请假流程实体类 @@ -46,11 +46,11 @@ public class ProcessLeave extends FlowEntity { /** * 请假开始时间 */ - private LocalDateTime startTime; + private Date startTime; /** * 请假结束时间 */ - private LocalDateTime endTime; + private Date endTime; /** * 请假理由 */ @@ -62,6 +62,6 @@ public class ProcessLeave extends FlowEntity { /** * 流程申请时间 */ - private LocalDateTime applyTime; + private Date applyTime; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java index bbd97a72..c59540da 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java @@ -23,6 +23,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.entity.ProcessLeave; import org.springblade.desk.mapper.LeaveMapper; @@ -35,8 +36,7 @@ import org.springblade.flow.core.utils.TaskUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.Duration; -import java.time.LocalDateTime; +import java.util.Date; /** * 服务实现类 @@ -56,13 +56,13 @@ public class LeaveServiceImpl extends BaseServiceImpl String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY); if (Func.isEmpty(leave.getId())) { // 保存leave - leave.setApplyTime(LocalDateTime.now()); + leave.setApplyTime(DateUtil.now()); save(leave); // 启动流程 Kv variables = Kv.create() .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, SecureUtil.getUserName()) .set("taskUser", TaskUtil.getTaskUser(leave.getTaskUser())) - .set("days", Duration.between(leave.getStartTime(), leave.getEndTime()).toDays()); + .set("days", DateUtil.between(leave.getStartTime(), leave.getEndTime()).toDays()); R result = flowClient.startProcessInstanceById(leave.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(leave.getId())), variables); if (result.isSuccess()) { log.debug("流程已启动,流程ID:" + result.getData().getProcessInstanceId()); diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index bf3b8b13..ce9c1207 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -24,6 +24,7 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.constant.BladeConstant; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.SysCache; @@ -33,7 +34,6 @@ import org.springblade.system.user.mapper.UserMapper; import org.springblade.system.user.service.IUserService; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; import java.util.List; /** @@ -84,7 +84,7 @@ public class UserServiceImpl extends BaseServiceImpl implement public boolean resetPassword(String userIds) { User user = new User(); user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD)); - user.setUpdateTime(LocalDateTime.now()); + user.setUpdateTime(DateUtil.now()); return this.update(user, Wrappers.update().lambda().in(User::getId, Func.toLongList(userIds))); } diff --git a/pom.xml b/pom.xml index 301be6fd..4a37adff 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.9.2 1.5.21 1.9.4 - 3.1.0 + 3.1.1 4.0.1 1.6.0 6.4.1 @@ -31,7 +31,7 @@ 2.1.5.RELEASE Greenwich.SR1 - Cairo-SR7 + Cairo-SR8 192.168.0.157