diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index f6e44d2e7..733d048b1 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -205,6 +205,6 @@ alipay: # 商户私钥，您的PKCS8格式RSA2私钥 merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3mJRX1UDkQMIwVmXEyVnY0e+Q93CZHBPM3Ws0aV/9UhNMG+3UXrWdAGNOVQgNXG93vtmz1tLhsD+TaumjSW4NFB5JKBnnEcMDoDQTiBzCKTniz8hzoMhYamh38KLqxIumrwWf3+OdHiTXayvh/NA4A13DCeUS2vKctruP3ghZ5d4ipcV6ctqazCq+/BK4xaxXPG5v+BemN5jm3qnNErEWiH0Kl/p7aUw/e8/y2Gv6RJgf/fs5ad0lnDQjUVb5pnMuYREID9PjAru7i1Uh4sr3GUoa1XUIeSLw+NEBrNdYReag3t20UZOLnEEGQeh/fwJUB73hA6fhdLDJ6CLIDkDdAgMBAAECggEBAJ/wJ6qseC9fystZOKbJ0Z90o4JiTJDVSNp7OV0bPyfrTCxNWE5dg1EWeWxP3wfksqZaeESWrHc3lurRhF9fJKP4FrocWRRXANAzy6oINSVfzLGt2S4BrwZ3DDMQSpzCQ/YdGoVAAYVqMSYIkt3341wocpHqGMjoO9oRxit6fUPx4yYhT3t8d/QZ0ReFd1YfsGieUCECxx5IeurJ2ieZczHSXUJ2hXMlf+n19+uEOUydmpfIZzg0kMM2ybRqpHZHK6UANnRZhLFvOVj2jzg6p2AbH689JGQEukoiGyCKtrfElZjyVkmvoHv0xcdiuODo0RPBZwYOckJh+RHUERiMj/ECgYEA90Yh4aZaDv5A6nHx4ptg22JoTj78FUqJtf6RzegiZzt6VDzTE/oQTzVt6qkbhd4uyxb2PuJ+1XHhZquN4gNnnpfSM8LhD3piPp7kCTEY7zrPp7HMTklb5qtEwb0ItbgfLJVf0bN+1fdTlyTH3004pSuf2C3h7flxSecmC7cPp28CgYEAvhMulEv/vcfC/aUYCiVu+X2Booj3GBwUgrPDKQxdF+zb1c90w06zf11JYXzollOn22VQtCPa+RpqRBmP8NwBu16QCFmTdH2hWug+uqoqjYpOjMBBL1nAyHuZYho7ddwUFcxl2ay/rs1HWLOvFt2AfEYvtZkQbzw0IujMKDFFlnMCgYEAy5X8c1KJN2rye5RQ+KfA+R9ujW2iEs2J0EPGO+dx29jGgPCLQRlTsENnOhr9RByIHkHLgD7u+kGGuQdqC7mN6K9LK765mgrDNJeRXFgGFYEwUvs6IQKZHbPJKlG/CA6N7CEYAQlt1jCJrBlmTl2/0421T0GHkG0dbyFW27JeuxUCgYApoKfV4KMc3DAPPuX56uLYDy2h/B8pj5TKXzZBuix1PfGTbQDkeUsEfNjCWgnSSnX7rb+0BBpD7g4R5gtJM9XJRFeFDKEnpQ/+idibJwN0xjKXzs834I9BGRipjJczI8TeVUqFFrlQPjL+8TNKba5jCTgPrHsV8Xh1oMh9kPTtkwKBgA3XCFNvlf7/ClZoVa71aEHppDn2sAbrUfo7KfsRWB1kO69MWjYeO/Rt54jRUpjSGHE5kowd3MufCa4NGhmzDo5l4QoI4WvQWTYDE46RgPTJQgJEbC976y9yI84gywMxSymTGHc4R5LkLknlCS0aht2Ebq0qFL2QVn2y3BEPHj+p # 支付宝公钥 - alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHZrR7g8yAAOkpzDkiRVnq02DorACdFz4Q/rupXUpaZ4HVKilc4sd6vlm18uG1th4yXSjkVBfSkNZmAs8vseg1tMvGFRvxJOpMW8GlA2nd87mDI/5a6jxXfmPtEsEsG4ddlZ3C2iF2qbnFm37dmG5+UXLYw8IodoCtkwPf6q8GvbR6ssfYE4eZRf08kv5ocelKqi4KK7tSWtTKztbwmF6g4BAW5vWEQuqXerK8DAFyLIrvMKWB6XYoA3pYpM00Ma0J62BfO2JHeRsKxYkcDHCKuOs4EMKnvxASC8RK5pKx4/q4sYH1bW3uGpv3cfG5e9V1HmXbaS1DFQAi9LHlksswIDAQAB + alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt5iUV9VA5EDCMFZlxMlZ2NHvkPdwmRwTzN1rNGlf/VITTBvt1F61nQBjTlUIDVxvd77Zs9bS4bA/k2rpo0luDRQeSSgZ5xHDA6A0E4gcwik54s/Ic6DIWGpod/Ci6sSLpq8Fn9/jnR4k12sr4fzQOANdwwnlEtrynLa7j94IWeXeIqXFenLamswqvvwSuMWsVzxub/gXpjeY5t6pzRKxFoh9Cpf6e2lMP3vP8thr+kSYH/37OWndJZw0I1FW+aZzLmERCA/T4wK7u4tVIeLK9xlKGtV1CHki8PjRAazXWEXmoN7dtFGTi5xBBkHof38CVAe94QOn4XSwyegiyA5A3QIDAQAB # 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 notifyUrl: xxxx diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index a919c74e3..167c4861d 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -200,6 +200,6 @@ alipay: # 商户私钥，您的PKCS8格式RSA2私钥 merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3mJRX1UDkQMIwVmXEyVnY0e+Q93CZHBPM3Ws0aV/9UhNMG+3UXrWdAGNOVQgNXG93vtmz1tLhsD+TaumjSW4NFB5JKBnnEcMDoDQTiBzCKTniz8hzoMhYamh38KLqxIumrwWf3+OdHiTXayvh/NA4A13DCeUS2vKctruP3ghZ5d4ipcV6ctqazCq+/BK4xaxXPG5v+BemN5jm3qnNErEWiH0Kl/p7aUw/e8/y2Gv6RJgf/fs5ad0lnDQjUVb5pnMuYREID9PjAru7i1Uh4sr3GUoa1XUIeSLw+NEBrNdYReag3t20UZOLnEEGQeh/fwJUB73hA6fhdLDJ6CLIDkDdAgMBAAECggEBAJ/wJ6qseC9fystZOKbJ0Z90o4JiTJDVSNp7OV0bPyfrTCxNWE5dg1EWeWxP3wfksqZaeESWrHc3lurRhF9fJKP4FrocWRRXANAzy6oINSVfzLGt2S4BrwZ3DDMQSpzCQ/YdGoVAAYVqMSYIkt3341wocpHqGMjoO9oRxit6fUPx4yYhT3t8d/QZ0ReFd1YfsGieUCECxx5IeurJ2ieZczHSXUJ2hXMlf+n19+uEOUydmpfIZzg0kMM2ybRqpHZHK6UANnRZhLFvOVj2jzg6p2AbH689JGQEukoiGyCKtrfElZjyVkmvoHv0xcdiuODo0RPBZwYOckJh+RHUERiMj/ECgYEA90Yh4aZaDv5A6nHx4ptg22JoTj78FUqJtf6RzegiZzt6VDzTE/oQTzVt6qkbhd4uyxb2PuJ+1XHhZquN4gNnnpfSM8LhD3piPp7kCTEY7zrPp7HMTklb5qtEwb0ItbgfLJVf0bN+1fdTlyTH3004pSuf2C3h7flxSecmC7cPp28CgYEAvhMulEv/vcfC/aUYCiVu+X2Booj3GBwUgrPDKQxdF+zb1c90w06zf11JYXzollOn22VQtCPa+RpqRBmP8NwBu16QCFmTdH2hWug+uqoqjYpOjMBBL1nAyHuZYho7ddwUFcxl2ay/rs1HWLOvFt2AfEYvtZkQbzw0IujMKDFFlnMCgYEAy5X8c1KJN2rye5RQ+KfA+R9ujW2iEs2J0EPGO+dx29jGgPCLQRlTsENnOhr9RByIHkHLgD7u+kGGuQdqC7mN6K9LK765mgrDNJeRXFgGFYEwUvs6IQKZHbPJKlG/CA6N7CEYAQlt1jCJrBlmTl2/0421T0GHkG0dbyFW27JeuxUCgYApoKfV4KMc3DAPPuX56uLYDy2h/B8pj5TKXzZBuix1PfGTbQDkeUsEfNjCWgnSSnX7rb+0BBpD7g4R5gtJM9XJRFeFDKEnpQ/+idibJwN0xjKXzs834I9BGRipjJczI8TeVUqFFrlQPjL+8TNKba5jCTgPrHsV8Xh1oMh9kPTtkwKBgA3XCFNvlf7/ClZoVa71aEHppDn2sAbrUfo7KfsRWB1kO69MWjYeO/Rt54jRUpjSGHE5kowd3MufCa4NGhmzDo5l4QoI4WvQWTYDE46RgPTJQgJEbC976y9yI84gywMxSymTGHc4R5LkLknlCS0aht2Ebq0qFL2QVn2y3BEPHj+p # 支付宝公钥 - alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHZrR7g8yAAOkpzDkiRVnq02DorACdFz4Q/rupXUpaZ4HVKilc4sd6vlm18uG1th4yXSjkVBfSkNZmAs8vseg1tMvGFRvxJOpMW8GlA2nd87mDI/5a6jxXfmPtEsEsG4ddlZ3C2iF2qbnFm37dmG5+UXLYw8IodoCtkwPf6q8GvbR6ssfYE4eZRf08kv5ocelKqi4KK7tSWtTKztbwmF6g4BAW5vWEQuqXerK8DAFyLIrvMKWB6XYoA3pYpM00Ma0J62BfO2JHeRsKxYkcDHCKuOs4EMKnvxASC8RK5pKx4/q4sYH1bW3uGpv3cfG5e9V1HmXbaS1DFQAi9LHlksswIDAQAB + alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt5iUV9VA5EDCMFZlxMlZ2NHvkPdwmRwTzN1rNGlf/VITTBvt1F61nQBjTlUIDVxvd77Zs9bS4bA/k2rpo0luDRQeSSgZ5xHDA6A0E4gcwik54s/Ic6DIWGpod/Ci6sSLpq8Fn9/jnR4k12sr4fzQOANdwwnlEtrynLa7j94IWeXeIqXFenLamswqvvwSuMWsVzxub/gXpjeY5t6pzRKxFoh9Cpf6e2lMP3vP8thr+kSYH/37OWndJZw0I1FW+aZzLmERCA/T4wK7u4tVIeLK9xlKGtV1CHki8PjRAazXWEXmoN7dtFGTi5xBBkHof38CVAe94QOn4XSwyegiyA5A3QIDAQAB # 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 notifyUrl: xxxx \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index c6f41d80f..4e60a1a55 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -200,6 +200,6 @@ alipay: # 商户私钥，您的PKCS8格式RSA2私钥 merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3mJRX1UDkQMIwVmXEyVnY0e+Q93CZHBPM3Ws0aV/9UhNMG+3UXrWdAGNOVQgNXG93vtmz1tLhsD+TaumjSW4NFB5JKBnnEcMDoDQTiBzCKTniz8hzoMhYamh38KLqxIumrwWf3+OdHiTXayvh/NA4A13DCeUS2vKctruP3ghZ5d4ipcV6ctqazCq+/BK4xaxXPG5v+BemN5jm3qnNErEWiH0Kl/p7aUw/e8/y2Gv6RJgf/fs5ad0lnDQjUVb5pnMuYREID9PjAru7i1Uh4sr3GUoa1XUIeSLw+NEBrNdYReag3t20UZOLnEEGQeh/fwJUB73hA6fhdLDJ6CLIDkDdAgMBAAECggEBAJ/wJ6qseC9fystZOKbJ0Z90o4JiTJDVSNp7OV0bPyfrTCxNWE5dg1EWeWxP3wfksqZaeESWrHc3lurRhF9fJKP4FrocWRRXANAzy6oINSVfzLGt2S4BrwZ3DDMQSpzCQ/YdGoVAAYVqMSYIkt3341wocpHqGMjoO9oRxit6fUPx4yYhT3t8d/QZ0ReFd1YfsGieUCECxx5IeurJ2ieZczHSXUJ2hXMlf+n19+uEOUydmpfIZzg0kMM2ybRqpHZHK6UANnRZhLFvOVj2jzg6p2AbH689JGQEukoiGyCKtrfElZjyVkmvoHv0xcdiuODo0RPBZwYOckJh+RHUERiMj/ECgYEA90Yh4aZaDv5A6nHx4ptg22JoTj78FUqJtf6RzegiZzt6VDzTE/oQTzVt6qkbhd4uyxb2PuJ+1XHhZquN4gNnnpfSM8LhD3piPp7kCTEY7zrPp7HMTklb5qtEwb0ItbgfLJVf0bN+1fdTlyTH3004pSuf2C3h7flxSecmC7cPp28CgYEAvhMulEv/vcfC/aUYCiVu+X2Booj3GBwUgrPDKQxdF+zb1c90w06zf11JYXzollOn22VQtCPa+RpqRBmP8NwBu16QCFmTdH2hWug+uqoqjYpOjMBBL1nAyHuZYho7ddwUFcxl2ay/rs1HWLOvFt2AfEYvtZkQbzw0IujMKDFFlnMCgYEAy5X8c1KJN2rye5RQ+KfA+R9ujW2iEs2J0EPGO+dx29jGgPCLQRlTsENnOhr9RByIHkHLgD7u+kGGuQdqC7mN6K9LK765mgrDNJeRXFgGFYEwUvs6IQKZHbPJKlG/CA6N7CEYAQlt1jCJrBlmTl2/0421T0GHkG0dbyFW27JeuxUCgYApoKfV4KMc3DAPPuX56uLYDy2h/B8pj5TKXzZBuix1PfGTbQDkeUsEfNjCWgnSSnX7rb+0BBpD7g4R5gtJM9XJRFeFDKEnpQ/+idibJwN0xjKXzs834I9BGRipjJczI8TeVUqFFrlQPjL+8TNKba5jCTgPrHsV8Xh1oMh9kPTtkwKBgA3XCFNvlf7/ClZoVa71aEHppDn2sAbrUfo7KfsRWB1kO69MWjYeO/Rt54jRUpjSGHE5kowd3MufCa4NGhmzDo5l4QoI4WvQWTYDE46RgPTJQgJEbC976y9yI84gywMxSymTGHc4R5LkLknlCS0aht2Ebq0qFL2QVn2y3BEPHj+p # 支付宝公钥 - alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHZrR7g8yAAOkpzDkiRVnq02DorACdFz4Q/rupXUpaZ4HVKilc4sd6vlm18uG1th4yXSjkVBfSkNZmAs8vseg1tMvGFRvxJOpMW8GlA2nd87mDI/5a6jxXfmPtEsEsG4ddlZ3C2iF2qbnFm37dmG5+UXLYw8IodoCtkwPf6q8GvbR6ssfYE4eZRf08kv5ocelKqi4KK7tSWtTKztbwmF6g4BAW5vWEQuqXerK8DAFyLIrvMKWB6XYoA3pYpM00Ma0J62BfO2JHeRsKxYkcDHCKuOs4EMKnvxASC8RK5pKx4/q4sYH1bW3uGpv3cfG5e9V1HmXbaS1DFQAi9LHlksswIDAQAB + alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt5iUV9VA5EDCMFZlxMlZ2NHvkPdwmRwTzN1rNGlf/VITTBvt1F61nQBjTlUIDVxvd77Zs9bS4bA/k2rpo0luDRQeSSgZ5xHDA6A0E4gcwik54s/Ic6DIWGpod/Ci6sSLpq8Fn9/jnR4k12sr4fzQOANdwwnlEtrynLa7j94IWeXeIqXFenLamswqvvwSuMWsVzxub/gXpjeY5t6pzRKxFoh9Cpf6e2lMP3vP8thr+kSYH/37OWndJZw0I1FW+aZzLmERCA/T4wK7u4tVIeLK9xlKGtV1CHki8PjRAazXWEXmoN7dtFGTi5xBBkHof38CVAe94QOn4XSwyegiyA5A3QIDAQAB # 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 notifyUrl: xxxx \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index 3ef362bc0..05fd40b60 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -203,6 +203,6 @@ alipay: # 商户私钥，您的PKCS8格式RSA2私钥 merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3mJRX1UDkQMIwVmXEyVnY0e+Q93CZHBPM3Ws0aV/9UhNMG+3UXrWdAGNOVQgNXG93vtmz1tLhsD+TaumjSW4NFB5JKBnnEcMDoDQTiBzCKTniz8hzoMhYamh38KLqxIumrwWf3+OdHiTXayvh/NA4A13DCeUS2vKctruP3ghZ5d4ipcV6ctqazCq+/BK4xaxXPG5v+BemN5jm3qnNErEWiH0Kl/p7aUw/e8/y2Gv6RJgf/fs5ad0lnDQjUVb5pnMuYREID9PjAru7i1Uh4sr3GUoa1XUIeSLw+NEBrNdYReag3t20UZOLnEEGQeh/fwJUB73hA6fhdLDJ6CLIDkDdAgMBAAECggEBAJ/wJ6qseC9fystZOKbJ0Z90o4JiTJDVSNp7OV0bPyfrTCxNWE5dg1EWeWxP3wfksqZaeESWrHc3lurRhF9fJKP4FrocWRRXANAzy6oINSVfzLGt2S4BrwZ3DDMQSpzCQ/YdGoVAAYVqMSYIkt3341wocpHqGMjoO9oRxit6fUPx4yYhT3t8d/QZ0ReFd1YfsGieUCECxx5IeurJ2ieZczHSXUJ2hXMlf+n19+uEOUydmpfIZzg0kMM2ybRqpHZHK6UANnRZhLFvOVj2jzg6p2AbH689JGQEukoiGyCKtrfElZjyVkmvoHv0xcdiuODo0RPBZwYOckJh+RHUERiMj/ECgYEA90Yh4aZaDv5A6nHx4ptg22JoTj78FUqJtf6RzegiZzt6VDzTE/oQTzVt6qkbhd4uyxb2PuJ+1XHhZquN4gNnnpfSM8LhD3piPp7kCTEY7zrPp7HMTklb5qtEwb0ItbgfLJVf0bN+1fdTlyTH3004pSuf2C3h7flxSecmC7cPp28CgYEAvhMulEv/vcfC/aUYCiVu+X2Booj3GBwUgrPDKQxdF+zb1c90w06zf11JYXzollOn22VQtCPa+RpqRBmP8NwBu16QCFmTdH2hWug+uqoqjYpOjMBBL1nAyHuZYho7ddwUFcxl2ay/rs1HWLOvFt2AfEYvtZkQbzw0IujMKDFFlnMCgYEAy5X8c1KJN2rye5RQ+KfA+R9ujW2iEs2J0EPGO+dx29jGgPCLQRlTsENnOhr9RByIHkHLgD7u+kGGuQdqC7mN6K9LK765mgrDNJeRXFgGFYEwUvs6IQKZHbPJKlG/CA6N7CEYAQlt1jCJrBlmTl2/0421T0GHkG0dbyFW27JeuxUCgYApoKfV4KMc3DAPPuX56uLYDy2h/B8pj5TKXzZBuix1PfGTbQDkeUsEfNjCWgnSSnX7rb+0BBpD7g4R5gtJM9XJRFeFDKEnpQ/+idibJwN0xjKXzs834I9BGRipjJczI8TeVUqFFrlQPjL+8TNKba5jCTgPrHsV8Xh1oMh9kPTtkwKBgA3XCFNvlf7/ClZoVa71aEHppDn2sAbrUfo7KfsRWB1kO69MWjYeO/Rt54jRUpjSGHE5kowd3MufCa4NGhmzDo5l4QoI4WvQWTYDE46RgPTJQgJEbC976y9yI84gywMxSymTGHc4R5LkLknlCS0aht2Ebq0qFL2QVn2y3BEPHj+p # 支付宝公钥 - alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHZrR7g8yAAOkpzDkiRVnq02DorACdFz4Q/rupXUpaZ4HVKilc4sd6vlm18uG1th4yXSjkVBfSkNZmAs8vseg1tMvGFRvxJOpMW8GlA2nd87mDI/5a6jxXfmPtEsEsG4ddlZ3C2iF2qbnFm37dmG5+UXLYw8IodoCtkwPf6q8GvbR6ssfYE4eZRf08kv5ocelKqi4KK7tSWtTKztbwmF6g4BAW5vWEQuqXerK8DAFyLIrvMKWB6XYoA3pYpM00Ma0J62BfO2JHeRsKxYkcDHCKuOs4EMKnvxASC8RK5pKx4/q4sYH1bW3uGpv3cfG5e9V1HmXbaS1DFQAi9LHlksswIDAQAB + alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt5iUV9VA5EDCMFZlxMlZ2NHvkPdwmRwTzN1rNGlf/VITTBvt1F61nQBjTlUIDVxvd77Zs9bS4bA/k2rpo0luDRQeSSgZ5xHDA6A0E4gcwik54s/Ic6DIWGpod/Ci6sSLpq8Fn9/jnR4k12sr4fzQOANdwwnlEtrynLa7j94IWeXeIqXFenLamswqvvwSuMWsVzxub/gXpjeY5t6pzRKxFoh9Cpf6e2lMP3vP8thr+kSYH/37OWndJZw0I1FW+aZzLmERCA/T4wK7u4tVIeLK9xlKGtV1CHki8PjRAazXWEXmoN7dtFGTi5xBBkHof38CVAe94QOn4XSwyegiyA5A3QIDAQAB # 服务器异步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 notifyUrl: xxxx \ No newline at end of file diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index a3239e4bc..79ed6de0a 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse; import com.alipay.easysdk.factory.Factory; +import com.aliyun.tea.TeaUnretryableException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -89,6 +90,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; @@ -108,6 +111,7 @@ import java.util.stream.Collectors; @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @RunWith(SpringRunner.class) public class SpringBootTestController { + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -257,14 +261,18 @@ public class SpringBootTestController { @Test public void alipayLoginTest() { String refreshToken = ""; - String auth_code = "1741970ec0e7445fb2dd2712480dYX91"; + String auth_code = "354109ecc25f4d9f943331578f56XD91"; try { // AlipaySystemOauthTokenResponse alipaySystemOauthTokenResponse = Factory.Base.OAuth().refreshToken(refreshToken); // System.out.println(JSON.toJSONString(alipaySystemOauthTokenResponse)); AlipaySystemOauthTokenResponse token = Factory.Base.OAuth().getToken(auth_code); System.out.println(JSON.toJSONString(token)); } catch (Exception e) { - throw new RuntimeException(e); + if (e instanceof TeaUnretryableException) { + TeaUnretryableException exception = (TeaUnretryableException) e; + logger.error("TeaUnretryableException异常:{}", exception.getLastRequest()); + } + logger.error("Exception", e); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java index 2281288ab..5e206c758 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java @@ -36,6 +36,7 @@ public class InitializeAdapayConfig implements CommandLineRunner { @Override public void run(String... args) throws Exception { + log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 InitializeAdapayConfig order 1 <<<<<<<<<<<<<"); /* 单商户 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java b/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java index 42d21a049..b89d880c7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java @@ -3,25 +3,34 @@ package com.jsowell.alipay.config; import com.alipay.easysdk.factory.Factory; import com.alipay.easysdk.kernel.Config; import com.jsowell.common.constant.Constants; -import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -@Order(5) -@Data +@Slf4j @Component -@ConfigurationProperties(prefix = "alipay") +@Order(2) public class AliPayConfig implements CommandLineRunner { + @Value("${alipay.gatewayHost}") private String gatewayHost; + + @Value("${alipay.appId}") private String appId; + + @Value("${alipay.merchantPrivateKey}") private String merchantPrivateKey; + + @Value("${alipay.alipayPublicKey}") private String alipayPublicKey; + + @Value("${alipay.notifyUrl}") private String notifyUrl; @Override public void run(String... args) throws Exception { + log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 AliPayConfig order 2 <<<<<<<<<<<<<"); // 设置参数（全局只需设置一次） Config config = new Config(); config.protocol = Constants.HTTPS; diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java index 9b7f21521..797075a5b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java @@ -78,7 +78,7 @@ public class WechatPayConfig implements CommandLineRunner { @Override public void run(String... args) throws Exception { - // System.out.println(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 MyStartupRunner1 order 2 <<<<<<<<<<<<<"); + System.out.println(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 WechatPayConfig order 3 <<<<<<<<<<<<<"); //微信支付 WeChatPayParameter.mchId = wechatMchId; WeChatPayParameter.appId = wechatAppId;