From 6b226a0b194d0f971bfec8807e04c6cb2c308d2b Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Sun, 15 Aug 2021 22:41:48 +0800
Subject: [PATCH] =?UTF-8?q?jar=20=E5=8C=85=E5=86=B2=E7=AA=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 35 +++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  4 +--
 ruoyi-oss/pom.xml                             |  4 +++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c31108c6..8a5fd1195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.6</druid.version>
         <knife4j.version>3.0.3</knife4j.version>
+        <swagger-annotations.version>1.5.22</swagger-annotations.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
@@ -28,10 +29,12 @@
         <hutool.version>5.7.6</hutool.version>
         <feign.version>3.0.3</feign.version>
         <feign-okhttp.version>11.0</feign-okhttp.version>
+        <okio.version>1.17.2</okio.version>
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
         <redisson.version>3.16.1</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <datasource.version>3.4.1</datasource.version>
+        <wildfly-common.version>1.5.2.Final</wildfly-common.version>
 
         <!-- OSS 配置 -->
         <qiniu.version>7.8.0</qiniu.version>
@@ -70,6 +73,19 @@
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- 指定 swagger-annotations 版本冲突-->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger-annotations.version}</version>
             </dependency>
 
             <!-- excel工具 -->
@@ -127,6 +143,17 @@
                 <groupId>io.github.openfeign</groupId>
                 <artifactId>feign-okhttp</artifactId>
                 <version>${feign-okhttp.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.openfeign</groupId>
+                        <artifactId>feign-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
             </dependency>
 
             <dependency>
@@ -151,6 +178,14 @@
                 <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
                 <version>${lock4j.version}</version>
             </dependency>
+
+            <!-- undertow 中的wildfly-common包冲突处理 -->
+            <dependency>
+                <groupId>org.wildfly.common</groupId>
+                <artifactId>wildfly-common</artifactId>
+                <version>${wildfly-common.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 6491c8557..fc490d61c 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -10,7 +10,7 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
           username: root
           password: root
         # 从库数据源
@@ -72,7 +72,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 192.168.64.128
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 6fd1bd7d0..ce0c7b200 100644
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -46,6 +46,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>