Merge branch 'master' of http://47.100.114.196:3001/jwy/aeon_sender

pom.xml

@@ -78,7 +78,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -470,7 +469,7 @@
             </plugin>
 
 <!--         正式环境  -->
-            <!-- <plugin>
+            <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.38.1</version>
@@ -489,9 +488,9 @@
                         </image>
                     </images>
                 </configuration>
-            </plugin> -->
+            </plugin>
 <!--            &lt;!&ndash;         测试环境  &ndash;&gt;-->
-           <plugin>
+           <!-- <plugin>
                <groupId>io.fabric8</groupId>
                <artifactId>docker-maven-plugin</artifactId>
                <version>0.38.1</version>
@@ -510,7 +509,7 @@
                        </image>
                    </images>
                </configuration>
-           </plugin>
+           </plugin> -->
 
 
         </plugins>