Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
de22889a
Commit
de22889a
authored
Mar 13, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
to autowired
parent
a529fa8d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
35 deletions
+40
-35
pom.xml
pom.xml
+20
-12
MvcInterceptorConfig.java
...om/gogirl/infrastructure/config/MvcInterceptorConfig.java
+18
-18
WxCallbackController.java
.../java/com/gogirl/interfaces/xcx/WxCallbackController.java
+2
-5
No files found.
pom.xml
View file @
de22889a
...
@@ -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>
<!--
<!–undertow servlet 容器–>-->
<!--
<!–undertow servlet 容器–>-->
<!-- <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>
...
...
src/main/java/com/gogirl/infrastructure/config/MvcInterceptorConfig.java
View file @
de22889a
...
@@ -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()));
}
//
}
}
}
...
...
src/main/java/com/gogirl/interfaces/xcx/WxCallbackController.java
View file @
de22889a
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment