update

sanluan · Jan 11, 2017 · 98d9a3c · 98d9a3c
1 parent 818438d
commit 98d9a3c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 38 deletions.
diff --git a/publiccms-by-maven/pom.xml b/publiccms-by-maven/pom.xml
@@ -18,41 +18,8 @@
 		<httpclientVersion>4.5.2</httpclientVersion>
 		<jacksonVersion>2.8.1</jacksonVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<db_host>172.17.0.2</db_host>
-		<db_username>root</db_username>
-		<db_password>mysql1234</db_password>
-		<ftl_update_delay>5</ftl_update_delay>
-		<log_level>info</log_level>
-
 	</properties>
 
-	<profiles>
-		<profile>
-			<id>release</id>
-			<properties>
-				<db_host>172.18.0.2</db_host>
-				<db_username>root</db_username>
-				<db_password>mysqlqidianxinchuang</db_password>
-				<ftl_update_delay>60</ftl_update_delay>
-				<log_level>info</log_level>
-			</properties>
-		</profile>
-
-		<profile>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<id>local</id>
-			<properties>
-				<db_host>172.17.0.2</db_host>
-				<db_username>root</db_username>
-				<db_password>mysql123</db_password>
-				<ftl_update_delay>5</ftl_update_delay>
-			</properties>
-		</profile>
-	</profiles>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.freemarker</groupId>

diff --git a/publiccms-by-maven/src/main/resources/config/properties/dbconfig.properties b/publiccms-by-maven/src/main/resources/config/properties/dbconfig.properties
@@ -1,7 +1,7 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://${db_host}/pcms?useUnicode\=true&characterEncoding\=UTF-8&zeroDateTimeBehavior\=round
-jdbc.username=${db_username}
-jdbc.password=${db_password}
+jdbc.url=jdbc\:mysql\://127.0.0.1/public_cms?useUnicode\=true&characterEncoding\=UTF-8&zeroDateTimeBehavior\=round
+jdbc.username=publiccms
+jdbc.password=publiccms_password
 cpool.checkoutTimeout=20000
 cpool.autoCommitOnClose=true
 cpool.minPoolSize=5

diff --git a/publiccms-by-maven/src/main/resources/config/properties/freemarker.properties b/publiccms-by-maven/src/main/resources/config/properties/freemarker.properties
@@ -1,5 +1,5 @@
 freemarkerSettings.new_builtin_class_resolver=allows_nothing
-freemarkerSettings.template_update_delay=5
+freemarkerSettings.template_update_delay=1800
 freemarkerSettings.defaultEncoding=UTF-8
 freemarkerSettings.url_escaping_charset=UTF-8
 freemarkerSettings.locale=zh_CN

diff --git a/publiccms-by-maven/src/main/resources/simplelog.properties b/publiccms-by-maven/src/main/resources/simplelog.properties
@@ -13,6 +13,6 @@ org.apache.commons.logging.simplelog.dateTimeFormat=MM-dd HH:mm:ss:SSS zzz
 
 #Default logging detail level for all instances of SimpleLog. Must be one of: trace debug info warn error fatal If not specified, defaults to info.
 #org.apache.commons.logging.simplelog.defaultlog=info
-org.apache.commons.logging.simplelog.defaultlog=${log_level}
+org.apache.commons.logging.simplelog.defaultlog=info
 ## Configure logging levels
 #org.apache.commons.logging.simplelog.log.org.springframework.jdbc=trace