Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
payment-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
payment-ci-test
Commits
a8b99d14
提交
a8b99d14
authored
7月 20, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复:文件找不到问题
上级
d0d12077
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
18 行增加
和
13 行删除
+18
-13
UserSystemConstant.java
...ain/java/com/mmc/payment/constant/UserSystemConstant.java
+3
-0
WechatPayController.java
.../java/com/mmc/payment/controller/WechatPayController.java
+2
-1
apiclient_key.pem
src/main/java/com/mmc/payment/file/apiclient_key.pem
+0
-0
WechatPayServiceImpl.java
...va/com/mmc/payment/service/Impl/WechatPayServiceImpl.java
+1
-1
WechatPayService.java
src/main/java/com/mmc/payment/service/WechatPayService.java
+2
-1
WxConfigUtils.java
src/main/java/com/mmc/payment/util/WxConfigUtils.java
+2
-10
application-dev.yml
src/main/resources/application-dev.yml
+4
-0
application-local.yml
src/main/resources/application-local.yml
+4
-0
没有找到文件。
src/main/java/com/mmc/payment/constant/UserSystemConstant.java
浏览文件 @
a8b99d14
...
@@ -40,4 +40,7 @@ public class UserSystemConstant {
...
@@ -40,4 +40,7 @@ public class UserSystemConstant {
@Value
(
"${wx.pay.notify-url}"
)
@Value
(
"${wx.pay.notify-url}"
)
private
String
notifyUrl
;
private
String
notifyUrl
;
@Value
(
"${data.file.url}"
)
private
String
privateKeyFromPath
;
}
}
src/main/java/com/mmc/payment/controller/WechatPayController.java
浏览文件 @
a8b99d14
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.IOException
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -31,7 +32,7 @@ public class WechatPayController extends BaseController {
...
@@ -31,7 +32,7 @@ public class WechatPayController extends BaseController {
@ApiOperation
(
value
=
"小程序调起支付API"
)
@ApiOperation
(
value
=
"小程序调起支付API"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"pay"
)
@PostMapping
(
"pay"
)
public
ResultBody
orderPay
(
@RequestBody
OrderRequestParamsVO
orderRequestParamsVO
,
HttpServletRequest
request
)
{
public
ResultBody
orderPay
(
@RequestBody
OrderRequestParamsVO
orderRequestParamsVO
,
HttpServletRequest
request
)
throws
IOException
{
return
ResultBody
.
success
(
wechatPayService
.
orderPay
(
orderRequestParamsVO
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
request
));
return
ResultBody
.
success
(
wechatPayService
.
orderPay
(
orderRequestParamsVO
,
this
.
getUserLoginInfoFromRedis
(
request
).
getUserAccountId
(),
request
));
}
}
...
...
src/main/
resources
/apiclient_key.pem
→
src/main/
java/com/mmc/payment/file
/apiclient_key.pem
浏览文件 @
a8b99d14
File moved
src/main/java/com/mmc/payment/service/Impl/WechatPayServiceImpl.java
浏览文件 @
a8b99d14
...
@@ -48,7 +48,7 @@ public class WechatPayServiceImpl implements WechatPayService {
...
@@ -48,7 +48,7 @@ public class WechatPayServiceImpl implements WechatPayService {
WxConfigUtils
wxConfigUtils
;
WxConfigUtils
wxConfigUtils
;
@Override
@Override
public
Map
orderPay
(
OrderRequestParamsVO
orderRequestParamsVO
,
Integer
userAccountId
,
HttpServletRequest
request
)
{
public
Map
orderPay
(
OrderRequestParamsVO
orderRequestParamsVO
,
Integer
userAccountId
,
HttpServletRequest
request
)
throws
IOException
{
UserAccountSimpleDTO
userSimpleInfo
=
userAppApi
.
feignGetUserSimpleInfo
(
userAccountId
,
request
.
getHeader
(
"token"
));
UserAccountSimpleDTO
userSimpleInfo
=
userAppApi
.
feignGetUserSimpleInfo
(
userAccountId
,
request
.
getHeader
(
"token"
));
if
(
userSimpleInfo
==
null
)
{
if
(
userSimpleInfo
==
null
)
{
throw
new
RuntimeException
(
"服务器内部错误!"
);
throw
new
RuntimeException
(
"服务器内部错误!"
);
...
...
src/main/java/com/mmc/payment/service/WechatPayService.java
浏览文件 @
a8b99d14
...
@@ -3,6 +3,7 @@ package com.mmc.payment.service;
...
@@ -3,6 +3,7 @@ package com.mmc.payment.service;
import
com.mmc.payment.model.vo.order.OrderRequestParamsVO
;
import
com.mmc.payment.model.vo.order.OrderRequestParamsVO
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.IOException
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -11,7 +12,7 @@ import java.util.Map;
...
@@ -11,7 +12,7 @@ import java.util.Map;
* 概要:
* 概要:
*/
*/
public
interface
WechatPayService
{
public
interface
WechatPayService
{
Map
orderPay
(
OrderRequestParamsVO
orderRequestParamsVO
,
Integer
userAccountId
,
HttpServletRequest
request
);
Map
orderPay
(
OrderRequestParamsVO
orderRequestParamsVO
,
Integer
userAccountId
,
HttpServletRequest
request
)
throws
IOException
;
Map
payCallback
(
HttpServletRequest
request
);
Map
payCallback
(
HttpServletRequest
request
);
}
}
src/main/java/com/mmc/payment/util/WxConfigUtils.java
浏览文件 @
a8b99d14
...
@@ -7,8 +7,6 @@ import com.wechat.pay.java.core.notification.NotificationConfig;
...
@@ -7,8 +7,6 @@ import com.wechat.pay.java.core.notification.NotificationConfig;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.io.File
;
import
java.net.URL
;
/**
/**
* @Author LW
* @Author LW
...
@@ -26,7 +24,7 @@ public class WxConfigUtils {
...
@@ -26,7 +24,7 @@ public class WxConfigUtils {
Config
config
=
Config
config
=
new
RSAAutoCertificateConfig
.
Builder
()
new
RSAAutoCertificateConfig
.
Builder
()
.
merchantId
(
userSystemConstant
.
getMchid
())
.
merchantId
(
userSystemConstant
.
getMchid
())
.
privateKeyFromPath
(
this
.
getFile
Path
())
.
privateKeyFromPath
(
userSystemConstant
.
getPrivateKeyFrom
Path
())
.
merchantSerialNumber
(
userSystemConstant
.
getMchNumber
())
.
merchantSerialNumber
(
userSystemConstant
.
getMchNumber
())
.
apiV3Key
(
userSystemConstant
.
getApiv3Key
())
.
apiV3Key
(
userSystemConstant
.
getApiv3Key
())
.
build
();
.
build
();
...
@@ -40,17 +38,11 @@ public class WxConfigUtils {
...
@@ -40,17 +38,11 @@ public class WxConfigUtils {
NotificationConfig
config
=
NotificationConfig
config
=
new
RSAAutoCertificateConfig
.
Builder
()
new
RSAAutoCertificateConfig
.
Builder
()
.
merchantId
(
userSystemConstant
.
getMchid
())
.
merchantId
(
userSystemConstant
.
getMchid
())
.
privateKeyFromPath
(
this
.
getFile
Path
())
.
privateKeyFromPath
(
userSystemConstant
.
getPrivateKeyFrom
Path
())
.
merchantSerialNumber
(
userSystemConstant
.
getMchNumber
())
.
merchantSerialNumber
(
userSystemConstant
.
getMchNumber
())
.
apiV3Key
(
userSystemConstant
.
getApiv3Key
())
.
apiV3Key
(
userSystemConstant
.
getApiv3Key
())
.
build
();
.
build
();
return
config
;
return
config
;
}
}
private
String
getFilePath
()
{
ClassLoader
classLoader
=
getClass
().
getClassLoader
();
URL
resourceUrl
=
classLoader
.
getResource
(
"apiclient_key.pem"
);
return
new
File
(
resourceUrl
.
getFile
()).
getAbsolutePath
();
}
}
}
src/main/resources/application-dev.yml
浏览文件 @
a8b99d14
...
@@ -60,3 +60,7 @@ iuav:
...
@@ -60,3 +60,7 @@ iuav:
userapp
:
userapp
:
url
:
http://cms-svc:35150
url
:
http://cms-svc:35150
data
:
file
:
url
:
src/main/java/com/mmc/payment/file/apiclient_key.pem
src/main/resources/application-local.yml
浏览文件 @
a8b99d14
...
@@ -60,5 +60,9 @@ iuav:
...
@@ -60,5 +60,9 @@ iuav:
oms
:
oms
:
url
:
http://localhost:8077/oms/
url
:
http://localhost:8077/oms/
data
:
file
:
url
:
src/main/java/com/mmc/payment/file/apiclient_key.pem
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论