'commit'

Ylt/biz-common/src/main/java/com/charge/bizcommon/config/MybatisBizCommonAutoConfiguration.java

@@ -1,7 +1,7 @@
 /*
 package com.charge.bizcommon.config;
 
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
 
 @MapperScan(value = "com.charge.bizcommon.dao")

Ylt/ms-admin/pom.xml

@@ -254,7 +254,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-admin/src/main/java/com/charge/orderbk/AdminOrderApplication.java

@@ -1,8 +1,7 @@
 package com.charge.orderbk;
 
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;

Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java

@@ -52,12 +52,10 @@ public class ChargeOrderTotalMannageController {
      * @param
      * @return
      */
-    @RequestMapping(value = "/bigData")
+    @RequestMapping(value = "/bigData") //URL地址是拼接而来的
     @ResponseBody
     public CommonResponse bigData(HttpServletRequest request) {
         try {
-
-
             Map bigData = chargeOrderMannageService.bigData();
             return I100cResponse.success(bigData);
         } catch (Exception e) {

Ylt/ms-distribute/pom.xml

@@ -133,7 +133,6 @@
     </dependencies>
 
 
-
     <build>
         <finalName>ms-distribute</finalName>
         <plugins>
@@ -165,10 +164,16 @@
                         <artifactId>mysql-connector-java</artifactId>
                         <version>${mysql.version}</version>
                     </dependency>
+
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-excel/pom.xml

@@ -207,7 +207,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-excel/src/main/java/com/charge/excel/ExcelApplication.java

@@ -2,7 +2,6 @@ package com.charge.excel;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;

Ylt/ms-excel/src/main/java/com/charge/excel/controller/ImportExcelController.java

@@ -1,11 +1,8 @@
 package com.charge.excel.controller;
 
-import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSON;
 import com.charge.excel.dto.LabelFailUserDTO;
-import com.charge.excel.dto.LabelResultDTO;
 import com.charge.excel.listener.UploadDataListener;
 //import com.charge.excel.service.ExcelSaveService;
 import com.charge.excel.service.ImportCarInfoService;
@@ -13,7 +10,6 @@ import com.charge.excel.service.LabelService;
 import com.charge.excel.vo.ImportCarVO;
 import com.charge.util.CommonResponse;
 import com.charge.util.I100cResponse;
-import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +17,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @RestController

Ylt/ms-openapi/pom.xml

@@ -255,7 +255,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-openapi/src/main/java/com/charge/openapi/OpenApiApplication.java

@@ -3,10 +3,8 @@ package com.charge.openapi;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

Ylt/ms-order/pom.xml

@@ -208,7 +208,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-protocol-kstar/pom.xml

@@ -110,8 +110,12 @@
         <dependency>
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.1.5</version>
         </dependency>
     </dependencies>
 
@@ -148,7 +152,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-protocol-kstar/src/main/java/com/charge/kstar/KStarApplication.java

@@ -11,7 +11,7 @@ import com.charge.protocol.common.netty.config.IServerConfiguration;
 import com.charge.protocol.common.netty.config.ServerConfiguration;
 import com.charge.protocol.common.netty.config.TcpConfig;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.mybatis.spring.annotation.MapperScan;
+import tk.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;

Ylt/ms-protocol-shenghong/pom.xml

@@ -144,7 +144,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-protocol-xingxing/pom.xml

@@ -142,7 +142,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-protocol/pom.xml

@@ -147,7 +147,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-station/pom.xml

@@ -202,7 +202,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-station/src/main/java/com/charge/station/StationApplication.java

@@ -2,7 +2,6 @@ package com.charge.station;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;

Ylt/ms-task/pom.xml

@@ -194,7 +194,12 @@
                     <dependency>
                         <groupId>tk.mybatis</groupId>
                         <artifactId>mapper</artifactId>
-                        <version>3.4.0</version>
+                        <version>4.1.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-spring-boot-starter</artifactId>
+                        <version>2.1.5</version>
                     </dependency>
                 </dependencies>
             </plugin>

Ylt/ms-wallet/pom.xml

@@ -51,7 +51,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

Ylt/ms-websocket-ocpp/src/main/java/com/net/config/MybatisPlusConfig.java

@@ -3,7 +3,6 @@ package com.net.config;
 import com.baomidou.mybatisplus.mapper.ISqlInjector;
 import com.baomidou.mybatisplus.mapper.LogicSqlInjector;
 import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.plugins.PerformanceInterceptor;
 import com.baomidou.mybatisplus.plugins.parser.ISqlParser;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;

Ylt/rough-dependencies/pom.xml

@@ -45,6 +45,10 @@
         <hutool.version>5.8.29</hutool.version>
         <!--lombok版本-->
         <lombok.version>1.18.24</lombok.version>
+        <!--mapper版本-->
+        <mapper.version>4.1.2</mapper.version>
+        <mapper-spring-boot-starter.version>2.1.5</mapper-spring-boot-starter.version>
+
         <registryUrl>yourdomain.com</registryUrl>
         <registryProject>ycharge</registryProject>
     </properties>