fix:修复版本依赖的关系

moxi624 · May 5, 2022 · c9bc7c4 · c9bc7c4
1 parent 053b6b3
commit c9bc7c4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git a/mogu_admin/pom.xml b/mogu_admin/pom.xml
@@ -28,8 +28,7 @@
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel</artifactId>
-            <version>${sentinel.version}</version>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <dependency>

diff --git a/mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/SearchFeignClient.java b/mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/SearchFeignClient.java
@@ -32,7 +32,7 @@ public interface SearchFeignClient {
      * @return
      */
     @PostMapping("/search/deleteElasticSearchByUids")
-    public String deleteElasticSearchByUids(@RequestParam(required = true) String uids);
+    public String deleteElasticSearchByUids(@RequestParam(value = "uids", required = true) String uids);
 
     /**
      * 初始化ElasticSearch索引
@@ -48,7 +48,7 @@ public interface SearchFeignClient {
      * @return
      */
     @PostMapping("/search/addElasticSearchIndexByUid")
-    public String addElasticSearchIndexByUid(@RequestParam(required = true) String uid);
+    public String addElasticSearchIndexByUid(@RequestParam(value = "uid", required = true) String uid);
 
 
     /**
@@ -58,7 +58,7 @@ public interface SearchFeignClient {
      * @return
      */
     @PostMapping("/search/deleteSolrIndexByUid")
-    public String deleteSolrIndexByUid(@RequestParam(required = true) String uid);
+    public String deleteSolrIndexByUid(@RequestParam(value = "uid", required = true) String uid);
 
     /**
      * 通过uids删除Solr博客索引
@@ -67,7 +67,7 @@ public interface SearchFeignClient {
      * @return
      */
     @PostMapping("/search/deleteSolrIndexByUids")
-    public String deleteSolrIndexByUids(@RequestParam(required = true) String uids);
+    public String deleteSolrIndexByUids(@RequestParam(value = "uids", required = true) String uids);
 
     /**
      * 初始化Solr索引
@@ -83,14 +83,14 @@ public interface SearchFeignClient {
      * @return
      */
     @PostMapping("/search/addSolrIndexByUid")
-    public String addSolrIndexByUid(@RequestParam(required = true) String uid);
+    public String addSolrIndexByUid(@RequestParam(value = "uid", required = true) String uid);
 
     /**
      * 通过uid来更新Solr索引
      *
      * @return
      */
     @PostMapping("/search/updateSolrIndexByUid")
-    public String updateSolrIndexByUid(@RequestParam(required = true) String uid);
+    public String updateSolrIndexByUid(@RequestParam(value = "uid", required = true) String uid);
 
 }
diff --git a/mogu_picture/pom.xml b/mogu_picture/pom.xml
@@ -40,8 +40,7 @@
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel</artifactId>
-            <version>${sentinel.version}</version>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <dependency>

diff --git a/mogu_search/pom.xml b/mogu_search/pom.xml
@@ -47,8 +47,7 @@
         <!--Sentinel流量控制-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel</artifactId>
-            <version>${sentinel.version}</version>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <!--Sentinel持久化到Nacos-->

diff --git a/mogu_web/pom.xml b/mogu_web/pom.xml
@@ -37,8 +37,7 @@
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel</artifactId>
-            <version>${sentinel.version}</version>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -1,12 +1,6 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
-    </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.moxi</groupId>
     <artifactId>mogu_blog</artifactId>
@@ -52,7 +46,6 @@
         <spring.mock.version>2.0.8</spring.mock.version>
         <knife4j.version>3.0.2</knife4j.version>
         <spring-cloud-alibaba.version>2.2.4.RELEASE</spring-cloud-alibaba.version>
-        <sentinel.version>2.1.0.RELEASE</sentinel.version>
     </properties>
 
 
@@ -77,7 +70,15 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Hoxton.RELEASE</version>
+                <version>Hoxton.SR3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.2.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>