@@ -74,18 +74,18 @@ | |||
<groupId>jakarta.persistence</groupId> | |||
<artifactId>jakarta.persistence-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.data</groupId> | |||
<artifactId>spring-data-jpa</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.hibernate</groupId> | |||
<artifactId>hibernate-core</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-data-jpa</artifactId> | |||
</dependency> | |||
<!-- <dependency>--> | |||
<!-- <groupId>org.springframework.data</groupId>--> | |||
<!-- <artifactId>spring-data-jpa</artifactId>--> | |||
<!-- </dependency>--> | |||
<!-- <dependency>--> | |||
<!-- <groupId>org.hibernate</groupId>--> | |||
<!-- <artifactId>hibernate-core</artifactId>--> | |||
<!-- </dependency>--> | |||
<!-- <dependency>--> | |||
<!-- <groupId>org.springframework.boot</groupId>--> | |||
<!-- <artifactId>spring-boot-starter-data-jpa</artifactId>--> | |||
<!-- </dependency>--> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-web</artifactId> | |||
@@ -244,10 +244,10 @@ | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.ningdatech</groupId> | |||
<artifactId>nd-flowable-starter</artifactId> | |||
</dependency> | |||
<!-- <dependency>--> | |||
<!-- <groupId>com.ningdatech</groupId>--> | |||
<!-- <artifactId>nd-flowable-starter</artifactId>--> | |||
<!-- </dependency>--> | |||
<dependency> | |||
<groupId>com.ningdatech</groupId> | |||
@@ -260,6 +260,14 @@ | |||
</exclusions> | |||
<version>1.0.0</version> | |||
</dependency> | |||
<!--KingBase--> | |||
<dependency> | |||
<groupId>com.kingbase8</groupId> | |||
<artifactId>kingbase8-8.2.0</artifactId> | |||
<scope>system</scope> | |||
<systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath> | |||
</dependency> | |||
</dependencies> | |||
<!-- 打包 --> | |||
<!--配置环境的profile--> | |||
@@ -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<UserInfoVO> processList(@Valid @ModelAttribute UserPageQuery userPageQuery) { | |||
// return userManage.queryUserList(userPageQuery); | |||
// } | |||
} |
@@ -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 | |||
@@ -101,6 +101,12 @@ | |||
<artifactId>nd-flowable-starter</artifactId> | |||
<version>1.0.0</version> | |||
</dependency> | |||
<!--KingBase--> | |||
<dependency> | |||
<groupId>com.kingbase8</groupId> | |||
<artifactId>kingbase8-8.2.0</artifactId> | |||
<version>1.0</version> | |||
</dependency> | |||
</dependencies> | |||
</dependencyManagement> | |||