Skip to content

caosy / fun-common

Go to a project
Commit fb32a73e by Huang Linyu
Options

Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-common into f-6.6.3

parents d30d3ede 12497fff
Inline Side-by-side
Showing with 75 additions and 32 deletions
fun-common-core/src/main/java/com/ctrip/fun/common/core/util/DateUtil.java
......@@ -363,6 +363,11 @@ public class DateUtil {
public static void main(String[] args) throws ParseException {
DateUtil.getDates("2014-05-26", "2014-06-26", "1");
System.out.println(DateUtil.addDays(new Date(), 1));
long day = getDistinceDay(parseDate("2017-10-23"), new Date());
System.out.println("day---->"+day);
}
// 获取相隔天数
......
fun-common-core/src/main/java/com/ctrip/fun/common/core/util/EncryptUtil.java
......@@ -291,7 +291,8 @@ public class EncryptUtil {
}
public static void main(String[] args) throws Exception{
String src = "3e6f1a1c511148c492d7abc694f6a9";
// String src = "3e6f1a1c511148c492d7abc694f6a9";
String src = "1234567.com";
byte[] key = {67, 116, 114, 105, 112, 46, 73, 87, 97, 110, 45, 71, 111, 108, 102, 64, 68, 83, 84, 53, 56, 53, 48, 57};
byte[] result = EncryptUtil.encryptBy3Des(key, src.getBytes());
String base64str = new String(Base64.encodeBase64(result));
......@@ -306,6 +307,16 @@ public class EncryptUtil {
// PBKDF2
System.out.println(getMD5Str("12345"));
System.out.println(authenticate(getMD5Str("12345"), toByte("641FD40ED3EBFA29C66A329C937F749538A64F0A"), toByte("7D7B435E0A7DC4EA")));
byte[] bb = Base64.decodeBase64("h3xP2d5oUbUh6xmwLKXa4Q==");
byte[] plain1 = null;
try {
plain1 = EncryptUtil.decryptBy3Des(key, bb);
System.out.println("plain1:"+new String(plain1));
} catch (Exception e) {
}
}
......
fun-common-soa/src/main/java/com/ctrip/fun/golf/service/rongyun/RongYunService.java
......@@ -17,8 +17,8 @@ import com.ctrip.fun.common.vo.rongyun.response.RongYunTokenResponse;
public class RongYunService {
private String rongyunAppKey = "tdrvipksrrcm5";
private String rongyunAppSecret = "x4368Fr6lZw";
private String proxyHostname = "10.8.16.106";
private int proxyPort = 8080;
private String proxyHostname;// = "10.8.16.106";
private int proxyPort;// = 8080;
/**
* 用uid换取融云tokenApi
......
fun-common-soa/src/main/resources/app.properties
......@@ -40,8 +40,10 @@ PINGAN_TRUSTSTOREPASSWORD=${PINGAN_TRUSTSTOREPASSWORD}
PINGAN_ELECTRONIC_URL=${PINGAN_ELECTRONIC_URL}
#connect
proxyHost=${proxyHost}
proxyPort=${proxyPort}
#proxyHost=${proxyHost}
#proxyPort=${proxyPort}
proxyHost=
proxyPort=0
umeng_api_key=${umeng_api_key}
umeng_api_secret=${umeng_api_secret}
......
fun-common-soa/src/main/resources/debug/app.properties
......@@ -21,14 +21,10 @@ weather.sign=sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json
weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#payment2
payment.createPayOrderPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/createpayorder
payment.payOrderOperatePath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/payoperation
payment.queryPayStatusPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/queryPayStatus
payment.serverBaseNotifyPath=http://10.8.55.46:8080/fun-golf-service
#payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
#payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
#payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
#payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
#express
expressUrl=http://www.kuaidi100.com/poll
......@@ -44,8 +40,10 @@ PINGAN_TRUSTSTOREPASSWORD=paic1234
PINGAN_ELECTRONIC_URL=http://epcis-ptp-dmzstg1.pingan.com.cn:9080/epcis.ptp.partner.getAhsEPolicyPDFWithCert.do
#connect
proxyHost=10.8.16.106
proxyPort=8080
#proxyHost=10.8.16.106
#proxyPort=8080
proxyHost=
proxyPort=0
#umeng
umeng_api_key=57e8b616e0f55afc8e0028e8
......
fun-common-soa/src/main/resources/development/app.properties
......@@ -22,15 +22,15 @@ weather.imagePath=http://7x2w1g.com1.z0.glb.clouddn.com/
#payment2
#payment.createPayOrderPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/createpayorder
payment.createPayOrderPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/createpayorder
payment.payOrderOperatePath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/payoperation
payment.queryPayStatusPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/queryPayStatus
payment.serverBaseNotifyPath=http://localhost:5354/fun-golf-service
#payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
#payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
#payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
#payment.payOrderOperatePath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/payoperation
#payment.queryPayStatusPath=http://ws.security.pay.fat103.qa.nt.ctripcorp.com/api-webapp/json/queryPayStatus
#payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
payment.createPayOrderPath=https://payapi.ctrip.com/api-webapp/json/CreatePayOrder
payment.payOrderOperatePath=https://payapi.ctrip.com/api-webapp/json/payoperation
payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStatus
payment.serverBaseNotifyPath=http://localhost:8080/fun-golf-service
#express
expressUrl=http://www.kuaidi100.com/poll
expressKey=eezQpjws5509
......@@ -45,8 +45,11 @@ PINGAN_TRUSTSTOREPASSWORD=paic1234
PINGAN_ELECTRONIC_URL=http://epcis-ptp-dmzstg1.pingan.com.cn:9080/epcis.ptp.partner.getAhsEPolicyPDFWithCert.do
#connect
proxyHost=10.8.16.106
proxyPort=8080
#proxyHost=10.8.16.106
#proxyPort=8080
proxyHost=
proxyPort=0
#umeng
umeng_api_key=57e8b616e0f55afc8e0028e8
......
fun-common-soa/src/main/resources/production/app.properties
......@@ -27,7 +27,8 @@ payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStat
#payment.createPayOrderPath=https://payapi.ctrip.com/api-merchant/json/CreatePayOrderV3
#payment.payOrderOperatePath=https://payapi.ctrip.com/api-merchant/json/PayOperationV3
#payment.queryPayStatusPath=https://payapi.ctrip.com/api-merchant/json/QueryPayStatusV3
payment.serverBaseNotifyPath=http://service.golf.fun.ctripcorp.com/fun-golf-service
#payment.serverBaseNotifyPath=http://service.golf.fun.ctripcorp.com/fun-golf-service
payment.serverBaseNotifyPath=http://192.168.1.170:8080/fun-golf-service
#express
expressUrl=http://www.kuaidi100.com/poll
......@@ -43,8 +44,10 @@ PINGAN_TRUSTSTOREPASSWORD=paic1234
PINGAN_ELECTRONIC_URL=https://epcis-ptp.pingan.com.cn/epcis.ptp.partner.getAhsEPolicyPDFWithCert.do
#connect
proxyHost=10.8.16.106
proxyPort=8080
#proxyHost=10.8.16.106
#proxyPort=8080
proxyHost=
proxyPort=0
#umeng
umeng_api_key=583526f0734be455c1001d20
......
fun-common-soa/src/main/resources/test/app.properties
......@@ -30,7 +30,7 @@ payment.queryPayStatusPath=https://payapi.ctrip.com/api-webapp/json/queryPayStat
#payment.createPayOrderPath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/CreatePayOrderV3
#payment.payOrderOperatePath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/PayOperationV3
#payment.queryPayStatusPath=http://ws.proxy.fx.fws.qa.nt.ctripcorp.com/soa2/11599/json/QueryPayStatusV3
payment.serverBaseNotifyPath=http://10.8.55.46:8080/fun-golf-service
payment.serverBaseNotifyPath=http://112.65.124.86:18081/fun-golf-service
#express
expressUrl=http://www.kuaidi100.com/poll
......@@ -46,8 +46,8 @@ PINGAN_TRUSTSTOREPASSWORD=paic1234
PINGAN_ELECTRONIC_URL=http://epcis-ptp-dmzstg1.pingan.com.cn:9080/epcis.ptp.partner.getAhsEPolicyPDFWithCert.do
#connect
proxyHost=10.8.16.106
proxyPort=8080
proxyHost=
proxyPort=0
#umeng
......
fun-common-soa/src/main/resources/uat/app.properties
......@@ -41,8 +41,8 @@ PINGAN_TRUSTSTOREPASSWORD=paic1234
PINGAN_ELECTRONIC_URL=https://epcis-ptp.pingan.com.cn/epcis.ptp.partner.getAhsEPolicyPDFWithCert.do
#connect
proxyHost=10.8.16.106
proxyPort=8080
proxyHost=
proxyPort=0
#umeng
umeng_api_key=57e8b616e0f55afc8e0028e8
......
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderListExcelBean.java
......@@ -56,6 +56,8 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
private String userType;
private Double insuranceAmount;
private boolean isDelayOrder;
public Date getRegisterTime() {
return registerTime;
......@@ -167,5 +169,13 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
this.insuranceAmount = insuranceAmount;
}
public boolean isDelayOrder() {
return isDelayOrder;
}
public void setDelayOrder(boolean isDelayOrder) {
this.isDelayOrder = isDelayOrder;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpOrderQuery.java
......@@ -53,6 +53,8 @@ public class OpOrderQuery extends AbstractPagedQuery {
private Integer resourceId;
private String city;
private Boolean delayOrder;
/**
* @return the userId
......@@ -266,4 +268,13 @@ public class OpOrderQuery extends AbstractPagedQuery {
this.city = city;
}
public Boolean getDelayOrder() {
return delayOrder;
}
public void setDelayOrder(Boolean delayOrder) {
this.delayOrder = delayOrder;
}
}
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 sign in to comment