优化配置

iBase4J · May 18, 2018 · 6fb5993 · 6fb5993
1 parent 6393156
commit 6fb5993
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 56 deletions.
diff --git a/...src/main/resources/config/jdbc.properties → ...main/resources/config/dev/jdbc.properties b/...src/main/resources/config/jdbc.properties → ...main/resources/config/dev/jdbc.properties
@@ -3,15 +3,15 @@ druid.driverClassName=com.mysql.cj.jdbc.Driver
 #\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs)
 druid.key=
 #\u8bfb
-druid.reader.url=jdbc:mysql://${jdbc.host}:3306/ibase4j?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
+druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
 druid.reader.username=root
 #\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
-druid.reader.password=${jdbc.password}
+druid.reader.password=68NKG7n1mN8rErEfbag2qM==
 #\u5199
-druid.writer.url=jdbc:mysql://${jdbc.host}:3306/ibase4j?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
+druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
 druid.writer.username=root
 #\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
-druid.writer.password=${jdbc.password}
+druid.writer.password=68NKG7n1mN8rErEfbag2qM==
 
 #\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570
 druid.initialSize=5

diff --git a/...c/main/resources/config/system.properties → ...in/resources/config/dev/system.properties b/...c/main/resources/config/system.properties → ...in/resources/config/dev/system.properties
@@ -2,7 +2,7 @@
 #rpc.type=motan
 rpc.type=dubbo
 rpc.registry=zookeeper
-rpc.address=${zookeeper.address}
+rpc.address=127.0.0.1:2181
 rpc.protocol.maxThread=500
 rpc.protocol.minThread=20
 rpc.protocol.maxContentLength=1048576
@@ -15,9 +15,9 @@ rpc.package=org.ibase4j
 #\u5931\u8d25\u91cd\u8bd5\u6b21\u6570
 rpc.consumer.retries=0
 #
-redis.host=${redis.host}
+redis.host=127.0.0.1
 redis.port=6379
-redis.password=${redis.password}
+redis.password=
 #\u6700\u5c0f\u7a7a\u95f2\u6570
 redis.minIdle=2
 #\u6700\u5927\u7a7a\u95f2\u6570
@@ -55,8 +55,8 @@ mq.receiveTimeout=10000
 #\u4e34\u65f6\u6587\u4ef6\u9884\u89c8
 ui.file.uri.prefix=http://localhost/
 #fastdfs
-fdfs.trackerList=${fdfs.trackerList}
-fdfs.fileHost=http://${fdfs.host}/
+fdfs.trackerList=127.0.0.1:22122
+fdfs.fileHost=http://127.0.0.1/
 #
 sftp.host=192.168.5.100
 sftp.port=22

diff --git a/...src/main/resources/config/jdbc.properties → ...main/resources/config/dev/jdbc.properties b/...src/main/resources/config/jdbc.properties → ...main/resources/config/dev/jdbc.properties
@@ -3,15 +3,15 @@ druid.driverClassName=com.mysql.cj.jdbc.Driver
 #\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs)
 druid.key=
 #\u8bfb
-druid.reader.url=jdbc:mysql://${jdbc.host}:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
+druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
 druid.reader.username=root
 #\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
-druid.reader.password=${jdbc.password}
+druid.reader.password=68NKG7n1mN8rErEfbag2qM==
 #\u5199
-druid.writer.url=jdbc:mysql://${jdbc.host}:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
+druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
 druid.writer.username=root
 #\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
-druid.writer.password=${jdbc.password}
+druid.writer.password=68NKG7n1mN8rErEfbag2qM==
 
 #\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570
 druid.initialSize=5

diff --git a/...c/main/resources/config/system.properties → ...in/resources/config/dev/system.properties b/...c/main/resources/config/system.properties → ...in/resources/config/dev/system.properties
@@ -3,5 +3,5 @@ rpc.protocol.port=18088
 redis.enableTransaction=false
 #\u4f1a\u8bdd
 session.maxInactiveInterval=1800
-session.cookie.secure=${session.cookie.secure}
+session.cookie.secure=false
 rememberMe.cookie.maxAge=86400
diff --git a/pom.xml b/pom.xml
@@ -71,48 +71,8 @@
 		<swagger.version>1.5.17</swagger.version>
 		<thumbnailator.version>0.4.8</thumbnailator.version>
 		<javassist.version>3.22.0-GA</javassist.version>
-		<!-- 环境配置 -->
-		<redis.host>127.0.0.1</redis.host>
-		<redis.password></redis.password>
-		<zookeeper.address>127.0.0.1:2181</zookeeper.address>
-		<fastDFS.host>127.0.0.1</fastDFS.host>
-		<session.cookie.secure>false</session.cookie.secure>
-		<jdbc.host>127.0.0.1</jdbc.host>
-		<jdbc.password>68NKG7n1mN8rErEfbag2qM==</jdbc.password>
-		<fdfs.host>http://127.0.0.1/</fdfs.host>
-		<fdfs.trackerList>127.0.0.1:22122</fdfs.trackerList>
 	</properties>
 
-	<!-- @TODO -->
-	<profiles>
-		<profile>
-			<id>test</id>
-			<properties>
-				<redis.host>127.0.0.1</redis.host>
-				<redis.password></redis.password>
-				<zookeeper.address>127.0.0.1:2181</zookeeper.address>
-				<fastDFS.host>127.0.0.1</fastDFS.host>
-				<jdbc.host>127.0.0.1</jdbc.host>
-				<jdbc.password>68NKG7n1mN8rErEfbag2qM==</jdbc.password>
-				<fdfs.host>http://127.0.0.1/</fdfs.host>
-				<fdfs.trackerList>127.0.0.1:22122</fdfs.trackerList>
-			</properties>
-		</profile>
-		<profile>
-			<id>product</id>
-			<properties>
-				<redis.host>127.0.0.1</redis.host>
-				<redis.password></redis.password>
-				<zookeeper.address>127.0.0.1:2181</zookeeper.address>
-				<fastDFS.host>127.0.0.1</fastDFS.host>
-				<session.cookie.secure>true</session.cookie.secure>
-				<jdbc.host>127.0.0.1</jdbc.host>
-				<jdbc.password>68NKG7n1mN8rErEfbag2qM==</jdbc.password>
-				<fdfs.host>http://127.0.0.1/</fdfs.host>
-				<fdfs.trackerList>127.0.0.1:22122</fdfs.trackerList>
-			</properties>
-		</profile>
-	</profiles>
 	<repositories>
 		<repository>
 			<id>spring-snapshots</id>

diff --git a/sqls/1.iBase4J.sql b/sqls/1.iBase4J.sql
@@ -600,7 +600,9 @@ CREATE TABLE IF NOT EXISTS `task_fire_log` (
 CREATE TABLE `sys_lock` (
   `key_` varchar(256) NOT NULL,
   `name_` varchar(128) NOT NULL,
-  `expire_` datetime NOT NULL,
+  `expire_` int(6) NOT NULL,
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`key_`),
-  KEY `expire_` (`expire_`)
+  INDEX `expire_` (`expire_`),
+  INDEX `create_time` (`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;