[shenyu] branch master updated: Optimize code for shenyu-admin (#4442)

[xiaoyu]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new b7c0c5961 Optimize code for shenyu-admin (#4442)
b7c0c5961 is described below

commit b7c0c5961250bc835d8067fc190193603fb2ea93
Author: balloon72 <96562725+balloo...@users.noreply.github.com>
AuthorDate: Mon Mar 6 19:32:27 2023 +0800

    Optimize code for shenyu-admin (#4442)
    
    * Optimize code for shenyu-admin
    
    * Optimize code for shenyu-admin
    
    * Optimize code for shenyu-admin
    
    ---------
    
    Co-authored-by: hanmo1 <ISFA-9844>
    Co-authored-by: xiaoyu <xia...@apache.org>
---
 .../apache/shenyu/admin/listener/websocket/WebsocketConfigurator.java   | 2 +-
 .../java/org/apache/shenyu/admin/service/impl/ResourceServiceImpl.java  | 1 +
 .../main/java/org/apache/shenyu/admin/utils/ShenyuDictH2Trigger.java    | 2 +-
 .../plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketConfigurator.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketConfigurator.java
index 8a94a4506..39db705e4 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketConfigurator.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketConfigurator.java
@@ -68,7 +68,7 @@ public class WebsocketConfigurator extends 
ServerEndpointConfig.Configurator imp
                     return true;
                 }
             }
-            LOG.error("originHeaderValue is forbidden: " + originHeaderValue);
+            LOG.error("originHeaderValue is forbidden: {}", originHeaderValue);
             return false;
         }
         return super.checkOrigin(originHeaderValue);
diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ResourceServiceImpl.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ResourceServiceImpl.java
index d84c14d3a..20229d98d 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ResourceServiceImpl.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ResourceServiceImpl.java
@@ -222,6 +222,7 @@ public class ResourceServiceImpl implements ResourceService 
{
      *
      * @param event event
      */
+    @Transactional(rollbackFor = Exception.class)
     @EventListener(value = BatchPluginDeletedEvent.class)
     public void onPluginDeleted(final BatchPluginDeletedEvent event) {
         // 5. delete resource & permission.
diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShenyuDictH2Trigger.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShenyuDictH2Trigger.java
index ac92746f1..31436fe03 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShenyuDictH2Trigger.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShenyuDictH2Trigger.java
@@ -45,7 +45,7 @@ public class ShenyuDictH2Trigger implements Trigger {
                         + " VALUES ( ?, ?, ?, ?, ?, ?, ?, ?)")) {
             BaseTrigger.sqlExecute(newRow, statement);
         } catch (ShenyuException e) {
-            LOG.error("ShenyuDictH2Trigger Error:" + e);
+            LOG.error("ShenyuDictH2Trigger Error: ", e);
         }
     }
 
diff --git 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
index 7a81c2b51..bc1ccdf2b 100644
--- 
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
+++ 
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/client/ClickHouseLogCollectClient.java
@@ -133,7 +133,7 @@ public class ClickHouseLogCollectClient extends 
AbstractLogConsumeClient<ClickHo
             
request.query(String.format(ClickHouseLoggingConstant.CREATE_TABLE_SQL, 
database, config.getEngine())).executeAndWait();
             
request.query(String.format(ClickHouseLoggingConstant.CREATE_DISTRIBUTED_TABLE_SQL,
 database, database, config.getClusterName(), database)).executeAndWait();
         } catch (Exception e) {
-            LOG.error("inti ClickHouseLogClient error" + e);
+            LOG.error("inti ClickHouseLogClient error", e);
         }
     }
 }