日志框架还原

src/main/java/org/sss/presentation/noui/controller/LoginController.java

@@ -22,7 +22,6 @@ import org.sss.presentation.noui.context.NoUiContextManager;
 import org.sss.presentation.noui.jwt.JWT;
 import org.sss.presentation.noui.jwt.JwtLogin;
 import org.sss.presentation.noui.jwt.RedisLoginInfo;
-import org.sss.presentation.noui.log.aop.LogAnnotation;
 import org.sss.presentation.noui.util.NoUiPresentationUtil;
 import org.sss.presentation.noui.util.NumericUtil;
 import org.sss.presentation.noui.util.RedisUtil;
@@ -40,7 +39,6 @@ public class LoginController {
 	@Autowired
 	private NoUiVersion noUiVersion;
 
-	@LogAnnotation
 	@ResponseBody
 	@RequestMapping(value = "/login", method = RequestMethod.POST)
 	public Object login(@RequestBody Map<String, Object> dataMap, HttpServletRequest request, HttpSession session) {

src/main/java/org/sss/presentation/noui/log/SqlLogAppender.java

-package org.sss.presentation.noui.log;
-
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Layout;
-import org.apache.log4j.MDC;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.spi.LoggingEvent;
-import org.sss.presentation.noui.common.Constants;
-import org.sss.presentation.noui.log.aop.LogAop;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class SqlLogAppender extends AppenderSkeleton {
-
-	private PatternLayout patternLayout;
-
-//	protected String pattern;
-
-	protected static Map<String, List> map = new ConcurrentHashMap();
-
-	public Map<String,List> getMap(){
-		return map;
-	}
-
-//	public String getPattern() {
-//		return pattern;
-//	}
-//
-//	public void setPattern(String pattern) {
-//		this.pattern = pattern;
-//	}
-
-
-	public PatternLayout getPatternLayout() {
-		return patternLayout;
-	}
-
-	public void setPatternLayout(PatternLayout patternLayout) {
-		this.patternLayout = patternLayout;
-	}
-
-	@Override
-	protected void append(LoggingEvent loggingEvent) {
-		String message = this.subAppend(loggingEvent);
-		String thread_name = (String) MDC.get(LogAop.THREAD_NAME);
-		if(thread_name == null)return;
-		if(map.containsKey(thread_name)){
-			map.get(thread_name).add(message);
-		}else{
-			List list = new ArrayList();
-			list.add(message);
-			map.put(thread_name,list);
-		}
-
-	}
-
-	public String subAppend(LoggingEvent event) {
-
-//		PatternLayout patternLayout = new PatternLayout();
-//		patternLayout.setConversionPattern(pattern);
-//		setLayout(patternLayout);
-
-		String result;
-		if(layout ==null){
-			result = event.getRenderedMessage();
-		}else{
-			result = layout.format(event);
-			StringBuffer buffer = new StringBuffer(result);
-			if(layout.ignoresThrowable()) {
-				String[] s = event.getThrowableStrRep();
-				if(s != null) {
-					int len = s.length;
-					for(int i = 0; i < len; ++i) {
-						buffer.append(s[i]);
-						buffer.append(Layout.LINE_SEP);
-					}
-				}
-			}
-			result = new String(buffer);
-		}
-		return result;
-	}
-
-	@Override
-	public void close() {
-
-	}
-
-	@Override
-	public boolean requiresLayout() {
-		return false;
-	}
-}

src/main/java/org/sss/presentation/noui/log/aop/LogAnnotation.java

-package org.sss.presentation.noui.log.aop;
-
-import java.lang.annotation.*;
-
-/**
- * Created by cjh on 2019/12/12 0012.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface LogAnnotation {
-}

src/main/java/org/sss/presentation/noui/log/aop/LogAop.java

-package org.sss.presentation.noui.log.aop;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.aspectj.lang.JoinPoint;
-import org.sss.presentation.noui.log.SqlLogAppender;
-
-import java.util.List;
-import java.util.Map;
-
-public class LogAop {
-
-	public final static String THREAD_NAME = "thread_name";
-
-
-    public void before(JoinPoint joinPoint){
-
-        MDC.put(THREAD_NAME,Thread.currentThread().getName());
-    }
-
-    public void after(JoinPoint joinPoint){
-        String thread_name = (String) MDC.get(THREAD_NAME);
-		MDC.clear();
-
-        //发送每笔交易的日志到MQ
-        SqlLogAppender sqlLogAppender = (SqlLogAppender) Logger.getRootLogger().getAppender("SqlLog");
-        if(sqlLogAppender != null){
-            Map<String, List> map = sqlLogAppender.getMap();
-            List<String> list = map.get(thread_name);
-            StringBuffer buffer = new StringBuffer();
-            if(list != null){
-				for(String str:list){
-					buffer.append(str);
-				}
-			}
-            map.remove(thread_name);
-        }
-    }
-}

src/main/resources/log4j.xml

@@ -21,12 +21,6 @@
             <param name="LevelMin" value="TRACE"/>
         </filter>
     </appender>
-    <appender name="SqlLog" class="org.sss.presentation.noui.log.SqlLogAppender">
-        <param name="Threshold" value="ERROR"/>
-        <layout class="org.apache.log4j.PatternLayout" >
-            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-        </layout>
-    </appender>
 
     <category name="org.sss">
         <priority value="INFO"/>
@@ -44,6 +38,5 @@
         <level value="WARN"/>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="FILE"/>
-        <appender-ref ref="SqlLog"/>
     </root>
 </log4j:configuration>
\ No newline at end of file