diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPayIntegration.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPayIntegration.java index 32e7d66..3215220 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPayIntegration.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPayIntegration.java @@ -27,10 +27,11 @@ public class AliPayIntegration { public String pay(OrderTrade tradeEntity) throws Exception { Factory.setOptions(config); //调用支付宝的接口 - AlipayTradePrecreateResponse payResponse = Factory.Payment.FaceToFace() - .preCreate("商城", - tradeEntity.getCode(), - tradeEntity.getPaymentAmount().toString()); +// AlipayTradePrecreateResponse payResponse = Factory.Payment.FaceToFace() +// .preCreate(tradeEntity.getUserName(), +// tradeEntity.getCode(), +// tradeEntity.getPaymentAmount().toString()); + AlipayTradePrecreateResponse payResponse = Factory.Payment.FaceToFace().preCreate("订单主题:Mac笔记本", "LS123qwe123", "19999"); //参照官方文档响应示例,解析返回结果 String httpBodyStr = payResponse.getHttpBody(); JSONObject jsonObject = JSONObject.parseObject(httpBodyStr); diff --git a/mcwl-admin/src/main/java/com/mcwl/web/core/config/CorsConfig.java b/mcwl-admin/src/main/java/com/mcwl/web/core/config/CorsConfig.java deleted file mode 100644 index 0eae7b1..0000000 --- a/mcwl-admin/src/main/java/com/mcwl/web/core/config/CorsConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.mcwl.web.core.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -/** - * 跨域配置 - */ -@Configuration -public class CorsConfig { - - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); - CorsConfiguration corsConfiguration = new CorsConfiguration(); - corsConfiguration.addAllowedOrigin("*"); - corsConfiguration.addAllowedHeader("*"); - corsConfiguration.addAllowedMethod("*"); - urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); - return new CorsFilter(urlBasedCorsConfigurationSource); - } -} diff --git a/mcwl-admin/src/main/resources/application.yml b/mcwl-admin/src/main/resources/application.yml index f5c7415..9ee7657 100644 --- a/mcwl-admin/src/main/resources/application.yml +++ b/mcwl-admin/src/main/resources/application.yml @@ -180,7 +180,8 @@ mall: protocol: https gatewayHost: openapi-sandbox.dl.alipaydev.com signType: RSA2 - appId: 9021000138607290 - privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCarcUREqQVHIYq4FBuqvcYxOxsuUI3gOphRXcN0k/hIUV7fcfO9ivui99pJihbou9MmC22FM7hzFMHHl4GvZQJuw/GgJlnh9T/SlfS9Awlr0nbzVtXYOd7Os1EM4Jry2PW3zkvaWMvO3DfcYU47bqN8aw+vVBhSVeVhq41zKkH9k8UPw6Ny4WmVUHje84ykf1uBR8AqPxEeDIYD79CGGLtGLECuHoeRsVpGrNmZxwmcen1Bwf8oWiM68+Ein3S/pV69ED6x74+/WDJO71IHUJN+1DclLVXWVGriUenUzTVrAhh8RHgtF5J+t4K24qrGpbsryXzuYJ/p872ieI2oFnLAgMBAAECggEAVfbziiyJAq6qplOqgAcGcz6mgzpm4cAFAvB/XTAgcudx3VMnZA+OlPIpxR+O2Hbydegxp3tjCzzqfA9VhHuCNfI/rzuzhkWIjCV+L+Cwi5UjAETeWe6iV+tzP089UbllEHtZJc91bz+i2JwXxW7h+pdw+iFu9dK0GYcTdRT8cE6FVkBtRikUMA/bAQ4f5umF/vv5yx2XsyfCJddyI2eKIOQQ3FZ27/EEvj+hkWFGj+hcTO0zchCzYudaUyhVanJfPOTMeQrh5J9d13HXQYH0qPT4NYrLSXPjl04zAhWyZQw50kFMpkYnog0i9E9XWESSBXilALd2hITmRAj8MPqi8QKBgQDmJ4P5Fa88nvBoPvpjkevcoOP7EzokvsJuw9QHwr7mKwY5/uTrDkHmgy0iIQJ7BQmYOTW+CcwAcaquQwZrdauxsto5sG+Vle62e9FIGxqsCqrzqRS3bKY2NHUS33Ep43lA9Uz07wYchFHs17e4rTidotaWd+ONhGu2zi44vXZOMwKBgQCsDHr1fDoKplRnJ9Na+YkkpG86lGvHW8R/69dn4ur89mCGhFyexLrSA1NggAMYT9pADg4G2jYvsPa+0ynV4rg8fmvfgpO9dvv3UoOGBxxdzaxNlIdb5LsuyQMN6wcWNSQFH9qDt9nyZ5BLCQXd/DJLMtgLSBpAYi+HZD1E4Zv+CQKBgQCaDZslr+ES56QtcvIwkazZigvvtCf4DoOglo2nADC9adEKItZhi7KKtAUS0huR8oZAkRKq+G3HYk4HxK9YYHQjRn8RnEqkSq51ER29cP8CZ0WUQPmv6Ra8M5KlplBd5Hf2BfuT+yYREnSv3piIEdJSmXufTfJPeHKM8yc3LYIxxwKBgFnjK1qWTLzDqdU7OXGObdh3EKXKZYUCrOcokKH2LE99aXDeNoW8wt52XllMiFFrZtuQfEOYPjcsfb21FWZpzVfNtQ5Ral7Si1HsCks769YWXq8pqo6YMjN/UdkzscAog2kp+0BWDchX00tgq3APEze2mKlMQmrg4XQbKueR964BAoGBAMA5mWyKVfphQ2SsOrYSF5hQ7PBaTT/gLLU2CWBcCXge4oO7dd3MIsd2+7cJG9uYPiSgJdLGqmVfet4pBXNd4znYjHunRr6BukTZzQSNujn0j2fr3SDN46vuqVjYsPF05hGWy3XH5NflrTHq7RO6qkqcqxdaSCRZO7a9G+ckzvx/ - publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjehzFgsbjUfksMRBGsYGi/ycg5/SMP8jmGMbRWbiVmDVKO8GdVI0StLZvfLi8ozUPcGrJzQL3HaXx+b88JXQPJ2ftUiBvQnoAf+qzWKqsqXo40uuy6DZc+0LAGoxup2WyFp4YcIf+XFMJBSGmQaGSqYs3Lx49/aWI1uFTzBL4YF4X7ckXm6Cl2xr5gD1Gl1twbKIyeDnAZal2Eego4pLwFkcP6jZFaAY0V3YqTfhZLAl5NK+K4BCB2iQPOiK6Qr5XMRhnUVQVeZr5T9PmYf1GyncBIWgUaZlmGNq6Yup2trQW/mEqDqzeek4N3NuoORdZ2JBAnLdqAjQyRBrQAnkbQIDAQAA + appId: 9021000140696171 + privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCIw8lnyhxyCK/2NLXeJcZUwOoU9hA6Opg5dxJqOrLB0yZpxSrqgv+PooMBzFV5Wwf0s388sC9cdTEUm8NevIAwlioCc2JLfNwgVtfOHVQr4A4bwrzg9zpDJWw5fHmxfGodPCQCF2ZfdY48n/W8eI+6WdInIg7yXUT3/xN3nMepA2J96TYBrqwURoFMzzw0Z3fV+z82QOQrIAJQeMVsTkBZOeZriykNs7sVT+DtLuGDsznEDTj04xu1Miymd81sxeGxmR8j53/nlN4UCnKn+BjwmPGn9/PolSknAzjkgnFaeOX7gG+wSYus+R6UcVEvql3uYEHp4iBi/dukV/vXw9xzAgMBAAECggEABrHOwg3apppWQq8B2AXxV2S6EJya3r7PhMCXXivRZDt5veOw3hnbeKRz1TqzVGVoVkoTCF13dAcoh+G4BoMjoz02gTg0r41FGTAnECfPXvZwulsl870mVPMYARhevJlieFvhR1jt4e5XMBCEbt1X679J0jCQmryGC72orko2W8eD2NAoEVOZy7ZGhNAsNSAisHDGy0XlDTcU1h9MlEb7qeg1N48L+GrYZB27FHxWR8DwXhK+nlznJrNOPcDhvFds+LM1YH2wV2sKWMPmjW5gZv+kLdHK7tY6oHEmdG8Co4ULSCwQl9/ZCbQJC5n1K80Cxs6GbO02pl2+J/1psNebwQKBgQDqk+O1HuasPGWbbvOZz3RBtaGqnarZWXWPa0K7xtTjyVyNtvdzaU9lY/jHvyCsq/4djmIE9QL4v2HZm6L8X1rPP0mZLGygZuoYhf2G8OaKA1XLFvplYMVNmxa5FHOlW0udxzbIjrNQY5TnMZLsmeI18+1W8n7zMBBrmwJhayioZwKBgQCVQSnSe7SZHXV30I5OVzJtnx2hrerskNtxNAsMjZGgKWk6FKK/5j33SrUCBT6BH+jPrhQqVcdv62c7Vjuj8oM6BH2kUJykXKWGDJgltB8jPvl7Cc+IGKMNcrmD1gF24xzHeAK6m3yfZHAgbsI90kGRAqTvKOR8troBIpXyqcoUFQKBgQCj/louEHlhpiO+w5WITVFQcuOf/PQpWXJnnqwbzMieqvKKnIRoahI4puiQ9JyqOt+/1//MyWGXd2y4Diem2h8JToxsinMyvGAiXuI8iYQSrnw3LExHvZySQb9kCtlCnA3EMzaohaL0q3m5G55EzNwpreuaYpO//jUslUTXyGu3NwKBgAsFN7hR6ADSOwUwwgEo0RFlCUQR2mHDRGC0bghsP49q31kpgubWckbbHkha6MWR/JexC84gbUxnPkUUVe0CEAxtnnVOenJsYNBoB6fpB8+La9JY5BjxcMCicu44E/2aQVq9Er6Cko4WVW0foHn+F1dEsbby9wP6XfuNeTLktIYNAoGAUS2pUS30KMeeVyHj0uFey+tbsDA0MHZal0ZRsNwWCIwlBaouTIVmzKlz5t2Eg4JtoZov1n9T3BU6pnfNqJxOUEirRYz+WJxH9usIy8F3RAICjLqBbIYGdgtF+YSLKPWx9RrB5JRjgOYXByhPyGqQSARI+L4wVQxeENxypfqgLbo= + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqKWaJol63OuxavPwcqLNahXzxrDDqlqrsFDkeG3j5F+15qUJvBxmKiirAVWXeBkDFf/6cdBlI4gvkfNCE4TUq59nGfpRGEx0Gv5WhPfD1RJMPmjOhbCtuBkQDGPOSKF42zxL+B0o9lmV/z02hPrE5a8D8rarZkmEGFu96o10oMcg6o75u0JSDH+hBgA+B42zDghpLrEyMoljJDt5cQwnatStmKpHlhSZoKnzTwWN4q8YAMy/8J8yvy/RMz6jwntacbN8Rm9d1bM7BDCAU62CjhGZKLu14HrFRX/bDSlnL6Ud+J9Hhnr6sYSCG+Oqu3hu2zpeqRFVj/vKPqOsIZ8fUwIDAQAB notifyUrl: http://susan.net.cn/notify + gatewayUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do