diff --git a/Ylt/biz-common/src/main/java/com/charge/bizcommon/config/MybatisBizCommonAutoConfiguration.java b/Ylt/biz-common/src/main/java/com/charge/bizcommon/config/MybatisBizCommonAutoConfiguration.java index bf68a55..776ada1 100644 --- a/Ylt/biz-common/src/main/java/com/charge/bizcommon/config/MybatisBizCommonAutoConfiguration.java +++ b/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") diff --git a/Ylt/ms-admin/pom.xml b/Ylt/ms-admin/pom.xml index 6042709..a9d9fba 100644 --- a/Ylt/ms-admin/pom.xml +++ b/Ylt/ms-admin/pom.xml @@ -254,7 +254,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/AdminOrderApplication.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/AdminOrderApplication.java index 5cc974b..d624b0b 100644 --- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/AdminOrderApplication.java +++ b/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; diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java index efdb147..0a9866a 100644 --- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java +++ b/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) { diff --git a/Ylt/ms-distribute/pom.xml b/Ylt/ms-distribute/pom.xml index 04116e6..157b377 100644 --- a/Ylt/ms-distribute/pom.xml +++ b/Ylt/ms-distribute/pom.xml @@ -133,7 +133,6 @@ - ms-distribute @@ -165,10 +164,16 @@ mysql-connector-java ${mysql.version} + tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-excel/pom.xml b/Ylt/ms-excel/pom.xml index 03e0041..76defc5 100644 --- a/Ylt/ms-excel/pom.xml +++ b/Ylt/ms-excel/pom.xml @@ -207,7 +207,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-excel/src/main/java/com/charge/excel/ExcelApplication.java b/Ylt/ms-excel/src/main/java/com/charge/excel/ExcelApplication.java index de387e2..4a0e7c4 100644 --- a/Ylt/ms-excel/src/main/java/com/charge/excel/ExcelApplication.java +++ b/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; diff --git a/Ylt/ms-excel/src/main/java/com/charge/excel/controller/ImportExcelController.java b/Ylt/ms-excel/src/main/java/com/charge/excel/controller/ImportExcelController.java index e61fbef..54ebd3e 100644 --- a/Ylt/ms-excel/src/main/java/com/charge/excel/controller/ImportExcelController.java +++ b/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 diff --git a/Ylt/ms-openapi/pom.xml b/Ylt/ms-openapi/pom.xml index 975450b..4826071 100644 --- a/Ylt/ms-openapi/pom.xml +++ b/Ylt/ms-openapi/pom.xml @@ -255,7 +255,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-openapi/src/main/java/com/charge/openapi/OpenApiApplication.java b/Ylt/ms-openapi/src/main/java/com/charge/openapi/OpenApiApplication.java index 4bfea58..f521414 100644 --- a/Ylt/ms-openapi/src/main/java/com/charge/openapi/OpenApiApplication.java +++ b/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; diff --git a/Ylt/ms-order/pom.xml b/Ylt/ms-order/pom.xml index 5989c44..a44c499 100644 --- a/Ylt/ms-order/pom.xml +++ b/Ylt/ms-order/pom.xml @@ -208,7 +208,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-protocol-kstar/pom.xml b/Ylt/ms-protocol-kstar/pom.xml index 101f4da..a35a515 100644 --- a/Ylt/ms-protocol-kstar/pom.xml +++ b/Ylt/ms-protocol-kstar/pom.xml @@ -110,8 +110,12 @@ tk.mybatis mapper - 4.0.0 - compile + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 @@ -148,7 +152,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-protocol-kstar/src/main/java/com/charge/kstar/KStarApplication.java b/Ylt/ms-protocol-kstar/src/main/java/com/charge/kstar/KStarApplication.java index 10040b4..08fe3de 100644 --- a/Ylt/ms-protocol-kstar/src/main/java/com/charge/kstar/KStarApplication.java +++ b/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; diff --git a/Ylt/ms-protocol-shenghong/pom.xml b/Ylt/ms-protocol-shenghong/pom.xml index bd9bb27..b60a3c0 100644 --- a/Ylt/ms-protocol-shenghong/pom.xml +++ b/Ylt/ms-protocol-shenghong/pom.xml @@ -144,7 +144,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-protocol-xingxing/pom.xml b/Ylt/ms-protocol-xingxing/pom.xml index 4902306..3024db4 100644 --- a/Ylt/ms-protocol-xingxing/pom.xml +++ b/Ylt/ms-protocol-xingxing/pom.xml @@ -142,7 +142,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-protocol/pom.xml b/Ylt/ms-protocol/pom.xml index d694517..47f943d 100644 --- a/Ylt/ms-protocol/pom.xml +++ b/Ylt/ms-protocol/pom.xml @@ -147,7 +147,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-station/pom.xml b/Ylt/ms-station/pom.xml index 4a17fe5..15836c6 100644 --- a/Ylt/ms-station/pom.xml +++ b/Ylt/ms-station/pom.xml @@ -202,7 +202,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-station/src/main/java/com/charge/station/StationApplication.java b/Ylt/ms-station/src/main/java/com/charge/station/StationApplication.java index d3b1844..7c977e0 100644 --- a/Ylt/ms-station/src/main/java/com/charge/station/StationApplication.java +++ b/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; diff --git a/Ylt/ms-task/pom.xml b/Ylt/ms-task/pom.xml index bf6c8f7..fbbed8f 100644 --- a/Ylt/ms-task/pom.xml +++ b/Ylt/ms-task/pom.xml @@ -194,7 +194,12 @@ tk.mybatis mapper - 3.4.0 + 4.1.2 + + + tk.mybatis + mapper-spring-boot-starter + 2.1.5 diff --git a/Ylt/ms-wallet/pom.xml b/Ylt/ms-wallet/pom.xml index fc590ac..735068d 100644 --- a/Ylt/ms-wallet/pom.xml +++ b/Ylt/ms-wallet/pom.xml @@ -51,7 +51,6 @@ spring-boot-starter-data-redis - org.mybatis.spring.boot mybatis-spring-boot-starter diff --git a/Ylt/ms-websocket-ocpp/src/main/java/com/net/config/MybatisPlusConfig.java b/Ylt/ms-websocket-ocpp/src/main/java/com/net/config/MybatisPlusConfig.java index 01521d0..cb24b00 100644 --- a/Ylt/ms-websocket-ocpp/src/main/java/com/net/config/MybatisPlusConfig.java +++ b/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; diff --git a/Ylt/rough-dependencies/pom.xml b/Ylt/rough-dependencies/pom.xml index 5370b11..6578b30 100644 --- a/Ylt/rough-dependencies/pom.xml +++ b/Ylt/rough-dependencies/pom.xml @@ -45,6 +45,10 @@ 5.8.29 1.18.24 + + 4.1.2 + 2.1.5 + yourdomain.com ycharge