Commit de22889a by huluobin

to autowired

parent a529fa8d
......@@ -19,7 +19,6 @@
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<weixin-java-mp.version>3.3.0</weixin-java-mp.version>
</properties>
......@@ -206,6 +205,7 @@
<version>3.1.0</version>
</dependency>
<!-- 数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
......@@ -217,15 +217,15 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
<!-- &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
<!-- &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-undertow</artifactId>-->
......@@ -237,6 +237,14 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.15</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
......
......@@ -90,24 +90,24 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
}
@Bean
public ObjectMapper jacksonObjectMapperCustomization() {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
format.setTimeZone(timeZone);
Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
.timeZone(timeZone)
.dateFormat(format);
return builder.build();
}
@Override
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
converters.removeIf(c -> c instanceof MappingJackson2HttpMessageConverter);
converters.add(new MappingJackson2HttpMessageConverter(jacksonObjectMapperCustomization()));
}
// @Bean
// public ObjectMapper jacksonObjectMapperCustomization() {
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
// format.setTimeZone(timeZone);
//
// Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
// .timeZone(timeZone)
// .dateFormat(format);
//
// return builder.build();
// }
//
// @Override
// public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
// converters.removeIf(c -> c instanceof MappingJackson2HttpMessageConverter);
// converters.add(new MappingJackson2HttpMessageConverter(jacksonObjectMapperCustomization()));
// }
}
......
......@@ -8,10 +8,7 @@ import com.gogirl.application.order.serve.OrderManageService;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @Author robbendev
......@@ -40,7 +37,7 @@ public class WxCallbackController {
}
@ApiOperation(value = "预约订单(微信+余额)支付回调")
@PostMapping("/customer/pay/notifyBalanceWxPay")
@RequestMapping(method = RequestMethod.POST, value = "/customer/pay/notifyBalanceWxPay")
public String notifyBalanceWxPayOrder(@RequestBody String xmlData) {
log.info("支付回调参数xmlData:" + xmlData);
WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment