From 2a922caf896a44ee50c126a66e59b8b49d1b1678 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 19 三月 2020 09:22:46 +0800
Subject: [PATCH] 升级 v2.2
---
ruoyi/src/main/resources/application-dev.yml | 2 +-
ruoyi/pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml
index bd5885c..eac3770 100644
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@@ -122,6 +122,12 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.spring.boot.starter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
diff --git a/ruoyi/src/main/resources/application-dev.yml b/ruoyi/src/main/resources/application-dev.yml
index 29bed64..4954cb6 100644
--- a/ruoyi/src/main/resources/application-dev.yml
+++ b/ruoyi/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://192.168.0.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
# 浠庡簱鏁版嵁婧�
--
Gitblit v1.9.3