Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
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
licc
volunteer_service
Commits
0ba672e7
Commit
0ba672e7
authored
May 19, 2021
by
cy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部署
parent
c496019a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
Common.java
...ice/src/main/java/cn/wisenergy/service/common/Common.java
+6
-6
WxCommon.java
...ce/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
+2
-2
application.yml
wisenergy-web-admin/src/main/resources/application.yml
+1
-1
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
View file @
0ba672e7
...
...
@@ -39,24 +39,24 @@ public class Common {
* 支付宝--回调地址
*/
//测试
public
static
final
String
NOTIFY_URL
=
"http://111.203.232.171:8997/pay/aliPayCallBack.do"
;
//
public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do";
//线上
//
public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do";
public
static
final
String
NOTIFY_URL
=
"https://jygkzy.com/api/pay/aliPayCallBack.do"
;
/***
* 支付宝--pc端支付成功跳转地址
*/
//测试
public
static
final
String
RETURN_URL_PC
=
"http://111.203.232.171:8999/#/wallet"
;
//
public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet";
//线上
//
public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet";
public
static
final
String
RETURN_URL_PC
=
"https://jygkzy.com/#/wallet"
;
/***
* 支付宝--手机网页支付成功跳转地址
*/
//测试
public
static
final
String
RETURN_URL_WAP
=
"http://111.203.232.171:8999/#/history"
;
//
public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history";
//线上
//
public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history";
public
static
final
String
RETURN_URL_WAP
=
"https://jygkzy.com/#/history"
;
/**
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
View file @
0ba672e7
...
...
@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay;
public
class
WxCommon
{
//测试
public
static
final
String
NOTIFY_URL
=
"http://111.203.232.171:8997/pay/wxPayCallBack.do"
;
//
public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do";
//线上
//
public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do";
public
static
final
String
NOTIFY_URL
=
"https://jygkzy.com/api/pay/wxPayCallBack.do"
;
...
...
wisenergy-web-admin/src/main/resources/application.yml
View file @
0ba672e7
...
...
@@ -13,7 +13,7 @@ spring:
allow-bean-definition-overriding
:
true
# 环境 dev|test|prod
profiles
:
active
:
dev
active
:
prod
# jackson时间格式化
jackson
:
time-zone
:
GMT+8
...
...
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