From c8736494cf9b75aa176743a73f41843f53b43eed Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 17:26:48 +0800 Subject: [PATCH] fix video --- mallinkAdmin/src/main/resources/application-dev.yml | 6 ++++++ mallinkAdmin/src/main/resources/application-prod.yml | 6 ++++++ mallinkBApi/src/main/resources/application-dev.yml | 6 ++++++ mallinkBApi/src/main/resources/application-prod.yml | 6 ++++++ mallinkCApi/src/main/resources/application-dev.yml | 6 ++++++ mallinkCApi/src/main/resources/application-prod.yml | 6 ++++++ mallinkCallback/src/main/resources/application-dev.yml | 6 ++++++ mallinkCallback/src/main/resources/application-prod.yml | 6 ++++++ mallinkMQConsumer/src/main/resources/application-dev.yml | 6 ++++++ mallinkMQConsumer/src/main/resources/application-prod.yml | 6 ++++++ mallinkPosApi/src/main/resources/application-dev.yml | 6 ++++++ mallinkPosApi/src/main/resources/application-prod.yml | 6 ++++++ mallinkPublicApi/src/main/resources/application-dev.yml | 6 ++++++ mallinkPublicApi/src/main/resources/application-prod.yml | 6 ++++++ .../park/impl/jieshun/JieShunParkCallbackService.java | 3 +++ 15 files changed, 87 insertions(+) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 61418fccb..52dfd13b9 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -166,6 +166,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing jasypt: diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index d870af674..83d0f4b60 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -126,6 +126,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 10c107aae..3928e6030 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -162,6 +162,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index d4cfd7c38..f446e839f 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -118,6 +118,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index d466cafa0..3872bd4c3 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -158,6 +158,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing jasypt: encryptor: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index eeee155ef..0ab8176b1 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -117,6 +117,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index d97a8e530..5e1e0cada 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -164,6 +164,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing jasypt: encryptor: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 447e84453..06a4aa0fc 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -122,6 +122,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index bc9209e7f..c2464f0be 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -158,6 +158,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing jasypt: encryptor: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 416ea13b1..4730a4320 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -117,6 +117,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 2424d62f5..90f228f13 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -162,6 +162,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 162c7a3f6..32cfdbd36 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -116,6 +116,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkPublicApi/src/main/resources/application-dev.yml b/mallinkPublicApi/src/main/resources/application-dev.yml index aad7e236a..7a2448bd3 100644 --- a/mallinkPublicApi/src/main/resources/application-dev.yml +++ b/mallinkPublicApi/src/main/resources/application-dev.yml @@ -158,6 +158,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing jasypt: encryptor: diff --git a/mallinkPublicApi/src/main/resources/application-prod.yml b/mallinkPublicApi/src/main/resources/application-prod.yml index 1de08ddbc..5995443c3 100644 --- a/mallinkPublicApi/src/main/resources/application-prod.yml +++ b/mallinkPublicApi/src/main/resources/application-prod.yml @@ -117,6 +117,12 @@ alipay: alipayCertPath: /opt/iformall/service/alipay/alipayCertPublicKey_RSA2.crt alipayRootCertPath: /opt/iformall/service/alipay/alipayRootCert.crt callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback + +video: + aliyun: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + regionId: cn-beijing fm: exception: true diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java index 4d8634ac4..ab53e3ca9 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java @@ -44,6 +44,9 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB WxCarJSOrderMapper wxCarJSOrderMapper; private String handleCarNumber(String carNumber) { + if (StringUtils.isBlank(carNumber)) { + return "空车牌"; + } if (carNumber.contains("-")) { carNumber = carNumber.replaceAll("-", ""); }