From 8511394a6c6812a68bce417bc5440613ab175e53 Mon Sep 17 00:00:00 2001 From: ZhouYang Date: Thu, 31 Aug 2023 11:47:30 +0800 Subject: [PATCH 1/2] Support tidb databse --- .../resources/application-tidb.properties | 67 +++++++++++++++++++ .../src/main/resources/application.properties | 3 +- openjob-server/pom.xml | 2 +- 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 openjob-server/openjob-server-starter/src/main/resources/application-tidb.properties diff --git a/openjob-server/openjob-server-starter/src/main/resources/application-tidb.properties b/openjob-server/openjob-server-starter/src/main/resources/application-tidb.properties new file mode 100644 index 00000000..4906fb6b --- /dev/null +++ b/openjob-server/openjob-server-starter/src/main/resources/application-tidb.properties @@ -0,0 +1,67 @@ +server.port=${SERVER_PORT:8080} +### admin config +# user passwd hash salt +openjob.admin.user.passwd-salt=${OJ_ADMIN_USER_PWD_SALT:3TJPjpUanNqZ0N1} +# i18n +spring.messages.basename=messages.message +spring.messages.use-code-as-default-message=true +### spring config +spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false +spring.datasource.driver-class-name=${OJ_DS_DRIVER_CLASS:com.mysql.cj.jdbc.Driver} +spring.datasource.url=${OJ_DS_URL:jdbc:mysql://127.0.0.1:4000/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +spring.datasource.username=${OJ_DS_USERNAME:root} +spring.datasource.password=${OJ_DS_PASSWORD:123456} +spring.datasource.type=com.zaxxer.hikari.HikariDataSource +spring.datasource.hikari.minimum-idle=${OJ_DS_HK_MINI_IDLE:1} +spring.datasource.hikari.maximum-pool-size=${OJ_DS_HK_MAX_POOL_SIZE:10} +spring.datasource.hikari.idle-timeout=${OJ_DS_HK_IDLE_TIMEOUT:60000} +spring.datasource.hikari.pool-name=${OJ_DS_HK_POOL_NAME:openjob} +# fixed warn for "spring.jpa.open-in-view is enabled by default" +spring.jpa.open-in-view=false +spring.flyway.enabled=true +spring.flyway.clean-disabled=true +spring.flyway.locations=${OJ_FW_LOCATIONS:classpath:db/migration/mysql} +spring.flyway.baseline-on-migrate=true +spring.flyway.table=${OJ_FW_TABLE:migration_version} +spring.flyway.baseline-version=0 +spring.flyway.encoding=UTF-8 +spring.flyway.validate-on-migrate=false +openjob.log.storage.selector=${OJ_LOG_STORAGE_SELECTOR:mysql} +# h2 +openjob.log.storage.h2.properties.user=${OJ_LOG_STORAGE_H2_USER:root} +openjob.log.storage.h2.properties.password=${OJ_LOG_STORAGE_H2_PASSWORD:123456} +openjob.log.storage.h2.properties.url=${OJ_LOG_STORAGE_H2_URL:jdbc:h2:mem:openjob;AUTO_RECONNECT=TRUE;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;WRITE_DELAY=0;} +# mysql +openjob.log.storage.mysql.properties.user=${OJ_LOG_STORAGE_MYSQL_USER:root} +openjob.log.storage.mysql.properties.password=${OJ_LOG_STORAGE_MYSQL_PASSWORD:123456} +openjob.log.storage.mysql.properties.url=${OJ_LOG_STORAGE_MYSQL_URL:jdbc:mysql://127.0.0.1:4000/openjob?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai} +# oracle +openjob.log.storage.oracle.properties.user=${OJ_LOG_STORAGE_ORACLE_USER:openjob} +openjob.log.storage.oracle.properties.password=${OJ_LOG_STORAGE_ORACLE_PASSWORD:123456} +openjob.log.storage.oracle.properties.url=${OJ_LOG_STORAGE_ORACLE_URL:jdbc:oracle:thin:@127.0.0.1:1521:openjob} +# postgresql +openjob.log.storage.postgresql.properties.user=${OJ_LOG_STORAGE_POSTGRESQL_USER:postgres} +openjob.log.storage.postgresql.properties.password=${OJ_LOG_STORAGE_POSTGRESQL_PASSWORD:pg123456} +openjob.log.storage.postgresql.properties.url=${OJ_LOG_STORAGE_POSTGRESQL_URL:jdbc:postgresql://127.0.0.1:5432/openjob} +# elasticsearch7 +openjob.log.storage.elasticsearch7.username=${OJ_LOG_STORAGE_ES7_USERNAME:} +openjob.log.storage.elasticsearch7.password=${OJ_LOG_STORAGE_ES7_PASSWORD:} +openjob.log.storage.elasticsearch7.cluster-nodes=${OJ_LOG_STORAGE_ES7_CLUSTER_NODES:localhost:9200} +openjob.log.storage.elasticsearch7.index=${OJ_LOG_STORAGE_ES7_INDEX:openjob} +openjob.log.storage.elasticsearch7.socket-timeout=${OJ_LOG_STORAGE_ES7_SOCKET_TIMEOUT:3000} +openjob.scheduler.delay.enable=${OJ_SCHEDULER_DELAY_ENABLE:true} +#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration +spring.redis.host=${OJ_REDIS_HOST:127.0.0.1} +spring.redis.password=${OJ_REDIS_PASSWORD:} +spring.redis.database=${OJ_REDIS_DB:0} +spring.redis.port=${OJ_REDIS_PORT:6379} +spring.redis.client-type=lettuce +spring.redis.lettuce.pool.max-active=32 +spring.redis.lettuce.pool.max-idle=8 +spring.redis.lettuce.pool.max-wait=1000 +spring.redis.lettuce.pool.time-between-eviction-runs=60s +spring.jpa.show-sql=${SPRING_JPA_SHOW_SQL:false} +akka.remote.hostname=${AKKA_REMOTE_HOSTNAME:} +akka.remote.port=${AKKA_REMOTE_PORT:25520} +akka.bind.hostname=${AKKA_BIND_HOSTNAME:} +akka.bind.port=${AKKA_BIND_PORT:25520} \ No newline at end of file diff --git a/openjob-server/openjob-server-starter/src/main/resources/application.properties b/openjob-server/openjob-server-starter/src/main/resources/application.properties index 4a12dba1..60c076e0 100644 --- a/openjob-server/openjob-server-starter/src/main/resources/application.properties +++ b/openjob-server/openjob-server-starter/src/main/resources/application.properties @@ -2,6 +2,7 @@ server.port=${SERVER_PORT:8080} #spring.profiles.active=mysql #spring.profiles.active=pgsql #spring.profiles.active=oracle +spring.profiles.active=tidb ### admin config # user passwd hash salt openjob.admin.user.passwd-salt=${OJ_ADMIN_USER_PWD_SALT:3TJPjpUanNqZ0N1} @@ -11,7 +12,7 @@ spring.messages.use-code-as-default-message=true ### spring config spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=false spring.datasource.driver-class-name=${OJ_DS_DRIVER_CLASS:org.h2.Driver} -spring.datasource.url=${OJ_DS_URL:jdbc:h2:mem:openjob;MODE=MySQL;DATABASE_TO_LOWER=true} +spring.datasource.url=${OJ_DS_URL:jdbc:h2:mem:openjob;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true} spring.datasource.username=${OJ_DS_USERNAME:root} spring.datasource.password=${OJ_DS_PASSWORD:123456} #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect diff --git a/openjob-server/pom.xml b/openjob-server/pom.xml index 9330c471..30aa69c7 100644 --- a/openjob-server/pom.xml +++ b/openjob-server/pom.xml @@ -25,7 +25,7 @@ 1.5.4 - 8.2.2 + 7.15.0 From e76683d244f5b9c66c75776d1fea13af31b7bc7a Mon Sep 17 00:00:00 2001 From: ZhouYang Date: Thu, 31 Aug 2023 11:53:33 +0800 Subject: [PATCH 2/2] annotation tidb active --- .../src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openjob-server/openjob-server-starter/src/main/resources/application.properties b/openjob-server/openjob-server-starter/src/main/resources/application.properties index 60c076e0..38f0cc84 100644 --- a/openjob-server/openjob-server-starter/src/main/resources/application.properties +++ b/openjob-server/openjob-server-starter/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=${SERVER_PORT:8080} #spring.profiles.active=mysql #spring.profiles.active=pgsql #spring.profiles.active=oracle -spring.profiles.active=tidb +#spring.profiles.active=tidb ### admin config # user passwd hash salt openjob.admin.user.passwd-salt=${OJ_ADMIN_USER_PWD_SALT:3TJPjpUanNqZ0N1}