~jiangyouyao/beauty-erp.git

			@@ -23,15 +23,15 @@
			maxUploadSize=10485760

			#Matser\u7684ip\u5730\u5740
			redis.hostname=120.27.238.55
			#redis.hostname=120.27.238.55
			#\u7AEF\u53E3\u53F7
			redis.port=6379
			#redis.port=6379
			#\u5982\u679C\u6709\u5BC6\u7801
			redis.password=xcong123
			#redis.password=xcong123
			#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
			redis.timeout=10000
			redis.database=1
			redis_time_out=1800000
			#redis.timeout=10000
			#redis.database=2
			#redis_time_out=1800000
			cookie_time_out=36000

			#APP登录公钥
			@@ -100,9 +100,8 @@

			#是否启用异常上报
			is_open_exception_report=false
			showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
			showExcptionUrl=http://test.hive.jyymatrix.cc/showException


			#异常信息查询接口
			showExcptionUrl=http://erp.hive.jyymatrix.cc/showException