1.0.0

sys-server/src/main/java/com/zq/system/config/thread/ThreadPoolExecutorUtil.java

@@ -16,7 +16,7 @@
 package com.zq.system.config.thread;
 package com.zq.system.config.thread;
 
 
 
 
-import com.zq.system.utils.SpringContextHolder;
+import com.zq.common.config.base.SpringContextHolder;
 
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;

sys-server/src/main/java/com/zq/system/modules/quartz/utils/ExecutionJob.java

@@ -19,6 +19,7 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import cn.hutool.extra.template.TemplateUtil;
+import com.zq.common.config.base.SpringContextHolder;
 import com.zq.system.config.thread.ThreadPoolExecutorUtil;
 import com.zq.system.config.thread.ThreadPoolExecutorUtil;
 import com.zq.system.modules.quartz.domain.QuartzJob;
 import com.zq.system.modules.quartz.domain.QuartzJob;
 import com.zq.system.modules.quartz.domain.QuartzLog;
 import com.zq.system.modules.quartz.domain.QuartzLog;
@@ -26,7 +27,6 @@ import com.zq.system.modules.quartz.repository.QuartzLogRepository;
 import com.zq.system.modules.quartz.service.QuartzJobService;
 import com.zq.system.modules.quartz.service.QuartzJobService;
 import com.zq.system.modules.tools.domain.vo.EmailVo;
 import com.zq.system.modules.tools.domain.vo.EmailVo;
 import com.zq.system.modules.tools.service.EmailService;
 import com.zq.system.modules.tools.service.EmailService;
-import com.zq.system.utils.SpringContextHolder;
 import com.zq.common.config.redis.RedisUtils;
 import com.zq.common.config.redis.RedisUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.common.utils.StringUtils;
 import com.zq.common.utils.ThrowableUtil;
 import com.zq.common.utils.ThrowableUtil;

sys-server/src/main/java/com/zq/system/modules/quartz/utils/QuartzRunnable.java

@@ -15,7 +15,7 @@
  */
  */
 package com.zq.system.modules.quartz.utils;
 package com.zq.system.modules.quartz.utils;
 
 
-import com.zq.system.utils.SpringContextHolder;
+import com.zq.common.config.base.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils;

sys-server/src/main/java/com/zq/system/utils/SecurityUtils.java

@@ -18,6 +18,7 @@ package com.zq.system.utils;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.json.JSONUtil;
+import com.zq.common.config.base.SpringContextHolder;
 import com.zq.system.exception.BadRequestException;
 import com.zq.system.exception.BadRequestException;
 import com.zq.system.utils.enums.DataScopeEnum;
 import com.zq.system.utils.enums.DataScopeEnum;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

sys-server/src/main/java/com/zq/system/utils/SpringContextHolder.java

-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package com.zq.system.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.env.Environment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Jie
- * @date 2019-01-07
- */
-@Slf4j
-public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
-
-    private static ApplicationContext applicationContext = null;
-    private static final List<CallBack> CALL_BACKS = new ArrayList<>();
-    private static boolean addCallback = true;
-
-    /**
-     * 针对 某些初始化方法，在SpringContextHolder 未初始化时 提交回调方法。
-     * 在SpringContextHolder 初始化后，进行回调使用
-     *
-     * @param callBack 回调函数
-     */
-    public synchronized static void addCallBacks(CallBack callBack) {
-        if (addCallback) {
-            SpringContextHolder.CALL_BACKS.add(callBack);
-        } else {
-            log.warn("CallBack：{} 已无法添加！立即执行", callBack.getCallBackName());
-            callBack.executor();
-        }
-    }
-
-    /**
-     * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) {
-        assertContextInjected();
-        return (T) applicationContext.getBean(name);
-    }
-
-    /**
-     * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
-     */
-    public static <T> T getBean(Class<T> requiredType) {
-        assertContextInjected();
-        return applicationContext.getBean(requiredType);
-    }
-
-    /**
-     * 获取SpringBoot 配置信息
-     *
-     * @param property     属性key
-     * @param defaultValue 默认值
-     * @param requiredType 返回类型
-     * @return /
-     */
-    public static <T> T getProperties(String property, T defaultValue, Class<T> requiredType) {
-        T result = defaultValue;
-        try {
-            result = getBean(Environment.class).getProperty(property, requiredType);
-        } catch (Exception ignored) {
-        }
-        return result;
-    }
-
-    /**
-     * 获取SpringBoot 配置信息
-     *
-     * @param property 属性key
-     * @return /
-     */
-    public static String getProperties(String property) {
-        return getProperties(property, null, String.class);
-    }
-
-    /**
-     * 获取SpringBoot 配置信息
-     *
-     * @param property     属性key
-     * @param requiredType 返回类型
-     * @return /
-     */
-    public static <T> T getProperties(String property, Class<T> requiredType) {
-        return getProperties(property, null, requiredType);
-    }
-
-    /**
-     * 检查ApplicationContext不为空.
-     */
-    private static void assertContextInjected() {
-        if (applicationContext == null) {
-            throw new IllegalStateException("applicaitonContext属性未注入, 请在applicationContext" +
-                    ".xml中定义SpringContextHolder或在SpringBoot启动类中注册SpringContextHolder.");
-        }
-    }
-
-    /**
-     * 清除SpringContextHolder中的ApplicationContext为Null.
-     */
-    private static void clearHolder() {
-        log.debug("清除SpringContextHolder中的ApplicationContext:"
-                + applicationContext);
-        applicationContext = null;
-    }
-
-    @Override
-    public void destroy() {
-        SpringContextHolder.clearHolder();
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (SpringContextHolder.applicationContext != null) {
-            log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
-        }
-        SpringContextHolder.applicationContext = applicationContext;
-        if (addCallback) {
-            for (CallBack callBack : SpringContextHolder.CALL_BACKS) {
-                callBack.executor();
-            }
-            CALL_BACKS.clear();
-        }
-        SpringContextHolder.addCallback = false;
-    }
-}