Skip to content

B
browser-backend
Commit 9539bb16 authored by Qingsong Li's avatar Qingsong Li
Browse files
Options

remove secret information

parent 582b80dc
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 225 deletions
build.sh
View file @ 9539bb16
......@@ -3,9 +3,9 @@ git pull origin master
mvn package spring-boot:repackage -Dmaven.test.skip=true
export DOCKER_HOST=registry.cn-shenzhen.aliyuncs.com
export DOCKER_USER=liqingsong@1616554330968404
export DOCKER_PASS=Edgec2018
export DOCKER_HOST=xxx
export DOCKER_USER=xxx
export DOCKER_PASS=xxx
export COMMIT=`date +%s | md5sum | head -c 10 ; echo`
export TAG="latest"
......
devops/.env
View file @ 9539bb16
......@@ -6,5 +6,5 @@ ACCOUNT_SERVICE_PASSWORD=123
MONGODB_PASSWORD=123
MONGODB_SUPER_PASSWORD=Cdex32eO9
#DOCKER_HOST=tcp://registry-vpc.cn-shenzhen.aliyuncs.com:80
DOCKER_USER=liqingsong@1616554330968404
DOCKER_PASS=Edgec2018
\ No newline at end of file
DOCKER_USER=xxxx
DOCKER_PASS=xxxx
\ No newline at end of file
devops/build-staging.sh
View file @ 9539bb16
......@@ -13,9 +13,9 @@ if [ "$2" == "y" ]; then
fi
export DOCKER_HOST=registry-vpc.cn-shenzhen.aliyuncs.com
export DOCKER_USER=liqingsong@1616554330968404
export DOCKER_PASS=Edgec2018
export DOCKER_HOST=xxxx
export DOCKER_USER=xxxx
export DOCKER_PASS=xxxx
export COMMIT=`date +%s | md5sum | head -c 10 ; echo`
#export COMMIT="latest"
......
src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java
View file @ 9539bb16
......@@ -17,7 +17,6 @@ import com.edgec.browserbackend.account.service.AccountService;
import com.edgec.browserbackend.account.service.PaymentService;
import com.edgec.browserbackend.account.service.SmsUtils;
import com.edgec.browserbackend.alipay.AlipayConfig;
import com.edgec.browserbackend.alipay.CloudamAlipayConfig;
import com.edgec.browserbackend.alipay.VpsAlipayConfig;
import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
import com.edgec.browserbackend.browser.domain.PayBack;
......@@ -120,8 +119,7 @@ public class PaymentServiceImpl implements PaymentService {
// 1. 构建微信支付订单查询数据，并获取微信支付订单信息
// 获取微信支付订单存在失败的情况，所以针对失败情况去使用定时任务来重新调用本方法
boolean isVpsClient = true;
WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
WXPayConfig ourWxPayConfig = new FGLWxConfig();
WXPay wxPay = new WXPay(ourWxPayConfig);
Map<String, String> data = encapsulateWxOrderDataMap(tradeno, ourWxPayConfig);
Map<String, String> respData = wxPay.orderQuery(data);
......@@ -245,7 +243,7 @@ public class PaymentServiceImpl implements PaymentService {
// 获取支付宝支付的配置信息
boolean isVpsClient = true;
AlipayConfig alipayConfig = isVpsClient ? new VpsAlipayConfig() : new CloudamAlipayConfig();
AlipayConfig alipayConfig = new VpsAlipayConfig();
// 获取支付宝的 client
AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getURL(), alipayConfig.getAPPID(),
alipayConfig.getAPP_PRIVATE_KEY(), "json", alipayConfig.getCHARSET(),
......@@ -287,8 +285,7 @@ public class PaymentServiceImpl implements PaymentService {
String notifyUrl = AccountController.WECHAT_PAY_CALLBACK_URL + internalOrder.getTradeNo();
// 获取微信支付的配置信息
boolean isVpsClient = true;
WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
WXPayConfig ourWxPayConfig = new FGLWxConfig();
// 封装请求 微信支付 的数据
Map<String, String> data = encapsulateDataMap(amount, internalOrder, notifyUrl, ourWxPayConfig);
......@@ -399,7 +396,7 @@ public class PaymentServiceImpl implements PaymentService {
// String redirectUrl = "https://www.cloudam.cn";
// String redirectUrlEncode = URLEncoder.encode(redirectUrl, "utf-8");
WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
WXPayConfig ourWxPayConfig = new FGLWxConfig();
WXPay wxPay = new WXPay(ourWxPayConfig);
Map<String, String> data = new HashMap<>();
......@@ -463,7 +460,7 @@ public class PaymentServiceImpl implements PaymentService {
byName.getPromotion().setWithdrawn(byName.getPromotion().getWithdrawn() + amount);
accountRepository.save(byName);
AlipayConfig alipayConfig = isVpsClient ? new VpsAlipayConfig() : new CloudamAlipayConfig();
AlipayConfig alipayConfig = new VpsAlipayConfig();
DefaultAlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getURL(), alipayConfig.getAPPID(), alipayConfig.getAPP_PRIVATE_KEY(),
"json", alipayConfig.getCHARSET(), alipayConfig.getALIPAY_PUBLIC_KEY(), alipayConfig.getSIGN_TYPE());
......@@ -564,7 +561,7 @@ public class PaymentServiceImpl implements PaymentService {
}
boolean isVpsClient = true;
WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
WXPayConfig ourWxPayConfig = new FGLWxConfig();
WXPay wxPay = new WXPay(ourWxPayConfig);
Map<String, String> data = encapsulateWxOrderDataMap(tradeno, ourWxPayConfig);
Map<String, String> respData = wxPay.orderQuery(data);
......
src/main/java/com/edgec/browserbackend/alipay/AlipayConfig.java
View file @ 9539bb16
......@@ -18,14 +18,6 @@ public abstract class AlipayConfig {
public static String RETURN_URL_VPS_FRONT = "https://www.fangguanlian.cn/home/detail.html?order="; // VPS购买
public static String RETURN_URL_C3IP = "https://www.cloudam.cn/v2/console/ipcloud-buy?alipayreturn="; //c3ip云购买
public static String RETURN_URL_MODIFYSPEC_DESC = "https://cloudam.cn/v2/console/child-page/4";
public static String RETURN_URL_MODIFYSPEC_ASC = "https://cloudam.cn/v2/console/child-page/3";
public static String RETURN_URL_ORDER = "https://www.cloudam.cn/v2/console/orderDetail?alipayreturn=";
public static String RETURN_URL_BROWSER = "https://www.fangguanlian.cn/web/paySuccess.html?alipayreturn=";
public static String ALIPAY_AUTH_URL = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm";
......
src/main/java/com/edgec/browserbackend/alipay/CloudamAlipayConfig.java deleted 100644 → 0
View file @ 582b80dc
package com.edgec.browserbackend.alipay;
import org.apache.commons.lang3.StringUtils;
public class CloudamAlipayConfig extends AlipayConfig{
@Override
public String getAPPID() {
return "2019071765790965";
}
@Override
public String getAPP_PRIVATE_KEY() {
return "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDU+npZLO6AoKN" +
"lQBO/3gOMTJEeOBDV5zRdvkrMUBq8R5r5phzkq2T2lxg5gMnZx6Lk/NZ0evSntMG" +
"PzKXFEmVdBKRuqQvQ7gaZNeWA494sCP76dEDPREcvs7qcP7xTuK9/FTqPQH3iUEA" +
"058N03/edQGdv1HLi3BmTYdp2ywZQsb0hqGu6/pPYCLnwSprBdWv1nG3zstcBEmK" +
"PYNKipzy0LpHiGB445XO0EJWV/XK6t1knDKrC6FFiFfxuLy3fHy37jjFW2TxZLSc" +
"ROGs0Py+w9saxIJ1n7jGJqHCQmyuNgPKtelYy1jpbdXIX/2bhW1ck4dOCF8j37Gc" +
"cGZR+c3nAgMBAAECggEASFW1FDe0zzfKvT/mw1qcTTUu1milNIsnifKzR6mPn4r3" +
"pyHYZ0R0f4KoH0JO/LKVfz8lKagx2ufyYifZRlW/Alff4JPr5Y0AitW5eNaMtTcV" +
"vF7UhoyA39JRskRyRU7fbVga4jwBlHgB2JqGFoqymeFe3dpSIjzbPSeM9Ei0Rg3s" +
"hIv+An/U2optO29ggsC0hXyHWXLupaMwbIpBTOHDiFzxW7z4ZxUH1jAL0jvQxuNN" +
"YEY8vAcvJAlz4iab5x2vlEn00crfhE+kwO6f+0Am7spDKjkjsVX8mioD+J/VozZk" +
"517zz5EF66DdtD5i9LdLIGBsWjagbINtVrH7KWqlgQKBgQDzWxlOMpjsP/WFk0L5" +
"ic7HJvflbz+hCJAyQlDAy43Ls8nVYIkeTk2Umae+uSbkMga2N83LN4e1FRNGDjGB" +
"JNDHtzAF3aAwPXS+PDwLGDrgQ44KN8aw/1dt0W9TiBVLHOhAjqPO4UqW0wkgSwNh" +
"HqeuR1GwLyp5IueFZxX/YhNT4QKBgQDNef0W6fDhhcsxyLm5dDL+LuenE1omas74" +
"zNKPaR7yQpZOxqdJYXEI6nrJ1vTUOLa1nqT1/n8kgLNDASRQH5NFQfSizRG07tij" +
"3NLto8DD89h82y7IbY1Rz38FH3Mf+W7soKMKo6tQb7oHOZm2uDTlSpe25neDSJeI" +
"kL+JsEbaxwKBgQCkAOYJ/DFxLh2CGt+NGqF/N7TjK9k+5m1/YY/YjpYODSldowRl" +
"pzHDjtYsw80BBvHdBbisVs0fbYeis9gLB8uofL1hhp35RMGTnzZ756VuFDj6i+Jc" +
"0IiUWwviyJhJGb8wGrEssEo7YRgKamNppWYuHqRfzzmZj7tl/TYm+Wq7IQKBgBFo" +
"NDisuOtiGkStbI55eZhvAND2orx+b+pD79KWZTjAy1sBGUruJlVLB/vxaexQoanh" +
"NrhgRwUgog8bGahwBFnprH/eP5HEajX3jybyqHHxRnXNW7k/DqnPmkMk1uvuhacm" +
"NKnCE9FMpcXW616/XDvQhenIvHcyvyOin5dah6YhAoGASANVYkA4JX3cTXzDvlzh" +
"5l/afal++mv6Ld2TH/3aeg2CBh2HzNIUBCr/SQFpqOjQf6L2lpftDPIbtDB7ogVv" +
"roAgSIXPlz+TK9rgMRI/uzWTP4J164r2UBs5aT5N5Y6hArL7ce1+1QemCsevFRTP" +
"tHwdG2+8KyXqSWp4eyFmBFs=";
}
@Override
public String getALIPAY_PUBLIC_KEY() {
return "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkXY3UcHC2Eu4X0Ggf36Kz94aag+nGoBhIjcyXADTCsqYpKLenWC/RzgzbipFKOur+Z8AyxK9pk4Z/B5NlMuSsNM+D4cHdRl21qZszXlygTNIxOnl+tGdlbxjEmlIqwuhSFZRAz7/zhAQ0Rto/1mz+DNmHvhXpXY91xVMLetWXkIKQR+D5IXtAXVkssHevRMiMhMrlazw9Gn1vS+8iKy+Op9G7o9M2LvNiKv0HNOIhvoMqntdPCFWgGNuXMPoobsfkD8dFQs2GzuERgWs+maBQuHWXkghk4RoMYCjS0wKvm8zxJVfHmQ6yApcM676R1pRpJrMzX+LTQINm3UQCaCxKwIDAQAB";
}
@Override
public String getNOTIFY_URL() {
return "https://www.cloudam.cn/accounts/0xalipaycallback/";
}
// public static String RETURN_URL_CLOUDAM = "https://www.cloudam.cn/v2/console/finance?alipayreturn="; // cloudam 费用中心，账户余额
//
// public static String RETURN_URL_CVM = "https://www.cloudam.cn/v2/console/cloudhost-buy?alipayreturn="; // 云主机购买
//
// public static String RETURN_URL_VPS = "https://www.fangguanlian.cn/vpsconsole/vps/cost?alipayreturn="; // vps 费用中心， 账户余额
//
// public static String RETURN_URL_VPS_FRONT = "https://www.fangguanlian.cn/home/detail.html?order="; // VPS购买
@Override
public String getSIGN_TYPE() {
return "RSA2";
}
@Override
public String getCHARSET() {
return "utf-8";
}
@Override
public String getURL() {
return "https://openapi.alipay.com/gateway.do";
}
@Override
public String getReturnUrl(boolean isVpsClient, String by) {
if (StringUtils.isNotEmpty(by)) {
switch (by) {
case "1":
return RETURN_URL_VPS_FRONT; // vps购买
case "2":
return RETURN_URL_CVM; // 云主机购买
case "3":
return RETURN_URL_C3IP; //云ip购买
case "4":
return RETURN_URL_MODIFYSPEC_ASC;
case "5":
return RETURN_URL_MODIFYSPEC_DESC;
case "6":
return RETURN_URL_ORDER;
}
}
// 费用中心
if (isVpsClient) {
return RETURN_URL_VPS;
} else {
return RETURN_URL_CLOUDAM;
}
}
}
\ No newline at end of file
src/main/java/com/edgec/browserbackend/alipay/VpsAlipayConfig.java
View file @ 9539bb16
......@@ -7,42 +7,17 @@ public class VpsAlipayConfig extends AlipayConfig{
@Override
public String getAPPID() {
return "2019091967616095";
return "xxxx";
}
@Override
public String getAPP_PRIVATE_KEY() {
return "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQi9PVnyGA+r1Q"+
"Fu08beA/oGX1FBBWMl6A1e7LydbpFutHY2gtLszQquM2CnfR6cS+p2lhNLRO1al9" +
"LO26NR7F+UEbj0ieo1HLss8jS8qpmIcMjWdYYvEbiK19lEW0aYO2tgDKj+JGtvru" +
"L9mBZnr4quuQPa8gBb07DbJ+GsXBNWfRyz3YjVKfzwbU85azu72Gh/cRvqX6Zcbk" +
"1nlbfvHkhGTv/JkTQBT3ilo2bhPffFyArI20gwA0a9zAGr4h31QOl6Sw6mv3q8ed" +
"u4vBl0vVAAKiQJW1e52thLuJ5tflZToqnk5A7QdwqfCe8mksA3V/97+T04bUzINn" +
"QhFK4Q/JAgMBAAECggEAbN0BONt33t+FIaDGOKxWyoANmTDfEk/62yBSJpl3kXfA" +
"XCS9RhDPJAKA1z4BrFdut+Omc/LSSPDqKAjjFDgUl131KdDTJNS2pzHxRUiUQ5H2" +
"tYu/LfmASVJA1nQnKvWFp0Q9B4Cyqx1rwhjCXvVDLjny+/nnSD0WuhP9YCzTnHY1" +
"U7djStrlHmVmiIrHlSV4Myul0Y7AWy2r7X/f43eSra1UP8J2KmN7IYD1nW19Fkdn" +
"uDnXXDLcctnZ5toMjMbikjzvKyMW8HnPyG5aHztJlJWQ33tpAZBkAIWZ4/4KuVLa" +
"zt6MPUXPEw7urWHVg1cqKprAlShVL5G6mCD2AJ6mPQKBgQD8Iv9GqYmaeW4NBQYn" +
"jInoDYaHU2VUwYXwuNjqm7IgVgf6VHqJ5aj5EA+gClpzH6HzLvuEEZ5D4XTlpbHa" +
"AN8h3aMo2lryEB8Cv/6uMjMYRFkuuMCVc1XaAsjTxJhO1qwsW4/IkWIoM7uGMD74" +
"5zGvWg12QQuMPV7sVXT0XCrxFwKBgQDTvdjdu3QdIWYUaiRIkF/8e+6+finFZ0Dt" +
"aaTnZ6mDSGaBwGqOSt+woOB61Vkl/EoaLpPGW0mKmhSlAnrD04LmB1LNt16W39RN" +
"5mjVxBdHIkyWUcQAq46kNYvPJ6BGJkZiRW1eOrXfw0fTBQPb3X1Na2cWBzvT4+tw" +
"Am1Sjv/SHwKBgQDkCKLnvZ194CTwEYMncaun+9OXwIz8wqnotMU6KeZH6Ib+mDjb" +
"TqIr36LCE5sKU6mczvka0PRaYCXhLKJVkEQ91L4jzJhEJOBnFE26LhyX7fjakK1c" +
"fRtAORR4sm0toGnHFGhN9W7Y/TC0hB3v7ui4trFGKj3PcBHRnNhRyKntsQKBgGR2" +
"xEnYYixcJ2nyPorrbY+HYeyiQcF2zziWEnb1GVm/5VsU57nhzqaofjnptmWugZ5Q" +
"kS7hK1CG8NqmBYeaeJYZzXDr2wZs5vebJgyfAIhwvrPn0b6bp49EFLTSUVpXWLfR" +
"xyWZZ6fmqNJ3o7ATNBuipQOvpPRRROkdTa+JR9nzAoGBAJV4ejLCkgllaGr7IISK" +
"YgYNicZKqzNtJ7JTxYsH7pylNHC8eo63S+xNv5xCUp85vjHGQXbp+HY3HeEqzkRn" +
"PS7gkR0Q9tpdX03xREkWodj0GchdjwRgSlHK9W30x00pccv0iDlxSrGJUVLTqFlu" +
"fCu0gOJ91NfpFLX9bP1YN29V";
return "xxx";
}
@Override
public String getALIPAY_PUBLIC_KEY() {
return "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhwIiSpdHHs7XgZyNiSA++/usN6Sg2IKLlEUhfy89yig9GSGyb2p/VW7Ei4/5IuG9hM0yQx9bM28VDMj/KO0Y5VCcOgrVB11UhfdwpLx8JQXB9u9x0gf/q/wovdxBgqtStLuQ98vveID2O/nf+PluWfq/90EgiQs16fi91b7H150fHr3ra8HHTuvCMKGBck3QUURrRp9OdQaa/vPQjuEyVUNUyX9B9HRdn4PkigI/5rrxjVt4r/jvSOR2MhgBo0QKIm4lCxNibumAHN/w+mewjmoTu77X14bn80V1xPjTRfRohyuW1t0pOcPIpiV7FmlQB0T6uzKZ8I3vVg4l0SxfdQIDAQAB";
return "xxxx";
}
......
src/main/java/com/edgec/browserbackend/wxpay/CloudamWxConfig.java deleted 100644 → 0
View file @ 582b80dc
package com.edgec.browserbackend.wxpay;
import java.io.InputStream;
public class CloudamWxConfig extends WXPayConfig {
@Override
public String getAppID() {
return "wx5a3621300bfec508";
}
@Override
public String getMchID() {
return "1535208831";
}
@Override
public String getKey() {
return "acdkgjef237ckgSriEICRe2408sdjSKJ";
}
public int getHttpConnectTimeoutMs() {
return 8000;
}
public int getHttpReadTimeoutMs() {
return 10000;
}
@Override
public InputStream getCertStream() {
return getClass().getResourceAsStream("/certs/wx_cert.p12");
}
@Override
public IWXPayDomain getWXPayDomain() {
IWXPayDomain iwxPayDomain = new IWXPayDomain() {
public void report(String domain, long elapsedTimeMillis, Exception ex) {
}
public DomainInfo getDomain(WXPayConfig config) {
return new IWXPayDomain.DomainInfo(WXPayConstants.DOMAIN_API, true);
}
};
return iwxPayDomain;
}
@Override
public String getBody() {
return "Cloudam深圳云端软件-用户充值";
}
@Override
public String getWebUrl() {
return "https://www.cloudam.cn/";
}
}
src/main/java/com/edgec/browserbackend/wxpay/FGLWxConfig.java
View file @ 9539bb16
......@@ -5,17 +5,17 @@ import java.io.InputStream;
public class FGLWxConfig extends WXPayConfig {
@Override
public String getAppID() {
return "wx5a3621300bfec508";
return "xxxx";
}
@Override
public String getMchID() {
return "1553406861";
return "xxxxx";
}
@Override
public String getKey() {
return "acdkgjef237ckgSriEICRe2408sdjEDC";
return "xxxx";
}
public int getHttpConnectTimeoutMs() {
......
src/main/resources/application.yml
View file @ 9539bb16
......@@ -11,8 +11,8 @@ spring:
mail:
host: smtp.qiye.aliyun.com
port: 465
username: info@cloudam.io
password: Edgec2018
username: xxxx
password: xxxx
properties:
mail:
smtp:
......
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