paramValues, long readTimeoutMs) {
- return null;
- }
-
- private String buildUrl(String path) {
- return serverListManager.getCurrentServerAddr() + path;
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/AbstractBuildThreadPoolTemplate.java b/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/AbstractBuildThreadPoolTemplate.java
deleted file mode 100644
index 38a775ff..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/AbstractBuildThreadPoolTemplate.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.github.dynamic.threadpool.starter.toolkit.thread;
-
-import com.github.dynamic.threadpool.common.toolkit.Assert;
-import com.github.dynamic.threadpool.starter.alarm.ThreadPoolAlarm;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.*;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
-
-/**
- * Abstract build threadPool template.
- *
- * @author chen.ma
- * @date 2021/7/5 21:45
- */
-@Slf4j
-public class AbstractBuildThreadPoolTemplate {
-
- /**
- * 线程池构建初始化参数
- *
- * 此处本身是模版设计方法, 但是考虑创建简洁性, 移除 abstract
- * 异常参考 {@link AbstractQueuedSynchronizer#tryAcquire}
- *
- * @return
- */
- protected static ThreadPoolInitParam initParam() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * 构建线程池
- *
- * @return
- */
- public static ThreadPoolExecutor buildPool() {
- ThreadPoolInitParam initParam = initParam();
- return buildPool(initParam);
- }
-
- /**
- * 构建线程池
- *
- * @return
- */
- public static ThreadPoolExecutor buildPool(ThreadPoolInitParam initParam) {
- Assert.notNull(initParam);
- ThreadPoolExecutor executorService =
- new ThreadPoolExecutorTemplate(initParam.getCorePoolNum(),
- initParam.getMaxPoolNum(),
- initParam.getKeepAliveTime(),
- initParam.getTimeUnit(),
- initParam.getWorkQueue(),
- initParam.getThreadFactory(),
- initParam.rejectedExecutionHandler);
- return executorService;
- }
-
- /**
- * 构建快速执行线程池
- *
- * @return
- */
- public static ThreadPoolExecutor buildFastPool() {
- ThreadPoolInitParam initParam = initParam();
- return buildFastPool(initParam);
- }
-
- /**
- * 构建快速执行线程池
- *
- * @return
- */
- public static ThreadPoolExecutor buildFastPool(ThreadPoolInitParam initParam) {
- TaskQueue taskQueue = new TaskQueue(initParam.getCapacity());
- FastThreadPoolExecutor fastThreadPoolExecutor =
- new FastThreadPoolExecutor(initParam.getCorePoolNum(),
- initParam.getMaxPoolNum(),
- initParam.getKeepAliveTime(),
- initParam.getTimeUnit(),
- taskQueue,
- initParam.getThreadFactory(),
- initParam.rejectedExecutionHandler);
- taskQueue.setExecutor(fastThreadPoolExecutor);
- return fastThreadPoolExecutor;
- }
-
- /**
- * 构建自定义线程池
- *
- * @param initParam
- * @return
- */
- public static CustomThreadPoolExecutor buildCustomPool(ThreadPoolInitParam initParam) {
- Assert.notNull(initParam);
- CustomThreadPoolExecutor executorService =
- new CustomThreadPoolExecutor(initParam.getCorePoolNum(),
- initParam.getMaxPoolNum(),
- initParam.getKeepAliveTime(),
- initParam.getTimeUnit(),
- initParam.getWorkQueue(),
- initParam.getThreadPoolId(),
- initParam.getThreadFactory(),
- initParam.getThreadPoolAlarm(),
- initParam.getRejectedExecutionHandler());
- return executorService;
- }
-
- @Data
- @Accessors(chain = true)
- public static class ThreadPoolInitParam {
-
- /**
- * 核心线程数量
- */
- private Integer corePoolNum;
-
- /**
- * 最大线程数量
- */
- private Integer maxPoolNum;
-
- /**
- * 线程存活时间
- */
- private Long keepAliveTime;
-
- /**
- * 线程存活时间单位
- */
- private TimeUnit timeUnit;
-
- /**
- * 队列最大容量
- */
- private Integer capacity;
-
- /**
- * 阻塞队列
- */
- private BlockingQueue workQueue;
-
- /**
- * 线程池任务满时拒绝任务策略
- */
- private RejectedExecutionHandler rejectedExecutionHandler;
-
- /**
- * 创建线程工厂
- */
- private ThreadFactory threadFactory;
-
- /**
- * 线程 ID
- */
- private String threadPoolId;
-
- /**
- * 报警策略
- */
- private ThreadPoolAlarm threadPoolAlarm;
-
- public ThreadPoolInitParam(String threadNamePrefix, boolean isDaemon) {
- this.threadPoolId = threadNamePrefix;
- this.threadFactory = ThreadFactoryBuilder.builder()
- .prefix(threadNamePrefix)
- .daemon(isDaemon)
- .build();
- }
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/CustomThreadPoolExecutor.java b/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/CustomThreadPoolExecutor.java
deleted file mode 100644
index a770c361..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/CustomThreadPoolExecutor.java
+++ /dev/null
@@ -1,954 +0,0 @@
-package com.github.dynamic.threadpool.starter.toolkit.thread;
-
-import com.github.dynamic.threadpool.starter.alarm.ThreadPoolAlarm;
-import com.github.dynamic.threadpool.starter.alarm.ThreadPoolAlarmManage;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static com.github.dynamic.threadpool.common.constant.Constants.MAP_INITIAL_CAPACITY;
-
-/**
- * Custom threadPool wrap.
- *
- * @author chen.ma
- * @date 2021/7/8 21:47
- */
-public final class CustomThreadPoolExecutor extends ThreadPoolExecutor {
-
- private final AtomicInteger rejectCount = new AtomicInteger();
- private final AtomicInteger ctl = new AtomicInteger(ctlOf(RUNNING, 0));
-
- private static final int COUNT_BITS = Integer.SIZE - 3;
- private static final int CAPACITY = (1 << COUNT_BITS) - 1;
-
- private static final int RUNNING = -1 << COUNT_BITS;
- private static final int SHUTDOWN = 0 << COUNT_BITS;
- private static final int STOP = 1 << COUNT_BITS;
- private static final int TIDYING = 2 << COUNT_BITS;
- private static final int TERMINATED = 3 << COUNT_BITS;
-
- private final BlockingQueue workQueue;
- private final ReentrantLock mainLock = new ReentrantLock();
- private final HashSet workers = new HashSet();
- private final Condition termination = mainLock.newCondition();
-
- private int largestPoolSize;
- private long completedTaskCount;
- private volatile long keepAliveTime;
- private volatile boolean allowCoreThreadTimeOut;
- private volatile int corePoolSize;
- private volatile int maximumPoolSize;
- private String threadPoolId;
-
- private final AccessControlContext acc;
- private volatile ThreadPoolAlarm threadPoolAlarm;
- private volatile ThreadFactory threadFactory;
- private volatile RejectedExecutionHandler handler;
-
- private static final RejectedExecutionHandler DEFAULT_HANDLER = new ThreadPoolExecutor.AbortPolicy();
- private static final RuntimePermission SHUTDOWN_PERM = new RuntimePermission("modifyThread");
-
- public CustomThreadPoolExecutor(int corePoolSize,
- int maximumPoolSize,
- long keepAliveTime,
- TimeUnit unit,
- @NonNull BlockingQueue workQueue,
- @NonNull String threadPoolId,
- @NonNull ThreadFactory threadFactory,
- @NonNull ThreadPoolAlarm threadPoolAlarm,
- @NonNull RejectedExecutionHandler handler) {
- super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
-
- if (corePoolSize < 0 ||
- maximumPoolSize <= 0 ||
- maximumPoolSize < corePoolSize ||
- keepAliveTime < 0) {
- throw new IllegalArgumentException();
- }
-
- this.corePoolSize = corePoolSize;
- this.maximumPoolSize = maximumPoolSize;
- this.workQueue = workQueue;
- this.threadPoolId = threadPoolId;
- this.keepAliveTime = unit.toNanos(keepAliveTime);
- this.threadFactory = threadFactory;
- this.handler = handler;
- this.threadPoolAlarm = threadPoolAlarm;
- this.acc = System.getSecurityManager() == null ? null : AccessController.getContext();
- }
-
- private static int runStateOf(int c) {
- return c & ~CAPACITY;
- }
-
- private static int workerCountOf(int c) {
- return c & CAPACITY;
- }
-
- private static int ctlOf(int rs, int wc) {
- return rs | wc;
- }
-
- private static boolean runStateLessThan(int c, int s) {
- return c < s;
- }
-
- private static boolean runStateAtLeast(int c, int s) {
- return c >= s;
- }
-
- private static boolean isRunning(int c) {
- return c < SHUTDOWN;
- }
-
- private boolean compareAndIncrementWorkerCount(int expect) {
- return ctl.compareAndSet(expect, expect + 1);
- }
-
- private boolean compareAndDecrementWorkerCount(int expect) {
- return ctl.compareAndSet(expect, expect - 1);
- }
-
- private void decrementWorkerCount() {
- do {
- } while (!compareAndDecrementWorkerCount(ctl.get()));
- }
-
- public Integer getRejectCount() {
- return rejectCount.get();
- }
-
- public ThreadPoolAlarm getThreadPoolAlarm() {
- return this.threadPoolAlarm;
- }
-
- public void setThreadPoolAlarm(ThreadPoolAlarm threadPoolAlarm) {
- this.threadPoolAlarm = threadPoolAlarm;
- }
-
- public String getThreadPoolId() {
- return this.threadPoolId;
- }
-
- private final class Worker
- extends AbstractQueuedSynchronizer
- implements Runnable {
-
- private static final long serialVersionUID = 6138294804551838833L;
-
- final Thread thread;
- Runnable firstTask;
- volatile long completedTasks;
-
- Worker(Runnable firstTask) {
- setState(-1);
- this.firstTask = firstTask;
- this.thread = getThreadFactory().newThread(this);
- }
-
- @Override
- public void run() {
- runWorker(this);
- }
-
- @Override
- protected boolean isHeldExclusively() {
- return getState() != 0;
- }
-
- @Override
- protected boolean tryAcquire(int unused) {
- if (compareAndSetState(0, 1)) {
- setExclusiveOwnerThread(Thread.currentThread());
- return true;
- }
- return false;
- }
-
- @Override
- protected boolean tryRelease(int unused) {
- setExclusiveOwnerThread(null);
- setState(0);
- return true;
- }
-
- public void lock() {
- acquire(1);
- }
-
- public boolean tryLock() {
- return tryAcquire(1);
- }
-
- public void unlock() {
- release(1);
- }
-
- public boolean isLocked() {
- return isHeldExclusively();
- }
-
- void interruptIfStarted() {
- Thread t;
- if (getState() >= 0 && (t = thread) != null && !t.isInterrupted()) {
- try {
- t.interrupt();
- } catch (SecurityException ignore) {
- }
- }
- }
- }
-
- private void advanceRunState(int targetState) {
- for (; ; ) {
- int c = ctl.get();
- if (runStateAtLeast(c, targetState) ||
- ctl.compareAndSet(c, ctlOf(targetState, workerCountOf(c)))) {
- break;
- }
- }
- }
-
- final void tryTerminate() {
- for (; ; ) {
- int c = ctl.get();
- if (isRunning(c)
- || runStateAtLeast(c, TIDYING)
- || (runStateOf(c) == SHUTDOWN && !workQueue.isEmpty())) {
- return;
- }
- if (workerCountOf(c) != 0) {
- interruptIdleWorkers(ONLY_ONE);
- return;
- }
-
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- if (ctl.compareAndSet(c, ctlOf(TIDYING, 0))) {
- try {
- terminated();
- } finally {
- ctl.set(ctlOf(TERMINATED, 0));
- termination.signalAll();
- }
- return;
- }
- } finally {
- mainLock.unlock();
- }
- }
- }
-
- private void checkShutdownAccess() {
- SecurityManager security = System.getSecurityManager();
- if (security != null) {
- security.checkPermission(SHUTDOWN_PERM);
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- for (Worker w : workers) {
- security.checkAccess(w.thread);
- }
- } finally {
- mainLock.unlock();
- }
- }
- }
-
- private void interruptWorkers() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- for (Worker w : workers) {
- w.interruptIfStarted();
- }
- } finally {
- mainLock.unlock();
- }
- }
-
- private void interruptIdleWorkers(boolean onlyOne) {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- for (Worker w : workers) {
- Thread t = w.thread;
- if (!t.isInterrupted() && w.tryLock()) {
- try {
- t.interrupt();
- } catch (SecurityException ignore) {
- } finally {
- w.unlock();
- }
- }
- if (onlyOne) {
- break;
- }
- }
- } finally {
- mainLock.unlock();
- }
- }
-
- private void interruptIdleWorkers() {
- interruptIdleWorkers(false);
- }
-
- private static final boolean ONLY_ONE = true;
-
- final void reject(Runnable command) {
- rejectCount.incrementAndGet();
- ThreadPoolAlarmManage.checkPoolRejectAlarm(this);
- handler.rejectedExecution(command, this);
- }
-
- void onShutdown() {
- }
-
- final boolean isRunningOrShutdown(boolean shutdownOk) {
- int rs = runStateOf(ctl.get());
- return rs == RUNNING || (rs == SHUTDOWN && shutdownOk);
- }
-
- private List drainQueue() {
- BlockingQueue q = workQueue;
- ArrayList taskList = new ArrayList();
- q.drainTo(taskList);
- if (!q.isEmpty()) {
- for (Runnable r : q.toArray(new Runnable[0])) {
- if (q.remove(r)) {
- taskList.add(r);
- }
- }
- }
- return taskList;
- }
-
- private boolean addWorker(Runnable firstTask, boolean core) {
- retry:
- for (; ; ) {
- int c = ctl.get();
- int rs = runStateOf(c);
-
- // Check if queue empty only if necessary.
- if (rs >= SHUTDOWN && !(rs == SHUTDOWN && firstTask == null && !workQueue.isEmpty())) {
- return false;
- }
-
- for (; ; ) {
- int wc = workerCountOf(c);
- if (wc >= CAPACITY ||
- wc >= (core ? corePoolSize : maximumPoolSize)) {
- return false;
- }
- if (compareAndIncrementWorkerCount(c)) {
- break retry;
- }
- c = ctl.get();
- if (runStateOf(c) != rs) {
- continue retry;
- }
- }
- }
-
- ThreadPoolAlarmManage.checkPoolLivenessAlarm(core, this);
-
- boolean workerStarted = false;
- boolean workerAdded = false;
- Worker w = null;
- try {
- w = new Worker(firstTask);
- final Thread t = w.thread;
- if (t != null) {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- int rs = runStateOf(ctl.get());
-
- if (rs < SHUTDOWN || (rs == SHUTDOWN && firstTask == null)) {
- if (t.isAlive()) {
- throw new IllegalThreadStateException();
- }
- workers.add(w);
- int s = workers.size();
- if (s > largestPoolSize) {
- largestPoolSize = s;
- }
- workerAdded = true;
- }
- } finally {
- mainLock.unlock();
- }
- if (workerAdded) {
- t.start();
- workerStarted = true;
- }
- }
- } finally {
- if (!workerStarted) {
- addWorkerFailed(w);
- }
- }
- return workerStarted;
- }
-
- private void addWorkerFailed(Worker w) {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- if (w != null) {
- workers.remove(w);
- }
- decrementWorkerCount();
- tryTerminate();
- } finally {
- mainLock.unlock();
- }
- }
-
- private void processWorkerExit(Worker w, boolean completedAbruptly) {
- if (completedAbruptly) {
- decrementWorkerCount();
- }
-
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- completedTaskCount += w.completedTasks;
- workers.remove(w);
- } finally {
- mainLock.unlock();
- }
-
- tryTerminate();
-
- int c = ctl.get();
- if (runStateLessThan(c, STOP)) {
- if (!completedAbruptly) {
- int min = allowCoreThreadTimeOut ? 0 : corePoolSize;
- if (min == 0 && !workQueue.isEmpty()) {
- min = 1;
- }
- if (workerCountOf(c) >= min) {
- return;
- }
- }
- addWorker(null, false);
- }
- }
-
- private Runnable getTask() {
- boolean timedOut = false;
-
- for (; ; ) {
- int c = ctl.get();
- int rs = runStateOf(c);
-
- if (rs >= SHUTDOWN && (rs >= STOP || workQueue.isEmpty())) {
- decrementWorkerCount();
- return null;
- }
-
- int wc = workerCountOf(c);
-
- boolean timed = allowCoreThreadTimeOut || wc > corePoolSize;
-
- if ((wc > maximumPoolSize || (timed && timedOut)) && (wc > 1 || workQueue.isEmpty())) {
- if (compareAndDecrementWorkerCount(c)) {
- return null;
- }
- continue;
- }
-
- try {
- Runnable r = timed ?
- workQueue.poll(keepAliveTime, TimeUnit.NANOSECONDS) :
- workQueue.take();
- if (r != null) {
- return r;
- }
- timedOut = true;
- } catch (InterruptedException retry) {
- timedOut = false;
- }
- }
- }
-
- final void runWorker(Worker w) {
- Thread wt = Thread.currentThread();
- Runnable task = w.firstTask;
- w.firstTask = null;
- w.unlock();
- boolean completedAbruptly = true;
- try {
- while (task != null || (task = getTask()) != null) {
- w.lock();
- if ((runStateAtLeast(ctl.get(), STOP)
- || (Thread.interrupted() && runStateAtLeast(ctl.get(), STOP)))
- && !wt.isInterrupted()) {
- wt.interrupt();
- }
- try {
- beforeExecute(wt, task);
- Throwable thrown = null;
- try {
- task.run();
- } catch (RuntimeException x) {
- thrown = x;
- throw x;
- } catch (Error x) {
- thrown = x;
- throw x;
- } catch (Throwable x) {
- thrown = x;
- throw new Error(x);
- } finally {
- afterExecute(task, thrown);
- }
- } finally {
- task = null;
- w.completedTasks++;
- w.unlock();
- }
- }
- completedAbruptly = false;
- } finally {
- processWorkerExit(w, completedAbruptly);
- }
- }
-
- @Override
- public void execute(@NonNull Runnable command) {
- int c = ctl.get();
- if (workerCountOf(c) < corePoolSize) {
- if (addWorker(command, true)) {
- return;
- }
- c = ctl.get();
- }
- if (isRunning(c) && workQueue.offer(command)) {
- ThreadPoolAlarmManage.checkPoolCapacityAlarm(this);
- int recheck = ctl.get();
- if (!isRunning(recheck) && remove(command)) {
- reject(command);
- } else if (workerCountOf(recheck) == 0) {
- addWorker(null, false);
- }
- } else if (!addWorker(command, false)) {
- reject(command);
- }
- }
-
- @Override
- public void shutdown() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- checkShutdownAccess();
- advanceRunState(SHUTDOWN);
- interruptIdleWorkers();
- onShutdown();
- } finally {
- mainLock.unlock();
- }
- tryTerminate();
- }
-
- @Override
- public List shutdownNow() {
- List tasks;
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- checkShutdownAccess();
- advanceRunState(STOP);
- interruptWorkers();
- tasks = drainQueue();
- } finally {
- mainLock.unlock();
- }
- tryTerminate();
- return tasks;
- }
-
- @Override
- public boolean isShutdown() {
- return !isRunning(ctl.get());
- }
-
- @Override
- public boolean isTerminating() {
- int c = ctl.get();
- return !isRunning(c) && runStateLessThan(c, TERMINATED);
- }
-
- @Override
- public boolean isTerminated() {
- return runStateAtLeast(ctl.get(), TERMINATED);
- }
-
- @Override
- public boolean awaitTermination(long timeout, TimeUnit unit)
- throws InterruptedException {
- long nanos = unit.toNanos(timeout);
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- for (; ; ) {
- if (runStateAtLeast(ctl.get(), TERMINATED)) {
- return true;
- }
- if (nanos <= 0) {
- return false;
- }
- nanos = termination.awaitNanos(nanos);
- }
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- protected void finalize() {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null || acc == null) {
- shutdown();
- } else {
- PrivilegedAction pa = () -> {
- shutdown();
- return null;
- };
- AccessController.doPrivileged(pa, acc);
- }
- }
-
- @Override
- public void setThreadFactory(@NonNull ThreadFactory threadFactory) {
- this.threadFactory = threadFactory;
- }
-
- @Override
- public ThreadFactory getThreadFactory() {
- return threadFactory;
- }
-
- @Override
- public void setRejectedExecutionHandler(@NonNull RejectedExecutionHandler handler) {
- this.handler = handler;
- }
-
- @Override
- public RejectedExecutionHandler getRejectedExecutionHandler() {
- return handler;
- }
-
- @Override
- public void setCorePoolSize(int corePoolSize) {
- if (corePoolSize < 0) {
- throw new IllegalArgumentException();
- }
- int delta = corePoolSize - this.corePoolSize;
- this.corePoolSize = corePoolSize;
- if (workerCountOf(ctl.get()) > corePoolSize) {
- interruptIdleWorkers();
- } else if (delta > 0) {
- int k = Math.min(delta, workQueue.size());
- while (k-- > 0 && addWorker(null, true)) {
- if (workQueue.isEmpty()) {
- break;
- }
- }
- }
- }
-
- @Override
- public int getCorePoolSize() {
- return corePoolSize;
- }
-
- @Override
- public boolean prestartCoreThread() {
- return workerCountOf(ctl.get()) < corePoolSize &&
- addWorker(null, true);
- }
-
- void ensurePrestart() {
- int wc = workerCountOf(ctl.get());
- if (wc < corePoolSize) {
- addWorker(null, true);
- } else if (wc == 0) {
- addWorker(null, false);
- }
- }
-
- @Override
- public int prestartAllCoreThreads() {
- int n = 0;
- while (addWorker(null, true)) {
- ++n;
- }
- return n;
- }
-
- @Override
- public boolean allowsCoreThreadTimeOut() {
- return allowCoreThreadTimeOut;
- }
-
- @Override
- public void allowCoreThreadTimeOut(boolean value) {
- if (value && keepAliveTime <= 0) {
- throw new IllegalArgumentException("Core threads must have nonzero keep alive times");
- }
- if (value != allowCoreThreadTimeOut) {
- allowCoreThreadTimeOut = value;
- if (value) {
- interruptIdleWorkers();
- }
- }
- }
-
- @Override
- public void setMaximumPoolSize(int maximumPoolSize) {
- if (maximumPoolSize <= 0 || maximumPoolSize < corePoolSize) {
- throw new IllegalArgumentException();
- }
- this.maximumPoolSize = maximumPoolSize;
- if (workerCountOf(ctl.get()) > maximumPoolSize) {
- interruptIdleWorkers();
- }
- }
-
- @Override
- public int getMaximumPoolSize() {
- return maximumPoolSize;
- }
-
- @Override
- public void setKeepAliveTime(long time, TimeUnit unit) {
- if (time < 0) {
- throw new IllegalArgumentException();
- }
- if (time == 0 && allowsCoreThreadTimeOut()) {
- throw new IllegalArgumentException("Core threads must have nonzero keep alive times");
- }
- long keepAliveTime = unit.toNanos(time);
- long delta = keepAliveTime - this.keepAliveTime;
- this.keepAliveTime = keepAliveTime;
- if (delta < 0) {
- interruptIdleWorkers();
- }
- }
-
- @Override
- public long getKeepAliveTime(TimeUnit unit) {
- return unit.convert(keepAliveTime, TimeUnit.NANOSECONDS);
- }
-
- @Override
- public BlockingQueue getQueue() {
- return workQueue;
- }
-
- @Override
- public boolean remove(Runnable task) {
- boolean removed = workQueue.remove(task);
- tryTerminate();
- return removed;
- }
-
- @Override
- public void purge() {
- final BlockingQueue q = workQueue;
- try {
- Iterator it = q.iterator();
- while (it.hasNext()) {
- Runnable r = it.next();
- if (r instanceof Future && ((Future) r).isCancelled()) {
- it.remove();
- }
- }
- } catch (ConcurrentModificationException fallThrough) {
- for (Object r : q.toArray()) {
- if (r instanceof Future && ((Future) r).isCancelled()) {
- q.remove(r);
- }
- }
- }
-
- tryTerminate();
- }
-
- @Override
- public int getPoolSize() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- return runStateAtLeast(ctl.get(), TIDYING) ? 0 : workers.size();
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- public int getActiveCount() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- int n = 0;
- for (Worker w : workers) {
- if (w.isLocked()) {
- ++n;
- }
- }
- return n;
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- public int getLargestPoolSize() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- return largestPoolSize;
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- public long getTaskCount() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- long n = completedTaskCount;
- for (Worker w : workers) {
- n += w.completedTasks;
- if (w.isLocked()) {
- ++n;
- }
- }
- return n + workQueue.size();
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- public long getCompletedTaskCount() {
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- long n = completedTaskCount;
- for (Worker w : workers) {
- n += w.completedTasks;
- }
- return n;
- } finally {
- mainLock.unlock();
- }
- }
-
- @Override
- public String toString() {
- long ncompleted;
- int nworkers, nactive;
- final ReentrantLock mainLock = this.mainLock;
- mainLock.lock();
- try {
- ncompleted = completedTaskCount;
- nactive = 0;
- nworkers = workers.size();
- for (Worker w : workers) {
- ncompleted += w.completedTasks;
- if (w.isLocked()) {
- ++nactive;
- }
- }
- } finally {
- mainLock.unlock();
- }
- int c = ctl.get();
- String rs = (runStateLessThan(c, SHUTDOWN) ? "Running" :
- (runStateAtLeast(c, TERMINATED) ? "Terminated" :
- "Shutting down"));
- return super.toString() +
- "[" + rs +
- ", pool size = " + nworkers +
- ", active threads = " + nactive +
- ", queued tasks = " + workQueue.size() +
- ", completed tasks = " + ncompleted +
- "]";
- }
-
- private ConcurrentHashMap statisticsTime = new ConcurrentHashMap(MAP_INITIAL_CAPACITY);
-
- @Override
- protected void beforeExecute(Thread t, Runnable r) {
- statisticsTime.put(String.valueOf(r.hashCode()), new Date());
- }
-
- @Override
- protected void afterExecute(Runnable r, Throwable t) {
- Date startDate = statisticsTime.remove(String.valueOf(r.hashCode()));
- Date finishDate = new Date();
- long diff = finishDate.getTime() - startDate.getTime();
-
- }
-
- @Override
- protected void terminated() {
- }
-
- @NoArgsConstructor
- public static class CallerRunsPolicy implements RejectedExecutionHandler {
- @Override
- public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
- if (!e.isShutdown()) {
- r.run();
- }
- }
- }
-
- @NoArgsConstructor
- public static class AbortPolicy implements RejectedExecutionHandler {
- @Override
- public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
- throw new RejectedExecutionException("Task " + r.toString() +
- " rejected from " +
- e.toString());
- }
- }
-
- @NoArgsConstructor
- public static class DiscardPolicy implements RejectedExecutionHandler {
- @Override
- public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
- }
- }
-
- @NoArgsConstructor
- public static class DiscardOldestPolicy implements RejectedExecutionHandler {
- @Override
- public void rejectedExecution(Runnable r, ThreadPoolExecutor e) {
- if (!e.isShutdown()) {
- e.getQueue().poll();
- e.execute(r);
- }
- }
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/RejectedTypeEnum.java b/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/RejectedTypeEnum.java
deleted file mode 100644
index 2781c98c..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/RejectedTypeEnum.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.github.dynamic.threadpool.starter.toolkit.thread;
-
-import com.github.dynamic.threadpool.starter.spi.CustomRejectedExecutionHandler;
-import com.github.dynamic.threadpool.starter.spi.DynamicTpServiceLoader;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.stream.Stream;
-
-/**
- * Reject policy type Enum.
- *
- * @author chen.ma
- * @date 2021/7/10 23:16
- */
-public enum RejectedTypeEnum {
-
- /**
- * 被拒绝任务的程序由主线程执行
- */
- CALLER_RUNS_POLICY(1, new ThreadPoolExecutor.CallerRunsPolicy()),
-
- /**
- * 被拒绝任务的处理程序, 抛出异常
- */
- ABORT_POLICY(2, new ThreadPoolExecutor.AbortPolicy()),
-
- /**
- * 被拒绝任务的处理程序, 默默地丢弃被拒绝的任务。
- */
- DISCARD_POLICY(3, new ThreadPoolExecutor.DiscardPolicy()),
-
- /**
- * 被拒绝任务的处理程序, 它丢弃最早的未处理请求, 然后重试
- */
- DISCARD_OLDEST_POLICY(4, new ThreadPoolExecutor.DiscardOldestPolicy()),
-
- /**
- * 发生拒绝事件时, 添加新任务并运行最早的任务
- */
- RUNS_OLDEST_TASK_POLICY(5, RejectedPolicies.runsOldestTaskPolicy()),
-
- /**
- * 使用阻塞方法将拒绝任务添加队列, 可保证任务不丢失
- */
- SYNC_PUT_QUEUE_POLICY(6, RejectedPolicies.syncPutQueuePolicy());
-
- /**
- * 类型
- */
- public Integer type;
-
- /**
- * 线程池拒绝策略
- */
- public RejectedExecutionHandler rejectedHandler;
-
- RejectedTypeEnum(Integer type, RejectedExecutionHandler rejectedHandler) {
- this.type = type;
- this.rejectedHandler = rejectedHandler;
- }
-
- static {
- DynamicTpServiceLoader.register(CustomRejectedExecutionHandler.class);
- }
-
- public static RejectedExecutionHandler createPolicy(int type) {
- Optional rejectedTypeEnum = Stream.of(RejectedTypeEnum.values())
- .filter(each -> Objects.equals(type, each.type))
- .map(each -> each.rejectedHandler)
- .findFirst();
-
- // 使用 SPI 匹配拒绝策略
- RejectedExecutionHandler resultRejected = rejectedTypeEnum.orElseGet(() -> {
- Collection customRejectedExecutionHandlers = DynamicTpServiceLoader
- .getSingletonServiceInstances(CustomRejectedExecutionHandler.class);
- Optional customRejected = customRejectedExecutionHandlers.stream()
- .filter(each -> Objects.equals(type, each.getType()))
- .map(each -> each.generateRejected())
- .findFirst();
-
- return customRejected.orElse(ABORT_POLICY.rejectedHandler);
- });
-
- return resultRejected;
- }
-
- public static String getRejectedNameByType(int type) {
- Optional rejectedTypeEnum = Arrays.stream(RejectedTypeEnum.values())
- .filter(each -> each.type == type).findFirst();
-
- return rejectedTypeEnum.map(each -> each.rejectedHandler.getClass().getSimpleName()).orElse("");
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/DynamicThreadPoolWrap.java b/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/DynamicThreadPoolWrap.java
deleted file mode 100644
index 571b4679..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/DynamicThreadPoolWrap.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dynamic.threadpool.starter.wrap;
-
-import com.github.dynamic.threadpool.starter.common.CommonThreadPool;
-import com.github.dynamic.threadpool.starter.toolkit.thread.CustomThreadPoolExecutor;
-import lombok.Data;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-
-/**
- * Dynamic threadPool wrap.
- *
- * @author chen.ma
- * @date 2021/6/20 16:55
- */
-@Data
-public class DynamicThreadPoolWrap {
-
- private String tenantId;
-
- private String itemId;
-
- private String tpId;
-
- private boolean subscribeFlag;
-
- private CustomThreadPoolExecutor pool;
-
- /**
- * 首选服务端线程池, 为空使用默认线程池 {@link CommonThreadPool#getInstance(String)}
- *
- * @param threadPoolId
- */
- public DynamicThreadPoolWrap(String threadPoolId) {
- this(threadPoolId, CommonThreadPool.getInstance(threadPoolId));
- }
-
- /**
- * 首选服务端线程池, 为空使用 threadPoolExecutor
- *
- * @param threadPoolId
- * @param threadPoolExecutor
- */
- public DynamicThreadPoolWrap(String threadPoolId, CustomThreadPoolExecutor threadPoolExecutor) {
- this.tpId = threadPoolId;
- this.pool = threadPoolExecutor;
- }
-
- /**
- * 提交任务
- *
- * @param command
- */
- public void execute(Runnable command) {
- pool.execute(command);
- }
-
- /**
- * 提交任务
- *
- * @param task
- * @return
- */
- public Future submit(Runnable task) {
- return pool.submit(task);
- }
-
- /**
- * 提交任务
- *
- * @param task
- * @param
- * @return
- */
- public Future submit(Callable task) {
- return pool.submit(task);
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/ManagerListenerWrap.java b/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/ManagerListenerWrap.java
deleted file mode 100644
index 2b35b07d..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/wrap/ManagerListenerWrap.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.github.dynamic.threadpool.starter.wrap;
-
-import com.github.dynamic.threadpool.starter.core.Listener;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * Manager listener wrap.
- *
- * @author chen.ma
- * @date 2021/6/22 17:47
- */
-@Getter
-@Setter
-public class ManagerListenerWrap {
-
- private String lastCallMd5;
-
- final Listener listener;
-
- public ManagerListenerWrap(String md5, Listener listener) {
- this.lastCallMd5 = md5;
- this.listener = listener;
- }
-
-}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/resources/META-INF/spring.factories b/dynamic-threadpool-spring-boot-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 797fc7f9..00000000
--- a/dynamic-threadpool-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- com.github.dynamic.threadpool.starter.config.DynamicThreadPoolAutoConfiguration
diff --git a/example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java b/example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java
deleted file mode 100644
index 57e79924..00000000
--- a/example/src/main/java/com/github/dynamic/threadpool/example/ExampleApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.dynamic.threadpool.example;
-
-import com.github.dynamic.threadpool.starter.enable.EnableDynamicThreadPool;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-@EnableDynamicThreadPool
-public class ExampleApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(ExampleApplication.class, args);
- }
-
-}
diff --git a/example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java b/example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java
deleted file mode 100644
index 6d3ec6c6..00000000
--- a/example/src/main/java/com/github/dynamic/threadpool/example/config/ThreadPoolConfig.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.github.dynamic.threadpool.example.config;
-
-import com.github.dynamic.threadpool.starter.core.DynamicThreadPool;
-import com.github.dynamic.threadpool.starter.toolkit.thread.CustomThreadPoolExecutor;
-import com.github.dynamic.threadpool.starter.toolkit.thread.ThreadPoolBuilder;
-import com.github.dynamic.threadpool.starter.wrap.DynamicThreadPoolWrap;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-import static com.github.dynamic.threadpool.example.constant.GlobalTestConstant.*;
-
-/**
- * Thread pool config.
- *
- * @author chen.ma
- * @date 2021/6/20 17:16
- */
-@Slf4j
-@Configuration
-public class ThreadPoolConfig {
-
- /**
- * {@link DynamicThreadPoolWrap} 完成 Server 端订阅配置功能.
- *
- * @return
- */
- @Bean
- public DynamicThreadPoolWrap messageCenterConsumeThreadPool() {
- return new DynamicThreadPoolWrap(MESSAGE_CONSUME);
- }
-
- /**
- * 通过 {@link DynamicThreadPool} 修饰 {@link CustomThreadPoolExecutor} 完成 Server 端订阅配置功能.
- *
- * 由动态线程池注解修饰后, IOC 容器中保存的是 {@link CustomThreadPoolExecutor}
- *
- * @return
- */
- @Bean
- @DynamicThreadPool
- public ThreadPoolExecutor customThreadPoolExecutor() {
- return ThreadPoolBuilder.builder().threadFactory(MESSAGE_PRODUCE).isCustomPool(true).build();
- }
-
-}
diff --git a/example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java b/example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java
deleted file mode 100644
index 85d49c9b..00000000
--- a/example/src/main/java/com/github/dynamic/threadpool/example/inittest/RunStateHandlerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dynamic.threadpool.example.inittest;
-
-import com.github.dynamic.threadpool.starter.core.GlobalThreadPoolManage;
-import com.github.dynamic.threadpool.starter.wrap.DynamicThreadPoolWrap;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import static com.github.dynamic.threadpool.example.constant.GlobalTestConstant.MESSAGE_PRODUCE;
-
-/**
- * Test run time metrics.
- *
- * @author chen.ma
- * @date 2021/8/15 21:00
- */
-@Slf4j
-@Component
-public class RunStateHandlerTest {
-
- // @PostConstruct
- @SuppressWarnings("all")
- public void runStateHandlerTest() {
- log.info("Test thread pool runtime state interface, The rejection policy will be triggered after 30s...");
-
- ScheduledExecutorService scheduledThreadPool = Executors.newSingleThreadScheduledExecutor();
- scheduledThreadPool.scheduleAtFixedRate(() -> {
- DynamicThreadPoolWrap executorService = GlobalThreadPoolManage.getExecutorService(MESSAGE_PRODUCE);
- ThreadPoolExecutor pool = executorService.getPool();
- try {
- pool.execute(() -> {
- log.info("Thread pool name :: {}, Executing incoming blocking...", Thread.currentThread().getName());
- try {
- int maxRandom = 10;
- int temp = 2;
- Random random = new Random();
- // Assignment thread pool completedTaskCount
- if (random.nextInt(maxRandom) % temp == 0) {
- Thread.sleep(10241024);
- } else {
- Thread.sleep(3000);
- }
- } catch (InterruptedException e) {
- // ignore
- }
- });
- } catch (Exception ex) {
- // ignore
- }
-
- }, 5, 2, TimeUnit.SECONDS);
- }
-
-}
diff --git a/example/src/main/resources/application.yaml b/example/src/main/resources/application.yaml
deleted file mode 100644
index aa2f581a..00000000
--- a/example/src/main/resources/application.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-server:
- port: 8088
- servlet:
- context-path: /example
-
-spring:
- profiles:
- active: dev
- application:
- name: dynamic-threadpool-example
- dynamic:
- thread-pool:
- notifys:
- - type: DING
- url: https://oapi.dingtalk.com/robot/send?access_token=
- token: 4a582a588a161d6e3a1bd1de7eea9ee9f562cdfcbe56b6e72029e7fd512b2eae
- receives: '15601166691'
- alarm-interval: 5
- server-addr: http://localhost:6691
- namespace: prescription
- item-id: ${spring.application.name}
diff --git a/auth/.gitignore b/hippo4j-auth/.gitignore
similarity index 100%
rename from auth/.gitignore
rename to hippo4j-auth/.gitignore
diff --git a/auth/pom.xml b/hippo4j-auth/pom.xml
similarity index 68%
rename from auth/pom.xml
rename to hippo4j-auth/pom.xml
index 354daee7..69d59712 100644
--- a/auth/pom.xml
+++ b/hippo4j-auth/pom.xml
@@ -4,14 +4,18 @@
4.0.0
- com.github.dynamic-threadpool
- parent
+ cn.hippo4j
+ hippo4j-all
${revision}
- auth
+ hippo4j-auth
jar
+
+ true
+
+
org.springframework.boot
@@ -49,6 +53,22 @@
cn.hutool
hutool-all
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+
+ io.jsonwebtoken
+ jjwt
+ ${jjwt.version}
+
+
+
+ cn.hippo4j
+ hippo4j-common
+
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java
new file mode 100644
index 00000000..25b364a1
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java
@@ -0,0 +1,95 @@
+package cn.hippo4j.auth.config;
+
+import cn.hippo4j.auth.constant.Constants;
+import cn.hippo4j.auth.filter.JWTAuthenticationFilter;
+import cn.hippo4j.auth.filter.JWTAuthorizationFilter;
+import cn.hippo4j.auth.security.JwtTokenManager;
+import cn.hippo4j.auth.service.impl.UserDetailsServiceImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.BeanIds;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+import javax.annotation.Resource;
+import java.util.stream.Stream;
+
+/**
+ * 安全配置.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 21:10
+ */
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class GlobalSecurityConfig extends WebSecurityConfigurerAdapter {
+
+ @Resource
+ private UserDetailsService userDetailsService;
+
+ @Resource
+ private JwtTokenManager tokenManager;
+
+ @Bean
+ public UserDetailsService customUserService() {
+ return new UserDetailsServiceImpl();
+ }
+
+ @Bean
+ public BCryptPasswordEncoder bCryptPasswordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+
+ @Bean(name = BeanIds.AUTHENTICATION_MANAGER)
+ @Override
+ public AuthenticationManager authenticationManagerBean() throws Exception {
+ return super.authenticationManagerBean();
+ }
+
+ @Bean
+ public CorsConfigurationSource corsConfigurationSource() {
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ CorsConfiguration config = new CorsConfiguration();
+ config.addAllowedMethod(Constants.SPLIT_STAR);
+ config.applyPermitDefaultValues();
+ source.registerCorsConfiguration("/**", config);
+ return source;
+ }
+
+ @Override
+ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+ auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
+ }
+
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+ http.cors().and().csrf().disable()
+ .authorizeRequests()
+ .antMatchers("/static/**", "/index.html", "/favicon.ico", "/avatar.jpg").permitAll()
+ .antMatchers("/doc.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs").anonymous()
+ .anyRequest().authenticated()
+ .and()
+ .addFilter(new JWTAuthenticationFilter(authenticationManager()))
+ .addFilter(new JWTAuthorizationFilter(tokenManager, authenticationManager()))
+ .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+ }
+
+ @Override
+ public void configure(WebSecurity web) throws Exception {
+ String[] ignores = Stream.of("/hippo4j/v1/cs/auth/users/apply/token/**", "/hippo4j/v1/cs/configs/**").toArray(String[]::new);
+ web.ignoring().antMatchers(ignores);
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java
new file mode 100644
index 00000000..739752d0
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java
@@ -0,0 +1,17 @@
+package cn.hippo4j.auth.constant;
+
+/**
+ * Constants.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:24
+ */
+public class Constants {
+
+ public static final String SPLIT_STAR = "*";
+
+ public static final String SPLIT_COMMA = ",";
+
+ public static final long TOKEN_VALIDITY_IN_SECONDS = 18000L;
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
new file mode 100644
index 00000000..b7d52472
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
@@ -0,0 +1,99 @@
+package cn.hippo4j.auth.filter;
+
+import cn.hippo4j.auth.model.biz.user.JwtUser;
+import cn.hippo4j.auth.model.biz.user.LoginUser;
+import cn.hippo4j.auth.toolkit.JwtTokenUtil;
+import cn.hippo4j.auth.toolkit.ReturnT;
+import cn.hippo4j.common.web.base.Results;
+import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static cn.hippo4j.auth.constant.Constants.SPLIT_COMMA;
+import static cn.hippo4j.common.constant.Constants.BASE_PATH;
+import static cn.hippo4j.common.constant.Constants.MAP_INITIAL_CAPACITY;
+
+/**
+ * JWT authentication filter.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:21
+ */
+@Slf4j
+public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
+
+ private final AuthenticationManager authenticationManager;
+
+ private final ThreadLocal rememberMe = new ThreadLocal();
+
+ public JWTAuthenticationFilter(AuthenticationManager authenticationManager) {
+ this.authenticationManager = authenticationManager;
+ super.setFilterProcessesUrl(BASE_PATH + "/auth/login");
+ }
+
+ @Override
+ public Authentication attemptAuthentication(HttpServletRequest request,
+ HttpServletResponse response) throws AuthenticationException {
+ // 从输入流中获取到登录的信息
+ try {
+ LoginUser loginUser = new ObjectMapper().readValue(request.getInputStream(), LoginUser.class);
+ rememberMe.set(loginUser.getRememberMe());
+ return authenticationManager.authenticate(
+ new UsernamePasswordAuthenticationToken(loginUser.getUsername(), loginUser.getPassword(), new ArrayList())
+ );
+ } catch (IOException e) {
+ logger.error("attemptAuthentication error :{}", e);
+ return null;
+ }
+ }
+
+ @Override
+ protected void successfulAuthentication(HttpServletRequest request,
+ HttpServletResponse response,
+ FilterChain chain,
+ Authentication authResult) throws IOException {
+ try {
+ JwtUser jwtUser = (JwtUser) authResult.getPrincipal();
+ boolean isRemember = rememberMe.get() == 1;
+
+ String role = "";
+ Collection authorities = jwtUser.getAuthorities();
+ for (GrantedAuthority authority : authorities) {
+ role = authority.getAuthority();
+ }
+
+ String token = JwtTokenUtil.createToken(jwtUser.getId(), jwtUser.getUsername(), role, isRemember);
+ response.setHeader("token", JwtTokenUtil.TOKEN_PREFIX + token);
+ response.setCharacterEncoding("UTF-8");
+ Map maps = new HashMap(MAP_INITIAL_CAPACITY);
+ maps.put("data", JwtTokenUtil.TOKEN_PREFIX + token);
+ maps.put("roles", role.split(SPLIT_COMMA));
+ response.getWriter().write(JSONUtil.toJsonStr(Results.success(maps)));
+ } finally {
+ rememberMe.remove();
+ }
+ }
+
+ @Override
+ protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) throws IOException, ServletException {
+ response.setCharacterEncoding("UTF-8");
+ response.getWriter().write(JSONUtil.toJsonStr(new ReturnT(-1, "Server Error")));
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
new file mode 100644
index 00000000..a303ab6a
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
@@ -0,0 +1,118 @@
+package cn.hippo4j.auth.filter;
+
+import cn.hippo4j.auth.security.JwtTokenManager;
+import cn.hippo4j.auth.toolkit.JwtTokenUtil;
+import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.common.toolkit.UserContext;
+import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Collections;
+
+import static cn.hippo4j.common.constant.Constants.ACCESS_TOKEN;
+import static cn.hippo4j.common.web.exception.ErrorCodeEnum.LOGIN_TIMEOUT;
+
+/**
+ * JWT authorization filter.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:21
+ */
+@Slf4j
+public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
+
+ private final JwtTokenManager tokenManager;
+
+ public JWTAuthorizationFilter(JwtTokenManager tokenManager, AuthenticationManager authenticationManager) {
+ super(authenticationManager);
+ this.tokenManager = tokenManager;
+ }
+
+ @Override
+ protected void doFilterInternal(HttpServletRequest request,
+ HttpServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ // 验证客户端交互时 Token
+ String accessToken = request.getParameter(ACCESS_TOKEN);
+ if (StrUtil.isNotBlank(accessToken)) {
+ tokenManager.validateToken(accessToken);
+
+ Authentication authentication = this.tokenManager.getAuthentication(accessToken);
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+
+ chain.doFilter(request, response);
+ return;
+ }
+
+ // 如果请求头中没有 Authorization 信息则直接放行
+ String tokenHeader = request.getHeader(JwtTokenUtil.TOKEN_HEADER);
+ if (tokenHeader == null || !tokenHeader.startsWith(JwtTokenUtil.TOKEN_PREFIX)) {
+ chain.doFilter(request, response);
+ return;
+ }
+
+ // 如果请求头中有 Token, 则进行解析, 并且设置认证信息
+ try {
+ SecurityContextHolder.getContext().setAuthentication(getAuthentication(tokenHeader));
+ } catch (Exception ex) {
+ // 返回 Json 形式的错误信息
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application/json; charset=utf-8");
+ String resultStatus = "-1";
+ if (ex instanceof ServiceException) {
+ ServiceException serviceException = (ServiceException) ex;
+ resultStatus = serviceException.errorCode.getCode();
+ }
+ response.getWriter().write(JSONUtil.toJSONString(Results.failure(resultStatus, ex.getMessage())));
+ response.getWriter().flush();
+ return;
+ }
+
+ try {
+ super.doFilterInternal(request, response, chain);
+ } finally {
+ UserContext.clear();
+ }
+ }
+
+ /**
+ * Token 中获取用户信息并新建一个 Token.
+ *
+ * @param tokenHeader
+ * @return
+ */
+ private UsernamePasswordAuthenticationToken getAuthentication(String tokenHeader) {
+ String token = tokenHeader.replace(JwtTokenUtil.TOKEN_PREFIX, "");
+ boolean expiration = JwtTokenUtil.isExpiration(token);
+ if (expiration) {
+ throw new ServiceException(LOGIN_TIMEOUT);
+ }
+
+ String username = JwtTokenUtil.getUsername(token);
+ String userRole = JwtTokenUtil.getUserRole(token);
+ UserContext.setUserInfo(username, userRole);
+
+ String role = JwtTokenUtil.getUserRole(token);
+ if (username != null) {
+ return new UsernamePasswordAuthenticationToken(username, null,
+ Collections.singleton(new SimpleGrantedAuthority(role))
+ );
+ }
+
+ return null;
+ }
+
+}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/PermissionMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
similarity index 69%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/PermissionMapper.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
index 67fb2c59..f0977313 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/PermissionMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
@@ -1,7 +1,7 @@
-package com.github.dynamic.threadpool.auth.mapper;
+package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.dynamic.threadpool.auth.model.PermissionInfo;
+import cn.hippo4j.auth.model.PermissionInfo;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/RoleMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
similarity index 69%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/RoleMapper.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
index bed36fe7..0286d0cc 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/RoleMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
@@ -1,7 +1,7 @@
-package com.github.dynamic.threadpool.auth.mapper;
+package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.dynamic.threadpool.auth.model.RoleInfo;
+import cn.hippo4j.auth.model.RoleInfo;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/UserMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
similarity index 69%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/UserMapper.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
index 28dc0361..317c6023 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/mapper/UserMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
@@ -1,7 +1,7 @@
-package com.github.dynamic.threadpool.auth.mapper;
+package cn.hippo4j.auth.mapper;
+import cn.hippo4j.auth.model.UserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.dynamic.threadpool.auth.model.UserInfo;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/PermissionInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
similarity index 92%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/PermissionInfo.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
index f938e18e..2c8faaaa 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/PermissionInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model;
+package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -18,7 +18,7 @@ public class PermissionInfo {
/**
* id
*/
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
/**
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/RoleInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
similarity index 91%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/RoleInfo.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
index b1f7ff46..f3bca4a4 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/RoleInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model;
+package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -18,7 +18,7 @@ public class RoleInfo {
/**
* id
*/
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
/**
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/UserInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
similarity index 85%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/UserInfo.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
index a472849d..0c4cba74 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/UserInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model;
+package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -18,7 +18,7 @@ public class UserInfo {
/**
* id
*/
- @TableId
+ @TableId(type = IdType.AUTO)
private Long id;
/**
@@ -31,6 +31,11 @@ public class UserInfo {
*/
private String password;
+ /**
+ * role
+ */
+ private String role;
+
/**
* gmtCreate
*/
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
similarity index 83%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionQueryPageReqDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
index c87d65b8..30e0b42c 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model.biz.permission;
+package cn.hippo4j.auth.model.biz.permission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
similarity index 82%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionRespDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
index 67d9a930..4d0bc92b 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/permission/PermissionRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model.biz.permission;
+package cn.hippo4j.auth.model.biz.permission;
import lombok.Data;
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
similarity index 84%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleQueryPageReqDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
index 783ecf80..ae93f7e1 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model.biz.role;
+package cn.hippo4j.auth.model.biz.role;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
similarity index 80%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleRespDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
index e6269a5d..2adffbcb 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/role/RoleRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model.biz.role;
+package cn.hippo4j.auth.model.biz.role;
import lombok.Data;
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java
new file mode 100644
index 00000000..d2b655d2
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java
@@ -0,0 +1,58 @@
+package cn.hippo4j.auth.model.biz.user;
+
+import lombok.Data;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+
+/**
+ * Jwt user.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:34
+ */
+@Data
+public class JwtUser implements UserDetails {
+
+ /**
+ * id
+ */
+ private Long id;
+
+ /**
+ * userName
+ */
+ private String username;
+
+ /**
+ * password
+ */
+ private String password;
+
+ /**
+ * authorities
+ */
+ private Collection authorities;
+
+ @Override
+ public boolean isAccountNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isAccountNonLocked() {
+ return true;
+ }
+
+ @Override
+ public boolean isCredentialsNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java
new file mode 100644
index 00000000..ad2184a8
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java
@@ -0,0 +1,29 @@
+package cn.hippo4j.auth.model.biz.user;
+
+import lombok.Data;
+
+/**
+ * Login user.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:41
+ */
+@Data
+public class LoginUser {
+
+ /**
+ * username
+ */
+ private String username;
+
+ /**
+ * password
+ */
+ private String password;
+
+ /**
+ * rememberMe
+ */
+ private Integer rememberMe;
+
+}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
similarity index 57%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserQueryPageReqDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
index 50c708bf..472e5b36 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
@@ -1,7 +1,8 @@
-package com.github.dynamic.threadpool.auth.model.biz.user;
+package cn.hippo4j.auth.model.biz.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;
+import lombok.experimental.Accessors;
/**
* User query page.
@@ -10,10 +11,12 @@ import lombok.Data;
* @date 2021/10/30 21:47
*/
@Data
+@Accessors(chain = true)
public class UserQueryPageReqDTO extends Page {
- public UserQueryPageReqDTO(long current, long size) {
- super(current, size);
- }
+ /**
+ * userName
+ */
+ private String userName;
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java
new file mode 100644
index 00000000..b84529d7
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java
@@ -0,0 +1,32 @@
+package cn.hippo4j.auth.model.biz.user;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * User req dto.
+ *
+ * @author chen.ma
+ * @date 2021/11/11 20:30
+ */
+@Data
+@Accessors(chain = true)
+public class UserReqDTO extends Page {
+
+ /**
+ * userName
+ */
+ private String userName;
+
+ /**
+ * password
+ */
+ private String password;
+
+ /**
+ * role
+ */
+ private String role;
+
+}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
similarity index 84%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserRespDTO.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
index 790cdadd..a82f68f3 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/model/biz/user/UserRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.auth.model.biz.user;
+package cn.hippo4j.auth.model.biz.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -20,9 +20,9 @@ public class UserRespDTO {
private String userName;
/**
- * password
+ * role
*/
- private String password;
+ private String role;
/**
* gmtCreate
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java
new file mode 100644
index 00000000..fdfbcdd1
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java
@@ -0,0 +1,46 @@
+package cn.hippo4j.auth.security;
+
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.expression.AccessException;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.stereotype.Component;
+
+/**
+ * Auth manager
+ *
+ * @author chen.ma
+ * @date 2021/12/20 20:34
+ */
+@Component
+@AllArgsConstructor
+public class AuthManager {
+
+ private final JwtTokenManager jwtTokenManager;
+
+ private final AuthenticationManager authenticationManager;
+
+ /**
+ * Resolve token from user.
+ *
+ * @param userName
+ * @param rawPassword
+ * @return
+ * @throws AccessException
+ */
+ @SneakyThrows
+ public String resolveTokenFromUser(String userName, String rawPassword) {
+ try {
+ UsernamePasswordAuthenticationToken authenticationToken =
+ new UsernamePasswordAuthenticationToken(userName, rawPassword);
+ authenticationManager.authenticate(authenticationToken);
+ } catch (AuthenticationException e) {
+ throw new AccessException("Unknown user.");
+ }
+
+ return jwtTokenManager.createToken(userName);
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java
new file mode 100644
index 00000000..157a9f66
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java
@@ -0,0 +1,61 @@
+package cn.hippo4j.auth.security;
+
+import cn.hutool.core.util.StrUtil;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+import static cn.hippo4j.auth.constant.Constants.TOKEN_VALIDITY_IN_SECONDS;
+import static cn.hippo4j.auth.toolkit.JwtTokenUtil.SECRET;
+import static cn.hippo4j.common.constant.Constants.AUTHORITIES_KEY;
+
+/**
+ * Jwt token manager.
+ *
+ * @author chen.ma
+ * @date 2021/12/20 20:36
+ */
+@Component
+public class JwtTokenManager {
+
+ public String createToken(String userName) {
+ long now = System.currentTimeMillis();
+
+ Date validity;
+ validity = new Date(now + TOKEN_VALIDITY_IN_SECONDS * 1000L);
+
+ Claims claims = Jwts.claims().setSubject(userName);
+ return Jwts.builder().setClaims(claims).setExpiration(validity)
+ .signWith(SignatureAlgorithm.HS512, SECRET).compact();
+ }
+
+ public void validateToken(String token) {
+ Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token);
+ }
+
+ /**
+ * Get auth Info.
+ *
+ * @param token token
+ * @return auth info
+ */
+ public Authentication getAuthentication(String token) {
+ Claims claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
+
+ List authorities = AuthorityUtils
+ .commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
+
+ User principal = new User(claims.getSubject(), StrUtil.EMPTY, authorities);
+ return new UsernamePasswordAuthenticationToken(principal, StrUtil.EMPTY, authorities);
+ }
+
+}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/PermissionService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
similarity index 84%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/service/PermissionService.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
index eec92f4e..922c0576 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/PermissionService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
@@ -1,7 +1,7 @@
-package com.github.dynamic.threadpool.auth.service;
+package cn.hippo4j.auth.service;
+import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionRespDTO;
/**
* Permission service.
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/RoleService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
similarity index 86%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/service/RoleService.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
index 399e8fff..2b212e4c 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/RoleService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
@@ -1,7 +1,7 @@
-package com.github.dynamic.threadpool.auth.service;
+package cn.hippo4j.auth.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.dynamic.threadpool.auth.model.biz.role.RoleRespDTO;
+import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
import java.util.List;
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/UserService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
similarity index 53%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/service/UserService.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
index d98a294b..bbbffba5 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/UserService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
@@ -1,7 +1,9 @@
-package com.github.dynamic.threadpool.auth.service;
+package cn.hippo4j.auth.service;
+import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO;
+import cn.hippo4j.auth.model.biz.user.UserRespDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.dynamic.threadpool.auth.model.biz.user.UserRespDTO;
+import cn.hippo4j.auth.model.biz.user.UserReqDTO;
import java.util.List;
@@ -16,27 +18,24 @@ public interface UserService {
/**
* 分页查询用户列表.
*
- * @param pageNo
- * @param pageSize
+ * @param reqDTO
* @return
*/
- IPage listUser(int pageNo, int pageSize);
+ IPage listUser(UserQueryPageReqDTO reqDTO);
/**
* 新增用户.
*
- * @param userName
- * @param password
+ * @param reqDTO
*/
- void addUser(String userName, String password);
+ void addUser(UserReqDTO reqDTO);
/**
* 修改用户.
*
- * @param userName
- * @param password
+ * @param reqDTO
*/
- void updateUser(String userName, String password);
+ void updateUser(UserReqDTO reqDTO);
/**
* 删除用户.
@@ -53,4 +52,12 @@ public interface UserService {
*/
List getUserLikeUsername(String userName);
+ /**
+ * 获取用户详情.
+ *
+ * @param reqDTO
+ * @return
+ */
+ UserRespDTO getUser(UserReqDTO reqDTO);
+
}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/PermissionServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
similarity index 77%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/PermissionServiceImpl.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
index 2a7bd176..ddbf36f4 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/PermissionServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
@@ -1,15 +1,16 @@
-package com.github.dynamic.threadpool.auth.service.impl;
+package cn.hippo4j.auth.service.impl;
+import cn.hippo4j.auth.mapper.PermissionMapper;
+import cn.hippo4j.auth.model.biz.permission.PermissionQueryPageReqDTO;
+import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
+import cn.hippo4j.auth.service.PermissionService;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.dynamic.threadpool.auth.mapper.PermissionMapper;
-import com.github.dynamic.threadpool.auth.model.PermissionInfo;
-import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionQueryPageReqDTO;
-import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionRespDTO;
-import com.github.dynamic.threadpool.auth.service.PermissionService;
+import cn.hippo4j.auth.model.PermissionInfo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -54,9 +55,9 @@ public class PermissionServiceImpl implements PermissionService {
@Override
public void deletePermission(String role, String resource, String action) {
LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(PermissionInfo.class)
- .eq(PermissionInfo::getRole, role)
- .eq(PermissionInfo::getResource, resource)
- .eq(PermissionInfo::getAction, action);
+ .eq(StrUtil.isNotBlank(role), PermissionInfo::getRole, role)
+ .eq(StrUtil.isNotBlank(resource), PermissionInfo::getResource, resource)
+ .eq(StrUtil.isNotBlank(action), PermissionInfo::getAction, action);
permissionMapper.delete(updateWrapper);
}
diff --git a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/RoleServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
similarity index 67%
rename from auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/RoleServiceImpl.java
rename to hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
index 4f15664b..04b7b59a 100644
--- a/auth/src/main/java/com/github/dynamic/threadpool/auth/service/impl/RoleServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
@@ -1,15 +1,18 @@
-package com.github.dynamic.threadpool.auth.service.impl;
+package cn.hippo4j.auth.service.impl;
+import cn.hippo4j.auth.mapper.RoleMapper;
+import cn.hippo4j.auth.model.biz.role.RoleQueryPageReqDTO;
+import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
+import cn.hippo4j.auth.service.PermissionService;
+import cn.hippo4j.auth.service.RoleService;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.dynamic.threadpool.auth.mapper.RoleMapper;
-import com.github.dynamic.threadpool.auth.model.RoleInfo;
-import com.github.dynamic.threadpool.auth.model.biz.role.RoleQueryPageReqDTO;
-import com.github.dynamic.threadpool.auth.model.biz.role.RoleRespDTO;
-import com.github.dynamic.threadpool.auth.service.RoleService;
+import cn.hippo4j.auth.model.RoleInfo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -28,6 +31,8 @@ public class RoleServiceImpl implements RoleService {
private final RoleMapper roleMapper;
+ private final PermissionService permissionService;
+
@Override
public IPage listRole(int pageNo, int pageSize) {
RoleQueryPageReqDTO queryPage = new RoleQueryPageReqDTO(pageNo, pageSize);
@@ -53,10 +58,18 @@ public class RoleServiceImpl implements RoleService {
@Override
public void deleteRole(String role, String userName) {
+ List roleStrList = CollUtil.toList(role);
+ if (StrUtil.isBlank(role)) {
+ LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(RoleInfo.class).eq(RoleInfo::getUserName, userName);
+ roleStrList = roleMapper.selectList(queryWrapper).stream().map(RoleInfo::getRole).collect(Collectors.toList());
+ }
+
LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(RoleInfo.class)
- .eq(RoleInfo::getRole, role)
- .eq(RoleInfo::getUserName, userName);
+ .eq(StrUtil.isNotBlank(role), RoleInfo::getRole, role)
+ .eq(StrUtil.isNotBlank(userName), RoleInfo::getUserName, userName);
roleMapper.delete(updateWrapper);
+
+ roleStrList.forEach(each -> permissionService.deletePermission(each, "", ""));
}
@Override
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
new file mode 100644
index 00000000..5a1c1fc9
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
@@ -0,0 +1,42 @@
+package cn.hippo4j.auth.service.impl;
+
+import cn.hippo4j.auth.mapper.UserMapper;
+import cn.hippo4j.auth.model.UserInfo;
+import cn.hippo4j.auth.model.biz.user.JwtUser;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * User details service impl.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:26
+ */
+public class UserDetailsServiceImpl implements UserDetailsService {
+
+ @Resource
+ private UserMapper userMapper;
+
+ @Override
+ public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
+ UserInfo userInfo = userMapper.selectOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserName, userName));
+
+ JwtUser jwtUser = new JwtUser();
+ jwtUser.setId(userInfo.getId());
+ jwtUser.setUsername(userName);
+ jwtUser.setPassword(userInfo.getPassword());
+
+ Set authorities = Collections.singleton(new SimpleGrantedAuthority(userInfo.getRole() + ""));
+ jwtUser.setAuthorities(authorities);
+
+ return jwtUser;
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
new file mode 100644
index 00000000..6b0470fa
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
@@ -0,0 +1,109 @@
+package cn.hippo4j.auth.service.impl;
+
+import cn.hippo4j.auth.mapper.UserMapper;
+import cn.hippo4j.auth.model.UserInfo;
+import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO;
+import cn.hippo4j.auth.model.biz.user.UserReqDTO;
+import cn.hippo4j.auth.model.biz.user.UserRespDTO;
+import cn.hippo4j.auth.service.RoleService;
+import cn.hippo4j.auth.service.UserService;
+import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hippo4j.common.web.exception.ServiceException;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * User service impl.
+ *
+ * @author chen.ma
+ * @date 2021/10/30 21:40
+ */
+@Service
+@AllArgsConstructor
+public class UserServiceImpl implements UserService {
+
+ private final UserMapper userMapper;
+
+ private final RoleService roleService;
+
+ private final BCryptPasswordEncoder bCryptPasswordEncoder;
+
+ @Override
+ public IPage listUser(UserQueryPageReqDTO reqDTO) {
+ LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class)
+ .eq(StringUtil.isNotBlank(reqDTO.getUserName()), UserInfo::getUserName, reqDTO.getUserName());
+ IPage selectPage = userMapper.selectPage(reqDTO, queryWrapper);
+
+ return selectPage.convert(each -> BeanUtil.toBean(each, UserRespDTO.class));
+ }
+
+ @Override
+ public void addUser(UserReqDTO reqDTO) {
+ LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class)
+ .eq(UserInfo::getUserName, reqDTO.getUserName());
+ UserInfo existUserInfo = userMapper.selectOne(queryWrapper);
+ if (existUserInfo != null) {
+ throw new RuntimeException("用户名重复");
+ }
+
+ reqDTO.setPassword(bCryptPasswordEncoder.encode(reqDTO.getPassword()));
+ UserInfo insertUser = BeanUtil.toBean(reqDTO, UserInfo.class);
+ userMapper.insert(insertUser);
+ }
+
+ @Override
+ public void updateUser(UserReqDTO reqDTO) {
+ if (StrUtil.isNotBlank(reqDTO.getPassword())) {
+ reqDTO.setPassword(bCryptPasswordEncoder.encode(reqDTO.getPassword()));
+ }
+ UserInfo updateUser = BeanUtil.toBean(reqDTO, UserInfo.class);
+
+ LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(UserInfo.class)
+ .eq(UserInfo::getUserName, reqDTO.getUserName());
+ userMapper.update(updateUser, updateWrapper);
+ }
+
+ @Override
+ public void deleteUser(String userName) {
+ LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(UserInfo.class)
+ .eq(UserInfo::getUserName, userName);
+ userMapper.delete(updateWrapper);
+ // roleService.deleteRole("", userName);
+ }
+
+ @Override
+ public List getUserLikeUsername(String userName) {
+ LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class)
+ .like(UserInfo::getUserName, userName)
+ .select(UserInfo::getUserName);
+
+ List userInfos = userMapper.selectList(queryWrapper);
+ List userNames = userInfos.stream().map(UserInfo::getUserName).collect(Collectors.toList());
+
+ return userNames;
+ }
+
+ @Override
+ public UserRespDTO getUser(UserReqDTO reqDTO) {
+ Wrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserName, reqDTO.getUserName());
+ UserInfo userInfo = userMapper.selectOne(queryWrapper);
+
+ UserRespDTO respUser = Optional.ofNullable(userInfo)
+ .map(each -> BeanUtil.toBean(each, UserRespDTO.class))
+ .orElseThrow(() -> new ServiceException("查询无此用户, 可以尝试清空缓存或退出登录."));
+ return respUser;
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java
new file mode 100644
index 00000000..bdcaa95d
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java
@@ -0,0 +1,118 @@
+package cn.hippo4j.auth.toolkit;
+
+import cn.hippo4j.auth.constant.Constants;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import static cn.hippo4j.common.constant.Constants.MAP_INITIAL_CAPACITY;
+
+/**
+ * Jwt token util.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 22:43
+ */
+public class JwtTokenUtil {
+
+ public static final String TOKEN_HEADER = "Authorization";
+ public static final String TOKEN_PREFIX = "Bearer ";
+
+ public static final String SECRET = "SecretKey039245678901232039487623456783092349288901402967890140939827";
+ public static final String ISS = "admin";
+
+ /**
+ * 角色的 Key
+ */
+ private static final String ROLE_CLAIMS = "rol";
+
+ /**
+ * 过期时间是 3600 秒, 既 24 小时
+ */
+ private static final long EXPIRATION = 86400L;
+
+ /**
+ * 选择了记住我之后的过期时间为 7 天
+ */
+ private static final long EXPIRATION_REMEMBER = 7 * EXPIRATION;
+
+ /**
+ * 创建 Token.
+ *
+ * @param id
+ * @param username
+ * @param role
+ * @param isRememberMe
+ * @return
+ */
+ public static String createToken(Long id, String username, String role, boolean isRememberMe) {
+ long expiration = isRememberMe ? EXPIRATION_REMEMBER : EXPIRATION;
+ HashMap map = new HashMap(MAP_INITIAL_CAPACITY);
+ map.put(ROLE_CLAIMS, role);
+ return Jwts.builder()
+ .signWith(SignatureAlgorithm.HS512, SECRET)
+ .setClaims(map)
+ .setIssuer(ISS)
+ .setSubject(id + Constants.SPLIT_COMMA + username)
+ .setIssuedAt(new Date())
+ .setExpiration(new Date(System.currentTimeMillis() + expiration * 1000))
+ .compact();
+ }
+
+ /**
+ * Token 中获取用户名.
+ *
+ * @param token
+ * @return
+ */
+ public static String getUsername(String token) {
+ List userInfo = Arrays.asList(getTokenBody(token).getSubject().split(Constants.SPLIT_COMMA));
+ return userInfo.get(1);
+ }
+
+ /**
+ * Token 中获取用户名.
+ *
+ * @param token
+ * @return
+ */
+ public static Integer getUserId(String token) {
+ List userInfo = Arrays.asList(getTokenBody(token).getSubject().split(Constants.SPLIT_COMMA));
+ return Integer.parseInt(userInfo.get(0));
+ }
+
+ /**
+ * 获取用户角色.
+ *
+ * @param token
+ * @return
+ */
+ public static String getUserRole(String token) {
+ return (String) getTokenBody(token).get(ROLE_CLAIMS);
+ }
+
+ /**
+ * 是否已过期.
+ *
+ * @param token
+ * @return
+ */
+ public static boolean isExpiration(String token) {
+ try {
+ return getTokenBody(token).getExpiration().before(new Date());
+ } catch (ExpiredJwtException e) {
+ return true;
+ }
+ }
+
+ private static Claims getTokenBody(String token) {
+ return Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
+ }
+
+}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java
new file mode 100644
index 00000000..f46e4de8
--- /dev/null
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java
@@ -0,0 +1,40 @@
+package cn.hippo4j.auth.toolkit;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * ReturnT.
+ *
+ * @author chen.ma
+ * @date 2021/11/10 00:00
+ */
+@Data
+@NoArgsConstructor
+public class ReturnT implements Serializable {
+
+ public static final long serialVersionUID = 42L;
+
+ public static final int SUCCESS_CODE = 200;
+ public static final int FAIL_CODE = 500;
+
+ public static final ReturnT SUCCESS = new ReturnT<>(null);
+ public static final ReturnT FAIL = new ReturnT<>(FAIL_CODE, null);
+
+ private int code;
+ private String msg;
+ private T content;
+
+ public ReturnT(int code, String msg) {
+ this.code = code;
+ this.msg = msg;
+ }
+
+ public ReturnT(T content) {
+ this.code = SUCCESS_CODE;
+ this.content = content;
+ }
+
+}
diff --git a/common/.gitignore b/hippo4j-common/.gitignore
similarity index 100%
rename from common/.gitignore
rename to hippo4j-common/.gitignore
diff --git a/dynamic-threadpool-spring-boot-starter/pom.xml b/hippo4j-common/pom.xml
similarity index 67%
rename from dynamic-threadpool-spring-boot-starter/pom.xml
rename to hippo4j-common/pom.xml
index a5bef1b2..2564b9e0 100644
--- a/dynamic-threadpool-spring-boot-starter/pom.xml
+++ b/hippo4j-common/pom.xml
@@ -4,16 +4,16 @@
4.0.0
- com.github.dynamic-threadpool
- parent
+ cn.hippo4j
+ hippo4j-all
${revision}
- dynamic-threadpool-spring-boot-starter
+ hippo4j-common
jar
${project.artifactId}
- ${project.artifactId}
+ HIPPO4J、HIPPO4J-CORE 公共代码库.
@@ -22,49 +22,36 @@
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- cn.hutool
- hutool-all
-
-
-
- com.squareup.okhttp3
- logging-interceptor
-
-
-
- com.alibaba
- fastjson
+ org.projectlombok
+ lombok
- com.github.dynamic-threadpool
- common
+ org.springframework.boot
+ spring-boot-starter-json
- org.springframework.boot
- spring-boot-configuration-processor
- true
+ com.google.guava
+ guava
- org.projectlombok
- lombok
+ cn.hutool
+ hutool-all
com.aliyun
alibaba-dingtalk-service-sdk
-
-
-
- com.google.guava
- guava
+
+
+
+ log4j
+ log4j
+
+
+ true
@@ -84,6 +71,19 @@
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 2.10.3
+
+
+
+ jar
+
+
+
+
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
new file mode 100644
index 00000000..05746360
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
@@ -0,0 +1,42 @@
+package cn.hippo4j.common.api;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Client close hook execute.
+ *
+ * @author chen.ma
+ * @date 2022/1/6 22:14
+ */
+public interface ClientCloseHookExecute {
+
+ /**
+ * Client close hook function execution.
+ *
+ * @param req
+ */
+ void closeHook(ClientCloseHookReq req);
+
+ @Data
+ @Accessors(chain = true)
+ class ClientCloseHookReq {
+
+ /**
+ * appName
+ */
+ private String appName;
+
+ /**
+ * instanceId
+ */
+ private String instanceId;
+
+ /**
+ * groupKey
+ */
+ private String groupKey;
+
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java
new file mode 100644
index 00000000..566bbb71
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java
@@ -0,0 +1,41 @@
+package cn.hippo4j.common.api;
+
+import java.util.List;
+
+/**
+ * Json facade.
+ *
+ * @author chen.ma
+ * @date 2021/12/13 20:01
+ */
+public interface JsonFacade {
+
+ /**
+ * To JSON string.
+ *
+ * @param object
+ * @return
+ */
+ String toJSONString(Object object);
+
+ /**
+ * Parse object.
+ *
+ * @param text
+ * @param clazz
+ * @param
+ * @return
+ */
+ T parseObject(String text, Class clazz);
+
+ /**
+ * Parse array.
+ *
+ * @param text
+ * @param clazz
+ * @param
+ * @return
+ */
+ List parseArray(String text, Class clazz);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java
new file mode 100644
index 00000000..951b91b0
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java
@@ -0,0 +1,23 @@
+package cn.hippo4j.common.api;
+
+import cn.hippo4j.common.notify.NotifyConfigDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Notify config builder.
+ *
+ * @author chen.ma
+ * @date 2022/2/24 19:50
+ */
+public interface NotifyConfigBuilder {
+
+ /**
+ * Build notify.
+ *
+ * @return
+ */
+ Map> buildNotify();
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java
new file mode 100644
index 00000000..a6bb2523
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java
@@ -0,0 +1,32 @@
+package cn.hippo4j.common.api;
+
+import cn.hippo4j.common.model.ThreadDetailStateInfo;
+
+import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * Get thread status in thread pool.
+ *
+ * @author chen.ma
+ * @date 2022/1/9 12:47
+ */
+public interface ThreadDetailState {
+
+ /**
+ * Get thread status in thread pool.
+ *
+ * @param threadPoolId
+ * @return
+ */
+ List getThreadDetailStateInfo(String threadPoolId);
+
+ /**
+ * Get thread status in thread pool.
+ *
+ * @param threadPoolExecutor
+ * @return
+ */
+ List getThreadDetailStateInfo(ThreadPoolExecutor threadPoolExecutor);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java
new file mode 100644
index 00000000..0f2733da
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java
@@ -0,0 +1,18 @@
+package cn.hippo4j.common.api;
+
+/**
+ * Thread pool dynamic refresh.
+ *
+ * @author chen.ma
+ * @date 2022/2/26 12:26
+ */
+public interface ThreadPoolDynamicRefresh {
+
+ /**
+ * Dynamic refresh.
+ *
+ * @param content
+ */
+ void dynamicRefresh(String content);
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
similarity index 97%
rename from common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
index f12df7e4..574366ec 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/config/ApplicationContextHolder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.config;
+package cn.hippo4j.common.config;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
similarity index 54%
rename from common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
index cc40c294..1b482c4e 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/constant/Constants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.constant;
+package cn.hippo4j.common.constant;
/**
* Constants.
@@ -14,10 +14,20 @@ public class Constants {
public static final String NAMESPACE = "namespace";
+ public static final String GROUP_KEY = "groupKey";
+
+ public static final String AUTHORITIES_KEY = "auth";
+
+ public static final String ACCESS_TOKEN = "accessToken";
+
+ public static final String TOKEN_TTL = "tokenTtl";
+
public static final String DEFAULT_NAMESPACE_ID = "public";
public static final String NULL = "";
+ public static final String UP = "UP";
+
public static final String ENCODE = "UTF-8";
public static final int CONFIG_LONG_POLL_TIMEOUT = 30000;
@@ -28,28 +38,52 @@ public class Constants {
public static final String GENERAL_SPLIT_SYMBOL = ",";
+ public static final String IDENTIFY_SLICER_SYMBOL = "_";
+
public static final String LONG_POLLING_LINE_SEPARATOR = "\r\n";
- public static final String BASE_PATH = "/v1/cs";
+ public static final String BASE_PATH = "/hippo4j/v1/cs";
public static final String CONFIG_CONTROLLER_PATH = BASE_PATH + "/configs";
public static final String LISTENER_PATH = CONFIG_CONTROLLER_PATH + "/listener";
+ public static final String MONITOR_PATH = BASE_PATH + "/monitor";
+
+ public static final String HEALTH_CHECK_PATH = BASE_PATH + "/health/check";
+
public static final String PROBE_MODIFY_REQUEST = "Listening-Configs";
public static final String LONG_PULLING_TIMEOUT = "Long-Pulling-Timeout";
public static final String LONG_PULLING_TIMEOUT_NO_HANGUP = "Long-Pulling-Timeout-No-Hangup";
+ public static final String LONG_PULLING_CLIENT_IDENTIFICATION = "Long-Pulling-Client-Identification";
+
public static final String LISTENING_CONFIGS = "Listening-Configs";
+ public static final String WEIGHT_CONFIGS = "Weight-Configs";
+
public static final String GROUP_KEY_DELIMITER = "+";
+ public static final String GROUP_KEY_DELIMITER_TRANSLATION = "\\+";
+
public static final long EVICTION_INTERVAL_TIMER_IN_MS = 60 * 1000;
public static final int SCHEDULED_THREAD_CORE_NUM = 1;
public static final int MAP_INITIAL_CAPACITY = 16;
+ public static final int HEALTH_CHECK_INTERVAL = 5;
+
+ public static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();
+
+ public static final String DEFAULT_GROUP = "default group";
+
+ public static final String UNKNOWN = "unknown";
+
+ public static final String EXECUTE_TIMEOUT_TRACE = "executeTimeoutTrace";
+
+ public static final int HTTP_EXECUTE_TIMEOUT = 5000;
+
}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/Builder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
similarity index 80%
rename from dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/Builder.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
index 6f78b19e..d787ef53 100644
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/thread/Builder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.starter.toolkit.thread;
+package cn.hippo4j.common.design.builder;
import java.io.Serializable;
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
new file mode 100644
index 00000000..7c176edb
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
@@ -0,0 +1,134 @@
+package cn.hippo4j.common.design.observer;
+
+import cn.hippo4j.common.toolkit.CollectionUtil;
+import cn.hippo4j.common.toolkit.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Send observer notification.
+ *
+ * @author chen.ma
+ * @date 2021/12/25 19:47
+ */
+@Slf4j
+public class AbstractSubjectCenter {
+
+ private static final Map> OBSERVERS_MAP = new ConcurrentHashMap();
+
+ /**
+ * Register observer.
+ *
+ * @param observer
+ */
+ public static void register(Observer observer) {
+ register(SubjectType.SPRING_CONTENT_REFRESHED.name(), observer);
+ }
+
+ /**
+ * Register observer.
+ *
+ * @param subjectType
+ * @param observer
+ */
+ public static void register(SubjectType subjectType, Observer observer) {
+ register(subjectType.name(), observer);
+ }
+
+ /**
+ * Register observer.
+ *
+ * @param subject
+ * @param observer
+ */
+ public static void register(String subject, Observer observer) {
+ if (StringUtil.isBlank(subject) || observer == null) {
+ log.warn("Register observer. A string whose subject or observer is empty or empty.");
+ return;
+ }
+
+ List observers = OBSERVERS_MAP.get(subject);
+ if (CollectionUtil.isEmpty(observers)) {
+ observers = new ArrayList();
+ }
+
+ observers.add(observer);
+ OBSERVERS_MAP.put(subject, observers);
+ }
+
+ /**
+ * Remove observer.
+ *
+ * @param observer
+ */
+ public static void remove(Observer observer) {
+ remove(SubjectType.SPRING_CONTENT_REFRESHED.name(), observer);
+ }
+
+ /**
+ * Remove observer.
+ *
+ * @param subject
+ * @param observer
+ */
+ public static void remove(String subject, Observer observer) {
+ List observers;
+ if (StringUtil.isBlank(subject) || CollectionUtil.isEmpty((observers = OBSERVERS_MAP.get(subject))) || observer == null) {
+ log.warn("Remove observer. A string whose subject or observer is empty or empty.");
+ return;
+ }
+
+ observers.remove(observer);
+ }
+
+ /**
+ * Notify.
+ *
+ * @param subjectType
+ * @param observerMessage
+ */
+ public static void notify(SubjectType subjectType, ObserverMessage observerMessage) {
+ notify(subjectType.name(), observerMessage);
+ }
+
+ /**
+ * Notify.
+ *
+ * @param subject
+ * @param observerMessage
+ */
+ public static void notify(String subject, ObserverMessage observerMessage) {
+ List observers = OBSERVERS_MAP.get(subject);
+ if (CollectionUtil.isEmpty(observers)) {
+ log.warn("Under the subject, there is no observer group.");
+ return;
+ }
+
+ observers.parallelStream().forEach(each -> {
+ try {
+ each.accept(observerMessage);
+ } catch (Exception ex) {
+ log.error("Notification subject :: {} observer exception", subject);
+ }
+ });
+ }
+
+ public enum SubjectType {
+
+ /**
+ * Spring content refreshed.
+ */
+ SPRING_CONTENT_REFRESHED,
+
+ /**
+ * Clear config cache.
+ */
+ CLEAR_CONFIG_CACHE
+
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
new file mode 100644
index 00000000..a8dbc17f
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
@@ -0,0 +1,18 @@
+package cn.hippo4j.common.design.observer;
+
+/**
+ * Observer.
+ *
+ * @author chen.ma
+ * @date 2021/12/25 19:46
+ */
+public interface Observer {
+
+ /**
+ * Receive notification.
+ *
+ * @param observerMessage
+ */
+ void accept(ObserverMessage observerMessage);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
new file mode 100644
index 00000000..9e9895b5
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
@@ -0,0 +1,18 @@
+package cn.hippo4j.common.design.observer;
+
+/**
+ * Message notifying observer.
+ *
+ * @author chen.ma
+ * @date 2021/12/25 19:54
+ */
+public interface ObserverMessage {
+
+ /**
+ * Message.
+ *
+ * @return
+ */
+ T message();
+
+}
diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
similarity index 91%
rename from config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
index b6250841..7e6848c7 100644
--- a/config/src/main/java/com/github/dynamic/threadpool/config/enums/DelEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.config.enums;
+package cn.hippo4j.common.enums;
/**
* Del enum.
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
new file mode 100644
index 00000000..81c1b1c4
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
@@ -0,0 +1,46 @@
+package cn.hippo4j.common.enums;
+
+import java.util.Objects;
+
+/**
+ * Enable enum.
+ *
+ * @author chen.ma
+ * @date 2021/12/21 20:34
+ */
+public enum EnableEnum {
+
+ /**
+ * True.
+ */
+ YES("1"),
+
+ /**
+ * False.
+ */
+ NO("0");
+
+ private final String statusCode;
+
+ EnableEnum(String statusCode) {
+ this.statusCode = statusCode;
+ }
+
+ public String getCode() {
+ return this.statusCode;
+ }
+
+ public Integer getIntCode() {
+ return Integer.parseInt(this.statusCode);
+ }
+
+ @Override
+ public String toString() {
+ return statusCode;
+ }
+
+ public static boolean getBool(Integer intStatusCode) {
+ return Objects.equals(intStatusCode, EnableEnum.YES.getIntCode()) ? true : false;
+ }
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
similarity index 93%
rename from common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
index 7f5ef744..cebe8a40 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/executor/ExecutorFactory.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.executor;
+package cn.hippo4j.common.executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
similarity index 96%
rename from common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
index d2262a39..0670aa95 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/executor/ThreadPoolManager.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.executor;
+package cn.hippo4j.common.executor;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java
new file mode 100644
index 00000000..92810bfa
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java
@@ -0,0 +1,20 @@
+package cn.hippo4j.common.function;
+
+/**
+ * Matcher.
+ *
+ * @author chen.ma
+ * @date 2022/1/9 13:29
+ */
+@FunctionalInterface
+public interface Matcher {
+
+ /**
+ * Match.
+ *
+ * @param t
+ * @return
+ */
+ boolean match(T t);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
new file mode 100644
index 00000000..c8fe64ae
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
@@ -0,0 +1,17 @@
+package cn.hippo4j.common.function;
+
+/**
+ * 无参消费者.
+ *
+ * @author chen.ma
+ * @date 2021/11/9 00:06
+ */
+@FunctionalInterface
+public interface NoArgsConsumer {
+
+ /**
+ * 方法执行
+ */
+ void accept();
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
similarity index 95%
rename from common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
index ef20d99a..a9f64620 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/model/GlobalRemotePoolInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.model;
+package cn.hippo4j.common.model;
import lombok.Getter;
import lombok.Setter;
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
similarity index 86%
rename from common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
index 88cb054d..d5d7e526 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/model/InstanceInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.model;
+package cn.hippo4j.common.model;
import lombok.Data;
import lombok.Getter;
@@ -24,6 +24,8 @@ public class InstanceInfo {
private String hostName;
+ private String groupKey;
+
private String port;
private String instanceId;
@@ -34,6 +36,10 @@ public class InstanceInfo {
private String callBackUrl;
+ private String identify;
+
+ private String active;
+
private volatile String vipAddress;
private volatile String secureVipAddress;
@@ -95,14 +101,29 @@ public class InstanceInfo {
public enum InstanceStatus {
+ /**
+ * UP
+ */
UP,
+ /**
+ * DOWN
+ */
DOWN,
+ /**
+ * STARTING
+ */
STARTING,
+ /**
+ * OUT_OF_SERVICE
+ */
OUT_OF_SERVICE,
+ /**
+ * UNKNOWN
+ */
UNKNOWN;
public static InstanceStatus toEnum(String s) {
@@ -119,10 +140,19 @@ public class InstanceInfo {
}
public enum ActionType {
+ /**
+ * ADDED
+ */
ADDED,
+ /**
+ * MODIFIED
+ */
MODIFIED,
+ /**
+ * DELETED
+ */
DELETED
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java
new file mode 100644
index 00000000..76f205ed
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java
@@ -0,0 +1,29 @@
+package cn.hippo4j.common.model;
+
+import lombok.Data;
+
+/**
+ * Many pool run state info.
+ *
+ * @author chen.ma
+ * @date 2022/1/8 12:54
+ */
+@Data
+public class ManyPoolRunStateInfo extends PoolRunStateInfo {
+
+ /**
+ * identify
+ */
+ private String identify;
+
+ /**
+ * active
+ */
+ private String active;
+
+ /**
+ * state
+ */
+ private String state;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java
new file mode 100644
index 00000000..9217821a
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java
@@ -0,0 +1,46 @@
+package cn.hippo4j.common.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Pool base info.
+ *
+ * @author chen.ma
+ * @date 2022/1/22 12:10
+ */
+@Data
+@Accessors(chain = true)
+public class PoolBaseInfo {
+
+ /**
+ * coreSize
+ */
+ private Integer coreSize;
+
+ /**
+ * maximumSize
+ */
+ private Integer maximumSize;
+
+ /**
+ * queueType
+ */
+ private String queueType;
+
+ /**
+ * queueCapacity
+ */
+ private Integer queueCapacity;
+
+ /**
+ * rejectedName
+ */
+ private String rejectedName;
+
+ /**
+ * keepAliveTime
+ */
+ private Long keepAliveTime;
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java
similarity index 88%
rename from common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java
index e46e4504..c21e380d 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameter.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.model;
+package cn.hippo4j.common.model;
/**
* Pool parameter.
@@ -92,4 +92,11 @@ public interface PoolParameter {
*/
Integer getLivenessAlarm();
+ /**
+ * allowCoreThreadTimeOut
+ *
+ * @return
+ */
+ Integer getAllowCoreThreadTimeOut();
+
}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java
similarity index 90%
rename from common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java
index 18e5a354..5eaf0020 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolParameterInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.model;
+package cn.hippo4j.common.model;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -82,4 +82,9 @@ public class PoolParameterInfo implements PoolParameter, Serializable {
*/
private Integer livenessAlarm;
+ /**
+ * allowCoreThreadTimeOut
+ */
+ private Integer allowCoreThreadTimeOut;
+
}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java
similarity index 60%
rename from common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java
index f2915c93..b29bcb2b 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/model/PoolRunStateInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.model;
+package cn.hippo4j.common.model;
import lombok.Getter;
import lombok.Setter;
@@ -13,7 +13,7 @@ import java.io.Serializable;
*/
@Getter
@Setter
-public class PoolRunStateInfo implements Serializable {
+public class PoolRunStateInfo extends PoolBaseInfo implements Serializable {
/**
* currentLoad
@@ -31,14 +31,9 @@ public class PoolRunStateInfo implements Serializable {
private String tpId;
/**
- * coreSize
+ * activeCount
*/
- private Integer coreSize;
-
- /**
- * maximumSize
- */
- private Integer maximumSize;
+ private Integer activeCount;
/**
* poolSize
@@ -55,16 +50,6 @@ public class PoolRunStateInfo implements Serializable {
*/
private Integer largestPoolSize;
- /**
- * queueType
- */
- private String queueType;
-
- /**
- * queueCapacity
- */
- private Integer queueCapacity;
-
/**
* queueSize
*/
@@ -83,11 +68,39 @@ public class PoolRunStateInfo implements Serializable {
/**
* rejectCount
*/
- private Integer rejectCount;
+ private Long rejectCount;
/**
* host
*/
private String host;
+ /**
+ * memoryProportion
+ */
+ private String memoryProportion;
+
+ /**
+ * freeMemory
+ */
+ private String freeMemory;
+
+ /**
+ * clientLastRefreshTime
+ */
+ private String clientLastRefreshTime;
+
+ /**
+ * timestamp
+ */
+ private Long timestamp;
+
+ public Integer getSimpleCurrentLoad() {
+ return Integer.parseInt(getCurrentLoad().replace("%", ""));
+ }
+
+ public Integer getSimplePeakLoad() {
+ return Integer.parseInt(getPeakLoad().replace("%", ""));
+ }
+
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
new file mode 100644
index 00000000..72663bd9
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
@@ -0,0 +1,38 @@
+package cn.hippo4j.common.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * Thread detail state info.
+ *
+ * @author chen.ma
+ * @date 2022/1/9 12:36
+ */
+@Data
+@Accessors(chain = true)
+public class ThreadDetailStateInfo {
+
+ /**
+ * threadId
+ */
+ private Long threadId;
+
+ /**
+ * threadName
+ */
+ private String threadName;
+
+ /**
+ * threadStatus
+ */
+ private String threadStatus;
+
+ /**
+ * threadStack
+ */
+ private List threadStack;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
new file mode 100644
index 00000000..81a2a2eb
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
@@ -0,0 +1,28 @@
+package cn.hippo4j.common.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Token info.
+ *
+ * @author chen.ma
+ * @date 2021/12/20 20:02
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TokenInfo {
+
+ /**
+ * accessToken
+ */
+ private String accessToken;
+
+ /**
+ * tokenTtl
+ */
+ private Long tokenTtl;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
new file mode 100644
index 00000000..201c48da
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
@@ -0,0 +1,33 @@
+package cn.hippo4j.common.monitor;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Base message.
+ *
+ * @author chen.ma
+ * @date 2021/12/7 20:31
+ */
+@Data
+@NoArgsConstructor
+public abstract class AbstractMessage implements Message {
+
+ /**
+ * groupKey: tenant + item + tpId + identify
+ */
+ private String groupKey;
+
+ /**
+ * messageTypeEnum
+ */
+ private MessageTypeEnum messageType;
+
+ /**
+ * message
+ */
+ private List messages;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java
new file mode 100644
index 00000000..70de9bdd
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java
@@ -0,0 +1,35 @@
+package cn.hippo4j.common.monitor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Abstract message monitoring interface.
+ *
+ * @author chen.ma
+ * @date 2021/12/6 20:16
+ */
+public interface Message extends Serializable {
+
+ /**
+ * Get groupKey.
+ *
+ * @return
+ */
+ String getGroupKey();
+
+ /**
+ * Get message type.
+ *
+ * @return
+ */
+ MessageTypeEnum getMessageType();
+
+ /**
+ * Get messages.
+ *
+ * @return
+ */
+ List getMessages();
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
new file mode 100644
index 00000000..8ca09d64
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
@@ -0,0 +1,35 @@
+package cn.hippo4j.common.monitor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Message request.
+ *
+ * @author chen.ma
+ * @date 2021/12/10 21:17
+ */
+public interface MessageRequest {
+
+ /**
+ * Get content params.
+ *
+ * @return
+ */
+ List> getContentParams();
+
+ /**
+ * Get response class.
+ *
+ * @return
+ */
+ Class getResponseClass();
+
+ /**
+ * Get message type.
+ *
+ * @return
+ */
+ MessageTypeEnum getMessageType();
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
new file mode 100644
index 00000000..e4546a53
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
@@ -0,0 +1,21 @@
+package cn.hippo4j.common.monitor;
+
+/**
+ * Message type enum.
+ *
+ * @author chen.ma
+ * @date 2021/12/7 19:34
+ */
+public enum MessageTypeEnum {
+
+ /**
+ * RUNTIME
+ */
+ RUNTIME,
+
+ /**
+ * DEFAULT
+ */
+ DEFAULT
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
new file mode 100644
index 00000000..3acb1258
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
@@ -0,0 +1,51 @@
+package cn.hippo4j.common.monitor;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Message wrapper.
+ *
+ * @author chen.ma
+ * @date 2021/12/7 22:42
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MessageWrapper implements MessageRequest {
+
+ /**
+ * contentParams
+ */
+ private List> contentParams;
+
+ /**
+ * responseClass
+ */
+ private Class responseClass;
+
+ /**
+ * getMessageType
+ */
+ private MessageTypeEnum messageType;
+
+ @Override
+ public List> getContentParams() {
+ return contentParams;
+ }
+
+ @Override
+ public Class getResponseClass() {
+ return responseClass;
+ }
+
+ @Override
+ public MessageTypeEnum getMessageType() {
+ return messageType;
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
new file mode 100644
index 00000000..058e38db
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
@@ -0,0 +1,71 @@
+package cn.hippo4j.common.monitor;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Dynamic thread pool runtime data.
+ *
+ * @author chen.ma
+ * @date 2021/12/6 18:18
+ */
+@Data
+@NoArgsConstructor
+public class RuntimeMessage extends AbstractMessage {
+
+ /**
+ * currentLoad
+ */
+ private String currentLoad;
+
+ /**
+ * peakLoad
+ */
+ private String peakLoad;
+
+ /**
+ * poolSize
+ */
+ private Integer poolSize;
+
+ /**
+ * The maximum number of threads that enter the thread pool at the same time
+ */
+ private Integer largestPoolSize;
+
+ /**
+ * activeSize
+ */
+ private String activeSize;
+
+ /**
+ * queueCapacity
+ */
+ private Integer queueCapacity;
+
+ /**
+ * queueSize
+ */
+ private Integer queueSize;
+
+ /**
+ * queueRemainingCapacity
+ */
+ private String queueRemainingCapacity;
+
+ /**
+ * completedTaskCount
+ */
+ private Long completedTaskCount;
+
+ /**
+ * rejectCount
+ */
+ private Integer rejectCount;
+
+ /**
+ * timestamp
+ */
+ private Long timestamp;
+
+}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/alarm/AlarmControlDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
similarity index 61%
rename from dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/alarm/AlarmControlDTO.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
index ae2b8d3a..3bca8893 100644
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/alarm/AlarmControlDTO.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
@@ -1,5 +1,6 @@
-package com.github.dynamic.threadpool.starter.alarm;
+package cn.hippo4j.common.notify;
+import cn.hutool.core.util.StrUtil;
import lombok.Builder;
import lombok.Data;
@@ -18,10 +19,15 @@ public class AlarmControlDTO {
*/
private String threadPool;
+ /**
+ * 推送报警平台
+ */
+ private String platform;
+
/**
* 推送报警类型
*/
- private MessageTypeEnum typeEnum;
+ private NotifyTypeEnum typeEnum;
/**
* 构建线程池报警标识
@@ -29,7 +35,7 @@ public class AlarmControlDTO {
* @return
*/
public String buildPk() {
- return threadPool + "_" + typeEnum;
+ return StrUtil.builder(threadPool, "+", platform).toString();
}
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java
new file mode 100644
index 00000000..019af2f9
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java
@@ -0,0 +1,77 @@
+package cn.hippo4j.common.notify;
+
+import cn.hippo4j.common.constant.Constants;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Alarm control assembly.
+ *
+ * @author chen.ma
+ * @date 2021/10/28 21:24
+ */
+public class AlarmControlHandler {
+
+ private final Map threadPoolLock = Maps.newHashMap();
+
+ private final Map> threadPoolAlarmCache = Maps.newConcurrentMap();
+
+ /**
+ * Control message push alarm frequency.
+ *
+ * @param alarmControl
+ * @return
+ */
+ public boolean isSendAlarm(AlarmControlDTO alarmControl) {
+ String threadPoolKey = alarmControl.buildPk();
+ Cache cache = threadPoolAlarmCache.get(threadPoolKey);
+ if (cache == null) {
+ return false;
+ }
+
+ String pkId = cache.getIfPresent(alarmControl.getTypeEnum().name());
+ if (StrUtil.isBlank(pkId)) {
+ ReentrantLock lock = threadPoolLock.get(threadPoolKey);
+ lock.lock();
+ try {
+ pkId = cache.getIfPresent(alarmControl.getTypeEnum().name());
+ if (StrUtil.isBlank(pkId)) {
+ // Val meaningless.
+ cache.put(alarmControl.getTypeEnum().name(), IdUtil.simpleUUID());
+ return true;
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Init cache and lock.
+ *
+ * @param threadPoolId
+ * @param platform
+ * @param interval
+ */
+ public void initCacheAndLock(String threadPoolId, String platform, Integer interval) {
+ String threadPoolKey = StrUtil.builder(threadPoolId, Constants.GROUP_KEY_DELIMITER, platform).toString();
+ Cache cache = CacheBuilder.newBuilder()
+ .expireAfterWrite(interval, TimeUnit.MINUTES)
+ .build();
+ threadPoolAlarmCache.put(threadPoolKey, cache);
+
+ // Set the lock to prevent false sending of alarm information.
+ ReentrantLock reentrantLock = new ReentrantLock();
+ threadPoolLock.put(threadPoolKey, reentrantLock);
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java
new file mode 100644
index 00000000..0eaf2012
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java
@@ -0,0 +1,124 @@
+package cn.hippo4j.common.notify;
+
+import cn.hippo4j.common.api.NotifyConfigBuilder;
+import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
+import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.google.common.collect.Maps;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Base send message service impl.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 21:32
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class HippoBaseSendMessageService implements HippoSendMessageService, CommandLineRunner {
+
+ private final NotifyConfigBuilder notifyConfigBuilder;
+
+ private final AlarmControlHandler alarmControlHandler;
+
+ private final Map> notifyConfigs = Maps.newHashMap();
+
+ private final Map sendMessageHandlers = Maps.newHashMap();
+
+ @Override
+ public void sendAlarmMessage(NotifyTypeEnum typeEnum, AlarmNotifyRequest alarmNotifyRequest) {
+ String threadPoolId = alarmNotifyRequest.getThreadPoolId();
+ String buildKey = StrUtil.builder(threadPoolId, "+", "ALARM").toString();
+ List notifyList = notifyConfigs.get(buildKey);
+ if (CollUtil.isEmpty(notifyList)) {
+ return;
+ }
+
+ notifyList.forEach(each -> {
+ try {
+ SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform());
+ if (messageHandler == null) {
+ log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
+ return;
+ }
+
+ if (isSendAlarm(each.getTpId(), each.getPlatform(), typeEnum)) {
+ alarmNotifyRequest.setNotifyTypeEnum(typeEnum);
+ messageHandler.sendAlarmMessage(each, alarmNotifyRequest);
+ }
+ } catch (Exception ex) {
+ log.warn("Failed to send thread pool alarm notification. key :: [{}]", threadPoolId, ex);
+ }
+ });
+ }
+
+ @Override
+ public void sendChangeMessage(ChangeParameterNotifyRequest changeParameterNotifyRequest) {
+ String threadPoolId = changeParameterNotifyRequest.getThreadPoolId();
+ String buildKey = StrUtil.builder(threadPoolId, "+", "CONFIG").toString();
+ List notifyList = notifyConfigs.get(buildKey);
+ if (CollUtil.isEmpty(notifyList)) {
+ log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
+ return;
+ }
+
+ notifyList.forEach(each -> {
+ try {
+ SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform());
+ if (messageHandler == null) {
+ log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
+ return;
+ }
+
+ messageHandler.sendChangeMessage(each, changeParameterNotifyRequest);
+ } catch (Exception ex) {
+ log.warn("Failed to send thread pool change notification. key :: [{}]", threadPoolId, ex);
+ }
+ });
+ }
+
+ /**
+ * Is send alarm.
+ *
+ * @param threadPoolId
+ * @param platform
+ * @param typeEnum
+ * @return
+ */
+ private boolean isSendAlarm(String threadPoolId, String platform, NotifyTypeEnum typeEnum) {
+ AlarmControlDTO alarmControl = AlarmControlDTO.builder()
+ .threadPool(threadPoolId)
+ .platform(platform)
+ .typeEnum(typeEnum)
+ .build();
+
+ return alarmControlHandler.isSendAlarm(alarmControl);
+ }
+
+ @Override
+ public void run(String... args) throws Exception {
+ Map sendMessageHandlerMap =
+ ApplicationContextHolder.getBeansOfType(SendMessageHandler.class);
+ sendMessageHandlerMap.values().forEach(each -> sendMessageHandlers.put(each.getType(), each));
+
+ Map> buildNotify = notifyConfigBuilder.buildNotify();
+ notifyConfigs.putAll(buildNotify);
+ }
+
+ /**
+ * Put platform.
+ *
+ * @param notifyConfigs
+ */
+ public synchronized void putPlatform(Map> notifyConfigs) {
+ this.notifyConfigs.putAll(notifyConfigs);
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java
new file mode 100644
index 00000000..158d07fd
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java
@@ -0,0 +1,29 @@
+package cn.hippo4j.common.notify;
+
+import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
+import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+
+/**
+ * Send message service.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 19:56
+ */
+public interface HippoSendMessageService {
+
+ /**
+ * Send alarm message.
+ *
+ * @param typeEnum
+ * @param alarmNotifyRequest
+ */
+ void sendAlarmMessage(NotifyTypeEnum typeEnum, AlarmNotifyRequest alarmNotifyRequest);
+
+ /**
+ * Send change message.
+ *
+ * @param changeParameterNotifyRequest
+ */
+ void sendChangeMessage(ChangeParameterNotifyRequest changeParameterNotifyRequest);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java
new file mode 100644
index 00000000..84d5e48c
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java
@@ -0,0 +1,61 @@
+package cn.hippo4j.common.notify;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 通知实体.
+ *
+ * @author chen.ma
+ * @date 2021/11/17 22:12
+ */
+@Data
+@Accessors(chain = true)
+public class NotifyConfigDTO {
+
+ /**
+ * 租户id
+ */
+ private String tenantId;
+
+ /**
+ * 项目id
+ */
+ private String itemId;
+
+ /**
+ * 线程池id
+ */
+ private String tpId;
+
+ /**
+ * 通知平台
+ */
+ private String platform;
+
+ /**
+ * 通知类型
+ */
+ private String type;
+
+ /**
+ * 密钥
+ */
+ private String secretKey;
+
+ /**
+ * 报警间隔
+ */
+ private Integer interval;
+
+ /**
+ * 接收者
+ */
+ private String receives;
+
+ /**
+ * 报警类型
+ */
+ private NotifyTypeEnum typeEnum;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java
new file mode 100644
index 00000000..3d2e65b4
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java
@@ -0,0 +1,26 @@
+package cn.hippo4j.common.notify;
+
+/**
+ * Notify platform enum.
+ *
+ * @author chen.ma
+ * @date 2021/8/15 15:50
+ */
+public enum NotifyPlatformEnum {
+
+ /**
+ * DING
+ */
+ DING,
+
+ /**
+ * LARK
+ */
+ LARK,
+
+ /**
+ * WECHAT
+ */
+ WECHAT
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java
new file mode 100644
index 00000000..14ce2685
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java
@@ -0,0 +1,36 @@
+package cn.hippo4j.common.notify;
+
+/**
+ * Notify type enum.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 19:44
+ */
+public enum NotifyTypeEnum {
+
+ /**
+ * CHANGE
+ */
+ CHANGE,
+
+ /**
+ * CAPACITY
+ */
+ CAPACITY,
+
+ /**
+ * ACTIVITY
+ */
+ ACTIVITY,
+
+ /**
+ * REJECT
+ */
+ REJECT,
+
+ /**
+ * TIMEOUT
+ */
+ TIMEOUT
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java
new file mode 100644
index 00000000..13a8a961
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java
@@ -0,0 +1,36 @@
+package cn.hippo4j.common.notify;
+
+import cn.hippo4j.common.notify.request.base.NotifyRequest;
+
+/**
+ * Send message handler.
+ *
+ * @author chen.ma
+ * @date 2021/8/15 15:44
+ */
+public interface SendMessageHandler {
+
+ /**
+ * Get type.
+ *
+ * @return
+ */
+ String getType();
+
+ /**
+ * Send alarm message.
+ *
+ * @param notifyConfig
+ * @param alarmNotifyRequest
+ */
+ void sendAlarmMessage(NotifyConfigDTO notifyConfig, T alarmNotifyRequest);
+
+ /**
+ * Send change message.
+ *
+ * @param notifyConfig
+ * @param changeParameterNotifyRequest
+ */
+ void sendChangeMessage(NotifyConfigDTO notifyConfig, R changeParameterNotifyRequest);
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java
new file mode 100644
index 00000000..0936ed85
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java
@@ -0,0 +1,56 @@
+package cn.hippo4j.common.notify;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * Thread pool notify alarm.
+ *
+ * @author chen.ma
+ * @date 2021/8/15 19:13
+ */
+@Data
+@NoArgsConstructor
+@RequiredArgsConstructor
+public class ThreadPoolNotifyAlarm {
+
+ /**
+ * isAlarm
+ */
+ @NonNull
+ private Boolean isAlarm;
+
+ /**
+ * activeAlarm
+ */
+ @NonNull
+ private Integer activeAlarm;
+
+ /**
+ * capacityAlarm
+ */
+ @NonNull
+ private Integer capacityAlarm;
+
+ /**
+ * interval
+ */
+ private Integer interval;
+
+ /**
+ * receive
+ */
+ private String receive;
+
+ /**
+ * receives
+ * ps：暂不启用该配置，后续如果开发邮箱时或许有用
+ */
+ @Deprecated
+ private Map receives;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java
new file mode 100644
index 00000000..f864cd26
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java
@@ -0,0 +1,26 @@
+package cn.hippo4j.common.notify;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Thread pool notify DTO.
+ *
+ * @author chen.ma
+ * @date 2022/2/24 19:08
+ */
+@Data
+public class ThreadPoolNotifyDTO {
+
+ /**
+ * notifyKey
+ */
+ private String notifyKey;
+
+ /**
+ * notifyList
+ */
+ private List notifyList;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java
new file mode 100644
index 00000000..380d4b9a
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java
@@ -0,0 +1,97 @@
+package cn.hippo4j.common.notify.platform;
+
+/**
+ * Ding alarm constants.
+ *
+ * @author chen.ma
+ * @date 2021/11/26 20:03
+ */
+public class DingAlarmConstants {
+
+ /**
+ * 钉钉机器人 Url
+ */
+ public static final String DING_ROBOT_SERVER_URL = "https://oapi.dingtalk.com/robot/send?access_token=";
+
+ /**
+ * 线程池报警通知标题
+ */
+ public static final String DING_ALARM_TITLE = "动态线程池告警";
+
+ /**
+ * 线程池参数变更通知标题
+ */
+ public static final String DING_NOTICE_TITLE = "动态线程池通知";
+
+ /**
+ * Trace 信息
+ */
+ public static final String DING_ALARM_TIMOUT_TRACE_REPLACE_TXT = "链路信息：%s \n\n";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String DING_ALARM_TIMOUT_REPLACE_TXT =
+ "任务执行时间：%d / ms \n\n" +
+ "超时时间：%d / ms \n\n" +
+ DING_ALARM_TIMOUT_TRACE_REPLACE_TXT +
+ " --- \n\n ";
+
+ /**
+ * 线程池报警通知文本
+ */
+ public static final String DING_ALARM_TXT =
+ "**[警报] %s - 动态线程池运行告警（%s）** \n\n" +
+ " --- \n\n " +
+ "线程池ID：%s \n\n " +
+ "应用名称：%s \n\n " +
+ "应用实例：%s \n\n " +
+ "实例标识：%s \n\n " +
+ " --- \n\n " +
+ "核心线程数：%d \n\n " +
+ "最大线程数：%d \n\n " +
+ "当前线程数：%d \n\n " +
+ "活跃线程数：%d \n\n " +
+ "最大任务数：%d \n\n " +
+ "线程池任务总量：%d \n\n " +
+ " --- \n\n " +
+ "队列类型：%s \n\n " +
+ "队列容量：%d \n\n " +
+ "队列元素个数：%d \n\n " +
+ "队列剩余个数：%d \n\n " +
+ " --- \n\n " +
+ DING_ALARM_TIMOUT_REPLACE_TXT +
+ "拒绝策略：%s \n\n" +
+ "拒绝策略执行次数：%d \n\n " +
+ "OWNER：@%s \n\n" +
+ "提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
+ " --- \n\n " +
+ "**播报时间：%s**";
+
+ /**
+ * 线程池参数变更通知文本
+ */
+ public static final String DING_NOTICE_TXT =
+ "**[通知] %s - 动态线程池参数变更** \n\n" +
+ " --- \n\n " +
+ "线程池ID：%s \n\n " +
+ "应用名称：%s \n\n " +
+ "应用实例：%s \n\n " +
+ " --- \n\n " +
+ "核心线程数：%s \n\n " +
+ "最大线程数：%s \n\n " +
+ "核心线程超时：%s \n\n " +
+ "线程存活时间：%s \n\n" +
+ "执行超时时间：%s \n\n" +
+ " --- \n\n " +
+ "队列类型：%s \n\n " +
+ "队列容量：%s \n\n " +
+ "AGO 拒绝策略：%s \n\n" +
+ "NOW 拒绝策略：%s \n\n" +
+ " --- \n\n " +
+ "提示：动态线程池配置变更实时通知（无限制） \n\n" +
+ "OWNER：@%s \n\n" +
+ " --- \n\n " +
+ "**播报时间：%s**";
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
new file mode 100644
index 00000000..52f77d9a
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
@@ -0,0 +1,177 @@
+package cn.hippo4j.common.notify.platform;
+
+import cn.hippo4j.common.notify.*;
+import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
+import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.dingtalk.api.DefaultDingTalkClient;
+import com.dingtalk.api.DingTalkClient;
+import com.dingtalk.api.request.OapiRobotSendRequest;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.taobao.api.ApiException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Objects;
+
+import static cn.hippo4j.common.notify.platform.DingAlarmConstants.*;
+
+/**
+ * Send ding notification message.
+ *
+ * @author chen.ma
+ * @date 2021/8/15 15:49
+ */
+@Slf4j
+public class DingSendMessageHandler implements SendMessageHandler {
+
+ @Override
+ public String getType() {
+ return NotifyPlatformEnum.DING.name();
+ }
+
+ @Override
+ public void sendAlarmMessage(NotifyConfigDTO notifyConfig, AlarmNotifyRequest alarmNotifyRequest) {
+ String[] receives = notifyConfig.getReceives().split(",");
+ String afterReceives = Joiner.on(", @").join(receives);
+
+ String dingAlarmTxt;
+ String dingAlarmTimoutReplaceTxt;
+ if (Objects.equals(alarmNotifyRequest.getNotifyTypeEnum(), NotifyTypeEnum.TIMEOUT)) {
+ String executeTimeoutTrace = alarmNotifyRequest.getExecuteTimeoutTrace();
+ if (StringUtil.isNotBlank(executeTimeoutTrace)) {
+ String dingAlarmTimoutTraceReplaceTxt = String.format(DING_ALARM_TIMOUT_TRACE_REPLACE_TXT, executeTimeoutTrace);
+ dingAlarmTimoutReplaceTxt = StrUtil.replace(DING_ALARM_TIMOUT_REPLACE_TXT, DING_ALARM_TIMOUT_TRACE_REPLACE_TXT, dingAlarmTimoutTraceReplaceTxt);
+ } else {
+ dingAlarmTimoutReplaceTxt = StrUtil.replace(DING_ALARM_TIMOUT_REPLACE_TXT, DING_ALARM_TIMOUT_TRACE_REPLACE_TXT, "");
+ }
+
+ dingAlarmTimoutReplaceTxt = String.format(dingAlarmTimoutReplaceTxt, alarmNotifyRequest.getExecuteTime(), alarmNotifyRequest.getExecuteTimeOut());
+ dingAlarmTxt = StrUtil.replace(DING_ALARM_TXT, DING_ALARM_TIMOUT_REPLACE_TXT, dingAlarmTimoutReplaceTxt);
+ } else {
+ dingAlarmTxt = StrUtil.replace(DING_ALARM_TXT, DING_ALARM_TIMOUT_REPLACE_TXT, "");
+ }
+
+ String[] strings = alarmNotifyRequest.getIdentify().split("_");
+ String text = String.format(
+ dingAlarmTxt,
+ // 环境
+ alarmNotifyRequest.getActive(),
+ // 报警类型
+ alarmNotifyRequest.getNotifyTypeEnum(),
+ // 线程池ID
+ alarmNotifyRequest.getThreadPoolId(),
+ // 应用名称
+ alarmNotifyRequest.getAppName(),
+ // Host
+ strings[0],
+ // 实例ID
+ strings[1],
+ // 核心线程数
+ alarmNotifyRequest.getCorePoolSize(),
+ // 最大线程数
+ alarmNotifyRequest.getMaximumPoolSize(),
+ // 当前线程数
+ alarmNotifyRequest.getPoolSize(),
+ // 活跃线程数
+ alarmNotifyRequest.getActiveCount(),
+ // 最大任务数
+ alarmNotifyRequest.getLargestPoolSize(),
+ // 线程池任务总量
+ alarmNotifyRequest.getCompletedTaskCount(),
+ // 队列类型名称
+ alarmNotifyRequest.getQueueName(),
+ // 队列容量
+ alarmNotifyRequest.getCapacity(),
+ // 队列元素个数
+ alarmNotifyRequest.getQueueSize(),
+ // 队列剩余个数
+ alarmNotifyRequest.getRemainingCapacity(),
+ // 拒绝策略名称
+ alarmNotifyRequest.getRejectedExecutionHandlerName(),
+ // 拒绝策略次数
+ alarmNotifyRequest.getRejectCountNum(),
+ // 告警手机号
+ afterReceives,
+ // 报警频率
+ notifyConfig.getInterval(),
+ // 当前时间
+ DateUtil.now()
+ );
+
+ execute(notifyConfig.getSecretKey(), DingAlarmConstants.DING_ALARM_TITLE, text, Lists.newArrayList(receives));
+ }
+
+ @Override
+ public void sendChangeMessage(NotifyConfigDTO notifyConfig, ChangeParameterNotifyRequest changeParameterNotifyRequest) {
+ String threadPoolId = changeParameterNotifyRequest.getThreadPoolId();
+
+ String[] receives = notifyConfig.getReceives().split(",");
+ String afterReceives = Joiner.on(", @").join(receives);
+
+ /**
+ * hesitant e.g. ➲ ➜ ⇨ ➪
+ */
+ String text = String.format(
+ DING_NOTICE_TXT,
+ // 环境
+ changeParameterNotifyRequest.getActive(),
+ // 线程池名称
+ threadPoolId,
+ // 应用名称
+ changeParameterNotifyRequest.getAppName(),
+ // 实例信息
+ changeParameterNotifyRequest.getIdentify(),
+ // 核心线程数
+ changeParameterNotifyRequest.getBeforeCorePoolSize() + " ➲ " + changeParameterNotifyRequest.getNowCorePoolSize(),
+ // 最大线程数
+ changeParameterNotifyRequest.getBeforeMaximumPoolSize() + " ➲ " + changeParameterNotifyRequest.getNowMaximumPoolSize(),
+ // 核心线程超时
+ changeParameterNotifyRequest.getBeforeAllowsCoreThreadTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowAllowsCoreThreadTimeOut(),
+ // 线程存活时间
+ changeParameterNotifyRequest.getBeforeKeepAliveTime() + " ➲ " + changeParameterNotifyRequest.getNowKeepAliveTime(),
+ // 执行超时时间
+ changeParameterNotifyRequest.getBeforeExecuteTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowExecuteTimeOut(),
+ // 阻塞队列
+ changeParameterNotifyRequest.getBlockingQueueName(),
+ // 阻塞队列容量
+ changeParameterNotifyRequest.getBeforeQueueCapacity() + " ➲ " + changeParameterNotifyRequest.getNowQueueCapacity(),
+ // 拒绝策略
+ changeParameterNotifyRequest.getBeforeRejectedName(),
+ changeParameterNotifyRequest.getNowRejectedName(),
+ // 告警手机号
+ afterReceives,
+ // 当前时间
+ DateUtil.now()
+ );
+
+ execute(notifyConfig.getSecretKey(), DingAlarmConstants.DING_NOTICE_TITLE, text, Lists.newArrayList(receives));
+ }
+
+ private void execute(String secretKey, String title, String text, List mobiles) {
+ String serverUrl = DingAlarmConstants.DING_ROBOT_SERVER_URL + secretKey;
+ DingTalkClient dingTalkClient = new DefaultDingTalkClient(serverUrl);
+ OapiRobotSendRequest request = new OapiRobotSendRequest();
+ request.setMsgtype("markdown");
+
+ OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
+ markdown.setTitle(title);
+ markdown.setText(text);
+
+ OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
+ at.setAtMobiles(mobiles);
+
+ request.setAt(at);
+ request.setMarkdown(markdown);
+
+ try {
+ dingTalkClient.execute(request);
+ } catch (ApiException ex) {
+ log.error("Ding failed to send message", ex);
+ }
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java
new file mode 100644
index 00000000..eab0552d
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java
@@ -0,0 +1,56 @@
+package cn.hippo4j.common.notify.platform;
+
+/**
+ * lark alarm constants.
+ *
+ * @author imyzt
+ * @date 2021-11-23 19:29
+ */
+public class LarkAlarmConstants {
+
+ /**
+ * lark bot url
+ */
+ public static final String LARK_BOT_URL = "https://open.feishu.cn/open-apis/bot/v2/hook/";
+
+ /**
+ * lark at format. openid
+ * 当配置openid时,机器人可以@人
+ */
+ public static final String LARK_AT_FORMAT_OPENID = "";
+
+ /**
+ * lark at format. username
+ * 当配置username时,只能蓝色字体展示@username,被@人无@提醒
+ */
+ public static final String LARK_AT_FORMAT_USERNAME = "%s";
+
+ /**
+ * lark openid prefix
+ */
+ public static final String LARK_OPENID_PREFIX = "ou_";
+
+ /**
+ * Trace 信息
+ */
+ public static final String LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT = ",{\"is_short\":true,\"text\":{\"content\":\"** 链路信息：** %s\",\"tag\":\"lark_md\"}}";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String LARK_ALARM_TIMOUT_REPLACE_TXT =
+ "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 任务执行时间：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 超时时间：** %s\",\"tag\":\"lark_md\"}}" +
+ LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT +
+ "],\"tag\":\"div\"},{\"tag\":\"hr\"},";
+
+ /**
+ * lark alarm json str
+ */
+ public static final String LARK_ALARM_JSON_STR = "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"red\",\"title\":{\"content\":\"[\uD83D\uDD25警报] %s 动态线程池运行告警（%s）\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 当前线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 活跃线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大任务数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程池任务总量：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列元素个数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列剩余个数：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"}," + LARK_ALARM_TIMOUT_REPLACE_TXT + "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略执行次数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示： %s 分钟内此线程池不会重复告警（可配置）\"}]}]}}";
+
+ /**
+ * lark notice json str
+ */
+ public static final String LARK_NOTICE_JSON_STR = "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"greed\",\"title\":{\"content\":\"[通知] %s 动态线程池参数变更\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 核心线程超时：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程存活时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 执行超时时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** AGO 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** NOW 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示：动态线程池配置变更实时通知（无限制）\"}]}]}}";
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
new file mode 100644
index 00000000..7ce64163
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
@@ -0,0 +1,171 @@
+package cn.hippo4j.common.notify.platform;
+
+import cn.hippo4j.common.notify.NotifyConfigDTO;
+import cn.hippo4j.common.notify.NotifyPlatformEnum;
+import cn.hippo4j.common.notify.NotifyTypeEnum;
+import cn.hippo4j.common.notify.SendMessageHandler;
+import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
+import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.hippo4j.common.notify.platform.LarkAlarmConstants.*;
+
+/**
+ * Send lark notification message.
+ *
+ * @author imyzt
+ * @date 2021/11/22 21:12
+ */
+@Slf4j
+@AllArgsConstructor
+public class LarkSendMessageHandler implements SendMessageHandler {
+
+ @Override
+ public String getType() {
+ return NotifyPlatformEnum.LARK.name();
+ }
+
+ @Override
+ @SneakyThrows
+ public void sendAlarmMessage(NotifyConfigDTO notifyConfig, AlarmNotifyRequest alarmNotifyRequest) {
+ String afterReceives = getReceives(notifyConfig.getReceives());
+
+ String larkAlarmTxt;
+ String larkAlarmTimoutReplaceTxt;
+ if (Objects.equals(alarmNotifyRequest.getNotifyTypeEnum(), NotifyTypeEnum.TIMEOUT)) {
+ String executeTimeoutTrace = alarmNotifyRequest.getExecuteTimeoutTrace();
+ if (StringUtil.isNotBlank(executeTimeoutTrace)) {
+ String larkAlarmTimoutTraceReplaceTxt = String.format(LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT, executeTimeoutTrace);
+ larkAlarmTimoutReplaceTxt = StrUtil.replace(LARK_ALARM_TIMOUT_REPLACE_TXT, LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT, larkAlarmTimoutTraceReplaceTxt);
+ } else {
+ larkAlarmTimoutReplaceTxt = StrUtil.replace(LARK_ALARM_TIMOUT_REPLACE_TXT, LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT, "");
+ }
+
+ larkAlarmTimoutReplaceTxt = String.format(larkAlarmTimoutReplaceTxt, alarmNotifyRequest.getExecuteTime(), alarmNotifyRequest.getExecuteTimeOut());
+ larkAlarmTxt = StrUtil.replace(LARK_ALARM_JSON_STR, LARK_ALARM_TIMOUT_REPLACE_TXT, larkAlarmTimoutReplaceTxt);
+ } else {
+ larkAlarmTxt = StrUtil.replace(LARK_ALARM_JSON_STR, LARK_ALARM_TIMOUT_REPLACE_TXT, "");
+ }
+
+ String text = String.format(larkAlarmTxt,
+ // 环境
+ alarmNotifyRequest.getActive(),
+ // 报警类型
+ alarmNotifyRequest.getNotifyTypeEnum(),
+ // 线程池ID
+ alarmNotifyRequest.getThreadPoolId(),
+ // 应用名称
+ alarmNotifyRequest.getAppName(),
+ // 实例信息
+ alarmNotifyRequest.getIdentify(),
+ // 核心线程数
+ alarmNotifyRequest.getCorePoolSize(),
+ // 最大线程数
+ alarmNotifyRequest.getMaximumPoolSize(),
+ // 当前线程数
+ alarmNotifyRequest.getPoolSize(),
+ // 活跃线程数
+ alarmNotifyRequest.getActiveCount(),
+ // 最大任务数
+ alarmNotifyRequest.getLargestPoolSize(),
+ // 线程池任务总量
+ alarmNotifyRequest.getCompletedTaskCount(),
+ // 队列类型名称
+ alarmNotifyRequest.getQueueName(),
+ // 队列容量
+ alarmNotifyRequest.getCapacity(),
+ // 队列元素个数
+ alarmNotifyRequest.getQueueSize(),
+ // 队列剩余个数
+ alarmNotifyRequest.getRemainingCapacity(),
+ // 拒绝策略名称
+ alarmNotifyRequest.getRejectedExecutionHandlerName(),
+ // 拒绝策略次数
+ alarmNotifyRequest.getRejectCountNum(),
+ // 告警手机号
+ afterReceives,
+ // 当前时间
+ DateUtil.now(),
+ // 报警频率
+ notifyConfig.getInterval()
+ );
+
+ execute(notifyConfig.getSecretKey(), text);
+ }
+
+ @Override
+ @SneakyThrows
+ public void sendChangeMessage(NotifyConfigDTO notifyConfig, ChangeParameterNotifyRequest changeParameterNotifyRequest) {
+ String threadPoolId = changeParameterNotifyRequest.getThreadPoolId();
+ String afterReceives = getReceives(notifyConfig.getReceives());
+ String larkNoticeJson = LARK_NOTICE_JSON_STR;
+
+ /**
+ * hesitant e.g. ➲ ➜ ⇨ ➪
+ */
+ String text = String.format(larkNoticeJson,
+ // 环境
+ changeParameterNotifyRequest.getActive(),
+ // 线程池名称
+ threadPoolId,
+ // 应用名称
+ changeParameterNotifyRequest.getAppName(),
+ // 实例信息
+ changeParameterNotifyRequest.getIdentify(),
+ // 核心线程数
+ changeParameterNotifyRequest.getBeforeCorePoolSize() + " ➲ " + changeParameterNotifyRequest.getNowCorePoolSize(),
+ // 最大线程数
+ changeParameterNotifyRequest.getBeforeMaximumPoolSize() + " ➲ " + changeParameterNotifyRequest.getNowMaximumPoolSize(),
+ // 核心线程超时
+ changeParameterNotifyRequest.getBeforeAllowsCoreThreadTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowAllowsCoreThreadTimeOut(),
+ // 线程存活时间
+ changeParameterNotifyRequest.getBeforeKeepAliveTime() + " ➲ " + changeParameterNotifyRequest.getNowKeepAliveTime(),
+ // 阻塞队列
+ changeParameterNotifyRequest.getBlockingQueueName(),
+ // 阻塞队列容量
+ changeParameterNotifyRequest.getBeforeQueueCapacity() + " ➲ " + changeParameterNotifyRequest.getNowQueueCapacity(),
+ // 执行超时时间
+ changeParameterNotifyRequest.getBeforeExecuteTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowExecuteTimeOut(),
+ // 拒绝策略
+ changeParameterNotifyRequest.getBeforeRejectedName(),
+ changeParameterNotifyRequest.getNowRejectedName(),
+ // 告警手机号
+ afterReceives,
+ // 当前时间
+ DateUtil.now()
+ );
+
+ execute(notifyConfig.getSecretKey(), text);
+ }
+
+ private String getReceives(String receives) {
+ if (StringUtil.isBlank(receives)) {
+ return "";
+ }
+ return Arrays.stream(receives.split(","))
+ .map(receive -> StrUtil.startWith(receive, LARK_OPENID_PREFIX) ?
+ String.format(LARK_AT_FORMAT_OPENID, receive) : String.format(LARK_AT_FORMAT_USERNAME, receive))
+ .collect(Collectors.joining(" "));
+ }
+
+ private void execute(String secretKey, String text) {
+ String serverUrl = LARK_BOT_URL + secretKey;
+
+ try {
+ HttpRequest.post(serverUrl).body(text).execute();
+ } catch (Exception ex) {
+ log.error("Lark failed to send message", ex);
+ }
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
new file mode 100644
index 00000000..c5f60646
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
@@ -0,0 +1,75 @@
+package cn.hippo4j.common.notify.platform;
+
+/**
+ * We chat alarm constants.
+ *
+ * @author chen.ma
+ * @date 2021/11/26 20:03
+ */
+public class WeChatAlarmConstants {
+
+ /**
+ * 企微机器人 Url
+ */
+ public static final String WE_CHAT_SERVER_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=";
+
+ /**
+ * Trace 信息
+ */
+ public static final String WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT = "> 链路信息：%s \n";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String WE_CHAT_ALARM_TIMOUT_REPLACE_TXT =
+ "> 任务执行时间：%s / ms \n" +
+ "> 超时时间：%s / ms \n" +
+ WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT;
+
+ /**
+ * 线程池报警通知文本
+ */
+ public static final String WE_CHAT_ALARM_TXT =
+ "### [警报] %s - 动态线程池运行告警（%s） \n" +
+ "> 线程池ID：%s \n" +
+ "> 应用名称：%s \n" +
+ "> 应用实例：%s \n" +
+ "> 核心线程数：%s \n" +
+ "> 最大线程数：%s \n" +
+ "> 当前线程数：%s \n" +
+ "> 活跃线程数：%s \n" +
+ "> 最大任务数：%s \n" +
+ "> 线程池任务总量：%s \n" +
+ "> 队列类型：%s \n" +
+ "> 队列容量：%s \n" +
+ "> 队列元素个数：%s \n" +
+ "> 队列剩余个数：%s \n" +
+ "> 拒绝策略：%s \n" +
+ "> 拒绝策略执行次数：%s \n" +
+ WE_CHAT_ALARM_TIMOUT_REPLACE_TXT +
+ "> OWNER：<@%s> \n" +
+ "> 提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
+ "**播报时间：%s**";
+
+ /**
+ * 线程池参数变更通知文本
+ */
+ public static final String WE_CHAT_NOTICE_TXT =
+ "### [通知] %s - 动态线程池参数变更 \n" +
+ "> 线程池ID：%s \n" +
+ "> 应用名称：%s \n" +
+ "> 应用实例：%s \n" +
+ "> 核心线程数：%s \n" +
+ "> 最大线程数：%s \n" +
+ "> 核心线程超时：%s \n" +
+ "> 线程存活时间：%s \n" +
+ "> 执行超时时间：%s \n" +
+ "> 队列类型：%s \n" +
+ "> 队列容量：%s \n" +
+ "> AGO 拒绝策略：%s \n" +
+ "> NOW 拒绝策略：%s \n" +
+ "> OWNER：<@%s> \n" +
+ "> 提示：动态线程池配置变更实时通知（无限制） \n\n" +
+ "**播报时间：%s**";
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
new file mode 100644
index 00000000..3260a4f1
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
@@ -0,0 +1,194 @@
+package cn.hippo4j.common.notify.platform;
+
+import cn.hippo4j.common.notify.*;
+import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
+import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.common.toolkit.StringUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import com.google.common.base.Joiner;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Objects;
+
+import static cn.hippo4j.common.notify.platform.WeChatAlarmConstants.*;
+
+/**
+ * WeChat send message handler.
+ *
+ * @author chen.ma
+ * @date 2021/11/26 20:06
+ */
+@Slf4j
+public class WeChatSendMessageHandler implements SendMessageHandler {
+
+ @Override
+ public String getType() {
+ return NotifyPlatformEnum.WECHAT.name();
+ }
+
+ @Override
+ public void sendAlarmMessage(NotifyConfigDTO notifyConfig, AlarmNotifyRequest alarmNotifyRequest) {
+ String[] receives = notifyConfig.getReceives().split(",");
+ String afterReceives = Joiner.on("><@").join(receives);
+
+ String weChatAlarmTxt;
+ String weChatAlarmTimoutReplaceTxt;
+ if (Objects.equals(alarmNotifyRequest.getNotifyTypeEnum(), NotifyTypeEnum.TIMEOUT)) {
+ String executeTimeoutTrace = alarmNotifyRequest.getExecuteTimeoutTrace();
+ if (StringUtil.isNotBlank(executeTimeoutTrace)) {
+ String weChatAlarmTimoutTraceReplaceTxt = String.format(WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, executeTimeoutTrace);
+ weChatAlarmTimoutReplaceTxt = StrUtil.replace(WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, weChatAlarmTimoutTraceReplaceTxt);
+ } else {
+ weChatAlarmTimoutReplaceTxt = StrUtil.replace(WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, "");
+ }
+
+ weChatAlarmTimoutReplaceTxt = String.format(weChatAlarmTimoutReplaceTxt, alarmNotifyRequest.getExecuteTime(), alarmNotifyRequest.getExecuteTimeOut());
+ weChatAlarmTxt = StrUtil.replace(WE_CHAT_ALARM_TXT, WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, weChatAlarmTimoutReplaceTxt);
+ } else {
+ weChatAlarmTxt = StrUtil.replace(WE_CHAT_ALARM_TXT, WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, "");
+ }
+
+ String text = String.format(
+ weChatAlarmTxt,
+ // 环境
+ alarmNotifyRequest.getActive(),
+ // 报警类型
+ alarmNotifyRequest.getNotifyTypeEnum(),
+ // 线程池ID
+ alarmNotifyRequest.getThreadPoolId(),
+ // 应用名称
+ alarmNotifyRequest.getAppName(),
+ // 实例信息
+ alarmNotifyRequest.getIdentify(),
+ // 核心线程数
+ alarmNotifyRequest.getCorePoolSize(),
+ // 最大线程数
+ alarmNotifyRequest.getMaximumPoolSize(),
+ // 当前线程数
+ alarmNotifyRequest.getPoolSize(),
+ // 活跃线程数
+ alarmNotifyRequest.getActiveCount(),
+ // 最大任务数
+ alarmNotifyRequest.getLargestPoolSize(),
+ // 线程池任务总量
+ alarmNotifyRequest.getCompletedTaskCount(),
+ // 队列类型名称
+ alarmNotifyRequest.getQueueName(),
+ // 队列容量
+ alarmNotifyRequest.getCapacity(),
+ // 队列元素个数
+ alarmNotifyRequest.getQueueSize(),
+ // 队列剩余个数
+ alarmNotifyRequest.getRemainingCapacity(),
+ // 拒绝策略名称
+ alarmNotifyRequest.getRejectedExecutionHandlerName(),
+ // 拒绝策略次数
+ alarmNotifyRequest.getRejectCountNum(),
+ // 告警手机号
+ afterReceives,
+ // 报警频率
+ notifyConfig.getInterval(),
+ // 当前时间
+ DateUtil.now()
+ );
+ execute(notifyConfig.getSecretKey(), text);
+ }
+
+ @Override
+ public void sendChangeMessage(NotifyConfigDTO notifyConfig, ChangeParameterNotifyRequest changeParameterNotifyRequest) {
+ String threadPoolId = changeParameterNotifyRequest.getThreadPoolId();
+
+ String[] receives = notifyConfig.getReceives().split(",");
+ String afterReceives = Joiner.on("><@").join(receives);
+
+ String text = String.format(
+ WE_CHAT_NOTICE_TXT,
+ // 环境
+ changeParameterNotifyRequest.getActive(),
+ // 线程池名称
+ threadPoolId,
+ // 应用名称
+ changeParameterNotifyRequest.getAppName(),
+ // 实例信息
+ changeParameterNotifyRequest.getIdentify(),
+ // 核心线程数
+ changeParameterNotifyRequest.getBeforeCorePoolSize() + " ➲ " + changeParameterNotifyRequest.getNowCorePoolSize(),
+ // 最大线程数
+ changeParameterNotifyRequest.getBeforeMaximumPoolSize() + " ➲ " + changeParameterNotifyRequest.getNowMaximumPoolSize(),
+ // 核心线程超时
+ changeParameterNotifyRequest.getBeforeAllowsCoreThreadTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowAllowsCoreThreadTimeOut(),
+ // 线程存活时间
+ changeParameterNotifyRequest.getBeforeKeepAliveTime() + " ➲ " + changeParameterNotifyRequest.getNowKeepAliveTime(),
+ // 执行超时时间
+ changeParameterNotifyRequest.getBeforeExecuteTimeOut() + " ➲ " + changeParameterNotifyRequest.getNowExecuteTimeOut(),
+ // 阻塞队列
+ changeParameterNotifyRequest.getBlockingQueueName(),
+ // 阻塞队列容量
+ changeParameterNotifyRequest.getBeforeQueueCapacity() + " ➲ " + changeParameterNotifyRequest.getNowQueueCapacity(),
+ // 拒绝策略
+ changeParameterNotifyRequest.getBeforeRejectedName(),
+ changeParameterNotifyRequest.getNowRejectedName(),
+ // 告警手机号
+ afterReceives,
+ // 当前时间
+ DateUtil.now()
+ );
+
+ execute(notifyConfig.getSecretKey(), text);
+ }
+
+ /**
+ * Execute.
+ *
+ * @param secretKey
+ * @param text
+ */
+ private void execute(String secretKey, String text) {
+ String serverUrl = WE_CHAT_SERVER_URL + secretKey;
+
+ try {
+ WeChatReqDTO weChatReq = new WeChatReqDTO();
+ weChatReq.setMsgtype("markdown");
+
+ Markdown markdown = new Markdown();
+ markdown.setContent(text);
+ weChatReq.setMarkdown(markdown);
+
+ HttpRequest.post(serverUrl).body(JSONUtil.toJSONString(weChatReq)).execute();
+ } catch (Exception ex) {
+ log.error("WeChat failed to send message", ex);
+ }
+ }
+
+ @Data
+ @Accessors(chain = true)
+ public static class WeChatReqDTO {
+
+ /**
+ * msgType
+ */
+ private String msgtype;
+
+ /**
+ * markdown
+ */
+ private Markdown markdown;
+
+ }
+
+ @Data
+ public static class Markdown {
+
+ /**
+ * content
+ */
+ private String content;
+
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/AlarmNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/AlarmNotifyRequest.java
new file mode 100644
index 00000000..b28faca6
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/AlarmNotifyRequest.java
@@ -0,0 +1,118 @@
+package cn.hippo4j.common.notify.request;
+
+import cn.hippo4j.common.notify.NotifyTypeEnum;
+import cn.hippo4j.common.notify.request.base.BaseNotifyRequest;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Alarm notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 19:41
+ */
+@Data
+@Accessors(chain = true)
+public class AlarmNotifyRequest extends BaseNotifyRequest {
+
+ /**
+ * interval
+ */
+ private Integer interval;
+
+ /**
+ * notifyTypeEnum
+ */
+ private NotifyTypeEnum notifyTypeEnum;
+
+ /**
+ * active
+ */
+ private String active;
+
+ /**
+ * appName
+ */
+ private String appName;
+
+ /**
+ * identify
+ */
+ private String identify;
+
+ /**
+ * corePoolSize
+ */
+ private Integer corePoolSize;
+
+ /**
+ * maximumPoolSize
+ */
+ private Integer maximumPoolSize;
+
+ /**
+ * poolSize
+ */
+ private Integer poolSize;
+
+ /**
+ * activeCount
+ */
+ private Integer activeCount;
+
+ /**
+ * largestPoolSize
+ */
+ private Integer largestPoolSize;
+
+ /**
+ * completedTaskCount
+ */
+ private Long completedTaskCount;
+
+ /**
+ * queueName
+ */
+ private String queueName;
+
+ /**
+ * capacity
+ */
+ private Integer capacity;
+
+ /**
+ * queueSize
+ */
+ private Integer queueSize;
+
+ /**
+ * remainingCapacity
+ */
+ private Integer remainingCapacity;
+
+ /**
+ * rejectedExecutionHandlerName
+ */
+ private String rejectedExecutionHandlerName;
+
+ /**
+ * rejectCountNum
+ */
+ private Long rejectCountNum;
+
+ /**
+ * executeTime
+ */
+ private Long executeTime;
+
+ /**
+ * executeTimeOut
+ */
+ private Long executeTimeOut;
+
+ /**
+ * executeTimeoutTrace
+ */
+ private String executeTimeoutTrace;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ChangeParameterNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ChangeParameterNotifyRequest.java
new file mode 100644
index 00000000..2386bf32
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ChangeParameterNotifyRequest.java
@@ -0,0 +1,51 @@
+package cn.hippo4j.common.notify.request;
+
+import cn.hippo4j.common.notify.request.base.BaseNotifyRequest;
+import lombok.Data;
+
+/**
+ * Change parameter notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 20:22
+ */
+@Data
+public class ChangeParameterNotifyRequest extends BaseNotifyRequest {
+
+ private String active;
+
+ private String appName;
+
+ private String identify;
+
+ private Integer beforeCorePoolSize;
+
+ private Integer nowCorePoolSize;
+
+ private Integer beforeMaximumPoolSize;
+
+ private Integer nowMaximumPoolSize;
+
+ private Boolean beforeAllowsCoreThreadTimeOut;
+
+ private Boolean nowAllowsCoreThreadTimeOut;
+
+ private Long beforeKeepAliveTime;
+
+ private Long nowKeepAliveTime;
+
+ private Long beforeExecuteTimeOut;
+
+ private Long nowExecuteTimeOut;
+
+ private String blockingQueueName;
+
+ private Integer beforeQueueCapacity;
+
+ private Integer nowQueueCapacity;
+
+ private String beforeRejectedName;
+
+ private String nowRejectedName;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotAlarmNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotAlarmNotifyRequest.java
new file mode 100644
index 00000000..24a8de80
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotAlarmNotifyRequest.java
@@ -0,0 +1,19 @@
+package cn.hippo4j.common.notify.request;
+
+import lombok.Data;
+
+/**
+ * Robot alarm notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 21:50
+ */
+@Data
+public class RobotAlarmNotifyRequest extends AlarmNotifyRequest {
+
+ /**
+ * secretKey
+ */
+ private String secretKey;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotChangeParameterNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotChangeParameterNotifyRequest.java
new file mode 100644
index 00000000..a0f66942
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/RobotChangeParameterNotifyRequest.java
@@ -0,0 +1,19 @@
+package cn.hippo4j.common.notify.request;
+
+import lombok.Data;
+
+/**
+ * Robot change parameter notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 21:03
+ */
+@Data
+public class RobotChangeParameterNotifyRequest extends ChangeParameterNotifyRequest {
+
+ /**
+ * secretKey
+ */
+ private String secretKey;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ThreadPoolNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ThreadPoolNotifyRequest.java
new file mode 100644
index 00000000..3f09b15c
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/ThreadPoolNotifyRequest.java
@@ -0,0 +1,23 @@
+package cn.hippo4j.common.notify.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Thread pool notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/24 19:06
+ */
+@Data
+@AllArgsConstructor
+public class ThreadPoolNotifyRequest {
+
+ /**
+ * groupKeys
+ */
+ private List groupKeys;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java
new file mode 100644
index 00000000..455e07d3
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java
@@ -0,0 +1,44 @@
+package cn.hippo4j.common.notify.request.base;
+
+import lombok.Data;
+
+/**
+ * Base notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 19:35
+ */
+@Data
+public class BaseNotifyRequest implements NotifyRequest {
+
+ /**
+ * tenantId
+ */
+ private String tenantId;
+
+ /**
+ * itemId
+ */
+ private String itemId;
+
+ /**
+ * threadPoolId
+ */
+ private String threadPoolId;
+
+ /**
+ * platform
+ */
+ private String platform;
+
+ /**
+ * type
+ */
+ private String type;
+
+ /**
+ * receives
+ */
+ private String receives;
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java
new file mode 100644
index 00000000..5e42abe7
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java
@@ -0,0 +1,10 @@
+package cn.hippo4j.common.notify.request.base;
+
+/**
+ * Notify request.
+ *
+ * @author chen.ma
+ * @date 2022/2/22 19:38
+ */
+public interface NotifyRequest {
+}
diff --git a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/ArrayUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
similarity index 53%
rename from dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/ArrayUtil.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
index f0d8e002..db1f6440 100644
--- a/dynamic-threadpool-spring-boot-starter/src/main/java/com/github/dynamic/threadpool/starter/toolkit/ArrayUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
@@ -1,4 +1,6 @@
-package com.github.dynamic.threadpool.starter.toolkit;
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.function.Matcher;
import java.lang.reflect.Array;
@@ -6,10 +8,61 @@ import java.lang.reflect.Array;
* Array util.
*
* @author chen.ma
- * @date 2021/7/5 21:54
+ * @date 2021/12/30 21:42
*/
public class ArrayUtil {
+ /**
+ * Is empty.
+ *
+ * @param array
+ * @param
+ * @return
+ */
+ public static boolean isEmpty(T[] array) {
+ return array == null || array.length == 0;
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param array
+ * @param
+ * @return
+ */
+ public static boolean isNotEmpty(T[] array) {
+ return !isEmpty(array);
+ }
+
+
+ /**
+ * First match.
+ *
+ * @param matcher
+ * @param array
+ * @param
+ * @return
+ */
+ public static T firstMatch(Matcher matcher, T... array) {
+ if (!isEmpty(array)) {
+ for (final T val : array) {
+ if (matcher.match(val)) {
+ return val;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Add all.
+ *
+ * @param array1
+ * @param array2
+ * @param
+ * @return
+ */
public static T[] addAll(final T[] array1, @SuppressWarnings("unchecked") final T... array2) {
if (array1 == null) {
return clone(array2);
@@ -32,6 +85,13 @@ public class ArrayUtil {
return joinedArray;
}
+ /**
+ * Clone.
+ *
+ * @param array
+ * @param
+ * @return
+ */
public static T[] clone(final T[] array) {
if (array == null) {
return null;
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
similarity index 98%
rename from common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
index 8bd43dd1..5ce48ec9 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Assert.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.toolkit;
+package cn.hippo4j.common.toolkit;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
new file mode 100644
index 00000000..117cbcba
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java
@@ -0,0 +1,38 @@
+package cn.hippo4j.common.toolkit;
+
+/**
+ * 字节转换工具类.
+ *
+ * @author chen.ma
+ * @date 2021/11/20 12:21
+ */
+public class ByteConvertUtil {
+
+ /**
+ * 字节转换.
+ *
+ * @param size
+ * @return
+ */
+ public static String getPrintSize(long size) {
+ long covertNum = 1024;
+ if (size < covertNum) {
+ return size + "B";
+ } else {
+ size = size / covertNum;
+ }
+ if (size < covertNum) {
+ return size + "KB";
+ } else {
+ size = size / covertNum;
+ }
+ if (size < covertNum) {
+ size = size * 100;
+ return (size / 100) + "." + (size % 100) + "MB";
+ } else {
+ size = size * 100 / covertNum;
+ return (size / 100) + "." + (size % 100) + "GB";
+ }
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
new file mode 100644
index 00000000..a43c3452
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
@@ -0,0 +1,113 @@
+package cn.hippo4j.common.toolkit;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Collection util.
+ *
+ * @author chen.ma
+ * @date 2021/12/22 20:43
+ */
+public class CollectionUtil {
+
+ /**
+ * Get first.
+ *
+ * @param iterable
+ * @param
+ * @return
+ */
+ public static T getFirst(Iterable iterable) {
+ Iterator iterator;
+ if (iterable != null && (iterator = iterable.iterator()) != null && iterator.hasNext()) {
+ return iterator.next();
+ }
+
+ return null;
+ }
+
+ /**
+ * Is empty.
+ *
+ * @param list
+ * @return
+ */
+ public static boolean isEmpty(List list) {
+ return list == null || list.isEmpty();
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param list
+ * @return
+ */
+ public static boolean isNotEmpty(List list) {
+ return !isEmpty(list);
+ }
+
+
+ /**
+ * Is empty.
+ *
+ * @param map
+ * @return
+ */
+ public static boolean isEmpty(Map map) {
+ return map == null || map.isEmpty();
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param map
+ * @return
+ */
+ public static boolean isNotEmpty(Map map) {
+ return !isEmpty(map);
+ }
+
+ /**
+ * Is empty.
+ *
+ * @param iterator
+ * @return
+ */
+ public static boolean isEmpty(Iterator iterator) {
+ return null == iterator || false == iterator.hasNext();
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param iterator
+ * @return
+ */
+ public static boolean isNotEmpty(Iterator iterator) {
+ return !isEmpty(iterator);
+ }
+
+ /**
+ * Is empty.
+ *
+ * @param collection
+ * @return
+ */
+ public static boolean isEmpty(Collection collection) {
+ return collection == null || collection.isEmpty();
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param collection
+ * @return
+ */
+ public static boolean isNotEmpty(Collection collection) {
+ return !isEmpty(collection);
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
new file mode 100644
index 00000000..da44380a
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
@@ -0,0 +1,21 @@
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.function.NoArgsConsumer;
+
+/**
+ * Condition util.
+ *
+ * @author chen.ma
+ * @date 2021/11/6 22:40
+ */
+public class ConditionUtil {
+
+ public static void condition(boolean condition, NoArgsConsumer trueConsumer, NoArgsConsumer falseConsumer) {
+ if (condition) {
+ trueConsumer.accept();
+ } else {
+ falseConsumer.accept();
+ }
+ }
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
similarity index 68%
rename from common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
index 2ad70a79..4120ca56 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/ContentUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
@@ -1,9 +1,8 @@
-package com.github.dynamic.threadpool.common.toolkit;
+package cn.hippo4j.common.toolkit;
-import com.alibaba.fastjson.JSON;
-import com.github.dynamic.threadpool.common.constant.Constants;
-import com.github.dynamic.threadpool.common.model.PoolParameter;
-import com.github.dynamic.threadpool.common.model.PoolParameterInfo;
+import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.common.model.PoolParameter;
+import cn.hippo4j.common.model.PoolParameterInfo;
/**
* Content util.
@@ -26,8 +25,9 @@ public class ContentUtil {
.setIsAlarm(parameter.getIsAlarm())
.setCapacityAlarm(parameter.getCapacityAlarm())
.setLivenessAlarm(parameter.getLivenessAlarm())
+ .setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut())
.setRejectedType(parameter.getRejectedType());
- return JSON.toJSONString(poolInfo);
+ return JSONUtil.toJSONString(poolInfo);
}
public static String getGroupKey(PoolParameter parameter) {
@@ -41,4 +41,17 @@ public class ContentUtil {
return resultStr;
}
+ public static String getGroupKey(String... parameters) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (int i = 0; i < parameters.length; i++) {
+ stringBuilder.append(parameters[i]);
+
+ if (i < parameters.length - 1) {
+ stringBuilder.append(Constants.GROUP_KEY_DELIMITER);
+ }
+ }
+
+ return stringBuilder.toString();
+ }
+
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
new file mode 100644
index 00000000..1d3ceb20
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
@@ -0,0 +1,70 @@
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.constant.Constants;
+import org.springframework.util.StringUtils;
+
+import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER;
+
+/**
+ * Group key.
+ *
+ * @author chen.ma
+ * @date 2021/6/24 21:12
+ */
+public class GroupKey {
+
+ public static String getKey(String dataId, String group) {
+ return getKey(dataId, group, "");
+ }
+
+ public static String getKey(String dataId, String group, String datumStr) {
+ return doGetKey(dataId, group, datumStr);
+ }
+
+ public static String getKey(String... params) {
+ StringBuilder groupKey = new StringBuilder();
+ groupKey.append(params[0]).append(GROUP_KEY_DELIMITER);
+
+ for (int i = 1; i < params.length - 1; i++) {
+ groupKey.append(params[i]).append(GROUP_KEY_DELIMITER);
+ }
+
+ groupKey.append(params[params.length]);
+ return groupKey.toString();
+ }
+
+ public static String getKeyTenant(String dataId, String group, String tenant) {
+ return doGetKey(dataId, group, tenant);
+ }
+
+ private static String doGetKey(String dataId, String group, String datumStr) {
+ StringBuilder sb = new StringBuilder();
+ urlEncode(dataId, sb);
+ sb.append(GROUP_KEY_DELIMITER);
+ urlEncode(group, sb);
+ if (!StringUtils.isEmpty(datumStr)) {
+ sb.append(GROUP_KEY_DELIMITER);
+ urlEncode(datumStr, sb);
+ }
+
+ return sb.toString();
+ }
+
+ public static String[] parseKey(String groupKey) {
+ return groupKey.split(Constants.GROUP_KEY_DELIMITER_TRANSLATION);
+ }
+
+ public static void urlEncode(String str, StringBuilder sb) {
+ for (int idx = 0; idx < str.length(); ++idx) {
+ char c = str.charAt(idx);
+ if ('+' == c) {
+ sb.append("%2B");
+ } else if ('%' == c) {
+ sb.append("%25");
+ } else {
+ sb.append(c);
+ }
+ }
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
new file mode 100644
index 00000000..c576851a
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
@@ -0,0 +1,41 @@
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.api.JsonFacade;
+
+import java.util.List;
+
+/**
+ * JSON util.
+ *
+ * @author chen.ma
+ * @date 2021/12/13 20:27
+ */
+public class JSONUtil {
+
+ private static final JsonFacade JSON_FACADE = new JacksonHandler();
+
+ public static String toJSONString(Object object) {
+ if (object == null) {
+ return null;
+ }
+
+ return JSON_FACADE.toJSONString(object);
+ }
+
+ public static T parseObject(String text, Class clazz) {
+ if (StringUtil.isBlank(text)) {
+ return null;
+ }
+
+ return JSON_FACADE.parseObject(text, clazz);
+ }
+
+ public static List parseArray(String text, Class clazz) {
+ if (StringUtil.isBlank(text)) {
+ return null;
+ }
+
+ return JSON_FACADE.parseArray(text, clazz);
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
new file mode 100644
index 00000000..a230a72f
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
@@ -0,0 +1,57 @@
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.api.JsonFacade;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import lombok.SneakyThrows;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Jackson util.
+ *
+ * @author chen.ma
+ * @date 2021/12/13 20:02
+ */
+public class JacksonHandler implements JsonFacade {
+
+ private static ObjectMapper MAPPER = new ObjectMapper();
+
+ static {
+ MAPPER.enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
+ String dateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+ MAPPER.setDateFormat(new SimpleDateFormat(dateTimeFormat));
+ MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+ MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ }
+
+ @Override
+ @SneakyThrows
+ public String toJSONString(Object object) {
+ return MAPPER.writeValueAsString(object);
+ }
+
+ @Override
+ @SneakyThrows
+ public T parseObject(String text, Class clazz) {
+ JavaType javaType = MAPPER.getTypeFactory().constructType(clazz);
+ return MAPPER.readValue(text, javaType);
+ }
+
+ @Override
+ @SneakyThrows
+ public List parseArray(String text, Class clazz) {
+ CollectionType collectionType = MAPPER.getTypeFactory().constructCollectionType(ArrayList.class, clazz);
+ return MAPPER.readValue(text, collectionType);
+ }
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
similarity index 83%
rename from common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
index a3563751..e263e822 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/toolkit/Md5Util.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
@@ -1,8 +1,7 @@
-package com.github.dynamic.threadpool.common.toolkit;
+package cn.hippo4j.common.toolkit;
-import com.github.dynamic.threadpool.common.constant.Constants;
-import com.github.dynamic.threadpool.common.model.PoolParameter;
-import org.springframework.util.StringUtils;
+import cn.hippo4j.common.constant.Constants;
+import cn.hippo4j.common.model.PoolParameter;
import java.io.IOException;
import java.net.URLEncoder;
@@ -10,8 +9,6 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.List;
-import static com.github.dynamic.threadpool.common.constant.Constants.WORD_SEPARATOR;
-
/**
* MD5 util.
*
@@ -76,12 +73,17 @@ public class Md5Util {
for (String groupKey : changedGroupKeys) {
String[] dataIdGroupId = GroupKey.parseKey(groupKey);
sb.append(dataIdGroupId[0]);
- sb.append(WORD_SEPARATOR);
+ sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[1]);
// if have tenant, then set it
if (dataIdGroupId.length == 3) {
- if (!StringUtils.isEmpty(dataIdGroupId[2])) {
- sb.append(WORD_SEPARATOR);
+ if (StringUtil.isNotBlank(dataIdGroupId[2])) {
+ sb.append(Constants.WORD_SEPARATOR);
+ sb.append(dataIdGroupId[2]);
+ }
+ } else if (dataIdGroupId.length == 4) {
+ if (StringUtil.isNotBlank(dataIdGroupId[2])) {
+ sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[2]);
}
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
new file mode 100644
index 00000000..ae7d85e9
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
@@ -0,0 +1,66 @@
+package cn.hippo4j.common.toolkit;
+
+import cn.hippo4j.common.monitor.AbstractMessage;
+import cn.hippo4j.common.monitor.Message;
+import cn.hippo4j.common.monitor.MessageWrapper;
+import lombok.SneakyThrows;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Message convert.
+ *
+ * @author chen.ma
+ * @date 2021/12/10 21:27
+ */
+public class MessageConvert {
+
+ /**
+ * {@link Message} to {@link MessageWrapper}.
+ *
+ * @param message
+ * @return
+ */
+ public static MessageWrapper convert(Message message) {
+ MessageWrapper wrapper = new MessageWrapper();
+ wrapper.setResponseClass(message.getClass());
+ wrapper.setMessageType(message.getMessageType());
+
+ List> messageMapList = new ArrayList();
+ List messages = message.getMessages();
+ messages.forEach(each -> {
+ String eachVal = JSONUtil.toJSONString(each);
+ Map mapObj = JSONUtil.parseObject(eachVal, Map.class);
+ messageMapList.add(mapObj);
+ });
+
+ wrapper.setContentParams(messageMapList);
+ return wrapper;
+ }
+
+ /**
+ * {@link MessageWrapper} to {@link Message}.
+ *
+ * @param messageWrapper
+ * @return
+ */
+ @SneakyThrows
+ public static Message convert(MessageWrapper messageWrapper) {
+ AbstractMessage message = (AbstractMessage) messageWrapper.getResponseClass().newInstance();
+ List> contentParams = messageWrapper.getContentParams();
+
+ List messages = new ArrayList();
+ contentParams.forEach(each -> {
+ String eachVal = JSONUtil.toJSONString(each);
+ Message messageObj = JSONUtil.parseObject(eachVal, messageWrapper.getResponseClass());
+ messages.add(messageObj);
+ });
+
+ message.setMessages(messages);
+ message.setMessageType(messageWrapper.getMessageType());
+ return message;
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
new file mode 100644
index 00000000..3de7caf2
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
@@ -0,0 +1,102 @@
+package cn.hippo4j.common.toolkit;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Reflect util.
+ *
+ * @author chen.ma
+ * @date 2022/1/9 13:16
+ */
+public class ReflectUtil {
+
+ private static final Map, Field[]> FIELDS_CACHE = new ConcurrentHashMap();
+
+ public static Object getFieldValue(Object obj, String fieldName) {
+ if (null == obj || StringUtil.isBlank(fieldName)) {
+ return null;
+ }
+
+ Field field = getField(obj instanceof Class ? (Class) obj : obj.getClass(), fieldName);
+ return getFieldValue(obj, field);
+ }
+
+ public static Object getFieldValue(Object obj, Field field) {
+ if (null == field) {
+ return null;
+ }
+ if (obj instanceof Class) {
+ obj = null;
+ }
+
+ setAccessible(field);
+ Object result;
+ try {
+ result = field.get(obj);
+ } catch (IllegalAccessException e) {
+ String exceptionMsg = String.format("IllegalAccess for %s.%s", field.getDeclaringClass(), field.getName());
+ throw new RuntimeException(exceptionMsg, e);
+ }
+
+ return result;
+ }
+
+ public static T setAccessible(T accessibleObject) {
+ if (null != accessibleObject && false == accessibleObject.isAccessible()) {
+ accessibleObject.setAccessible(true);
+ }
+ return accessibleObject;
+ }
+
+ public static Field getField(Class beanClass, String name) throws SecurityException {
+ final Field[] fields = getFields(beanClass);
+ return ArrayUtil.firstMatch((field) -> name.equals(getFieldName(field)), fields);
+ }
+
+ public static Field[] getFields(Class beanClass) throws SecurityException {
+ Field[] allFields = FIELDS_CACHE.get(beanClass);
+ if (null != allFields) {
+ return allFields;
+ }
+
+ allFields = getFieldsDirectly(beanClass, true);
+ FIELDS_CACHE.put(beanClass, allFields);
+ return allFields;
+ }
+
+ public static Field[] getFieldsDirectly(Class beanClass, boolean withSuperClassFields) throws SecurityException {
+ Assert.notNull(beanClass);
+
+ Field[] allFields = null;
+ Class searchType = beanClass;
+ Field[] declaredFields;
+ while (searchType != null) {
+ declaredFields = searchType.getDeclaredFields();
+ if (null == allFields) {
+ allFields = declaredFields;
+ } else {
+ int length = allFields.length;
+ allFields = Arrays.copyOf(allFields, length + declaredFields.length);
+ for (int i = 1; i < declaredFields.length; i++) {
+ allFields[length + i] = declaredFields[i - 1];
+ }
+ }
+ searchType = withSuperClassFields ? searchType.getSuperclass() : null;
+ }
+
+ return allFields;
+ }
+
+ public static String getFieldName(Field field) {
+ if (null == field) {
+ return null;
+ }
+
+ return field.getName();
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
new file mode 100644
index 00000000..2d1e5074
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
@@ -0,0 +1,153 @@
+package cn.hippo4j.common.toolkit;
+
+/**
+ * String util.
+ *
+ * @author chen.ma
+ * @date 2021/12/22 20:58
+ */
+public class StringUtil {
+
+ public static final String EMPTY = "";
+
+ public static final char UNDERLINE = '_';
+
+ /**
+ * Is blank.
+ *
+ * @param str
+ * @return
+ */
+ public static boolean isBlank(CharSequence str) {
+ int length;
+
+ if ((str == null) || ((length = str.length()) == 0)) {
+ return true;
+ }
+
+ for (int i = 0; i < length; i++) {
+ char c = str.charAt(i);
+
+ boolean charNotBlank = Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\ufeff' || c == '\u202a';
+ if (charNotBlank == false) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Is empty.
+ *
+ * @param str
+ * @return
+ */
+ public static boolean isEmpty(CharSequence str) {
+ return str == null || str.length() == 0;
+ }
+
+ /**
+ * Is not empty.
+ *
+ * @param str
+ * @return
+ */
+ public static boolean isNotEmpty(CharSequence str) {
+ return !isEmpty(str);
+ }
+
+ /**
+ * Is not blank.
+ *
+ * @param str
+ * @return
+ */
+ public static boolean isNotBlank(CharSequence str) {
+ return isBlank(str) == false;
+ }
+
+ /**
+ * Is all not empty.
+ *
+ * @param args
+ * @return
+ */
+ public static boolean isAllNotEmpty(CharSequence... args) {
+ return false == hasEmpty(args);
+ }
+
+ /**
+ * Has empty.
+ *
+ * @param strList
+ * @return
+ */
+ public static boolean hasEmpty(CharSequence... strList) {
+ if (ArrayUtil.isEmpty(strList)) {
+ return true;
+ }
+
+ for (CharSequence str : strList) {
+ if (isEmpty(str)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * To underline case.
+ *
+ * @param str
+ * @return
+ */
+ public static String toUnderlineCase(CharSequence str) {
+ return toSymbolCase(str, UNDERLINE);
+ }
+
+ /**
+ * To symbol case.
+ *
+ * @param str
+ * @param symbol
+ * @return
+ */
+ public static String toSymbolCase(CharSequence str, char symbol) {
+ if (str == null) {
+ return null;
+ }
+
+ final int length = str.length();
+ final StringBuilder sb = new StringBuilder();
+ char c;
+ for (int i = 0; i < length; i++) {
+ c = str.charAt(i);
+ final Character preChar = (i > 0) ? str.charAt(i - 1) : null;
+ if (Character.isUpperCase(c)) {
+ final Character nextChar = (i < str.length() - 1) ? str.charAt(i + 1) : null;
+ if (null != preChar && Character.isUpperCase(preChar)) {
+ sb.append(c);
+ } else if (null != nextChar && Character.isUpperCase(nextChar)) {
+ if (null != preChar && symbol != preChar) {
+ sb.append(symbol);
+ }
+ sb.append(c);
+ } else {
+ if (null != preChar && symbol != preChar) {
+ sb.append(symbol);
+ }
+ sb.append(Character.toLowerCase(c));
+ }
+ } else {
+ if (sb.length() > 0 && Character.isUpperCase(sb.charAt(sb.length() - 1)) && symbol != c) {
+ sb.append(symbol);
+ }
+ sb.append(c);
+ }
+ }
+
+ return sb.toString();
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
new file mode 100644
index 00000000..0c524ee2
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
@@ -0,0 +1,43 @@
+package cn.hippo4j.common.toolkit;
+
+/**
+ * Thread util.
+ *
+ * @author chen.ma
+ * @date 2021/12/6 23:34
+ */
+public class ThreadUtil {
+
+ /**
+ * 创建新线程.
+ *
+ * @param runnable {@link Runnable}
+ * @param name 线程名
+ * @param isDaemon 是否守护线程
+ * @return {@link Thread}
+ */
+ public static Thread newThread(Runnable runnable, String name, boolean isDaemon) {
+ Thread t = new Thread(null, runnable, name);
+ t.setDaemon(isDaemon);
+ return t;
+ }
+
+ /**
+ * 挂起当前线程.
+ *
+ * @param millis 毫秒
+ * @return
+ */
+ public static boolean sleep(long millis) {
+ if (millis > 0) {
+ try {
+ Thread.sleep(millis);
+ } catch (InterruptedException e) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
new file mode 100644
index 00000000..f4f2bd01
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
@@ -0,0 +1,46 @@
+package cn.hippo4j.common.toolkit;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Optional;
+
+/**
+ * User context (Transition scheme).
+ *
+ * @author chen.ma
+ * @date 2021/11/17 21:13
+ */
+public class UserContext {
+
+ private static final ThreadLocal USER_THREAD_LOCAL = new ThreadLocal();
+
+ public static void setUserInfo(String username, String userRole) {
+ USER_THREAD_LOCAL.set(new User(username, userRole));
+ }
+
+ public static String getUserName() {
+ return Optional.ofNullable(USER_THREAD_LOCAL.get()).map(User::getUsername).orElse("");
+ }
+
+ public static String getUserRole() {
+ return Optional.ofNullable(USER_THREAD_LOCAL.get()).map(User::getUserRole).orElse("");
+ }
+
+ public static void clear() {
+ USER_THREAD_LOCAL.remove();
+ }
+
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ static class User {
+
+ private String username;
+
+ private String userRole;
+
+ }
+
+}
diff --git a/common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
similarity index 68%
rename from common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java
rename to hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
index 6c7fd7ad..5b3383c1 100644
--- a/common/src/main/java/com/github/dynamic/threadpool/common/web/base/Result.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
@@ -1,4 +1,4 @@
-package com.github.dynamic.threadpool.common.web.base;
+package cn.hippo4j.common.web.base;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -17,14 +17,31 @@ public class Result implements Serializable {
private static final long serialVersionUID = -4408341719434417427L;
+ /**
+ * Correct return code.
+ */
public static final String SUCCESS_CODE = "0";
+ /**
+ * Return code.
+ */
private String code;
+ /**
+ * Message.
+ */
private String message;
+ /**
+ * Response data.
+ */
private T data;
+ /**
+ * Is success.
+ *
+ * @return
+ */
public boolean isSuccess() {
return SUCCESS_CODE.equals(code);
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java
new file mode 100644
index 00000000..1bee4c2c
--- /dev/null
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java
@@ -0,0 +1,98 @@
+package cn.hippo4j.common.web.base;
+
+import cn.hippo4j.common.web.exception.AbstractException;
+import cn.hippo4j.common.web.exception.ErrorCode;
+import cn.hippo4j.common.web.exception.ErrorCodeEnum;
+
+import java.util.Optional;
+
+/**
+ * Results.
+ *
+ * @author chen.ma
+ * @date 2021/3/19 16:12
+ */
+public final class Results {
+
+ /**
+ * 成功.
+ *
+ * @return
+ */
+ public static Result success() {
+ return new Result()
+ .setCode(Result.SUCCESS_CODE);
+ }
+
+ /**
+ * 成功.
+ *
+ * @param data 并设置 DATA 参数
+ * @param 对应 DATA 字段的数据类型
+ * @return
+ */
+ public static Result success(T data) {
+ return new Result()
+ .setCode(Result.SUCCESS_CODE)
+ .setData(data);
+ }
+
+ /**
+ * 返回失败信息.
+ *
+ * @return
+ */
+ public static Result failure() {
+ return failure(ErrorCodeEnum.SERVICE_ERROR.getCode(), ErrorCodeEnum.SERVICE_ERROR.getMessage());
+ }
+
+ /**
+ * 框架定义抽象异常拦截.
+ *
+ * @param abstractException 框架自定义抽象异常
+ * @return
+ */
+ public static Result failure(AbstractException abstractException) {
+ String errorCode = Optional.ofNullable(abstractException.getErrorCode())
+ .map(ErrorCode::getCode)
+ .orElse(ErrorCodeEnum.SERVICE_ERROR.getCode());
+
+ return new Result().setCode(errorCode)
+ .setMessage(abstractException.getMessage());
+ }
+
+ /**
+ * 未知异常.
+ *
+ * @param throwable 未知异常
+ * @return
+ */
+ public static Result failure(Throwable throwable) {
+ return new Result
-
+
-
-
-
-
+ 
-
-
-
-
-
-
+ 
+