From 7d1da567f0ba92f48c6e7361466ee2e0724339fb Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 16 Jun 2025 16:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88dubbo3.3.0,=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8nacos2.0.3=E4=BD=9C=E4=B8=BA=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83,=20=E5=8D=87=E7=BA=A7fastjson=202.0.11->2.0.?=
 =?UTF-8?q?23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-admin/pom.xml                         | 21 ++++++-
 .../java/com/jsowell/JsowellApplication.java  |  2 +
 .../src/main/resources/application.yml        | 13 ++++
 pom.xml                                       | 62 +++++++++++++++++--
 4 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml
index 052d409ea..f50a9c149 100644
--- a/jsowell-admin/pom.xml
+++ b/jsowell-admin/pom.xml
@@ -113,6 +113,25 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.jsowell</groupId>
+            <artifactId>charge-common-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-nacos</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -158,4 +177,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java b/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java
index 5acc5cce4..80ae93391 100644
--- a/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java
+++ b/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java
@@ -1,5 +1,6 @@
 package com.jsowell;
 
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -11,6 +12,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  */
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@EnableDubbo
 public class JsowellApplication {
 
 	public static void main(String[] args) {
diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml
index d2f6547e7..b0dd33f94 100644
--- a/jsowell-admin/src/main/resources/application.yml
+++ b/jsowell-admin/src/main/resources/application.yml
@@ -71,6 +71,19 @@ spring:
       # 热部署开关
       enabled: true
 
+# dubbo配置
+dubbo:
+  application:
+    name: jsowell-service
+    qosEnable: false
+  registry:
+    address: nacos://192.168.2.2:8848
+    username: nacos
+    password: nacos
+  protocol:
+    name: dubbo
+    port: -1
+
 # MyBatis配置
 mybatis:
   # 搜索指定包别名
diff --git a/pom.xml b/pom.xml
index 034b5ccc7..0ba5adf88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
          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">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.jsowell</groupId>
     <artifactId>jsowell-charger-web</artifactId>
     <version>1.0.0</version>
 
     <name>jsowell</name>
     <description>万车充运营管理平台</description>
-    
+
     <properties>
         <jsowell.version>1.0.0</jsowell.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -23,7 +23,8 @@
         <kaptcha.version>2.3.2</kaptcha.version>
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
-        <fastjson.version>2.0.11</fastjson.version>
+        <!--<fastjson.version>2.0.11</fastjson.version>-->
+        <fastjson.version>2.0.23</fastjson.version>
         <oshi.version>6.2.2</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
@@ -42,8 +43,11 @@
         <alipai.easysdk.version>2.2.3</alipai.easysdk.version>
         <tencent.sdk.version>3.1.87</tencent.sdk.version>
         <protostuff.version>1.8.0</protostuff.version>
+        <!--<dubbo.version>2.7.15</dubbo.version>-->
+        <dubbo.version>3.3.0</dubbo.version>
+        <nacos-client.version>2.0.3</nacos-client.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -336,6 +340,54 @@
                 <version>${protostuff.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.jsowell</groupId>
+                <artifactId>charge-common-api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+
+            <!--dubbo集成springboot依赖-->
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-dependencies-bom</artifactId>
+                <version>${dubbo.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-spring-boot-starter</artifactId>
+                <version>${dubbo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-registry-nacos</artifactId>
+                <version>${dubbo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo</artifactId>
+                <version>${dubbo.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.nacos</groupId>
+                <artifactId>nacos-client</artifactId>
+                <version>${nacos-client.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -395,4 +447,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>