蔡德晨 5 лет назад
Родитель
Сommit
ceca6b5d5d
2 измененных файлов с 12 добавлено и 7 удалено
  1. 10 7
      src/main/resources/jeeplus.properties
  2. 2 0
      src/main/resources/spring-context-jedis.xml

+ 10 - 7
src/main/resources/jeeplus.properties

@@ -6,8 +6,8 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 #jdbc.password=123456
 jdbc.password=root
@@ -32,10 +32,12 @@ jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
 redis.keyPrefix=jeeplus
-redis.host=192.168.2.4
-#redis.host=127.0.0.1
-redis.port=6380
-#redis.port=6379
+#redis.host=192.168.2.4
+redis.host=127.0.0.1
+#redis.port=6380
+redis.port=6379
+redis.timeout = 2000
+redis.password = 123456
 
 #============================#
 #===== System settings ======#
@@ -241,5 +243,6 @@ yy_shcxurl=https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterprise
 bos_access_key=9915286aab2949949b489e8ab3f70a09
 bos_secret_key=069036bdb93c4bc59c4995ccc543243e
 bos_endpoint=http://su.bcebos.com
-bos_buck_name=newxgccpm
+#bos_buck_name=newxgccpm
+bos_buck_name=xgccpm
 

+ 2 - 0
src/main/resources/spring-context-jedis.xml

@@ -20,6 +20,8 @@
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />
 		<constructor-arg index="2" value="${redis.port}" type="int" />
+		<constructor-arg index="3" value="${redis.timeout}" type="int" />
+		<constructor-arg index="4" value="${redis.password}" />
 	</bean>
 	
 </beans>