2022-11.23 springboot版本更新 2.1.0-2.6.7

eladmin-common/pom.xml

@@ -22,5 +22,10 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.2.3.Final</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

eladmin-system/pom.xml

@@ -113,11 +113,11 @@
             <version>2.0</version>
         </dependency>
         <!--netty-->
-        <dependency>
+<!--        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
             <version>4.1.17.Final</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>

eladmin-system/src/main/java/me/zhengjie/gemho/service/web/impl/WebMonitorPointsServiceImpl.java

@@ -39,8 +39,6 @@ public class WebMonitorPointsServiceImpl extends ServiceImpl<WebMonitorPointsMap
     @Autowired
     private IWebMonitorChartService iWebMonitorChartService;
     @Autowired
-    private IWebMonitorPointsService webMonitorPointsService;
-    @Autowired
     private IWebMonitorLinkService iWebMonitorLinkService;
     @Autowired
     private WebMonitorChartMapper webMonitorChartMapper;
@@ -107,8 +105,8 @@ public class WebMonitorPointsServiceImpl extends ServiceImpl<WebMonitorPointsMap
             //清空监测点信息
             QueryWrapper<WebMonitorPoints> webMonitorPointsQueryWrapper = new QueryWrapper<>();
             webMonitorPointsQueryWrapper.eq("chartid", chart.getId());
-            webMonitorPointsService.remove(webMonitorPointsQueryWrapper);
-            webMonitorPointsService.pchuli(webMonitorPoints);
+            webMonitorPointsMapper.delete(webMonitorPointsQueryWrapper);
+            this.pchuli(webMonitorPoints);
             //清空关联设备
             QueryWrapper<WebMonitorLink> webMonitorLinkQueryWrapper = new QueryWrapper<>();
             webMonitorLinkQueryWrapper.in("pointid", guids);

eladmin-system/src/main/resources/banner.txt

@@ -5,4 +5,4 @@
  \______  /\___  >__|_|  /___|  /\____/
         \/     \/      \/     \/
 
- :: Spring Boot ::       (v2.1.0.RELEASE)
+ :: Spring Boot ::       (v2.6.7)
\ No newline at end of file

pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.10.RELEASE</version>
+        <version>2.6.7</version>
     </parent>
 
     <properties>
@@ -36,8 +36,8 @@
         <swagger.version>2.9.2</swagger.version>
         <fastjson.version>1.2.70</fastjson.version>
         <druid.version>1.1.24</druid.version>
-        <commons-pool2.version>2.5.0</commons-pool2.version>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
+        <commons-pool2.version>2.11.1</commons-pool2.version>
+        <mapstruct.version>1.4.1.Final</mapstruct.version>
     </properties>
 
     <dependencies>
@@ -213,6 +213,12 @@
             <artifactId>yauaa</artifactId>
             <version>5.23</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>