From beb7b0173b7e3c8ca99dd2251c3d1110d7cc3b2b Mon Sep 17 00:00:00 2001 From: devezhao Date: Wed, 21 Oct 2020 14:08:55 +0800 Subject: [PATCH] logger --- src/main/java/com/rebuild/core/BootApplication.java | 3 +-- .../java/com/rebuild/core/configuration/NavBuilder.java | 4 ++++ .../rebuild/core/configuration/general/DataListManager.java | 4 ++++ .../rebuild/core/configuration/general/FormsBuilder.java | 4 ++++ .../rebuild/core/configuration/general/ShareToManager.java | 4 ---- .../com/rebuild/core/privileges/ChangeOwningDeptTask.java | 4 ++++ .../com/rebuild/core/rbstore/BusinessModelImporter.java | 4 ++++ .../com/rebuild/core/service/dataimport/DataImporter.java | 4 ++++ .../java/com/rebuild/core/service/general/BulkAssign.java | 5 +++++ .../com/rebuild/core/service/general/BulkBacthUpdate.java | 6 +++++- .../java/com/rebuild/core/service/general/BulkDelete.java | 4 ++++ .../java/com/rebuild/core/service/general/BulkOperator.java | 4 ---- .../java/com/rebuild/core/service/general/BulkShare.java | 4 ++++ .../rebuild/core/service/general/QuickCodeReindexTask.java | 4 ++++ .../core/service/trigger/impl/AggregationEvaluator.java | 2 +- src/main/java/com/rebuild/core/support/task/HeavyTask.java | 2 +- 16 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/rebuild/core/BootApplication.java b/src/main/java/com/rebuild/core/BootApplication.java index ac55321b0..528f21703 100644 --- a/src/main/java/com/rebuild/core/BootApplication.java +++ b/src/main/java/com/rebuild/core/BootApplication.java @@ -7,7 +7,6 @@ See LICENSE and COMMERCIAL in the project root for license information. package com.rebuild.core; -import com.rebuild.core.support.RebuildConfiguration; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -41,7 +40,7 @@ import javax.servlet.ServletException; @ImportResource("classpath:application-bean.xml") public class BootApplication extends SpringBootServletInitializer { - private static final Logger LOG = LoggerFactory.getLogger(RebuildConfiguration.class); + private static final Logger LOG = LoggerFactory.getLogger(BootApplication.class); private static boolean DEBUG = false; diff --git a/src/main/java/com/rebuild/core/configuration/NavBuilder.java b/src/main/java/com/rebuild/core/configuration/NavBuilder.java index 4818f55e3..3e52eb679 100644 --- a/src/main/java/com/rebuild/core/configuration/NavBuilder.java +++ b/src/main/java/com/rebuild/core/configuration/NavBuilder.java @@ -22,6 +22,8 @@ import org.apache.commons.lang.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import java.util.Iterator; @@ -34,6 +36,8 @@ import java.util.Iterator; */ public class NavBuilder extends NavManager { + private static final Logger LOG = LoggerFactory.getLogger(NavBuilder.class); + public static final NavBuilder instance = new NavBuilder(); private NavBuilder() { diff --git a/src/main/java/com/rebuild/core/configuration/general/DataListManager.java b/src/main/java/com/rebuild/core/configuration/general/DataListManager.java index 68af78ac4..db4792255 100644 --- a/src/main/java/com/rebuild/core/configuration/general/DataListManager.java +++ b/src/main/java/com/rebuild/core/configuration/general/DataListManager.java @@ -20,6 +20,8 @@ import com.rebuild.core.metadata.MetadataHelper; import com.rebuild.core.metadata.impl.EasyMeta; import com.rebuild.utils.JSONUtils; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -34,6 +36,8 @@ import java.util.Map; */ public class DataListManager extends BaseLayoutManager { + private static final Logger LOG = LoggerFactory.getLogger(DataListManager.class); + public static final DataListManager instance = new DataListManager(); private DataListManager() { diff --git a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java index 605c761f0..5a03dd0e5 100644 --- a/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java +++ b/src/main/java/com/rebuild/core/configuration/general/FormsBuilder.java @@ -36,6 +36,8 @@ import com.rebuild.core.support.general.FieldValueWrapper; import com.rebuild.core.support.i18n.Language; import com.rebuild.core.support.state.StateManager; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.util.Assert; import java.util.*; @@ -48,6 +50,8 @@ import java.util.*; */ public class FormsBuilder extends FormsManager { + private static final Logger LOG = LoggerFactory.getLogger(FormsBuilder.class); + public static final FormsBuilder instance = new FormsBuilder(); private FormsBuilder() { diff --git a/src/main/java/com/rebuild/core/configuration/general/ShareToManager.java b/src/main/java/com/rebuild/core/configuration/general/ShareToManager.java index ab0914509..75c129aad 100644 --- a/src/main/java/com/rebuild/core/configuration/general/ShareToManager.java +++ b/src/main/java/com/rebuild/core/configuration/general/ShareToManager.java @@ -18,8 +18,6 @@ import com.rebuild.core.privileges.UserHelper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.*; @@ -31,8 +29,6 @@ import java.util.*; */ public abstract class ShareToManager implements ConfigManager { - protected static final Logger LOG = LoggerFactory.getLogger(ShareToManager.class); - // 共享给全部 public static final String SHARE_ALL = "ALL"; // 私有 diff --git a/src/main/java/com/rebuild/core/privileges/ChangeOwningDeptTask.java b/src/main/java/com/rebuild/core/privileges/ChangeOwningDeptTask.java index 337f83aeb..06f0d80d3 100644 --- a/src/main/java/com/rebuild/core/privileges/ChangeOwningDeptTask.java +++ b/src/main/java/com/rebuild/core/privileges/ChangeOwningDeptTask.java @@ -13,6 +13,8 @@ import com.rebuild.core.Application; import com.rebuild.core.metadata.EntityHelper; import com.rebuild.core.metadata.MetadataHelper; import com.rebuild.core.support.task.HeavyTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.MessageFormat; @@ -24,6 +26,8 @@ import java.text.MessageFormat; */ public class ChangeOwningDeptTask extends HeavyTask { + private static final Logger LOG = LoggerFactory.getLogger(ChangeOwningDeptTask.class); + final private ID user; final private ID deptNew; diff --git a/src/main/java/com/rebuild/core/rbstore/BusinessModelImporter.java b/src/main/java/com/rebuild/core/rbstore/BusinessModelImporter.java index d79f75d1c..5b1696096 100644 --- a/src/main/java/com/rebuild/core/rbstore/BusinessModelImporter.java +++ b/src/main/java/com/rebuild/core/rbstore/BusinessModelImporter.java @@ -11,6 +11,8 @@ import com.alibaba.fastjson.JSONObject; import com.rebuild.core.metadata.MetadataHelper; import com.rebuild.core.metadata.impl.DynamicMetadataContextHolder; import com.rebuild.core.support.task.HeavyTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 批量导入业务模块 @@ -20,6 +22,8 @@ import com.rebuild.core.support.task.HeavyTask; */ public class BusinessModelImporter extends HeavyTask { + private static final Logger LOG = LoggerFactory.getLogger(BusinessModelImporter.class); + private final String[] modelFiles; public BusinessModelImporter(String[] modelFiles) { diff --git a/src/main/java/com/rebuild/core/service/dataimport/DataImporter.java b/src/main/java/com/rebuild/core/service/dataimport/DataImporter.java index edf37c050..781314f2f 100644 --- a/src/main/java/com/rebuild/core/service/dataimport/DataImporter.java +++ b/src/main/java/com/rebuild/core/service/dataimport/DataImporter.java @@ -21,6 +21,8 @@ import com.rebuild.core.metadata.impl.DisplayType; import com.rebuild.core.service.general.GeneralEntityServiceContextHolder; import com.rebuild.core.support.task.HeavyTask; import com.rebuild.utils.JSONUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; @@ -33,6 +35,8 @@ import java.util.*; */ public class DataImporter extends HeavyTask { + private static final Logger LOG = LoggerFactory.getLogger(DataImporter.class); + final private ImportRule rule; private ID owningUser; diff --git a/src/main/java/com/rebuild/core/service/general/BulkAssign.java b/src/main/java/com/rebuild/core/service/general/BulkAssign.java index a3d68aacc..5da1e6e39 100644 --- a/src/main/java/com/rebuild/core/service/general/BulkAssign.java +++ b/src/main/java/com/rebuild/core/service/general/BulkAssign.java @@ -12,8 +12,11 @@ import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.rebuild.core.Application; import com.rebuild.core.metadata.EntityHelper; +import com.rebuild.core.service.dataimport.DataImporter; import com.rebuild.core.service.notification.NotificationObserver; import com.rebuild.core.service.notification.NotificationOnce; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Set; @@ -25,6 +28,8 @@ import java.util.Set; */ public class BulkAssign extends BulkOperator { + private static final Logger LOG = LoggerFactory.getLogger(BulkAssign.class); + public BulkAssign(BulkContext context, GeneralEntityService ges) { super(context, ges); } diff --git a/src/main/java/com/rebuild/core/service/general/BulkBacthUpdate.java b/src/main/java/com/rebuild/core/service/general/BulkBacthUpdate.java index a4c6fcf85..73cdd44c7 100644 --- a/src/main/java/com/rebuild/core/service/general/BulkBacthUpdate.java +++ b/src/main/java/com/rebuild/core/service/general/BulkBacthUpdate.java @@ -17,6 +17,8 @@ import com.rebuild.core.metadata.EntityHelper; import com.rebuild.core.service.DataSpecificationException; import com.rebuild.core.support.general.BatchOperatorQuery; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 批量修改 @@ -26,6 +28,8 @@ import org.apache.commons.lang.StringUtils; */ public class BulkBacthUpdate extends BulkOperator { + private static final Logger LOG = LoggerFactory.getLogger(BulkBacthUpdate.class); + /** * 修改为 */ @@ -40,7 +44,7 @@ public class BulkBacthUpdate extends BulkOperator { } @Override - protected Integer exec() throws Exception { + protected Integer exec() { final ID[] willUpdates = prepareRecords(); this.setTotal(willUpdates.length); diff --git a/src/main/java/com/rebuild/core/service/general/BulkDelete.java b/src/main/java/com/rebuild/core/service/general/BulkDelete.java index 3712b7ad8..0aefd0707 100644 --- a/src/main/java/com/rebuild/core/service/general/BulkDelete.java +++ b/src/main/java/com/rebuild/core/service/general/BulkDelete.java @@ -10,6 +10,8 @@ package com.rebuild.core.service.general; import cn.devezhao.persist4j.engine.ID; import com.rebuild.core.Application; import com.rebuild.core.service.DataSpecificationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 删除 @@ -19,6 +21,8 @@ import com.rebuild.core.service.DataSpecificationException; */ public class BulkDelete extends BulkOperator { + private static final Logger LOG = LoggerFactory.getLogger(BulkDelete.class); + public BulkDelete(BulkContext context, GeneralEntityService ges) { super(context, ges); } diff --git a/src/main/java/com/rebuild/core/service/general/BulkOperator.java b/src/main/java/com/rebuild/core/service/general/BulkOperator.java index 2d3aed91b..6c4d0513e 100644 --- a/src/main/java/com/rebuild/core/service/general/BulkOperator.java +++ b/src/main/java/com/rebuild/core/service/general/BulkOperator.java @@ -16,8 +16,6 @@ import com.rebuild.core.Application; import com.rebuild.core.metadata.MetadataHelper; import com.rebuild.core.service.query.AdvFilterParser; import com.rebuild.core.support.task.HeavyTask; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.HashSet; import java.util.Set; @@ -30,8 +28,6 @@ import java.util.Set; */ public abstract class BulkOperator extends HeavyTask { - protected static final Logger LOG = LoggerFactory.getLogger(BulkOperator.class); - final protected BulkContext context; final protected GeneralEntityService ges; diff --git a/src/main/java/com/rebuild/core/service/general/BulkShare.java b/src/main/java/com/rebuild/core/service/general/BulkShare.java index f31f35460..9fd832f1d 100644 --- a/src/main/java/com/rebuild/core/service/general/BulkShare.java +++ b/src/main/java/com/rebuild/core/service/general/BulkShare.java @@ -14,6 +14,8 @@ import com.rebuild.core.Application; import com.rebuild.core.metadata.EntityHelper; import com.rebuild.core.service.notification.NotificationObserver; import com.rebuild.core.service.notification.NotificationOnce; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Set; @@ -25,6 +27,8 @@ import java.util.Set; */ public class BulkShare extends BulkOperator { + private static final Logger LOG = LoggerFactory.getLogger(BulkShare.class); + public BulkShare(BulkContext context, GeneralEntityService ges) { super(context, ges); } diff --git a/src/main/java/com/rebuild/core/service/general/QuickCodeReindexTask.java b/src/main/java/com/rebuild/core/service/general/QuickCodeReindexTask.java index 293e06573..5eabd0400 100644 --- a/src/main/java/com/rebuild/core/service/general/QuickCodeReindexTask.java +++ b/src/main/java/com/rebuild/core/service/general/QuickCodeReindexTask.java @@ -26,6 +26,8 @@ import com.rebuild.core.support.state.StateManager; import com.rebuild.core.support.state.StateSpec; import com.rebuild.core.support.task.HeavyTask; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; @@ -37,6 +39,8 @@ import java.util.List; */ public class QuickCodeReindexTask extends HeavyTask { + private static final Logger LOG = LoggerFactory.getLogger(QuickCodeReindexTask.class); + private static final int PAGE_SIZE = 1000; final private Entity entity; diff --git a/src/main/java/com/rebuild/core/service/trigger/impl/AggregationEvaluator.java b/src/main/java/com/rebuild/core/service/trigger/impl/AggregationEvaluator.java index d0a5e91d2..09acfcbdd 100644 --- a/src/main/java/com/rebuild/core/service/trigger/impl/AggregationEvaluator.java +++ b/src/main/java/com/rebuild/core/service/trigger/impl/AggregationEvaluator.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; */ public class AggregationEvaluator { - private static final Logger LOG = LoggerFactory.getLogger(FieldAggregation.class); + private static final Logger LOG = LoggerFactory.getLogger(AggregationEvaluator.class); private static final Pattern FIELD_PATT = Pattern.compile("\\{(.*?)}"); diff --git a/src/main/java/com/rebuild/core/support/task/HeavyTask.java b/src/main/java/com/rebuild/core/support/task/HeavyTask.java index a893c67db..5e002ac90 100644 --- a/src/main/java/com/rebuild/core/support/task/HeavyTask.java +++ b/src/main/java/com/rebuild/core/support/task/HeavyTask.java @@ -27,7 +27,7 @@ import java.util.Date; */ public abstract class HeavyTask extends SetUser> implements Runnable { - protected static final Logger LOG = LoggerFactory.getLogger(HeavyTask.class); + private static final Logger LOG = LoggerFactory.getLogger(HeavyTask.class); volatile private boolean interrupt = false; volatile private boolean interruptState = false;