diff --git a/doc/db/pigxx_ac.sql b/doc/db/pigxx_oa.sql similarity index 100% rename from doc/db/pigxx_ac.sql rename to doc/db/pigxx_oa.sql diff --git a/doc/md/deploy.md b/doc/md/deploy.md index 1f3e3b652..bf98276e1 100644 --- a/doc/md/deploy.md +++ b/doc/md/deploy.md @@ -37,7 +37,7 @@ pigx/pigx-config/src/main/resources/config/pigx-upms-dev.yml spring: datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: lengleng url: jdbc:pigx-mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai diff --git a/doc/md/elastic-job-monitor-platform.md b/doc/md/elastic-job-monitor-platform.md index 9a793a88d..10e1d81d3 100644 --- a/doc/md/elastic-job-monitor-platform.md +++ b/doc/md/elastic-job-monitor-platform.md @@ -46,7 +46,7 @@ spring: # 保存定时任务的数据源 datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: 123456 url: jdbc:mysql://mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index 71073b3ac..ac4d5ac0b 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.springframework.stereotype.Component; /** * 操作日志使用spring event异步入库 diff --git a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml index 47bef9d74..74fd70c83 100644 --- a/pigx-config/src/main/resources/config/pigx-activiti-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-activiti-dev.yml @@ -20,7 +20,7 @@ spring: check-process-definitions: false datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root url: jdbc:mysql://pigx-mysql:3306/pigxx_ac?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai diff --git a/pigx-config/src/main/resources/config/pigx-auth-dev.yml b/pigx-config/src/main/resources/config/pigx-auth-dev.yml index f91716288..d0e0a5a69 100644 --- a/pigx-config/src/main/resources/config/pigx-auth-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-auth-dev.yml @@ -2,7 +2,7 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false diff --git a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml index e99b598aa..f93543e96 100644 --- a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml @@ -9,7 +9,7 @@ security: spring: datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai diff --git a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml index 022a0abc6..5f8da9325 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml @@ -10,7 +10,7 @@ spring: # 保存定时任务的数据源 datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index 1f5366c63..f35eeb70a 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -18,7 +18,7 @@ security: spring: datasource: type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java index ec38fe9b9..c2bbc39d2 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java @@ -24,8 +24,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; - /** *

* 部门关系表 diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index 2125e64df..0bd60f144 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -28,7 +28,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; import java.time.LocalDateTime; /** diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index f6cdf201d..82b732860 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -25,7 +25,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; import java.time.LocalDateTime; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index ce99b1843..7b75937d9 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -22,7 +22,6 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index d9752c7ba..40ecfb6f5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -18,6 +18,8 @@ spring: service-id: pigx-config autoconfigure: exclude: org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration + main: + allow-bean-definition-overriding: true # 注册中心配置 eureka: diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index 4a8baa225..ef73fadb7 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -137,6 +137,22 @@ docker-maven-plugin + + + src/main/resources + true + + **/*.woff + + + + src/main/resources + false + + **/*.woff + + + diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index f9e09606b..e29ea93f6 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -29,6 +29,7 @@ import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.ActTaskService; import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum; +import com.pig4cloud.pigx.common.core.util.TenantContextHolder; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -71,18 +72,18 @@ public class ActTaskServiceImpl implements ActTaskService { @Override public IPage getTaskByName(Map params, String name) { - TaskQuery taskQuery = taskService.createTaskQuery() - .taskCandidateOrAssigned(name) - .orderByTaskCreateTime().asc(); - int page = MapUtil.getInt(params, PaginationConstant.CURRENT); int limit = MapUtil.getInt(params, PaginationConstant.SIZE); + TaskQuery taskQuery = taskService.createTaskQuery() + .taskCandidateOrAssigned(name) + .taskTenantId(String.valueOf(TenantContextHolder.getTenantId())); + IPage result = new Page(page, limit); result.setTotal(taskQuery.count()); - List taskDTOList = taskQuery.list().stream() - .map(task -> { + List taskDTOList = taskQuery.orderByTaskCreateTime().desc() + .listPage((page - 1) * limit, limit).stream().map(task -> { TaskDTO dto = new TaskDTO(); dto.setTaskId(task.getId()); dto.setTaskName(task.getName()); diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java index 13bc060db..79724062e 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java @@ -110,6 +110,7 @@ public class ModelServiceImpl implements ModelService { @Override public IPage getModelPage(Map params) { ModelQuery modelQuery = repositoryService.createModelQuery() + .modelTenantId(String.valueOf(TenantContextHolder.getTenantId())) .latestVersion().orderByLastUpdateTime().desc(); String category = (String) params.get("category"); if (StrUtil.isNotBlank(category)) { diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java index d26d02df2..0cde8f588 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java @@ -64,7 +64,9 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public IPage getProcessByPage(Map params) { - ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery().latestVersion(); + ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery() + .processDefinitionTenantId(String.valueOf(TenantContextHolder.getTenantId())).latestVersion(); + String category = MapUtil.getStr(params, "category"); if (StrUtil.isNotBlank(category)) { query.processDefinitionCategory(category); diff --git a/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/configuration/toolbar.js b/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/configuration/toolbar.js index f09159802..63bd63153 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/configuration/toolbar.js +++ b/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/configuration/toolbar.js @@ -165,11 +165,5 @@ KISBPM.TOOLBAR_CONFIG = { ], "secondaryItems" : [ - { - "type" : "button", - "title" : "Close", - "cssClass" : "editor-icon editor-icon-close", - "action" : "KISBPM.TOOLBAR.ACTIONS.closeEditor" - } ] -}; \ No newline at end of file +}; diff --git a/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css b/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css index 9eb9ebd02..e0981ea37 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css +++ b/pigx-visual/pigx-activiti/src/main/resources/static/editor-app/css/style-common.css @@ -937,7 +937,7 @@ a.dropdown-toggle { } .wrapper.full { - padding: 40px 0px 0px 0px; + padding: 5px 0px 0px 0px; overflow: hidden; max-width: 100%; min-width: 100%; @@ -1516,4 +1516,4 @@ button.selection:active, button.selection:focus { .fullscreen .modal-header h3 .summary { font-size: 13px; -} \ No newline at end of file +} diff --git a/pigx-visual/pigx-activiti/src/main/resources/static/modeler.html b/pigx-visual/pigx-activiti/src/main/resources/static/modeler.html index 0dde10d63..d45925be9 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/static/modeler.html +++ b/pigx-visual/pigx-activiti/src/main/resources/static/modeler.html @@ -27,15 +27,6 @@ - -

-