diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 0a9cea295..11f542123 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -161,4 +161,13 @@ adapay: rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ== appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa callback: https://api.jsowellcloud.com/uniapp/pay/adapayCallback - refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback \ No newline at end of file + refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback + + +#高德地图相关配置 +aMap: + merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC10OGVHfh4manoO2DE7xA8TipooKDt5WDpazYAKYKs3Rx5auWPoGEdERe1wyOQAJ34DmEULacTv2/mdjarLptL/sj3ba7XVDdAphNzrrIzLsNuzTqK9gxF5EeAAeo06H26rLrXmIvOL0KEsUuwxzuyFB0k3HZc8xM9yl3MXtv2Z0PpiYbvd32sd7HFZiM+H2ldzBZlXp2vC7ca0aj/BckIeWY/vJo5k400glTrcu8FSZbLRaMEzmJEyssVZzh2gPwvPVHoYvRIXpkiqNghyRWmKywC+h07fz21t94yhj+f/rGiK3YY3gv5S2xJ1NgmDfjmJvFMB3o00QH/GlJaiLcNAgMBAAECggEAL25ruyQTcxrbWWtMJnQbbzARHjRxZz6E1sASWV566a/RQtehRaPYUeXoopFi0KlojJLrvoDeamdxwNSsFGJXPy8brHjfuOsOcv4gavhzIqkbcOd3U1M3BnC0Om/FcsIIMs/m+mGgb0yi9Mzv6xE+wIlAxSICeuMq7N7DM5K3nYMIWhbE8kIrurMUpalH+s1FDL3FMOdRgM8L7yAjGoXZUtal6aDwTOsDkjlRmt+IuvqTjREtdBUZRLjKSU2b/3+Z42OOrkongYF74KPuQ1LmQ6Qa1D0O2b37A5ne8VbFjHai8E59Ol2PYwggajqj00G5x3KBUFJYiIhUApq6lXxywQKBgQDjgLExqhi6Op1G1Q0W5W/bKMrHshtcJawsO8C+PBxxPV9Da+5ZkguW4a1ErGCCPI0SVVW1QCTrPyrbJHyw9LteX98cnY6PGy1XVXWL+mKOK0jwL+yV299dMpk4R6u5+oO5ZX9WfoNsF3rEvfMiQxFSaH9HMR7q9GySno3NSzLW0QKBgQDMlyfqhnkDEY/rgRTo42FpX1KVf9JOP0L9+B2Q7Rec7iARuT6/qSxoV6PwNyYixyjbXx8xJQHoUDTRSgY5v543Nmh+bLOyR5NfNRqEmYpKtb0T4qB57jBMiVXcoIPXwcb7yVscAvI/rycDqEkOVgTqRdR0FW7q/svF9EuTzjNjfQKBgQDXtP7NY0U81jSno3xcuECdoQjb3WEZttKPwjwXY7FoIVPA/oYpQVNhxSrfUT3UXos31deFGoOm1ebRj7/2nKVHb0mBvVYdFByikPH6PfbSa/IlYptE4AviNwaWGUaW+ROKZtUc8qmzhHOwNZZhZwv2ggQkQUvaZNTJFDLJc0KJ8QKBgQDD/wr+YlUL24dE1iRx92Maz3cOQaX30CMdqtSoQnqcnIOcdxrmAevJCizDtBGUv7ckcbwwGIP7SttOpNvR9wBbZIQ2mWyNHoTQcM82uOEDMZgxtKqIJOegavEWq6+iwsEd9YiTDT+GQwXdOxrB4SZUSRF/JAlelzogKik9MA2LAQKBgG5cjf9V+6Ka2QjxkIV73/h5P5f08fUNAkLGiUjnH+eozsC3PGnifSwLVlfun8iHDXLwOtUK9xzGJ3yd/a8e9BBhZ8Xyd3Fqz2+q4cxorAz0UhZUnwDPUuLdEABntansYMhkrsOcXAiIQmFmMlgoHmbVHpFmWBy7VL3w2xDn1UM1 + aMapPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtdDhlR34eJmp6DtgxO8QPE4qaKCg7eVg6Ws2ACmCrN0ceWrlj6BhHREXtcMjkACd+A5hFC2nE79v5nY2qy6bS/7I922u11Q3QKYTc66yMy7Dbs06ivYMReRHgAHqNOh9uqy615iLzi9ChLFLsMc7shQdJNx2XPMTPcpdzF7b9mdD6YmG73d9rHexxWYjPh9pXcwWZV6drwu3GtGo/wXJCHlmP7yaOZONNIJU63LvBUmWy0WjBM5iRMrLFWc4doD8Lz1R6GL0SF6ZIqjYIckVpissAvodO389tbfeMoY/n/6xoit2GN4L+UtsSdTYJg345ibxTAd6NNEB/xpSWoi3DQIDAQAB + appId: 202306150188103814 + apiUrl: https://restapi.amap.com/rest/openmp/devgw?key=7967738241f0a580b5a1342f43793a61 + openId: 2089000923284502 \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index c9ca98dda..d41e86300 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -160,4 +160,12 @@ adapay: rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ== appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa callback: https://api.jsowellcloud.com/uniapp/pay/adapayCallback - refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback \ No newline at end of file + refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback + +#高德地图相关配置 +aMap: + merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC10OGVHfh4manoO2DE7xA8TipooKDt5WDpazYAKYKs3Rx5auWPoGEdERe1wyOQAJ34DmEULacTv2/mdjarLptL/sj3ba7XVDdAphNzrrIzLsNuzTqK9gxF5EeAAeo06H26rLrXmIvOL0KEsUuwxzuyFB0k3HZc8xM9yl3MXtv2Z0PpiYbvd32sd7HFZiM+H2ldzBZlXp2vC7ca0aj/BckIeWY/vJo5k400glTrcu8FSZbLRaMEzmJEyssVZzh2gPwvPVHoYvRIXpkiqNghyRWmKywC+h07fz21t94yhj+f/rGiK3YY3gv5S2xJ1NgmDfjmJvFMB3o00QH/GlJaiLcNAgMBAAECggEAL25ruyQTcxrbWWtMJnQbbzARHjRxZz6E1sASWV566a/RQtehRaPYUeXoopFi0KlojJLrvoDeamdxwNSsFGJXPy8brHjfuOsOcv4gavhzIqkbcOd3U1M3BnC0Om/FcsIIMs/m+mGgb0yi9Mzv6xE+wIlAxSICeuMq7N7DM5K3nYMIWhbE8kIrurMUpalH+s1FDL3FMOdRgM8L7yAjGoXZUtal6aDwTOsDkjlRmt+IuvqTjREtdBUZRLjKSU2b/3+Z42OOrkongYF74KPuQ1LmQ6Qa1D0O2b37A5ne8VbFjHai8E59Ol2PYwggajqj00G5x3KBUFJYiIhUApq6lXxywQKBgQDjgLExqhi6Op1G1Q0W5W/bKMrHshtcJawsO8C+PBxxPV9Da+5ZkguW4a1ErGCCPI0SVVW1QCTrPyrbJHyw9LteX98cnY6PGy1XVXWL+mKOK0jwL+yV299dMpk4R6u5+oO5ZX9WfoNsF3rEvfMiQxFSaH9HMR7q9GySno3NSzLW0QKBgQDMlyfqhnkDEY/rgRTo42FpX1KVf9JOP0L9+B2Q7Rec7iARuT6/qSxoV6PwNyYixyjbXx8xJQHoUDTRSgY5v543Nmh+bLOyR5NfNRqEmYpKtb0T4qB57jBMiVXcoIPXwcb7yVscAvI/rycDqEkOVgTqRdR0FW7q/svF9EuTzjNjfQKBgQDXtP7NY0U81jSno3xcuECdoQjb3WEZttKPwjwXY7FoIVPA/oYpQVNhxSrfUT3UXos31deFGoOm1ebRj7/2nKVHb0mBvVYdFByikPH6PfbSa/IlYptE4AviNwaWGUaW+ROKZtUc8qmzhHOwNZZhZwv2ggQkQUvaZNTJFDLJc0KJ8QKBgQDD/wr+YlUL24dE1iRx92Maz3cOQaX30CMdqtSoQnqcnIOcdxrmAevJCizDtBGUv7ckcbwwGIP7SttOpNvR9wBbZIQ2mWyNHoTQcM82uOEDMZgxtKqIJOegavEWq6+iwsEd9YiTDT+GQwXdOxrB4SZUSRF/JAlelzogKik9MA2LAQKBgG5cjf9V+6Ka2QjxkIV73/h5P5f08fUNAkLGiUjnH+eozsC3PGnifSwLVlfun8iHDXLwOtUK9xzGJ3yd/a8e9BBhZ8Xyd3Fqz2+q4cxorAz0UhZUnwDPUuLdEABntansYMhkrsOcXAiIQmFmMlgoHmbVHpFmWBy7VL3w2xDn1UM1 + aMapPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtdDhlR34eJmp6DtgxO8QPE4qaKCg7eVg6Ws2ACmCrN0ceWrlj6BhHREXtcMjkACd+A5hFC2nE79v5nY2qy6bS/7I922u11Q3QKYTc66yMy7Dbs06ivYMReRHgAHqNOh9uqy615iLzi9ChLFLsMc7shQdJNx2XPMTPcpdzF7b9mdD6YmG73d9rHexxWYjPh9pXcwWZV6drwu3GtGo/wXJCHlmP7yaOZONNIJU63LvBUmWy0WjBM5iRMrLFWc4doD8Lz1R6GL0SF6ZIqjYIckVpissAvodO389tbfeMoY/n/6xoit2GN4L+UtsSdTYJg345ibxTAd6NNEB/xpSWoi3DQIDAQAB + appId: 202306150188103814 + apiUrl: https://restapi.amap.com/rest/openmp/gw?key=7967738241f0a580b5a1342f43793a61 + openId: 2089000923284502 \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 280dda7c5..3d14d9ca1 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -127,11 +127,3 @@ wulian: getSimInfo: api.v2.card.info WuLianSimRenew: api.v2.order.renew -#高德地图相关配置 -aMap: - merchantPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC10OGVHfh4manoO2DE7xA8TipooKDt5WDpazYAKYKs3Rx5auWPoGEdERe1wyOQAJ34DmEULacTv2/mdjarLptL/sj3ba7XVDdAphNzrrIzLsNuzTqK9gxF5EeAAeo06H26rLrXmIvOL0KEsUuwxzuyFB0k3HZc8xM9yl3MXtv2Z0PpiYbvd32sd7HFZiM+H2ldzBZlXp2vC7ca0aj/BckIeWY/vJo5k400glTrcu8FSZbLRaMEzmJEyssVZzh2gPwvPVHoYvRIXpkiqNghyRWmKywC+h07fz21t94yhj+f/rGiK3YY3gv5S2xJ1NgmDfjmJvFMB3o00QH/GlJaiLcNAgMBAAECggEAL25ruyQTcxrbWWtMJnQbbzARHjRxZz6E1sASWV566a/RQtehRaPYUeXoopFi0KlojJLrvoDeamdxwNSsFGJXPy8brHjfuOsOcv4gavhzIqkbcOd3U1M3BnC0Om/FcsIIMs/m+mGgb0yi9Mzv6xE+wIlAxSICeuMq7N7DM5K3nYMIWhbE8kIrurMUpalH+s1FDL3FMOdRgM8L7yAjGoXZUtal6aDwTOsDkjlRmt+IuvqTjREtdBUZRLjKSU2b/3+Z42OOrkongYF74KPuQ1LmQ6Qa1D0O2b37A5ne8VbFjHai8E59Ol2PYwggajqj00G5x3KBUFJYiIhUApq6lXxywQKBgQDjgLExqhi6Op1G1Q0W5W/bKMrHshtcJawsO8C+PBxxPV9Da+5ZkguW4a1ErGCCPI0SVVW1QCTrPyrbJHyw9LteX98cnY6PGy1XVXWL+mKOK0jwL+yV299dMpk4R6u5+oO5ZX9WfoNsF3rEvfMiQxFSaH9HMR7q9GySno3NSzLW0QKBgQDMlyfqhnkDEY/rgRTo42FpX1KVf9JOP0L9+B2Q7Rec7iARuT6/qSxoV6PwNyYixyjbXx8xJQHoUDTRSgY5v543Nmh+bLOyR5NfNRqEmYpKtb0T4qB57jBMiVXcoIPXwcb7yVscAvI/rycDqEkOVgTqRdR0FW7q/svF9EuTzjNjfQKBgQDXtP7NY0U81jSno3xcuECdoQjb3WEZttKPwjwXY7FoIVPA/oYpQVNhxSrfUT3UXos31deFGoOm1ebRj7/2nKVHb0mBvVYdFByikPH6PfbSa/IlYptE4AviNwaWGUaW+ROKZtUc8qmzhHOwNZZhZwv2ggQkQUvaZNTJFDLJc0KJ8QKBgQDD/wr+YlUL24dE1iRx92Maz3cOQaX30CMdqtSoQnqcnIOcdxrmAevJCizDtBGUv7ckcbwwGIP7SttOpNvR9wBbZIQ2mWyNHoTQcM82uOEDMZgxtKqIJOegavEWq6+iwsEd9YiTDT+GQwXdOxrB4SZUSRF/JAlelzogKik9MA2LAQKBgG5cjf9V+6Ka2QjxkIV73/h5P5f08fUNAkLGiUjnH+eozsC3PGnifSwLVlfun8iHDXLwOtUK9xzGJ3yd/a8e9BBhZ8Xyd3Fqz2+q4cxorAz0UhZUnwDPUuLdEABntansYMhkrsOcXAiIQmFmMlgoHmbVHpFmWBy7VL3w2xDn1UM1 - aMapPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtdDhlR34eJmp6DtgxO8QPE4qaKCg7eVg6Ws2ACmCrN0ceWrlj6BhHREXtcMjkACd+A5hFC2nE79v5nY2qy6bS/7I922u11Q3QKYTc66yMy7Dbs06ivYMReRHgAHqNOh9uqy615iLzi9ChLFLsMc7shQdJNx2XPMTPcpdzF7b9mdD6YmG73d9rHexxWYjPh9pXcwWZV6drwu3GtGo/wXJCHlmP7yaOZONNIJU63LvBUmWy0WjBM5iRMrLFWc4doD8Lz1R6GL0SF6ZIqjYIckVpissAvodO389tbfeMoY/n/6xoit2GN4L+UtsSdTYJg345ibxTAd6NNEB/xpSWoi3DQIDAQAB - appId: 202306150188103814 - devUrl: https://restapi.amap.com/rest/openmp/devgw?key=7967738241f0a580b5a1342f43793a61 - prdUrl: https://restapi.amap.com/rest/openmp/gw?key=7967738241f0a580b5a1342f43793a61 - openId: 2089000923284502 \ No newline at end of file diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java index b59ba21f8..7118d0559 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java @@ -25,8 +25,9 @@ public class AMapUtils { private static String MERCHANT_PRIVATE_KEY; private static String AMAP_PUBLIC_KEY; private static String APP_ID; - private static String DEV_URL; - private static String PRD_URL; + // private static String DEV_URL; + // private static String PRD_URL; + private static String API_URL; @Value("${aMap.merchantPrivateKey}") public void setMerchantPrivateKey(String merchantPrivateKey) { @@ -43,14 +44,19 @@ public class AMapUtils { AMapUtils.APP_ID = appId; } - @Value("${aMap.devUrl}") - public void setDevUrl(String devUrl) { - AMapUtils.DEV_URL = devUrl; - } + // @Value("${aMap.devUrl}") + // public void setDevUrl(String devUrl) { + // AMapUtils.DEV_URL = devUrl; + // } - @Value("${aMap.prdUrl}") - public void setPrdUrl(String prdUrl) { - AMapUtils.PRD_URL = prdUrl; + // @Value("${aMap.prdUrl}") + // public void setPrdUrl(String prdUrl) { + // AMapUtils.PRD_URL = prdUrl; + // } + + @Value("${aMap.apiUrl}") + public void setApiUrl(String apiUrl) { + AMapUtils.API_URL = apiUrl; } /** @@ -105,7 +111,7 @@ public class AMapUtils { // 线上环境:https://restapi.amap.com/rest/openmp/gw?key=高德云店秘钥key // 高德云店秘钥key请登录高德云店「接入准备及配置」页面查看 RestTemplate restTemplate = new RestTemplate(); - ResponseEntity resp = restTemplate.postForEntity(DEV_URL, entity, String.class); + ResponseEntity resp = restTemplate.postForEntity(API_URL, entity, String.class); if (resp.getBody() != null && !"".equals(resp.getBody())) { JSONObject respObj = JSONObject.parseObject(resp.getBody()); System.out.println("高德返回结果:" + respObj);