Commit 0ba672e7 authored by cy's avatar cy

部署

parent c496019a
...@@ -39,24 +39,24 @@ public class Common { ...@@ -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端支付成功跳转地址 * 支付宝--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";
/** /**
......
...@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay; ...@@ -9,9 +9,9 @@ package cn.wisenergy.service.wxpay;
public class WxCommon { 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";
......
...@@ -13,7 +13,7 @@ spring: ...@@ -13,7 +13,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
# 环境 dev|test|prod # 环境 dev|test|prod
profiles: profiles:
active: dev active: prod
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
......
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