From 80e9982a1a35bf4bf1a6bdfc45be520d44ec7d88 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Fri, 21 Jul 2023 16:39:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../environment/checker/ExecuteEnvironmentChecker.java | 2 +- .../java/com/inspur/edp/web/common/logger/WebLogger.java | 7 ++----- .../edp/web/common/serialize/MyPropertyNamingStrategy.java | 6 +++--- .../formmetadata/event/FormMetadataSaveEventListener.java | 4 +--- 4 files changed, 7 insertions(+), 12 deletions(-) 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 aef7c11b..6af0b017 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 0bb8d8b3..5fd1045f 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 37b81df2..8ab55856 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-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 93c060a2..7249b589 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) { - } + } -- Gitee From 1ece6561ec3c737e4473210a6b36548e16f69031 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Thu, 27 Jul 2023 09:27:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuerySchemeI18nResourceStrategy.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 06d4144d..5590c7d2 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 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) { -- Gitee From 1dc8d0cd48e4e048277cd42362cdde6ed80fd305 Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Thu, 27 Jul 2023 09:27:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8B=B7=E8=B4=9D=20jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspur/edp/web/common/CopyJarFile.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 cd9eda44..f09b598d 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; } -- Gitee From b0364062a4f27a5134063c1571db896919bfa4ba Mon Sep 17 00:00:00 2001 From: guozhiqi Date: Thu, 27 Jul 2023 13:46:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=20bean=20=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E9=80=82=E5=BA=94=E8=A1=A5=E4=B8=81=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/FormMetadataConfiguration.java | 13 +++++++++++++ .../service/FormMetadataCommonServiceImpl.java | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) 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 bdae80ce..6c25a189 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/service/FormMetadataCommonServiceImpl.java b/web-form-metadata/src/main/java/com/inspur/edp/web/formmetadata/service/FormMetadataCommonServiceImpl.java index 6b7782db..08e74405 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; /** * 依据业务对象获取对应的配置信息 -- Gitee