diff --git a/web-common/src/main/java/com/inspur/edp/web/common/environment/checker/ExecuteEnvironmentChecker.java b/web-common/src/main/java/com/inspur/edp/web/common/environment/checker/ExecuteEnvironmentChecker.java
index aef7c11b24719c2191650a42a25ccef4228633ec..6af0b017285a812f1281e7b246c5cc55770947fd 100644
--- a/web-common/src/main/java/com/inspur/edp/web/common/environment/checker/ExecuteEnvironmentChecker.java
+++ b/web-common/src/main/java/com/inspur/edp/web/common/environment/checker/ExecuteEnvironmentChecker.java
@@ -30,7 +30,7 @@ import io.iec.edp.caf.commons.exception.ExceptionLevel;
  * @Create: 2022/7/29 15:20
  */
 public class ExecuteEnvironmentChecker {
-    private static final String endMessage = "若已安装，请尝试重启IGIX服务。";
+    private static final String endMessage = "若已安装，请尝试重启iGIX服务。";
 
     private static final String prefixMessage = "当前环境";
     /**
diff --git a/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java b/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java
index 0bb8d8b3c6b5890d697458b5bf52a49f4b61e826..5fd1045f71c20f7d32a0315efc31026b51538c65 100644
--- a/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java
+++ b/web-common/src/main/java/com/inspur/edp/web/common/logger/WebLogger.java
@@ -23,11 +23,8 @@ import org.slf4j.LoggerFactory;
 import java.util.Arrays;
 
 /**
- * @Title: WebLogger
- * @Description: com.inspur.edp.web.common.logger
- * @Author: Noah
- * @Version: V1.0
- * @Create: 2022/5/11 9:41
+ * web 统一的日志输出类 使用枚举的目的是为了保证绝对单例
+ * @author  noah
  */
 public enum WebLogger {
     /**
diff --git a/web-common/src/main/java/com/inspur/edp/web/common/serialize/MyPropertyNamingStrategy.java b/web-common/src/main/java/com/inspur/edp/web/common/serialize/MyPropertyNamingStrategy.java
index 37b81df2e1755cceb3b73ef302d63cc2d932ba4f..8ab55856380c2842c85f8e26b1ce25e0c1e966b9 100644
--- a/web-common/src/main/java/com/inspur/edp/web/common/serialize/MyPropertyNamingStrategy.java
+++ b/web-common/src/main/java/com/inspur/edp/web/common/serialize/MyPropertyNamingStrategy.java
@@ -29,17 +29,17 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy;
  */
 public class MyPropertyNamingStrategy extends PropertyNamingStrategy {
     @Override
-    public String nameForField(MapperConfig< ? > config, AnnotatedField field, String defaultName) {
+    public String nameForField(MapperConfig<?> config, AnnotatedField field, String defaultName) {
         return convert(defaultName);
     }
 
     @Override
-    public String nameForGetterMethod(MapperConfig< ? > config, AnnotatedMethod method, String defaultName) {
+    public String nameForGetterMethod(MapperConfig<?> config, AnnotatedMethod method, String defaultName) {
         return convert(defaultName);
     }
 
     @Override
-    public String nameForSetterMethod(MapperConfig< ? > config, AnnotatedMethod method, String defaultName) {
+    public String nameForSetterMethod(MapperConfig<?> config, AnnotatedMethod method, String defaultName) {
         return convert(defaultName);
     }
 
diff --git a/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java b/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
index cd9eda44c959269a49000b119e8c22580395afe9..f09b598dd2f53d772f8d188fa29cbbd7312fa1fb 100644
--- a/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
+++ b/web-common/src/test/java/com/inspur/edp/web/common/CopyJarFile.java
@@ -157,11 +157,11 @@ public class CopyJarFile {
         moduleMap.put("jitengine-web-core", ModulePath.init("web-jitengine-web-core"));
         moduleMap.put("web-npmpackage-core", ModulePath.init("web-npmpackage-core", "server/platform/common/libs", "npmpackage"));
         moduleMap.put("web-npmpackage-api", ModulePath.init("web-npmpackage-api", "server/platform/common/libs", "npmpackage"));
-        moduleMap.put("web-npmpackage-patch", ModulePath.init("web-npmpackage-patch", "server/platform/common/libs", "npmpackage"));
-        moduleMap.put("web-dynamic-form-api", ModulePath.init("web-dynamicform-api"));
-        moduleMap.put("web-dynamic-form-core", ModulePath.init("web-dynamicform-core"));
-        moduleMap.put("web-formconfig-api", ModulePath.init("web-formconfig-api"));
-        moduleMap.put("web-formconfig-core", ModulePath.init("web-formconfig-core"));
+//        moduleMap.put("web-npmpackage-patch", ModulePath.init("web-npmpackage-patch", "server/platform/common/libs", "npmpackage"));
+//        moduleMap.put("web-dynamic-form-api", ModulePath.init("web-dynamicform-api"));
+//        moduleMap.put("web-dynamic-form-core", ModulePath.init("web-dynamicform-core"));
+//        moduleMap.put("web-formconfig-api", ModulePath.init("web-formconfig-api"));
+//        moduleMap.put("web-formconfig-core", ModulePath.init("web-formconfig-core"));
         return moduleMap;
     }
 
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java
index bdae80ce06dad6e3dfbd390507e1dfe209904c91..6c25a189e75eb417f455c2b867655fe7c6553bf5 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/config/FormMetadataConfiguration.java
@@ -24,7 +24,10 @@ import com.inspur.edp.web.formmetadata.service.FormMetadataRTService;
 import com.inspur.edp.web.formmetadata.service.FormMetadataService;
 import com.inspur.edp.web.formmetadata.service.FormRelateMetadataService;
 import com.inspur.edp.web.formmetadata.webservice.FormMetadataWebServiceImpl;
+import io.iec.edp.caf.businessobject.api.service.DevBasicInfoService;
 import io.iec.edp.caf.rest.RESTEndpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -40,12 +43,22 @@ public class FormMetadataConfiguration {
         return new FormMetadataRTService();
     }
 
+    /**
+     * 增加 ConditionOnClass 的目的是为了在补丁工具中，不存在这个 class 的时候，不需要该 bean
+     * @return
+     */
     @Bean
+    @ConditionalOnClass(name = {"io.iec.edp.caf.businessobject.api.service.DevBasicInfoService"})
     public FormMetadataCommonService formMetadataCommonService() {
         return new FormMetadataCommonServiceImpl();
     }
 
+    /**
+     * 增加 ConditionOnClass 的目的是为了在补丁工具中，不存在这个 class 的时候，不需要该 bean
+     * @return
+     */
     @Bean
+    @ConditionalOnClass(name = {"io.iec.edp.caf.licservice.api.manager.StandardControlFactory"})
     public FormMetadataCreateLicControlListener getFormMetadataCreateLicControlListener() {
         return new FormMetadataCreateLicControlListener();
     }
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java
index 93c060a2bc15c074259a4405b2b4c9adfb013273..7249b5893b26cd5151bed9af3174b6d1d548f795 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/event/FormMetadataSaveEventListener.java
@@ -59,9 +59,7 @@ public class FormMetadataSaveEventListener implements MetadataEventListener {
      */
     @Override
     public void fireMetadataSavedEvent(MetadataEventArgs metadataEventArgs) {
-        if (metadataEventArgs == null || metadataEventArgs.getMetadata() == null
-                || metadataEventArgs.getMetadata().getHeader() == null) {
-        }
+
 
     }
 
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/QuerySchemeI18nResourceStrategy.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/QuerySchemeI18nResourceStrategy.java
index 06d4144d341b38d9062d81deb5af3ddd5b3b6762..5590c7d23e55b93837b361c86392e87a5234753e 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/QuerySchemeI18nResourceStrategy.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/i18n/component/strategy/i18nresourcestrategy/QuerySchemeI18nResourceStrategy.java
@@ -59,8 +59,21 @@ public class QuerySchemeI18nResourceStrategy extends AbstractI18nResourceStrateg
      */
     @Override
     protected I18nResourceItemCollection extractAttributeI18nResourceItemCollection(String i18nResourceItemBaseId, HashMap<String, Object> currentComponent) {
-        // 从fieldConfigs属性中提取多语字段
         I18nResourceItemCollection i18nResourceItemCollection = new I18nResourceItemCollection();
+        // 提取 filterText 的参数值
+        String filterTextKey = "filterText";
+        if (currentComponent.containsKey(filterTextKey)) {
+            // 表示筛选按钮文本为常量显示
+            if (currentComponent.get(filterTextKey) instanceof String) {
+                String currentComponentType = ComponentUtility.getInstance().getType(currentComponent);
+                String currentComponentId = ComponentUtility.getInstance().getId(currentComponent);
+                String filterTextValue = ComponentUtility.getInstance().getValue(currentComponent, filterTextKey);
+                String generatedComponentId = currentComponentType + "/" + currentComponentId + "/filterText";
+                I18nResourceItem i18nResourceItem = I18nResourceItemManager.createI18nResourceItem(i18nResourceItemBaseId, generatedComponentId, filterTextValue, "筛选按钮文本");
+                this.addInCollection(i18nResourceItemCollection, i18nResourceItem);
+            }
+        }
+        // 从fieldConfigs属性中提取多语字段
 
         I18nResourceItemCollection fieldConfigsI18nResourceItemCollection = extractFieldConfigsI18nResourceItemCollection(i18nResourceItemBaseId, currentComponent);
         if (fieldConfigsI18nResourceItemCollection != null && fieldConfigsI18nResourceItemCollection.size() > 0) {
diff --git a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetadataCommonServiceImpl.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetadataCommonServiceImpl.java
index 6b7782db7b6db53748aa65a119cb96c676ac54e7..08e74405fc824367d4928b4b6e561f7149ce9000 100644
--- a/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetadataCommonServiceImpl.java
+++ b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetadataCommonServiceImpl.java
@@ -22,11 +22,13 @@ import com.inspur.edp.web.formmetadata.api.FormMetadataCommonService;
 import com.inspur.edp.web.formmetadata.api.entity.FormSuInfoEntity;
 import io.iec.edp.caf.businessobject.api.entity.DevBasicBoInfo;
 import io.iec.edp.caf.businessobject.api.service.DevBasicInfoService;
-import io.iec.edp.caf.commons.utils.SpringBeanUtils;
+
+import javax.annotation.Resource;
 
 public class FormMetadataCommonServiceImpl implements FormMetadataCommonService {
 
-    private final DevBasicInfoService devBasicInfoService = SpringBeanUtils.getBean(DevBasicInfoService.class);
+    @Resource
+    DevBasicInfoService devBasicInfoService;
 
     /**
      * 依据业务对象获取对应的配置信息