diff --git a/hippo4j-server/src/main/resources/application-h2.properties b/hippo4j-server/src/main/resources/application-h2.properties index b2a1a3d0..5859aa19 100644 --- a/hippo4j-server/src/main/resources/application-h2.properties +++ b/hippo4j-server/src/main/resources/application-h2.properties @@ -1,6 +1,6 @@ +### Default database spring.datasource.driver-class-name=org.h2.Driver spring.datasource.url=jdbc:h2:mem:hippo4j_manager;DB_CLOSE_DELAY=-1;MODE=MySQL; spring.datasource.username=sa spring.datasource.password=sa spring.datasource.schema=classpath:sql-script/h2/hippo4j_manager.sql - diff --git a/hippo4j-server/src/main/resources/application-mysql.properties b/hippo4j-server/src/main/resources/application-mysql.properties index d751e3f9..2940c413 100644 --- a/hippo4j-server/src/main/resources/application-mysql.properties +++ b/hippo4j-server/src/main/resources/application-mysql.properties @@ -2,4 +2,4 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/hippo4j_manager?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.username=root -spring.datasource.password=123456 \ No newline at end of file +spring.datasource.password=root diff --git a/hippo4j-server/src/main/resources/application.properties b/hippo4j-server/src/main/resources/application.properties index 2c32d489..69a499af 100644 --- a/hippo4j-server/src/main/resources/application.properties +++ b/hippo4j-server/src/main/resources/application.properties @@ -4,8 +4,7 @@ ### Server Startup Port server.port=6691 - -spring.profiles.active= mysql +spring.profiles.active=mysql ### Server Tomcat server.tomcat.accesslog.enabled=true @@ -26,8 +25,6 @@ hippo4j.core.clean-history-data-enable=true # hippo4j.core.monitor.report-type=netty #*************** Config Module Related Configurations ***************# - - ### Hikari Datasource spring.datasource.hikari.pool-name=Hikari spring.datasource.hikari.connectionTimeout=30000 @@ -44,4 +41,4 @@ mybatis-plus.global-config.banner=false # mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.global-config.db-config.logic-delete-field=delFlag mybatis-plus.global-config.db-config.logic-delete-value=1 -mybatis-plus.global-config.db-config.logic-not-delete-value=0 \ No newline at end of file +mybatis-plus.global-config.db-config.logic-not-delete-value=0 diff --git a/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql b/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql index 02fbc4b4..2768fe2b 100755 --- a/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql +++ b/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql @@ -1,5 +1,3 @@ - - /******************************************/ /* 数据库全名 = hippo4j_manager */ /* 表名称 = tenant */ @@ -19,7 +17,10 @@ CREATE TABLE `tenant` ( KEY `uk_tenantinfo_tenantid` (`tenant_id`,`del_flag`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='租户表'; - +/******************************************/ +/* 数据库全名 = hippo4j_manager */ +/* 表名称 = item */ +/******************************************/ DROP TABLE IF EXISTS `item`, `item_info`; CREATE TABLE `item` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', @@ -231,4 +232,4 @@ ALTER TABLE `tenant` DROP INDEX `uk_tenantinfo_tenantid`; /* 1.4.0 Upgrade Start */ ALTER TABLE config Modify COLUMN keep_alive_time int(11) COMMENT '线程存活时间(秒)'; ALTER TABLE config Add execute_time_out int(11) COMMENT '执行超时时间(毫秒)' AFTER keep_alive_time; -/* 1.4.0 Upgrade Start */ \ No newline at end of file +/* 1.4.0 Upgrade Start */