升级为4.7.1

jflyfox · Sep 4, 2018 · 7d3a250 · 7d3a250
1 parent 8186be1
commit 7d3a250
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,10 @@
 Change Log 更新说明
 ------------------------------
 
+## 2018-09-04 jfinal cms4.7.1
+1. jfinal 改为最新3.4版本
+2. 修复启动缓存设置不生效bug
+
 ## 2017-06-11 jfinal cms4.7.0
 1. 去除jflyfox_jfinal和jflyfox_base项目依赖，将代码合并并重构
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>com.jflyfox</groupId>
 	<artifactId>jfinal_cms</artifactId>
 	<packaging>war</packaging>
-	<version>4.7.0</version>
+	<version>4.7.1</version>
 
 	<properties>
 		<!-- 文件拷贝时的编码 -->

diff --git a/src/main/resources/conf/db.properties b/src/main/resources/conf/db.properties
@@ -1,7 +1,7 @@
 #\u6570\u636e\u5e93:oracle postgre
 db_type=mysql
 
-mysql.jdbcUrl =jdbc:mysql://127.0.0.1:3306/jfinal_cms?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
+mysql.jdbcUrl =jdbc:mysql://127.0.0.1:3306/jflyfox_cms?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 mysql.user = root
 mysql.password = 123456
 mysql.driverClass = com.mysql.jdbc.Driver