Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
2fd4700b01
2 changed files with 31 additions and 22 deletions
  1. +22
    -22
      mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java
  2. +9
    -0
      mallinkService/src/main/java/com/iformall/utils/Base64Util.java

+ 22
- 22
mallinkService/src/main/java/com/iformall/service/pay/alipay/api/AliPayApi.java View File

@@ -10,9 +10,9 @@ import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelColumn
import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelFieldRule;
import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelRequest;
import com.iformall.service.pay.alipay.api.reqEntity.AlipayMemberCardModelStyle;
import com.iformall.utils.Base64Util;
import com.iformall.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Base64Util;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -72,29 +72,29 @@ public class AliPayApi {
* @throws UnsupportedEncodingException
*/
public static String getAppAuthUrl(Config config,String callback,String param) throws UnsupportedEncodingException {
//String paramstr = "";
//if (!StringUtils.isBlank(param)) {
// paramstr = "&state="+param;
//}
//return "https://openauth.alipay.com/oauth2/appToAppBatchAuth.htm?app_id="+config.appId+"&application_type=TINYAPP,WEBAPP,MOBILEAPP,PUBLICAPP&redirect_uri="+URLEncoder.encode(callback, "utf-8")+paramstr;
String state = "";
String paramstr = "";
if (!StringUtils.isBlank(param)) {
state = param;
paramstr = "&state="+Base64Util.encode(param).replaceAll("=", "");
}
Map map = new HashMap();
map.put("platformCode", "0");
map.put("taskType", "INTERFACE_AUTH");
Map agentOpParam = new HashMap();
agentOpParam.put("redirectUri", callback);
String[] apptypes = new String[]{"MOBILEAPP","WEBAPP","PUBLICAPP","TINYAPP","BASEAPP"};
agentOpParam.put("appTypes", apptypes);
agentOpParam.put("isvAppId", config.appId);
agentOpParam.put("state", Base64Util.encode(param));
map.put("agentOpParam", agentOpParam);
return "https://b.alipay.com/page/message/tasksDetail?bizData="+URLEncoder.encode(JSON.toJSONString(map), "utf-8");
return "https://openauth.alipay.com/oauth2/appToAppAuth.htm?app_id="+config.appId+"&application_type=TINYAPP,WEBAPP,MOBILEAPP,PUBLICAPP&redirect_uri="+URLEncoder.encode(callback, "utf-8")+paramstr;
// String state = "";
// if (!StringUtils.isBlank(param)) {
// state = param;
// }
// Map map = new HashMap();
// map.put("platformCode", "0");
// map.put("taskType", "INTERFACE_AUTH");
//
// Map agentOpParam = new HashMap();
// agentOpParam.put("redirectUri", callback);
// String[] apptypes = new String[]{"MOBILEAPP","WEBAPP","PUBLICAPP","TINYAPP","BASEAPP"};
// agentOpParam.put("appTypes", apptypes);
// agentOpParam.put("isvAppId", config.appId);
// agentOpParam.put("state", Base64Util.encode(param));
//
// map.put("agentOpParam", agentOpParam);
//
// return "https://b.alipay.com/page/message/tasksDetail?bizData="+URLEncoder.encode(JSON.toJSONString(map), "utf-8");
}
/**


+ 9
- 0
mallinkService/src/main/java/com/iformall/utils/Base64Util.java View File

@@ -170,6 +170,15 @@ public class Base64Util {

}

/**
*
* @param data
* @return
*/
public static String encode(String data) {
return encode(data.getBytes());
}
/**
*
* @param data


Loading…
Cancel
Save