Commit de22889a by huluobin

to autowired

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