Merge remote-tracking branch 'origin/develop' into develop-niehh

src/main/resources/cache/ehcache-local.xml

@@ -2,6 +2,7 @@
 <ehcache updateCheck="false" name="defaultCache">
 
 	<diskStore path="../temp/jeesite/ehcache" />
+	<!--<diskStore path="/tomcat/webapps/ROOT/youka/temp/jeesite/ehcache" />-->
 
 	<!-- 默认缓存配置. 自动失效：最后一次访问时间间隔300秒失效，若没有访问过自创建时间600秒失效。-->
 	<defaultCache maxEntriesLocalHeap="1000" eternal="false" timeToIdleSeconds="300" timeToLiveSeconds="600"

src/main/resources/cache/ehcache-rmi.xml

@@ -11,6 +11,7 @@
 	<cacheManagerPeerListenerFactory class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory" />
 
 	<diskStore path="../temp/jeesite/ehcache" />
+	<!--<diskStore path="/tomcat/webapps/ROOT/youka/temp/jeesite/ehcache" />-->
 
 	<!-- 默认缓存配置. -->
 	<defaultCache maxEntriesLocalHeap="1000" eternal="false" timeToIdleSeconds="300" timeToLiveSeconds="600"

src/main/resources/log4j.properties

@@ -9,6 +9,7 @@ log4j.appender.Console.layout.ConversionPattern=%d %-5p [%c{5}] - %m%n
 #RollingFile
 log4j.appender.RollingFile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RollingFile.File=D:/logs/youka/manage.log
+#log4j.appender.RollingFile.File=/tomcat/webapps/ROOT/youka/log/manage.log
 log4j.appender.RollingFile.layout=org.apache.log4j.PatternLayout
 log4j.appender.RollingFile.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
 

src/main/resources/youka.properties

@@ -15,6 +15,9 @@ jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://localhost:3306/youka?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=admin
+#jdbc.url=jdbc:mysql://mysql.zhennan-test.svc:3306/mydb?useUnicode=true&characterEncoding=utf-8
+#jdbc.username=myuser
+#jdbc.password=mypassword
 
 #mssql database settings
 #jdbc.type=mssql
@@ -122,3 +125,12 @@ activiti.form.server.url=
 
 #\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
 #projectPath=D\:\\workspace\\jeesite
+
+#路径前缀
+sys.pre.url=http://localhost:8080/
+#sys.pre.url=http://youka-api-zhennan-test.router.default.svc.cluster.local/
+#图片文件保存地址
+image.save.url=D:/youka/images/
+#image.save.url=/tomcat/webapps/ROOT/youka/image/
+#图片返回路径
+image.return.url=youka/image/
\ No newline at end of file