~jiangyouyao/beauty-erp.git

			@@ -1,8 +1,17 @@
			evn=xcx
			evn=xcxtest
			server.port=8080
			spring.datasource.username=chuhuan
			spring.datasource.password=chuhuan
			spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8


			#线上测试环境

			spring.datasource.username=ct_test
			spring.datasource.password=123456
			spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8





			spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
			spring.datasource.initialSize=3
			spring.datasource.minIdle=3
			@@ -25,21 +34,18 @@
			#spring.jackson.time-zone=GMT+8
			#spring.jackson.serialization.write-dates-as-timestamps=true
			#文件上传时的大小限制单位M
			spring.servlet.multipart.max-file-size=300MB
			spring.servlet.multipart.max-request-size=300MB
			spring.servlet.multipart.max-file-size=100MB
			spring.servlet.multipart.max-request-size=100MB
			#--------------------------------------



			#rabbitMQ配置
			rabbitmq.host=127.0.0.1
			rabbitmq.host=47.111.134.136
			rabbitmq.port=5672
			rabbitmq.username=hivequeue
			rabbitmq.password=hivequeueadmin
			useRabbit=true
			useRabbit=false

			#指定消费者确认方式当为manual时手动确认不配置表示自动确认
			#spring.rabbitmq.listener.simple.acknowledge-mode=manual
			server.session.timeout=120

			ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
			@@ -47,12 +53,16 @@
			ali.sms.regionId=cn-hangzhou
			ali.sms.signName=\u80bd\u598d


			#hour
			activities.groupBuy.limit=24
			#minute
			groupBuy.pay.timeLimit=30
			#定时任务
			scheduling.enabled=true

			swagger.enable=false
			#定时任务
			scheduling.enabled=false

			swagger.enable=false
			swagger.security.username=admin
			swagger.security.password=admin