| @@ -1,11 +1,10 @@ | |||||
| package com.iformall; | package com.iformall; | ||||
| import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | ||||
| import org.mybatis.spring.annotation.MapperScan; | |||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| import springfox.documentation.swagger2.annotations.EnableSwagger2; | import springfox.documentation.swagger2.annotations.EnableSwagger2; | ||||
| import tk.mybatis.spring.annotation.MapperScan; | |||||
| /** | /** | ||||
| * @author chenkx | * @author chenkx | ||||
| @@ -2,13 +2,13 @@ package com.iformall.config; | |||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||
| import org.springframework.web.servlet.config.annotation.CorsRegistry; | 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. | * Created by Administrator on 2017/8/9. | ||||
| */ | */ | ||||
| @Configuration | @Configuration | ||||
| public class CorsConfig extends WebMvcConfigurerAdapter { | |||||
| public class CorsConfig implements WebMvcConfigurer { | |||||
| @Override | @Override | ||||
| public void addCorsMappings(CorsRegistry registry) { | public void addCorsMappings(CorsRegistry registry) { | ||||
| @@ -6,13 +6,13 @@ import com.alibaba.fastjson.support.config.FastJsonConfig; | |||||
| import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; | import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; | ||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||
| import org.springframework.http.converter.HttpMessageConverter; | 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.math.BigInteger; | ||||
| import java.util.List; | import java.util.List; | ||||
| @Configuration | @Configuration | ||||
| public class WebConfig extends WebMvcConfigurerAdapter { | |||||
| public class WebConfig implements WebMvcConfigurer { | |||||
| @Override | @Override | ||||
| @@ -41,22 +41,16 @@ public class UploadController extends BaseController { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @Autowired | |||||
| private AwsProperty awsProperty; | |||||
| /* | |||||
| @Value("${fileUpload.path}") | @Value("${fileUpload.path}") | ||||
| private String filePath; | private String filePath; | ||||
| @Value("${fileUpload.server}") | @Value("${fileUpload.server}") | ||||
| private String server; | private String server; | ||||
| @Autowired | |||||
| private AwsProperty awsProperty; | |||||
| /** | |||||
| * 上传文件 | |||||
| * | |||||
| * @param multiReq | |||||
| * @return | |||||
| * @throws Exception | |||||
| */ | |||||
| @PostMapping(value = "/fileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") | @PostMapping(value = "/fileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") | ||||
| @ApiOperation("上传文件") | @ApiOperation("上传文件") | ||||
| public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq) { | public ResultData fileUpload(@RequestParam("file") MultipartFile multiReq) { | ||||
| @@ -108,6 +102,7 @@ public class UploadController extends BaseController { | |||||
| } | } | ||||
| return data; | return data; | ||||
| } | } | ||||
| */ | |||||
| /** | /** | ||||
| * 上传文件 | * 上传文件 | ||||
| @@ -9,7 +9,7 @@ import com.iformall.service.WxProfitSharingOrderService; | |||||
| import com.iformall.service.WxRefundOrderService; | import com.iformall.service.WxRefundOrderService; | ||||
| import com.iformall.utils.XmlUtil; | import com.iformall.utils.XmlUtil; | ||||
| import org.apache.commons.io.IOUtils; | import org.apache.commons.io.IOUtils; | ||||
| import org.jdom.JDOMException; | |||||
| import org.jdom2.JDOMException; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.http.MediaType; | import org.springframework.http.MediaType; | ||||
| @@ -36,10 +36,6 @@ public class WxPayController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxRefundOrderService wxRefundOrderService; | private WxRefundOrderService wxRefundOrderService; | ||||
| @Autowired | |||||
| private WxProfitSharingOrderService wxProfitSharingOrderService; | |||||
| /** | /** | ||||
| * | * | ||||
| * @return 接收微信异步通知 | * @return 接收微信异步通知 | ||||
| @@ -35,9 +35,6 @@ spring: | |||||
| max-idle: 8 | max-idle: 8 | ||||
| max-wait: -1 | max-wait: -1 | ||||
| min-idle: 0 | min-idle: 0 | ||||
| fileUpload: | |||||
| path: /home/test/images | |||||
| server: http://202.165.179.86:8081/images | |||||
| logging: | logging: | ||||
| level: | level: | ||||
| @@ -33,11 +33,6 @@ spring: | |||||
| max-wait: -1 | max-wait: -1 | ||||
| min-idle: 0 | min-idle: 0 | ||||
| fileUpload: | |||||
| path: /home/test/images | |||||
| server: http://202.165.179.86:8081/images | |||||
| logging: | logging: | ||||
| level: | level: | ||||
| tk.mybatis: debug | tk.mybatis: debug | ||||
| @@ -1,6 +1,7 @@ | |||||
| server: | server: | ||||
| port: 9000 | port: 9000 | ||||
| context-path: / | |||||
| servlet: | |||||
| context-path: / | |||||
| spring: | spring: | ||||
| application: | application: | ||||
| @@ -10,7 +11,7 @@ spring: | |||||
| jackson: | jackson: | ||||
| date-format: yyyy-MM-dd HH:mm:ss | date-format: yyyy-MM-dd HH:mm:ss | ||||
| time-zone: GMT+8 | time-zone: GMT+8 | ||||
| http: | |||||
| servlet: | |||||
| multipart: | multipart: | ||||
| max-file-size: 2MB | max-file-size: 2MB | ||||
| max-request-size: 2MB | max-request-size: 2MB | ||||
| @@ -12,7 +12,8 @@ | |||||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/trace.log</file> | <file>${logPath}/trace.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -22,7 +23,8 @@ | |||||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/info.log</file> | <file>${logPath}/info.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -37,7 +39,8 @@ | |||||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/debug.log</file> | <file>${logPath}/debug.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -53,7 +56,8 @@ | |||||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/warn.log</file> | <file>${logPath}/warn.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -70,7 +74,8 @@ | |||||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/error.log</file> | <file>${logPath}/error.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -20,6 +20,7 @@ | |||||
| </dependencies> | </dependencies> | ||||
| <build> | <build> | ||||
| <finalName>${project.artifactId}</finalName> | |||||
| <plugins> | <plugins> | ||||
| <plugin> | <plugin> | ||||
| <groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
| @@ -1,11 +1,9 @@ | |||||
| package com.iformall; | package com.iformall; | ||||
| import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | ||||
| import org.mybatis.spring.annotation.MapperScan; | |||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| import springfox.documentation.swagger2.annotations.EnableSwagger2; | |||||
| import tk.mybatis.spring.annotation.MapperScan; | |||||
| /** | /** | ||||
| * @author chenkx | * @author chenkx | ||||
| @@ -13,7 +11,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; | |||||
| */ | */ | ||||
| @SpringBootApplication | @SpringBootApplication | ||||
| @MapperScan(basePackages = {"com.iformall.mapper"}) | @MapperScan(basePackages = {"com.iformall.mapper"}) | ||||
| @EnableSwagger2 | |||||
| @EnableEncryptableProperties | @EnableEncryptableProperties | ||||
| public class BApplication { | public class BApplication { | ||||
| @@ -2,13 +2,13 @@ package com.iformall.config; | |||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||
| import org.springframework.web.servlet.config.annotation.CorsRegistry; | 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. | * Created by Administrator on 2017/8/9. | ||||
| */ | */ | ||||
| @Configuration | @Configuration | ||||
| public class CorsConfig extends WebMvcConfigurerAdapter { | |||||
| public class CorsConfig implements WebMvcConfigurer { | |||||
| @Override | @Override | ||||
| public void addCorsMappings(CorsRegistry registry) { | public void addCorsMappings(CorsRegistry registry) { | ||||
| @@ -12,7 +12,7 @@ import org.springframework.http.converter.HttpMessageConverter; | |||||
| import org.springframework.web.method.support.HandlerMethodArgumentResolver; | import org.springframework.web.method.support.HandlerMethodArgumentResolver; | ||||
| import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | ||||
| import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; | 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.math.BigInteger; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -25,7 +25,7 @@ import java.util.List; | |||||
| * @date 2017-04-20 22:30 | * @date 2017-04-20 22:30 | ||||
| */ | */ | ||||
| @Configuration | @Configuration | ||||
| public class WebMvcConfig extends WebMvcConfigurerAdapter { | |||||
| public class WebMvcConfig implements WebMvcConfigurer { | |||||
| @Autowired | @Autowired | ||||
| private AuthorizationInterceptor authorizationInterceptor; | private AuthorizationInterceptor authorizationInterceptor; | ||||
| @Autowired | @Autowired | ||||
| @@ -1,6 +1,7 @@ | |||||
| server: | server: | ||||
| port: 8000 | port: 8000 | ||||
| context-path: /B | |||||
| servlet: | |||||
| context-path: /B | |||||
| spring: | spring: | ||||
| application: | application: | ||||
| @@ -11,7 +12,6 @@ spring: | |||||
| date-format: yyyy-MM-dd HH:mm:ss | date-format: yyyy-MM-dd HH:mm:ss | ||||
| time-zone: GMT+8 | time-zone: GMT+8 | ||||
| # @{link} https://github.com/abel533 | # @{link} https://github.com/abel533 | ||||
| #Mybatis | #Mybatis | ||||
| mybatis: | mybatis: | ||||
| @@ -12,7 +12,8 @@ | |||||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/trace.log</file> | <file>${logPath}/trace.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -22,7 +23,8 @@ | |||||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/info.log</file> | <file>${logPath}/info.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -37,7 +39,8 @@ | |||||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/debug.log</file> | <file>${logPath}/debug.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -53,7 +56,8 @@ | |||||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/warn.log</file> | <file>${logPath}/warn.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -70,7 +74,8 @@ | |||||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/error.log</file> | <file>${logPath}/error.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -1,9 +1,9 @@ | |||||
| package com.iformall; | package com.iformall; | ||||
| import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | ||||
| import org.mybatis.spring.annotation.MapperScan; | |||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| import tk.mybatis.spring.annotation.MapperScan; | |||||
| /** | /** | ||||
| * @author chenkx | * @author chenkx | ||||
| @@ -2,13 +2,13 @@ package com.iformall.config; | |||||
| import org.springframework.context.annotation.Configuration; | import org.springframework.context.annotation.Configuration; | ||||
| import org.springframework.web.servlet.config.annotation.CorsRegistry; | 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. | * Created by Administrator on 2017/8/9. | ||||
| */ | */ | ||||
| @Configuration | @Configuration | ||||
| public class CorsConfig extends WebMvcConfigurerAdapter { | |||||
| public class CorsConfig implements WebMvcConfigurer { | |||||
| @Override | @Override | ||||
| public void addCorsMappings(CorsRegistry registry) { | public void addCorsMappings(CorsRegistry registry) { | ||||
| @@ -12,7 +12,7 @@ import org.springframework.http.converter.HttpMessageConverter; | |||||
| import org.springframework.web.method.support.HandlerMethodArgumentResolver; | import org.springframework.web.method.support.HandlerMethodArgumentResolver; | ||||
| import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | ||||
| import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; | 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.math.BigInteger; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -25,7 +25,7 @@ import java.util.List; | |||||
| * @date 2017-04-20 22:30 | * @date 2017-04-20 22:30 | ||||
| */ | */ | ||||
| @Configuration | @Configuration | ||||
| public class WebMvcConfig extends WebMvcConfigurerAdapter { | |||||
| public class WebMvcConfig implements WebMvcConfigurer { | |||||
| @Autowired | @Autowired | ||||
| private AuthorizationInterceptor authorizationInterceptor; | private AuthorizationInterceptor authorizationInterceptor; | ||||
| @Autowired | @Autowired | ||||
| @@ -1,6 +1,7 @@ | |||||
| server: | server: | ||||
| port: 7000 | port: 7000 | ||||
| context-path: /C | |||||
| servlet: | |||||
| context-path: /C | |||||
| spring: | spring: | ||||
| application: | application: | ||||
| @@ -12,7 +12,8 @@ | |||||
| <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/trace.log</file> | <file>${logPath}/trace.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/trace.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -22,7 +23,8 @@ | |||||
| <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/info.log</file> | <file>${logPath}/info.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/info.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -37,7 +39,8 @@ | |||||
| <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/debug.log</file> | <file>${logPath}/debug.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/debug.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -53,7 +56,8 @@ | |||||
| <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/warn.log</file> | <file>${logPath}/warn.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/warn.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -70,7 +74,8 @@ | |||||
| <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> | ||||
| <file>${logPath}/error.log</file> | <file>${logPath}/error.log</file> | ||||
| <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> | ||||
| <FileNamePattern>${logPath}/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <FileNamePattern>${logPath}/daily/error.%d{yyyy-MM-dd}.log</FileNamePattern> | |||||
| <maxHistory>180</maxHistory> <!-- 保留180天 --> | |||||
| </rollingPolicy> | </rollingPolicy> | ||||
| <layout> | <layout> | ||||
| <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | <pattern>[%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n</pattern> | ||||
| @@ -354,18 +354,18 @@ public class WxOrderCVo extends WxCouponOrder{ | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | 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") | ,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") | ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") | ||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| @@ -399,7 +399,7 @@ public class WxOrderCVo extends WxCouponOrder{ | |||||
| sb.append(","); | sb.append(","); | ||||
| sb.append(fields[k].toString()); | sb.append(fields[k].toString()); | ||||
| } | } | ||||
| this.sortColumns = sb.toString(); | |||||
| } | } | ||||
| public void setSortColumns(String sortColumns) | public void setSortColumns(String sortColumns) | ||||
| @@ -20,12 +20,13 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
| <artifactId>spring-boot-starter-parent</artifactId> | <artifactId>spring-boot-starter-parent</artifactId> | ||||
| <version>1.5.15.RELEASE</version> | |||||
| <version>2.0.5.RELEASE</version> | |||||
| <relativePath/> | <relativePath/> | ||||
| </parent> | </parent> | ||||
| <properties> | <properties> | ||||
| <weixin-java-miniapp.version>3.1.0</weixin-java-miniapp.version> | <weixin-java-miniapp.version>3.1.0</weixin-java-miniapp.version> | ||||
| <quartz.version>2.3.0</quartz.version> | |||||
| </properties> | </properties> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -65,26 +66,40 @@ | |||||
| <optional>true</optional> | <optional>true</optional> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>org.springframework.boot</groupId> | |||||
| <artifactId>spring-boot-starter-websocket</artifactId> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.springframework.boot</groupId> | |||||
| <artifactId>spring-boot-starter-web-services</artifactId> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis.spring.boot</groupId> | <groupId>org.mybatis.spring.boot</groupId> | ||||
| <artifactId>mybatis-spring-boot-starter</artifactId> | <artifactId>mybatis-spring-boot-starter</artifactId> | ||||
| <version>1.3.1</version> | |||||
| <version>1.3.2</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.github.pagehelper</groupId> | <groupId>com.github.pagehelper</groupId> | ||||
| <artifactId>pagehelper-spring-boot-starter</artifactId> | <artifactId>pagehelper-spring-boot-starter</artifactId> | ||||
| <version>1.2.1</version> | |||||
| <version>1.2.7</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>tk.mybatis</groupId> | <groupId>tk.mybatis</groupId> | ||||
| <artifactId>mapper-spring-boot-starter</artifactId> | <artifactId>mapper-spring-boot-starter</artifactId> | ||||
| <version>1.1.7</version> | |||||
| <version>2.0.4</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.springframework</groupId> | |||||
| <artifactId>spring-context-support</artifactId> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>mysql</groupId> | <groupId>mysql</groupId> | ||||
| <artifactId>mysql-connector-java</artifactId> | <artifactId>mysql-connector-java</artifactId> | ||||
| <version>5.1.44</version> | |||||
| <version>8.0.11</version> | |||||
| <scope>runtime</scope> | <scope>runtime</scope> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -96,45 +111,87 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.apache.commons</groupId> | <groupId>org.apache.commons</groupId> | ||||
| <artifactId>commons-lang3</artifactId> | <artifactId>commons-lang3</artifactId> | ||||
| <version>3.6</version> | |||||
| <version>3.8</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.google.guava</groupId> | <groupId>com.google.guava</groupId> | ||||
| <artifactId>guava</artifactId> | <artifactId>guava</artifactId> | ||||
| <version>23.6-jre</version> | |||||
| <version>26.0-jre</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.alibaba</groupId> | <groupId>com.alibaba</groupId> | ||||
| <artifactId>fastjson</artifactId> | <artifactId>fastjson</artifactId> | ||||
| <version>1.2.44</version> | |||||
| <version>1.2.49</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>com.alibaba</groupId> | <groupId>com.alibaba</groupId> | ||||
| <artifactId>druid</artifactId> | <artifactId>druid</artifactId> | ||||
| <version>1.1.2</version> | |||||
| <version>1.1.11</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis.generator</groupId> | <groupId>org.mybatis.generator</groupId> | ||||
| <artifactId>mybatis-generator-core</artifactId> | <artifactId>mybatis-generator-core</artifactId> | ||||
| <version>1.3.6</version> | |||||
| <version>1.3.7</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.quartz-scheduler</groupId> | |||||
| <artifactId>quartz</artifactId> | |||||
| <version>${quartz.version}</version> | |||||
| <exclusions> | |||||
| <exclusion> | |||||
| <groupId>com.mchange</groupId> | |||||
| <artifactId>c3p0</artifactId> | |||||
| </exclusion> | |||||
| <exclusion> | |||||
| <groupId>com.zaxxer</groupId> | |||||
| <artifactId>HikariCP-java6</artifactId> | |||||
| </exclusion> | |||||
| </exclusions> | |||||
| </dependency> | </dependency> | ||||
| <!-- Swagger --> | <!-- Swagger --> | ||||
| <dependency> | |||||
| <groupId>io.springfox</groupId> | |||||
| <artifactId>springfox-swagger2</artifactId> | |||||
| <version>2.8.0</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>io.springfox</groupId> | <groupId>io.springfox</groupId> | ||||
| <artifactId>springfox-swagger-ui</artifactId> | <artifactId>springfox-swagger-ui</artifactId> | ||||
| <version>2.6.1</version> | |||||
| <version>2.8.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>io.springfox</groupId> | <groupId>io.springfox</groupId> | ||||
| <artifactId>springfox-swagger2</artifactId> | |||||
| <version>2.6.1</version> | |||||
| <artifactId>springfox-spring-web</artifactId> | |||||
| <version>2.8.0</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>com.fasterxml.jackson.core</groupId> | |||||
| <artifactId>jackson-core</artifactId> | |||||
| <version>2.9.7</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>com.fasterxml.jackson.core</groupId> | |||||
| <artifactId>jackson-databind</artifactId> | |||||
| <version>2.9.7</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>javax.xml.bind</groupId> | |||||
| <artifactId>jaxb-api</artifactId> | |||||
| <version>2.3.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>javax.persistence</groupId> | <groupId>javax.persistence</groupId> | ||||
| <artifactId>persistence-api</artifactId> | <artifactId>persistence-api</artifactId> | ||||
| <version>1.0</version> | |||||
| <version>1.0.2</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.projectlombok</groupId> | |||||
| <artifactId>lombok</artifactId> | |||||
| <version>1.18.2</version> | |||||
| <scope>provided</scope> | |||||
| </dependency> | </dependency> | ||||
| <!-- </dependencyManagement> --> | <!-- </dependencyManagement> --> | ||||
| <!-- <dependencies> --> | <!-- <dependencies> --> | ||||
| @@ -157,13 +214,13 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.crazycake</groupId> | <groupId>org.crazycake</groupId> | ||||
| <artifactId>shiro-redis</artifactId> | <artifactId>shiro-redis</artifactId> | ||||
| <version>2.4.2.1-RELEASE</version> | |||||
| <version>3.1.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>jdom</groupId> | |||||
| <artifactId>jdom</artifactId> | |||||
| <version>1.0</version> | |||||
| <groupId>org.jdom</groupId> | |||||
| <artifactId>jdom2</artifactId> | |||||
| <version>2.0.6</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -181,14 +238,14 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>commons-io</groupId> | <groupId>commons-io</groupId> | ||||
| <artifactId>commons-io</artifactId> | <artifactId>commons-io</artifactId> | ||||
| <version>2.5</version> | |||||
| <version>2.6</version> | |||||
| </dependency> | </dependency> | ||||
| <!--easypoi--> | <!--easypoi--> | ||||
| <dependency> | <dependency> | ||||
| <groupId>cn.afterturn</groupId> | <groupId>cn.afterturn</groupId> | ||||
| <artifactId>easypoi-spring-boot-starter</artifactId> | <artifactId>easypoi-spring-boot-starter</artifactId> | ||||
| <version>3.2.0</version> | |||||
| <version>3.3.0</version> | |||||
| </dependency> | </dependency> | ||||
| <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas --> | <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas --> | ||||
| @@ -232,7 +289,7 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.github.ulisesbocchio</groupId> | <groupId>com.github.ulisesbocchio</groupId> | ||||
| <artifactId>jasypt-spring-boot</artifactId> | <artifactId>jasypt-spring-boot</artifactId> | ||||
| <version>2.0.0</version> | |||||
| <version>2.1.0</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| @@ -242,6 +299,8 @@ | |||||
| </dependency> | </dependency> | ||||
| </dependencies> | </dependencies> | ||||
| <!-- | |||||
| <build> | <build> | ||||
| <plugins> | <plugins> | ||||
| <plugin> | <plugin> | ||||
| @@ -255,5 +314,5 @@ | |||||
| </plugin> | </plugin> | ||||
| </plugins> | </plugins> | ||||
| </build> | </build> | ||||
| --> | |||||
| </project> | </project> | ||||