~jiangyouyao/beauty-erp.git

			@@ -1,7 +1,7 @@
			#是否启用debug模式
			debug=false
			# 日志文件保存地址
			log_path=/mnt/hive/log
			log_path=/mnt/hive/log-test

			# 系统语言环境 zh中文，us英文
			system_language=zh
			@@ -12,11 +12,12 @@
			default_password=123

			#nginx静态资源访问地址
			static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
			static_resource_url=http://hwfile.jyymatrix.cc/
			#文件保存地址
			file_storage_path=/mnt/hive/static/uploadeFile/
			file_storage_path=/mnt/sdc/webresource/
			#文件上传大小字节为单位 10MB
			maxUploadSize=10485760


			#Matser\u7684ip\u5730\u5740
			redis.hostname=118.31.227.147
			@@ -28,8 +29,6 @@
			redis.timeout=10000
			redis.database=1
			redis_time_out=1800000


			cookie_time_out=36000

			#APP登录公钥
			@@ -37,16 +36,6 @@
			#APP登录秘钥
			login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==

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

			#异常上报地址
			exception_center_url =http://geek.xc.jyymatrix.cc/addException
			#项目编号
			projNo=78
			#项目负责人
			owner=姜友瑶

			#日志文件清理阈值单位：MB
			log_max=20
			@@ -57,8 +46,10 @@


			wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
			xcx_appid =wx3836ab3c1490ff29
			xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
			xcx_appid =wx5cc58f796224af61
			xcx_secret =facea088aae414e5c2ee86b459887721
			gzh_appid=wx57e6335559bdbda6
			gzh_secret=ecb408af170e3890e6544290cad33760

			#微信支付调试开关
			wx_pay_debug_onoff = false
			@@ -72,12 +63,8 @@
			#快递鸟接口指令
			logistics.requestType=1002

			#丰桥顾客编码
			sf.logistics.clientCode=XCZHYF
			#丰桥校验码
			sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
			#丰桥接口地址
			sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService



			#发送短信配置
			crm.request_url = http://192.168.1.248
			@@ -96,9 +83,19 @@
			#微信支付回调地址
			pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback


			qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
			qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png

			#hive仓库地址
			hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
			hive.service=http://localhost:8082/meidu-crm/



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


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