diff --git a/pmapi/pom.xml b/pmapi/pom.xml
index 28565d8..b1315a4 100644
--- a/pmapi/pom.xml
+++ b/pmapi/pom.xml
@@ -74,18 +74,18 @@
jakarta.persistence
jakarta.persistence-api
-
- org.springframework.data
- spring-data-jpa
-
-
- org.hibernate
- hibernate-core
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
+
+
+
+
+
+
+
+
+
+
+
+
org.springframework.boot
spring-boot-starter-web
@@ -244,10 +244,10 @@
-
- com.ningdatech
- nd-flowable-starter
-
+
+
+
+
com.ningdatech
@@ -260,6 +260,14 @@
1.0.0
+
+
+
+ com.kingbase8
+ kingbase8-8.2.0
+ system
+ ${project.basedir}/src/lib/kingbase8-8.2.0.jar
+
diff --git a/pmapi/src/lib/kingbase8-8.2.0.jar b/pmapi/src/lib/kingbase8-8.2.0.jar
new file mode 100644
index 0000000..390ae26
Binary files /dev/null and b/pmapi/src/lib/kingbase8-8.2.0.jar differ
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java
new file mode 100644
index 0000000..a96d5e7
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationProcdefController.java
@@ -0,0 +1,38 @@
+package com.ningdatech.pmapi.organization.controller;
+
+import com.ningdatech.basic.model.PageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * @Classname OrganizationProcessController
+ * @Description
+ * @Date 2023/1/13 11:13
+ * @Author PoffyZhang
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/api/v1/organization/procdef")
+@Api(value = "OrganizationProcdef", tags = "单位配置-流程配置")
+@RequiredArgsConstructor
+public class OrganizationProcdefController {
+
+// private final
+//
+// @ApiOperation(value = "单位流程列表", notes = "单位流程列表")
+// @GetMapping("/list")
+// public PageVo processList(@Valid @ModelAttribute UserPageQuery userPageQuery) {
+// return userManage.queryUserList(userPageQuery);
+// }
+
+}
diff --git a/pmapi/src/main/resources/application-dev.yml b/pmapi/src/main/resources/application-dev.yml
index 2333bd9..f8f5bee 100644
--- a/pmapi/src/main/resources/application-dev.yml
+++ b/pmapi/src/main/resources/application-dev.yml
@@ -29,15 +29,63 @@ spring:
default-property-inclusion: non_null
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
+# datasource:
+# url: jdbc:mysql://47.98.125.47:3306/nd_project_management?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
+# driverClassName: com.mysql.jdbc.Driver
+# username: root
+# password: NingdaKeji123!
+# druid:
+# max-wait: 10000
+# min-idle: 5
+# max-active: 100
datasource:
- url: jdbc:mysql://47.98.125.47:3306/nd_project_management?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
- driverClassName: com.mysql.jdbc.Driver
- username: root
- password: NingdaKeji123!
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.kingbase8.Driver
+ # 数据源
druid:
- max-wait: 10000
- min-idle: 5
- max-active: 100
+ url: jdbc:kingbase8://120.26.44.207:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ username: SYSTEM
+ password: Ndkj1234
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间,单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间,单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ #mysql使用:SELECT 1 FROM DUAL
+ validationQuery: SELECT 1
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单,不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: admin
+ login-password: admin
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
logging:
config: classpath:logback-spring.xml
diff --git a/pom.xml b/pom.xml
index ba0603e..2f90422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,12 @@
nd-flowable-starter
1.0.0
+
+
+ com.kingbase8
+ kingbase8-8.2.0
+ 1.0
+