~jiangyouyao/beauty-erp.git

			@@ -2,11 +2,14 @@
			server.port=8080


			#线上测试环境
			#spring.datasource.username=hive
			#spring.datasource.password=hive123!@#
			#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?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.username=hive
			spring.datasource.password=hive123!@#
			spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8




			@@ -25,8 +28,6 @@
			spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
			spring.thymeleaf.prefix: classpath:/templates/views/
			spring.thymeleaf.cache=false
			mybatis.config-location=classpath:mybatis/mybatis-config.xml
			mybatis.mapper-locations=classpath:mybatis/mapper//*.xml
			#设置全局时间返回格式第三行设置为true表示返回时间戳
			#spring.jackson.date-format=yyyy-MM-dd
			#spring.jackson.time-zone=GMT+8
			@@ -57,10 +58,15 @@
			groupBuy.pay.timeLimit=30

			#定时任务
			scheduling.enabled=false
			scheduling.enabled=true

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

			#默认头像
			default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
			default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png

			mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
			mybatis-plus.mapper-locations=classpath:mybatis/mapper//.xml