fix

Author: stateIs0

README.md

@@ -211,7 +211,7 @@ public interface StreamAppContext {
 
 ## extension
 
-cn.think.in.java.open.exp.client.TenantCallback
+cn.think.in.java.open.exp.client.PluginFilter
 
 ```java
 public interface TenantCallback {

README_cn.md

@@ -204,7 +204,7 @@ public interface StreamAppContext {
 
 ## 扩展
 
-cn.think.in.java.open.exp.client.TenantCallback
+cn.think.in.java.open.exp.client.PluginFilter
 
 ```java
 public interface TenantCallback {

example/example-springboot2/src/main/java/cn/think/in/java/open/exp/adapter/springboot2/BaseController.java

@@ -4,7 +4,7 @@
 import cn.think.in.java.open.exp.client.ExpAppContext;
 import cn.think.in.java.open.exp.client.ExpAppContextSpiFactory;
 import cn.think.in.java.open.exp.client.Plugin;
-import cn.think.in.java.open.exp.client.TenantCallback;
+import cn.think.in.java.open.exp.client.PluginFilter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,25 +27,19 @@ public class BaseController {
     Map<String, Integer> sortMap = new HashMap<>();
     Map<String, String> pluginIdTenantIdMap = new HashMap<>();
 
-    TenantCallback callback;
+    PluginFilter callback;
 
     public BaseController() {
         sortMap.put("example-plugin1_1.0.0", 1);
         sortMap.put("example-plugin2_2.0.0", 2);
         pluginIdTenantIdMap.put("example-plugin2_2.0.0", "12345");
         pluginIdTenantIdMap.put("example-plugin1_1.0.0", "12345");
 
-        callback = new TenantCallback() {
-            @Override
-            public int getSort(String pluginId) {
-                // 获取这个插件的排序
-                return sortMap.get(pluginId);
-            }
+        callback = new PluginFilter() {
 
             @Override
-            public boolean filter(String pluginId) {
-                // 判断当前租户是不是这个匹配这个插件
-                return context.get().equals(pluginIdTenantIdMap.get(pluginId));
+            public <T> List<FModel<T>> filter(List<FModel<T>> list) {
+                return list;
             }
         };
 

example/simple-java-app/src/main/java/cn/think/in/java/simple/app/example/SimpleJavaAppMain.java

@@ -2,7 +2,7 @@
 
 import cn.think.in.java.open.exp.adapter.springboot2.example.UserService;
 import cn.think.in.java.open.exp.client.ExpAppContext;
-import cn.think.in.java.open.exp.client.TenantCallback;
+import cn.think.in.java.open.exp.client.PluginFilter;
 import cn.think.in.java.open.exp.core.impl.Bootstrap;
 import lombok.extern.slf4j.Slf4j;
 
@@ -13,17 +13,11 @@
 @Slf4j
 public class SimpleJavaAppMain {
     static ExpAppContext expAppContext;
-    static TenantCallback callback = new TenantCallback() {
-        @Override
-        public int getSort(String pluginId) {
-            int sort = new Random().nextInt(10);
-            log.info(pluginId + " >>>>>>> " + sort);
-            return sort;
-        }
+    static PluginFilter callback = new PluginFilter() {
 
         @Override
-        public boolean filter(String pluginId) {
-            return true;
+        public <T> List<FModel<T>> filter(List<FModel<T>> list) {
+            return list;
         }
     };
 

open-exp-code/auto-install-exp-maven-plugin/src/main/java/cn/think/in/java/auto/install/maven/plugin/UploadMojo.java

@@ -57,18 +57,16 @@ public void execute() throws MojoExecutionException {
         } catch (MalformedURLException e) {
             throw new RuntimeException(e);
         }
-        URL resource = urlClassLoader.findResource("pluginInfo.properties");
-        URL resource2 = urlClassLoader.findResource("eep.config");
+        URL resource = urlClassLoader.findResource("pluginMeta.properties");
         Properties properties = new Properties();
         try {
             properties.load(resource.openStream());
-            properties.load(resource2.openStream());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
 
-        Object o = properties.get("esign.plugin.code");
-        Object o2 = properties.get("esign.plugin.version");
+        Object o = properties.get("exp.plugin.code");
+        Object o2 = properties.get("exp.plugin.version");
 
         String id = o + "_" + o2;
 

open-exp-code/open-exp-client-api/src/main/java/cn/think/in/java/open/exp/client/ExpAppContext.java

@@ -7,7 +7,7 @@
 /**
  * @author cxs
  */
-public interface ExpAppContext extends StreamAppContext, TenantService {
+public interface ExpAppContext extends StreamAppContext, PluginFilterService {
 
     /**
      * 获取当前所有的插件 id

open-exp-code/open-exp-client-api/src/main/java/cn/think/in/java/open/exp/client/PluginFilter.java

@@ -0,0 +1,33 @@
+package cn.think.in.java.open.exp.client;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author cxs
+ **/
+public interface PluginFilter {
+
+    PluginFilter MOCK = new PluginFilterMock();
+
+    <T> List<FModel<T>> filter(List<FModel<T>> list);
+
+    @Data
+    class FModel<T> {
+        T t;
+        String pluginId;
+
+        public FModel(T t, String pluginId) {
+            this.t = t;
+            this.pluginId = pluginId;
+        }
+    }
+
+    class PluginFilterMock implements PluginFilter {
+        @Override
+        public <T> List<FModel<T>> filter(List<FModel<T>> list) {
+            return list;
+        }
+    }
+}

open-exp-code/open-exp-client-api/src/main/java/cn/think/in/java/open/exp/client/PluginFilterService.java

@@ -0,0 +1,13 @@
+package cn.think.in.java.open.exp.client;
+
+import java.util.List;
+
+/**
+ * @Author cxs
+ **/
+public interface PluginFilterService {
+
+    <P> List<P> get(String extCode, PluginFilter filter);
+
+    <P> List<P> get(Class<P> pClass, PluginFilter callback);
+}