liujie
2023-11-01 25f40033369888089e0c8640f2ad1b29d48ebea9
11.12
7个文件已修改
190 ■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/OtherApplication.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1411,7 +1411,6 @@
            }
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();
cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
@@ -1,29 +1,27 @@
package com.dsh;
import com.dsh.account.controller.CoachTypeController;
import com.dsh.account.controller.UseBenefitsController;
import com.dsh.account.model.vo.userBenefitDetail.Goods;
import com.dsh.account.util.ResultUtil;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.util.List;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AccountApplication.class)
class AccountApplicationTests {
    @Autowired
    private UseBenefitsController useBenefitsController;
    @Test
    void contextLoads() {
    }
}
//package com.dsh;
//
//import com.dsh.account.controller.CoachTypeController;
//
//import org.junit.jupiter.api.Test;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//
//import java.util.List;
//
//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AccountApplication.class)
//class AccountApplicationTests {
//
//    @Autowired
//    private CoachTypeController controller;
//
//
//    @Test
//    void contextLoads() {
//        System.out.println(System.getProperty("java.version"));
//        System.out.println(System.getProperty("java.compiler"));
//        System.out.println(System.getProperty("java.vm.specification.version"));
//        System.out.println(System.getProperty("java.specification.version"));
//
//    }
//
//}
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1004,6 +1004,7 @@
     */
    @PostMapping("/base/coursePackage/alipayRegisteredCoursesCallback")
    public void alipayCallback(HttpServletRequest request, HttpServletResponse response){
        System.err.println("========支付宝支付回调========");
        try {
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if(null != map){
cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
@@ -59,7 +59,7 @@
    private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
    private String callbackPath = "http://8.137.22.229:5004";//支付回调网关地址
    private String callbackPath = "http://8.137.22.229:56666/course";//支付回调网关地址
    private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java
@@ -259,7 +259,7 @@
        }
        //课程
        if (uri.startsWith(IGNORE_COURSE_URIS)) {
        if (uri.startsWith(IGNORE_COURSE_PREFIX)) {
            if(!StringUtils.isEmpty(IGNORE_COURSE_URIS)){
                String[] split = IGNORE_COURSE_URIS.split(",");
                for (String s : split) {
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
@@ -45,128 +45,4 @@
//            System.out.println("调用失败");
//        }
//    }
    public static void main(String[] args) {
        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
                "2021004124642138",
                "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC8Jqz8JmnbbggpEqdIyimlk1z7uq0W/rexxMZsh5f7LjSafci1/Gce3USgp1L2rVxEJPfL85rYXiLwnqUUPqi1P5MoymOU9GtK99dzlbkU8IPYKJWYWCtdnq5IdGLf4Kcs6ghYvTwbNHw5vl5QevtfEW8kzYxPrYkfO1i38i8zT8OTLHP2T+lRbfRvLMgScv+kiCWlI4k411yeeLxWm5ikg3M3zMjTl05VOqVhp45N3aglGzMMN3b6Ior73PzBUARmMeDQ73YX0l24acIpy1qNYkjZnvs0ghxd2eowgYgmaJBpfRZfD8NDFe20g/RQSK+mdJslxcdaFjW4OVUU8rdvAgMBAAECggEAeq1Q/vtg7BTbN0SVVC2UaAQkjXGTKDoetccShXMHklv3KoA3HQmchxBIjeNrgbFZRolAFHgaj1cZuwAFrKSKRdtU7TTBJz8SsgfVL+UAj3mezZLwrytV4y3yfwV77nNBLVTO6mVASpC3KsNIJXt6aOsqJ7np8Y25qWZ9mzpKsk4CPaSSPMj9KXZN1ivjfd4rscT9jPnzuTtcUwH2DBn4ykDsc1bnwRO/6IUwo7FJGK5IY7WRrmYFPqdqXpfmKZAMzBoRLJtBp+sbBkSjXHjVpsEJJYTgYqVaTc+iX3SjLi0a/7GieVd2U8OWVVmvbdJgawKWK1kEjCDIOVjOUzFI0QKBgQDlq+LiDPSjt2l+eosR1w82LdfaAyhh5Bhg3C9Or7GoP/PHvk/R3TfDR8yx1JJk1tM2PNg7gsx0KBnu8IKJviBNNvZ8ftMYL3Z3L+4SvUlD7sN01TUA1vPtWsMGEc73eqYy8a88H+rhUTSm6eHiq2sZGLKid+/ShLf+pXvHE5YRqQKBgQDRuE0ltOFbJHdDjP1W9xCZWbx3mDsSs/pZv761CLRKY0TVGq3QgakBJpjSX7OYJ4Cg2j+8R8PJjHsE1pnrRbiF63ypbCm2j5knCqgqFpctAqQ4fQk0263GORw+9FRPuVbL1zyFzFJTeOkwpK+p61tA0JAdDnymUKLdDuNZAl1fVwKBgQDZGPJdFTwGqW/p43IjyfMSFqFr7gI1DkRRArEhIwi+7rzEOcv/p6l3SR5fln1PHpYGNdt73Xbf8awZ5XSvOW4VLvgt1EA8I1lK7p6PTie8NCzD+mmgwo9O9LVWvmyyGFiT3Ur0fYMruvQXNwuTlM+mqGbrFo42o8e8yLZJBuWbCQKBgQCn901KmuE3BzDCGIS7ByvzNkzdGD6Pzzf+c7UA91S2k2UIrNJzQbWjJ0+UhnOntFOwALy1RmEH5oyMpngmV/PexmlUpD2QathFzaI7+1XfBdOTLomWHS/Dp+/4d+Wi6JUcs2lU2/0/v4I8pFnQ5KB0e9ZAf17UMZcPJ6Jsopk4BwKBgQCNnSK8b1xG/WMOae2HaHDjgwRCFJn5gS3NsLcj0zdFb9VfpaoxBd2vpR/kNO3VCEM6pZMOAGTYxaaS/27Wbavbu+m5oAZs1IwCjAryM9jSevwF59AX+OxOi8r4UYiEXMdmlSoNseIAe8U8X1/ZCGuLiS1p7k7nSkkCLBvWnzNKfA==","json","GBK",
                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
        AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest();
        request.setBizContent("{" +
                "  \"in_door_images\":[" +
                "    \"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
                "  ]," +
                "  \"external_id\":\"105290059990194\"," +
                "  \"merchant_type\":\"01\"," +
                "  \"name\":\"蚂蚁金服(杭州)网络技术有限公司\"," +
                "  \"alias_name\":\"支付宝\"," +
                "  \"mcc\":\"B0007\"," +
                "  \"cert_no\":\"9133010608210550XR\"," +
                "  \"cert_type\":\"201\"," +
                "  \"cert_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"," +
                "  \"cert_image_back\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
                "  \"legal_name\":\"马云\"," +
                "  \"legal_cert_no\":\"100100198811110001\"," +
                "  \"legal_cert_front_image\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
                "  \"legal_cert_back_image\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
                "  \"business_address\":{" +
                "    \"city_code\":\"371000\"," +
                "    \"district_code\":\"371002\"," +
                "    \"address\":\"万塘路18号黄龙时代广场B座\"," +
                "    \"province_code\":\"370000\"," +
                "    \"poiid\":\"B0FFIVU189\"," +
                "    \"longitude\":\"120.760001\"," +
                "    \"latitude\":\"60.270001\"" +
                "  }," +
                "  \"service_phone\":\"0571-85022088\"," +
                "  \"contact_infos\":[" +
                "    {" +
                "      \"name\":\"张三\"," +
                "      \"phone\":\"0571-85022088\"," +
                "      \"mobile\":\"13888888888\"," +
                "      \"email\":\"user@domain.com\"," +
                "      \"id_card_no\":\"110000199001011234\"" +
                "    }" +
                "  ]," +
                "  \"biz_cards\":[" +
                "    {" +
                "      \"account_holder_name\":\"张三\"," +
                "      \"account_no\":\"621485*****10408\"," +
                "      \"account_inst_province\":\"浙江省\"," +
                "      \"account_inst_city\":\"杭州市\"," +
                "      \"account_branch_name\":\"招商银行杭州高新支行\"," +
                "      \"usage_type\":\"01\"," +
                "      \"account_type\":\"DC\"," +
                "      \"account_inst_name\":\"招商银行\"," +
                "      \"account_inst_id\":\"CMB\"," +
                "      \"bank_code\":\"103290003044\"" +
                "    }" +
                "  ]," +
                "  \"qualifications\":[" +
                "    {" +
                "      \"industry_qualification_type\":\"B0099\"," +
                "      \"industry_qualification_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
                "    }" +
                "  ]," +
                "  \"out_door_images\":[" +
                "    \"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
                "  ]," +
                "  \"license_auth_letter_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"," +
                "  \"service\":[" +
                "    \"当面付\"" +
                "  ]," +
                "  \"sign_time_with_isv\":\"2015-04-15\"," +
                "  \"alipay_logon_id\":\"qwert@163.com\"," +
                "  \"sites\":[" +
                "    {" +
                "      \"site_type\":\"01\"," +
                "      \"site_url\":\"www.xxx.com\"," +
                "      \"site_name\":\"XXX网站\"," +
                "      \"account\":\"测试账号\"," +
                "      \"password\":\"测试密码\"" +
                "    }" +
                "  ]," +
                "  \"invoice_info\":{" +
                "    \"auto_invoice\":true," +
                "    \"accept_electronic\":true," +
                "    \"tax_payer_qualification\":\"01\"," +
                "    \"title\":\"蚂蚁金服(杭州)信息技术有限公司\"," +
                "    \"tax_no\":\"51010482542598631219\"," +
                "    \"tax_payer_valid\":\"19981011\"," +
                "    \"address\":\"浙江省杭州市*****路蚂蚁金服\"," +
                "    \"telephone\":\"0571****8888\"," +
                "    \"bank_account\":\"1234567******678123\"," +
                "    \"mail_name\":\"张*\"," +
                "    \"mail_address\":{" +
                "      \"city_code\":\"371000\"," +
                "      \"district_code\":\"371002\"," +
                "      \"address\":\"万塘路18号黄龙时代广场B座\"," +
                "      \"province_code\":\"370000\"," +
                "      \"poiid\":\"B0FFIVU189\"," +
                "      \"longitude\":\"120.760001\"," +
                "      \"latitude\":\"60.270001\"," +
                "      \"type\":\"BUSINESS_ADDRESS\"" +
                "    }," +
                "    \"mail_telephone\":\"0571****8888\"," +
                "    \"bank_name\":\"中国银行\"" +
                "  }," +
                "  \"cert_name\":\"xxxx小卖铺\"," +
                "  \"binding_alipay_logon_id\":\"asdf@163.com\"," +
                "  \"legal_cert_type\":\"100\"," +
                "  \"default_settle_rule\":{" +
                "    \"default_settle_type\":\"alipayAccount\"," +
                "    \"default_settle_target\":\"myalipay@alipay.com\"" +
                "  }" +
                "}");
        AntMerchantExpandIndirectZftCreateResponse response = null;
        try {
            response = alipayClient.execute(request);
        } catch (AlipayApiException e) {
            e.printStackTrace();
        }
        if(response.isSuccess()){
            System.out.println("调用成功");
        } else {
            System.out.println("调用失败");
        }
    }
}
cloud-server-other/src/main/java/com/dsh/OtherApplication.java
@@ -28,7 +28,9 @@
@MapperScan("com.dsh.other.mapper")
public class OtherApplication {
    public static void main(String[] args) {
        SpringApplication.run(OtherApplication.class, args);
        try {
            SpringApplication.run(OtherApplication.class, args);
        }catch (Exception e){e.printStackTrace();}
    }
    @Bean