Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

back_recharge
lvxinran 2020-11-01 17:38:13 +08:00
commit aa6133e571
2 changed files with 35 additions and 1 deletions

View File

@ -5,6 +5,7 @@
<!-- 定义日志文件 输入位置 -->
<property name="log_dir" value="/data/jl_logs"/>
<property name="log_fdir" value="/data/jl_flogs"/>
<property name="log_tdir" value="/data/jl_tlogs"/>
<property name="log_bdir" value="/data/jl_blogs"/>
<!-- 日志最大的历史 30天 -->
@ -55,6 +56,28 @@
</appender>
<appender name="file_flog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!--<Encoding>UTF-8</Encoding>-->
<!-- 过滤器只记录WARN级别的日志 -->
<encoder charset="UTF-8">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}:%msg%n</pattern>
</encoder>
<!-- <filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>-->
<!-- 最常用的滚动策略,它根据时间来制定滚动策略.既负责滚动也负责出发滚动 -->
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志输出位置 可相对、和绝对路径 -->
<fileNamePattern>${log_fdir}/%d{yyyy-MM-dd}/flog%i.log</fileNamePattern>
<!-- 可选节点,控制保留的归档文件的最大数量,超出数量就删除旧文件假设设置每个月滚动,且<maxHistory>是6
则只保存最近6个月的文件删除之前的旧文件。注意删除旧文件是那些为了归档而创建的目录也会被删除-->
<maxHistory>7</maxHistory>
<maxFileSize>200MB</maxFileSize>
</rollingPolicy>
</appender>
<appender name="file_tlog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!--<Encoding>UTF-8</Encoding>-->
<!-- 过滤器只记录WARN级别的日志 -->
@ -164,6 +187,9 @@
<appender-ref ref="file_blog"/>
</logger>
<logger name="FightLog" additivity="false">
<appender-ref ref="file_flog"/>
</logger>
<root level="INFO">
@ -176,7 +202,6 @@
<!--<appender-ref ref="AllLog" />-->
<appender-ref ref="ERROR"/>
<appender-ref ref="ERROR"/>
<!--<appender-ref ref="TRACE" />-->
</root>

View File

@ -32,6 +32,7 @@ import com.ljsd.jieling.thrift.pool.ServiceKey;
import com.ljsd.jieling.util.*;
import config.*;
import manager.STableManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import util.MathUtils;
@ -50,6 +51,7 @@ import java.util.stream.Collectors;
@Component
public class GMRequestHandler extends BaseHandler{
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(GMRequestHandler.class);
public static final Logger FIGHT_LOGGER = LoggerFactory.getLogger("FightLog");
private String osName = System.getProperty("os.name");
@Override
public MessageTypeProto.MessageType getMessageCode() {
@ -63,6 +65,13 @@ public class GMRequestHandler extends BaseHandler{
String command = gmCommand.getCommand();
int uid = iSession.getUid();
LOGGER.error("gm commond is {}",command);
if(command.startsWith("//check_fight")){
FIGHT_LOGGER.error(command);
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
return;
}
if(command.startsWith("//")){
PrintWriter printWriter = new PrintWriter(new FileOutputStream( new File(SysUtil.getPath("conf/check_fight" + uid + ".txt"))));
printWriter.print(command);