[shenyu] branch master updated: modify pluginJar to Base64 String in PluginData (#4473)

[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 d764f9df4 modify pluginJar to Base64 String in PluginData (#4473)
d764f9df4 is described below

commit d764f9df4810171361ee1692f27015a07abaf0e9
Author: Misaya295 <45778734+misaya...@users.noreply.github.com>
AuthorDate: Thu Mar 16 13:38:39 2023 +0800

    modify pluginJar to Base64 String in PluginData (#4473)
    
    * modify pluginJar to Base64 String in PluginData
    
    * fix ci
    
    * fix ci
---
 .../apache/shenyu/admin/transfer/PluginTransfer.java    |  2 ++
 .../java/org/apache/shenyu/common/dto/PluginData.java   | 17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/PluginTransfer.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/PluginTransfer.java
index c083cfea6..ccc833125 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/PluginTransfer.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/PluginTransfer.java
@@ -20,6 +20,7 @@ package org.apache.shenyu.admin.transfer;
 import org.apache.shenyu.admin.model.entity.PluginDO;
 import org.apache.shenyu.admin.model.vo.PluginVO;
 import org.apache.shenyu.common.dto.PluginData;
+import org.springframework.util.Base64Utils;
 
 import java.util.Optional;
 
@@ -48,6 +49,7 @@ public enum PluginTransfer {
                         .role(v.getRole())
                         .enabled(v.getEnabled())
                         .sort(v.getSort())
+                        
.pluginJar(Optional.ofNullable(v.getPluginJar()).map(Base64Utils::encodeToString).orElse(""))
                         .build())
                 .orElse(null);
     }
diff --git 
a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/PluginData.java 
b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/PluginData.java
index e8df01404..827150322 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/PluginData.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/PluginData.java
@@ -17,7 +17,6 @@
 
 package org.apache.shenyu.common.dto;
 
-import java.util.Arrays;
 import java.util.Objects;
 
 /**
@@ -39,7 +38,7 @@ public class PluginData {
 
     private Integer sort;
 
-    private byte[] pluginJar;
+    private String pluginJar;
 
     /**
      * no args constructor.
@@ -56,7 +55,7 @@ public class PluginData {
      * @param role    role
      * @param enabled enabled
      */
-    public PluginData(final String id, final String name, final String config, 
final String role, final Boolean enabled, final byte[] pluginJar) {
+    public PluginData(final String id, final String name, final String config, 
final String role, final Boolean enabled, final String pluginJar) {
         this.id = id;
         this.name = name;
         this.config = config;
@@ -76,7 +75,7 @@ public class PluginData {
      * @param sort sort
      */
     public PluginData(final String id, final String name, final String config, 
final String role, final Boolean enabled,
-                      final Integer sort, final byte[] pluginJar) {
+                      final Integer sort, final String pluginJar) {
         this.id = id;
         this.name = name;
         this.config = config;
@@ -195,7 +194,7 @@ public class PluginData {
      * get pluginJar.
      * @return pluginJar
      */
-    public byte[] getPluginJar() {
+    public String getPluginJar() {
         return pluginJar;
     }
 
@@ -203,7 +202,7 @@ public class PluginData {
      * set pluginJar.
      * @param pluginJar pluginJar
      */
-    public void setPluginJar(final byte[] pluginJar) {
+    public void setPluginJar(final String pluginJar) {
         this.pluginJar = pluginJar;
     }
 
@@ -262,7 +261,7 @@ public class PluginData {
                 + ", role='" + role + '\''
                 + ", enabled=" + enabled
                 + ", sort=" + sort
-                + ", pluginJar=" + Arrays.toString(pluginJar)
+                + ", pluginJar=" + pluginJar
                 + '}';
     }
 
@@ -304,7 +303,7 @@ public class PluginData {
         /**
          * sort.
          */
-        private byte[] pluginJar;
+        private String pluginJar;
 
 
         /**
@@ -395,7 +394,7 @@ public class PluginData {
          * @param  pluginJar pluginJar
          * @return this
          */
-        public Builder pluginJar(final byte[] pluginJar) {
+        public Builder pluginJar(final String pluginJar) {
             this.pluginJar = pluginJar;
             return this;
         }