From 06acf7cec7457e3d1fff90f94325fcb03801f074 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 31 Oct 2023 11:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9okhttp=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cs-device/cs-device-boot/pom.xml     | 20 +++++------
 cs-harmonic/cs-harmonic-boot/pom.xml | 20 +++++------
 pom.xml                              | 50 +++++++++++++++++++++++++---
 3 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/cs-device/cs-device-boot/pom.xml b/cs-device/cs-device-boot/pom.xml
index 110ca75..d007fbd 100644
--- a/cs-device/cs-device-boot/pom.xml
+++ b/cs-device/cs-device-boot/pom.xml
@@ -63,16 +63,16 @@
       <artifactId>pqs-influx</artifactId>
       <version>0.0.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>4.9.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>4.9.0</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.squareup.okhttp3</groupId>-->
+<!--      <artifactId>okhttp</artifactId>-->
+<!--      <version>4.9.0</version>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>com.squareup.okhttp3</groupId>-->
+<!--      <artifactId>logging-interceptor</artifactId>-->
+<!--      <version>4.9.0</version>-->
+<!--    </dependency>-->
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>user-api</artifactId>
diff --git a/cs-harmonic/cs-harmonic-boot/pom.xml b/cs-harmonic/cs-harmonic-boot/pom.xml
index c2acfeb..cc43399 100644
--- a/cs-harmonic/cs-harmonic-boot/pom.xml
+++ b/cs-harmonic/cs-harmonic-boot/pom.xml
@@ -46,16 +46,16 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>4.9.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.squareup.okhttp3</groupId>-->
+<!--            <artifactId>okhttp</artifactId>-->
+<!--            <version>4.9.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.squareup.okhttp3</groupId>-->
+<!--            <artifactId>logging-interceptor</artifactId>-->
+<!--            <version>4.9.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>cs-harmonic-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 7b01bdd..95b2804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.njcn</groupId>
@@ -28,8 +28,8 @@
     <!--nacos的ip:port-->
     <nacos.url>${middle.server.url}:18848</nacos.url>
     <!--服务器发布内容为空-->
-    <nacos.namespace>415a1c87-33aa-47bd-8e25-13cc456c87ed</nacos.namespace>
-<!--    <nacos.namespace>3eaa4bd1-bfb6-497b-aba2-47edda305427</nacos.namespace>-->
+    <nacos.namespace>eccf606c-4213-4ee1-846e-a265a50ae355</nacos.namespace>
+    <!--    <nacos.namespace>3eaa4bd1-bfb6-497b-aba2-47edda305427</nacos.namespace>-->
     <!--sentinel:port-->
     <sentinel.url>${middle.server.url}:8080</sentinel.url>
     <!--网关地址，主要用于配置swagger中认证token-->
@@ -85,7 +85,7 @@
     <mqtt.version>1.2.7</mqtt.version>
     <easypoi.version>4.4.0</easypoi.version>
     <progressbar.version>0.5.3</progressbar.version>
-    <okhttp.version>4.8.1</okhttp.version>
+    <okhttp3.version>4.9.0</okhttp3.version>
     <minio.version>8.2.1</minio.version>
     <spring-cloud-huawei.version>1.7.0-Hoxton</spring-cloud-huawei.version>
   </properties>
@@ -332,10 +332,50 @@
         <artifactId>progressbar</artifactId>
         <version>${progressbar.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>logging-interceptor</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>mockwebserver</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okcurl</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
-        <version>${okhttp.version}</version>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-dnsoverhttps</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-sse</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-testing-support</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-tls</artifactId>
+        <version>${okhttp3.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-urlconnection</artifactId>
+        <version>${okhttp3.version}</version>
       </dependency>
       <dependency>
         <groupId>io.minio</groupId>