From 78ac72b0fce488f62116538513e14390be51dab0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 30 Sep 2018 23:06:01 +0800 Subject: [PATCH] =?UTF-8?q?[upgrade=20to=20spring=20boot=202.0][=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/UserApplication.java | 3 +- .../java/com/iformall/config/CorsConfig.java | 4 +- .../java/com/iformall/config/WebConfig.java | 4 +- .../iformall/controller/UploadController.java | 15 +-- .../iformall/controller/WxPayController.java | 6 +- .../src/main/resources/application-dev.yml | 3 - .../src/main/resources/application-prod.yml | 5 - .../src/main/resources/application.yml | 5 +- .../src/main/resources/logback-spring.xml | 15 ++- mallinkBApi/pom.xml | 1 + .../main/java/com/iformall/BApplication.java | 5 +- .../java/com/iformall/config/CorsConfig.java | 4 +- .../com/iformall/config/WebMvcConfig.java | 4 +- .../src/main/resources/application.yml | 4 +- .../src/main/resources/logback-spring.xml | 15 ++- .../main/java/com/iformall/CApplication.java | 2 +- .../java/com/iformall/config/CorsConfig.java | 4 +- .../com/iformall/config/WebMvcConfig.java | 4 +- .../src/main/resources/application.yml | 3 +- .../src/main/resources/logback-spring.xml | 15 ++- .../com/iformall/domain/vo/WxOrderCVo.java | 24 ++-- pom.xml | 103 ++++++++++++++---- 22 files changed, 152 insertions(+), 96 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index 15968b2bc..768d979ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -1,11 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - import springfox.documentation.swagger2.annotations.EnableSwagger2; +import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkAdmin/src/main/java/com/iformall/config/CorsConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/CorsConfig.java index 49edf176d..22d61c8c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/CorsConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/CorsConfig.java @@ -2,13 +2,13 @@ package com.iformall.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * Created by Administrator on 2017/8/9. */ @Configuration -public class CorsConfig extends WebMvcConfigurerAdapter { +public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index 7e44cba4a..58ac99de5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -6,13 +6,13 @@ import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; import java.util.List; @Configuration -public class WebConfig extends WebMvcConfigurerAdapter { +public class WebConfig implements WebMvcConfigurer { @Override diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java index 4fdff4f08..8f73f31c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java @@ -41,22 +41,16 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private AwsProperty awsProperty; + + /* @Value("${fileUpload.path}") private String filePath; @Value("${fileUpload.server}") private String server; - @Autowired - private AwsProperty awsProperty; - - /** - * 上传文件 - * - * @param multiReq - * @return - * @throws Exception - */ @PostMapping(value = "/fileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传文件") public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq) { @@ -108,6 +102,7 @@ public class UploadController extends BaseController { } return data; } + */ /** * 上传文件 diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java index 825956c60..e0d431e49 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java @@ -9,7 +9,7 @@ import com.iformall.service.WxProfitSharingOrderService; import com.iformall.service.WxRefundOrderService; import com.iformall.utils.XmlUtil; import org.apache.commons.io.IOUtils; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; @@ -36,10 +36,6 @@ public class WxPayController extends BaseController { @Autowired private WxRefundOrderService wxRefundOrderService; - - @Autowired - private WxProfitSharingOrderService wxProfitSharingOrderService; - /** * * @return 接收微信异步通知 diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 7d689456c..e39fdf00c 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -35,9 +35,6 @@ spring: max-idle: 8 max-wait: -1 min-idle: 0 -fileUpload: - path: /home/test/images - server: http://202.165.179.86:8081/images logging: level: diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 0c0f5a5c1..bd0f1a701 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -33,11 +33,6 @@ spring: max-wait: -1 min-idle: 0 - -fileUpload: - path: /home/test/images - server: http://202.165.179.86:8081/images - logging: level: tk.mybatis: debug diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index 5b03e1e49..8ecf45f59 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: port: 9000 - context-path: / + servlet: + context-path: / spring: application: @@ -10,7 +11,7 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 - http: + servlet: multipart: max-file-size: 2MB max-request-size: 2MB diff --git a/mallinkAdmin/src/main/resources/logback-spring.xml b/mallinkAdmin/src/main/resources/logback-spring.xml index 1d04331e4..0499e2c57 100644 --- a/mallinkAdmin/src/main/resources/logback-spring.xml +++ b/mallinkAdmin/src/main/resources/logback-spring.xml @@ -12,7 +12,8 @@ ${logPath}/trace.log - ${logPath}/trace.%d{yyyy-MM-dd}.log + ${logPath}/daily/trace.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -22,7 +23,8 @@ ${logPath}/info.log - ${logPath}/info.%d{yyyy-MM-dd}.log + ${logPath}/daily/info.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -37,7 +39,8 @@ ${logPath}/debug.log - ${logPath}/debug.%d{yyyy-MM-dd}.log + ${logPath}/daily/debug.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -53,7 +56,8 @@ ${logPath}/warn.log - ${logPath}/warn.%d{yyyy-MM-dd}.log + ${logPath}/daily/warn.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -70,7 +74,8 @@ ${logPath}/error.log - ${logPath}/error.%d{yyyy-MM-dd}.log + ${logPath}/daily/error.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml index 9f2f013a8..fa63d3e57 100644 --- a/mallinkBApi/pom.xml +++ b/mallinkBApi/pom.xml @@ -20,6 +20,7 @@ + ${project.artifactId} org.springframework.boot diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index 4753db3e6..017c85a3c 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -1,11 +1,9 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - -import springfox.documentation.swagger2.annotations.EnableSwagger2; +import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx @@ -13,7 +11,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; */ @SpringBootApplication @MapperScan(basePackages = {"com.iformall.mapper"}) -@EnableSwagger2 @EnableEncryptableProperties public class BApplication { diff --git a/mallinkBApi/src/main/java/com/iformall/config/CorsConfig.java b/mallinkBApi/src/main/java/com/iformall/config/CorsConfig.java index 49edf176d..22d61c8c9 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/CorsConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/CorsConfig.java @@ -2,13 +2,13 @@ package com.iformall.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * Created by Administrator on 2017/8/9. */ @Configuration -public class CorsConfig extends WebMvcConfigurerAdapter { +public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { diff --git a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java index ee12d85e5..c92720c67 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -12,7 +12,7 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; import java.util.List; @@ -25,7 +25,7 @@ import java.util.List; * @date 2017-04-20 22:30 */ @Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { +public class WebMvcConfig implements WebMvcConfigurer { @Autowired private AuthorizationInterceptor authorizationInterceptor; @Autowired diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index 7ab7386bd..6437b71fa 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: port: 8000 - context-path: /B + servlet: + context-path: /B spring: application: @@ -11,7 +12,6 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 - # @{link} https://github.com/abel533 #Mybatis mybatis: diff --git a/mallinkBApi/src/main/resources/logback-spring.xml b/mallinkBApi/src/main/resources/logback-spring.xml index 1d04331e4..0499e2c57 100644 --- a/mallinkBApi/src/main/resources/logback-spring.xml +++ b/mallinkBApi/src/main/resources/logback-spring.xml @@ -12,7 +12,8 @@ ${logPath}/trace.log - ${logPath}/trace.%d{yyyy-MM-dd}.log + ${logPath}/daily/trace.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -22,7 +23,8 @@ ${logPath}/info.log - ${logPath}/info.%d{yyyy-MM-dd}.log + ${logPath}/daily/info.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -37,7 +39,8 @@ ${logPath}/debug.log - ${logPath}/debug.%d{yyyy-MM-dd}.log + ${logPath}/daily/debug.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -53,7 +56,8 @@ ${logPath}/warn.log - ${logPath}/warn.%d{yyyy-MM-dd}.log + ${logPath}/daily/warn.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -70,7 +74,8 @@ ${logPath}/error.log - ${logPath}/error.%d{yyyy-MM-dd}.log + ${logPath}/daily/error.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index 7442dfc31..d822ec386 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -1,9 +1,9 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import tk.mybatis.spring.annotation.MapperScan; /** * @author chenkx diff --git a/mallinkCApi/src/main/java/com/iformall/config/CorsConfig.java b/mallinkCApi/src/main/java/com/iformall/config/CorsConfig.java index 583c779ff..e8cdd8d9c 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/CorsConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/CorsConfig.java @@ -2,13 +2,13 @@ package com.iformall.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * Created by Administrator on 2017/8/9. */ @Configuration -public class CorsConfig extends WebMvcConfigurerAdapter { +public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { diff --git a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java index ee12d85e5..c92720c67 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -12,7 +12,7 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; import java.util.List; @@ -25,7 +25,7 @@ import java.util.List; * @date 2017-04-20 22:30 */ @Configuration -public class WebMvcConfig extends WebMvcConfigurerAdapter { +public class WebMvcConfig implements WebMvcConfigurer { @Autowired private AuthorizationInterceptor authorizationInterceptor; @Autowired diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index 98ff573a1..fe4329f6d 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: port: 7000 - context-path: /C + servlet: + context-path: /C spring: application: diff --git a/mallinkCApi/src/main/resources/logback-spring.xml b/mallinkCApi/src/main/resources/logback-spring.xml index 1d04331e4..0499e2c57 100644 --- a/mallinkCApi/src/main/resources/logback-spring.xml +++ b/mallinkCApi/src/main/resources/logback-spring.xml @@ -12,7 +12,8 @@ ${logPath}/trace.log - ${logPath}/trace.%d{yyyy-MM-dd}.log + ${logPath}/daily/trace.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -22,7 +23,8 @@ ${logPath}/info.log - ${logPath}/info.%d{yyyy-MM-dd}.log + ${logPath}/daily/info.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -37,7 +39,8 @@ ${logPath}/debug.log - ${logPath}/debug.%d{yyyy-MM-dd}.log + ${logPath}/daily/debug.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -53,7 +56,8 @@ ${logPath}/warn.log - ${logPath}/warn.%d{yyyy-MM-dd}.log + ${logPath}/daily/warn.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -70,7 +74,8 @@ ${logPath}/error.log - ${logPath}/error.%d{yyyy-MM-dd}.log + ${logPath}/daily/error.%d{yyyy-MM-dd}.log + 180 [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCVo.java index c543920ba..8a3fd476d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCVo.java @@ -354,18 +354,18 @@ public class WxOrderCVo extends WxCouponOrder{ public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,OrderNumber_ASC("`orderNumber` ASC"),OrderNumber_DESC("`orderNumber` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") - ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") - ,PaymentType_ASC("`paymentType` ASC"),PaymentType_DESC("`paymentType` DESC") + ,OrderNumber_ASC("`order_number` ASC"),OrderNumber_DESC("`order_number` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") + ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") + ,PaymentType_ASC("`payment_type` ASC"),PaymentType_DESC("`payment_type` DESC") ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") - ,PaymentTime_ASC("`paymentTime` ASC"),PaymentTime_DESC("`paymentTime` DESC") - ,OrderStatus_ASC("`orderStatus` ASC"),OrderStatus_DESC("`orderStatus` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,PaymentTime_ASC("`payment_time` ASC"),PaymentTime_DESC("`payment_time` DESC") + ,OrderStatus_ASC("`order_status` ASC"),OrderStatus_DESC("`order_status` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") ; private String value; @@ -399,7 +399,7 @@ public class WxOrderCVo extends WxCouponOrder{ sb.append(","); sb.append(fields[k].toString()); } - + this.sortColumns = sb.toString(); } public void setSortColumns(String sortColumns) diff --git a/pom.xml b/pom.xml index 4c9734fcc..7a8c6e71b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,12 +20,13 @@ org.springframework.boot spring-boot-starter-parent - 1.5.15.RELEASE + 2.0.5.RELEASE 3.1.0 + 2.3.0 @@ -65,26 +66,40 @@ true + + org.springframework.boot + spring-boot-starter-websocket + + + org.springframework.boot + spring-boot-starter-web-services + + org.mybatis.spring.boot mybatis-spring-boot-starter - 1.3.1 + 1.3.2 com.github.pagehelper pagehelper-spring-boot-starter - 1.2.1 + 1.2.7 tk.mybatis mapper-spring-boot-starter - 1.1.7 + 2.0.4 + + + + org.springframework + spring-context-support mysql mysql-connector-java - 5.1.44 + 8.0.11 runtime @@ -96,45 +111,87 @@ org.apache.commons commons-lang3 - 3.6 + 3.8 com.google.guava guava - 23.6-jre + 26.0-jre com.alibaba fastjson - 1.2.44 + 1.2.49 com.alibaba druid - 1.1.2 + 1.1.11 org.mybatis.generator mybatis-generator-core - 1.3.6 + 1.3.7 + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + com.mchange + c3p0 + + + com.zaxxer + HikariCP-java6 + + + + io.springfox + springfox-swagger2 + 2.8.0 + io.springfox springfox-swagger-ui - 2.6.1 + 2.8.0 io.springfox - springfox-swagger2 - 2.6.1 + springfox-spring-web + 2.8.0 + + + com.fasterxml.jackson.core + jackson-core + 2.9.7 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.7 + + + javax.xml.bind + jaxb-api + 2.3.0 javax.persistence persistence-api - 1.0 + 1.0.2 + + + org.projectlombok + lombok + 1.18.2 + provided @@ -157,13 +214,13 @@ org.crazycake shiro-redis - 2.4.2.1-RELEASE + 3.1.0 - jdom - jdom - 1.0 + org.jdom + jdom2 + 2.0.6 @@ -181,14 +238,14 @@ commons-io commons-io - 2.5 + 2.6 cn.afterturn easypoi-spring-boot-starter - 3.2.0 + 3.3.0 @@ -232,7 +289,7 @@ com.github.ulisesbocchio jasypt-spring-boot - 2.0.0 + 2.1.0 @@ -242,6 +299,8 @@ + + \ No newline at end of file