From 8abae442b6d959f17a12df868c4e838d3e127356 Mon Sep 17 00:00:00 2001
From: pandaapo <35672972+pandaapo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 18:05:22 +0800
Subject: [PATCH] Upgrade owasp esapi's configuration (#492)

---
 CHANGELOG.md                                           |  1 +
 .../src/main/resources/ESAPI.properties                | 10 ++++++++--
 .../src/main/resources/ESAPI.properties                | 10 ++++++++--
 .../src/main/resources/ESAPI.properties                | 10 ++++++++--
 .../src/main/resources/ESAPI.properties                | 10 ++++++++--
 .../src/main/resources/ESAPI.properties                | 10 ++++++++--
 6 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fc4b8ca3..b02892f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,3 +4,4 @@
 - [Feature: support ribbon service-level rule customization](https://github.com/Tencent/spring-cloud-tencent/pull/478)
 - [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/479)
 - [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)
+- [Upgrade owasp esapi's configuration](https://github.com/Tencent/spring-cloud-tencent/pull/492)
diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties
index d83195ab8..32df629d9 100644
--- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties
+++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties
@@ -1,8 +1,14 @@
 ESAPI.printProperties=true
-
 ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
 
-# ESAPI Encoder
 Encoder.AllowMultipleEncoding=false
 Encoder.AllowMixedEncoding=false
 Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec
+
+Logger.LogEncodingRequired=false
+Logger.UserInfo=false
+Logger.ClientInfo=false
+Logger.ApplicationName=ExampleApplication
+Logger.LogApplicationName=false
+Logger.LogServerIP=false
diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties
index d83195ab8..32df629d9 100644
--- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties
+++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties
@@ -1,8 +1,14 @@
 ESAPI.printProperties=true
-
 ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
 
-# ESAPI Encoder
 Encoder.AllowMultipleEncoding=false
 Encoder.AllowMixedEncoding=false
 Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec
+
+Logger.LogEncodingRequired=false
+Logger.UserInfo=false
+Logger.ClientInfo=false
+Logger.ApplicationName=ExampleApplication
+Logger.LogApplicationName=false
+Logger.LogServerIP=false
diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties
index d83195ab8..32df629d9 100644
--- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties
+++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties
@@ -1,8 +1,14 @@
 ESAPI.printProperties=true
-
 ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
 
-# ESAPI Encoder
 Encoder.AllowMultipleEncoding=false
 Encoder.AllowMixedEncoding=false
 Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec
+
+Logger.LogEncodingRequired=false
+Logger.UserInfo=false
+Logger.ClientInfo=false
+Logger.ApplicationName=ExampleApplication
+Logger.LogApplicationName=false
+Logger.LogServerIP=false
diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties
index d83195ab8..32df629d9 100644
--- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties
+++ b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties
@@ -1,8 +1,14 @@
 ESAPI.printProperties=true
-
 ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
 
-# ESAPI Encoder
 Encoder.AllowMultipleEncoding=false
 Encoder.AllowMixedEncoding=false
 Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec
+
+Logger.LogEncodingRequired=false
+Logger.UserInfo=false
+Logger.ClientInfo=false
+Logger.ApplicationName=ExampleApplication
+Logger.LogApplicationName=false
+Logger.LogServerIP=false
diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties
index d83195ab8..32df629d9 100644
--- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties
+++ b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties
@@ -1,8 +1,14 @@
 ESAPI.printProperties=true
-
 ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder
+ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory
 
-# ESAPI Encoder
 Encoder.AllowMultipleEncoding=false
 Encoder.AllowMixedEncoding=false
 Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec
+
+Logger.LogEncodingRequired=false
+Logger.UserInfo=false
+Logger.ClientInfo=false
+Logger.ApplicationName=ExampleApplication
+Logger.LogApplicationName=false
+Logger.LogServerIP=false