|  | @@ -2,48 +2,13 @@
 | 
	
		
			
				|  |  |  #===== Database sttings =====#
 | 
	
		
			
				|  |  |  #============================#
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -#oracle database settings
 | 
	
		
			
				|  |  | -#jdbc.type=oracle
 | 
	
		
			
				|  |  | -#jdbc.driver=oracle.jdbc.driver.OracleDriver
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
 | 
	
		
			
				|  |  | -#jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.password=root
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  #mysql database setting
 | 
	
		
			
				|  |  |  jdbc.type=mysql
 | 
	
		
			
				|  |  |  jdbc.driver=com.mysql.jdbc.Driver
 | 
	
		
			
				|  |  |  db.name=ruihuaoa-activity-data
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://192.168.1.80:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -#jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.password=gangwan
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://106.14.207.143:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -#jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.password=xyc@2017
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://192.168.110.68:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://127.0.0.1:3306/ruihuaoa-activity-testenv?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://192.168.110.61:3306/ruihuaoa-activity-data?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://localhost:3306/dkwy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://localhost: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://172.16.182.240:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 | 
	
		
			
				|  |  | -#jdbc.username=yangfan
 | 
	
		
			
				|  |  |  jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.password=123456
 | 
	
		
			
				|  |  | -#jdbc.password=gangwan123
 | 
	
		
			
				|  |  |  jdbc.password=root
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:mysql://120.26.207.193:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -#jdbc.username=root
 | 
	
		
			
				|  |  | -#jdbc.password=GANGWAN123
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -#mssql database settings
 | 
	
		
			
				|  |  | -#jdbc.type=mssql
 | 
	
		
			
				|  |  | -#jdbc.driver=net.sourceforge.jtds.jdbc.Driver
 | 
	
		
			
				|  |  | -#jdbc.url=jdbc:jtds:sqlserver://localhost:1433/jeeplus
 | 
	
		
			
				|  |  | -#jdbc.username=sa
 | 
	
		
			
				|  |  | -#jdbc.password=sa
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #pool settings
 | 
	
		
			
				|  |  |  jdbc.pool.init=20
 | 
	
	
		
			
				|  | @@ -54,25 +19,23 @@ jdbc.pool.maxActive=200
 | 
	
		
			
				|  |  |  jdbc.testSql=SELECT 'x' FROM DUAL
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #master
 | 
	
		
			
				|  |  | -#master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -master.jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | +master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | +#master.jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  |  master.jdbc.username=root
 | 
	
		
			
				|  |  |  master.jdbc.password=root
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #slave
 | 
	
		
			
				|  |  | -#slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | -slave.jdbc.url=jdbc:mysql://localhost:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | +slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  | +#slave.jdbc.url=jdbc:mysql://localhost:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 | 
	
		
			
				|  |  |  slave.jdbc.username=root
 | 
	
		
			
				|  |  |  slave.jdbc.password=root
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #redis settings
 | 
	
		
			
				|  |  |  redis.keyPrefix=jeeplus
 | 
	
		
			
				|  |  | -#redis.host=172.16.182.241
 | 
	
		
			
				|  |  | -#redis.host=101.37.149.85
 | 
	
		
			
				|  |  | -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
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #============================#
 | 
	
		
			
				|  |  |  #===== System settings ======#
 |