Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	dinky-admin/src/main/java/org/dinky/aop/ProcessAspect.java

dinky-admin/src/main/java/org/dinky/aop/ProcessAspect.java

@@ -19,7 +19,6 @@
 
 package org.dinky.aop;
 
-import org.apache.http.util.TextUtils;
 import org.dinky.context.ConsoleContextHolder;
 import org.dinky.process.annotations.ExecuteProcess;
 import org.dinky.process.annotations.ProcessId;
@@ -86,8 +85,11 @@ public Object processAround(ProceedingJoinPoint joinPoint, ExecuteProcess execut
     public Object processStepAround(ProceedingJoinPoint joinPoint, ProcessStep processStep) throws Throwable {
 
         String processName = MDC.get(PROCESS_NAME);
-        if (TextUtils.isEmpty(processName)){
-            log.warn("Process {} does not exist, This registration step {} was abandoned", processName,processStep.type());
+        if (TextUtils.isEmpty(processName)) {
+            log.warn(
+                    "Process {} does not exist, This registration step {} was abandoned",
+                    processName,
+                    processStep.type());
             return joinPoint.proceed();
         }