diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
index c5ed6ec2..237d5555 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CoreDispatcher.java
@@ -37,10 +37,8 @@ import static com.xhpc.evcs.config.EvcsFilter.encryptReqOut;
@Slf4j
public class CoreDispatcher {
- @Value("http://hlht.cd-test.zcsy-inc.cn/evcs/20160701")
- private String evcsSrvUrl;
- @Value("true")
- private boolean oklog = false;
+ @Value("${xhpc.evcs.oklog:true}")
+ private boolean oklog;
@Autowired
private AuthSecretTokenRepository authSecretTokenRepository;
public static final okhttp3.MediaType JSON = okhttp3.MediaType.parse("application/json; charset=utf-8");
@@ -49,10 +47,10 @@ public class CoreDispatcher {
public String ok(Object object, String url, String operatorId3irdpty, String operatorID) {
okhttp3.RequestBody body = null;
- HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
- logging.setLevel(HttpLoggingInterceptor.Level.BODY);
OkHttpClient.Builder builder = new OkHttpClient.Builder();
if (oklog) {
+ HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+ logging.setLevel(HttpLoggingInterceptor.Level.BODY);
builder.addInterceptor(logging);
}
builder.connectTimeout(10, TimeUnit.SECONDS)
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/CDCoreDispatcher.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/CDCoreDispatcher.java
deleted file mode 100644
index f3c50071..00000000
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/CDCoreDispatcher.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.xhpc.evcs.cd;
-
-import com.xhpc.evcs.api.CoreDispatcher;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-
-@Slf4j
-public abstract class CDCoreDispatcher extends CoreDispatcher {
-
- @Value("${xhpc.evcs.cdevcs.srv.url}")
- public String evcsSrvUrl;
-
- public String getEvcsSrvUrl() {
-
- return evcsSrvUrl;
- }
-
- public void setEvcsSrvUrl(String evcsSrvUrl) {
-
- this.evcsSrvUrl = evcsSrvUrl;
- }
-
-}
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java
index 28d9891a..a51e0f6c 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java
@@ -1,5 +1,6 @@
package com.xhpc.evcs.cd;
+import com.xhpc.evcs.api.CoreDispatcher;
import com.xhpc.order.domain.XhpcHistoryOrder;
import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval;
import com.xhpc.evcs.domain.AuthSecretToken;
@@ -27,7 +28,7 @@ import static com.xhpc.evcs.cd.NotificationEquipChargeStatusTask.transferInterne
import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT;
@Component
-public class NotificationChargeOrderInfo4BonusTask extends CDCoreDispatcher {
+public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher {
@Autowired
private XhpcHistoryOrderRepository xhpcHistoryOrderRepository;
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java
index 74793ab4..0ea7b120 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java
@@ -3,6 +3,7 @@ package com.xhpc.evcs.cd;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import com.xhpc.common.data.redis.CacheRateModel;
+import com.xhpc.evcs.api.CoreDispatcher;
import com.xhpc.evcs.domain.AuthSecretToken;
import com.xhpc.evcs.dto.*;
import com.xhpc.evcs.jpa.AuthSecretTokenRepository;
@@ -26,7 +27,7 @@ import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT;
import static com.xhpc.evcs.utils.DateUtil.DATE_FORMAT_DATE_TIME;
@Component
-public class NotificationEquipChargeStatusTask extends CDCoreDispatcher {
+public class NotificationEquipChargeStatusTask extends CoreDispatcher {
@Autowired
private AuthSecretTokenRepository authSecretTokenRepository;
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
index c97ede51..aaa5f7be 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java
@@ -1,6 +1,7 @@
package com.xhpc.evcs.cd;
import com.xhpc.common.api.dto.ChargingStationDto;
+import com.xhpc.evcs.api.CoreDispatcher;
import com.xhpc.evcs.domain.AuthSecretToken;
import com.xhpc.evcs.dto.*;
import com.xhpc.evcs.jpa.AuthSecretTokenRepository;
@@ -21,7 +22,7 @@ import static com.xhpc.evcs.dto.ConnectorStatusInfo.*;
import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT;
@Component
-public class NotificationStationStatusTask extends CDCoreDispatcher {
+public class NotificationStationStatusTask extends CoreDispatcher {
@Autowired
private AuthSecretTokenRepository authSecretTokenRepository;
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java
index 31006d6b..95aa61c7 100644
--- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java
@@ -52,7 +52,7 @@ public class EvcsFilter extends OncePerRequestFilter {
@Resource
private AuthSecretTokenRepository authSecretTokenRepository;
@Value("${xhpc.evcs.encrypt:false}")
- private boolean encrypt = false;
+ private boolean encrypt;
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException {
diff --git a/pom.xml b/pom.xml
index 9d3a38f3..11b74932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
2.5.1
2020.0.3
2021.1
- 1.1.0
+ 2.0.2
2.4.1
2.1.4
3.0.0