From 3fce0dba48a1c8740f90da4f34b283a32b87c2d0 Mon Sep 17 00:00:00 2001 From: code huan Date: Wed, 26 Oct 2022 14:58:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xxl-job/application.properties | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xxl-job/application.properties b/xxl-job/application.properties index b512c197..eae3a677 100644 --- a/xxl-job/application.properties +++ b/xxl-job/application.properties @@ -23,15 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -<<<<<<< HEAD -spring.datasource.url=jdbc:mysql://120.71.183.195:3306/zyt_shop/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=zyt_shop -spring.datasource.password=Gb84505016@zytshop -======= spring.datasource.url=jdbc:mysql://192.168.0.106:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai spring.datasource.username=root spring.datasource.password=lilishop ->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ### datasource-pool