Browse Source

1.修改了日志配置。2.修改了API返回结果转换器#getTotal()方法

test
wangxianzhang 3 years ago
parent
commit
58804b8bb7
  1. 22
      src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java
  2. 2
      src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java
  3. 62
      src/main/resources/logback-spring.xml

22
src/main/java/com/epmet/jmreport/converter/BaseApiResultConvertAdapter.java

@ -53,7 +53,27 @@ public abstract class BaseApiResultConvertAdapter implements ApiDataConvertAdapt
*/ */
@Override @Override
public String getTotal(JSONObject jsonObject) { public String getTotal(JSONObject jsonObject) {
return "10"; Object data = jsonObject.get("data");
if (data == null) {
// 没有数据返回
return "0";
}
if (data instanceof JSONObject) {
// data是个对象,还要解析里层的
JSONObject dataJO = (JSONObject) data;
if (!dataJO.containsKey("list")) {
// 就是单个对象,详情查询等
return null;
} else {
// 返回的是pageData对象,取出pages来返回
return dataJO.getString("pages");
}
} else {
// todo data就是个列表,不知道返回什么,需要测试
return null;
}
} }
/** /**

2
src/main/java/com/epmet/jmreport/converter/ListApiResultConverter.java

@ -14,7 +14,7 @@ public class ListApiResultConverter extends BaseApiResultConvertAdapter {
public String getData(JSONObject jsonObject) { public String getData(JSONObject jsonObject) {
JSONArray list = jsonObject.getJSONArray("data"); JSONArray list = jsonObject.getJSONArray("data");
if (list == null) { if (list == null) {
return "0"; return null;
} }
return list.toJSONString(); return list.toJSONString();
} }

62
src/main/resources/logback-spring.xml

@ -3,7 +3,7 @@
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>--> <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<include resource="logback-base.xml"/> <include resource="logback-base.xml"/>
<property name="log.path" value="logs/admin"/> <property name="log.path" value="logs/jmreport"/>
<springProperty scope="context" name="appname" source="spring.application.name"/> <springProperty scope="context" name="appname" source="spring.application.name"/>
@ -134,65 +134,13 @@
</filter> </filter>
</appender> </appender>
<!-- rocketmq client 的日志appender --> <!--日志从INFO级别开始打-->
<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender"> <root>
<!-- 正在记录的日志文档的路径及文档名 --> <level value="INFO"/>
<file>${log.path}/rocketmqclient.log</file> <!--console控制台日志已经在logback-base.xml中配置了,此处不需要重复配置-->
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
</appender>
<!--<root>
<level value="DEBUG"/>
<appender-ref ref="DEBUG_FILE"/>
</root>-->
<!-- 开发、测试环境 -->
<!--<springProfile name="dev,test,local">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<logger name="com.epmet.dao" level="DEBUG"/>
&lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
<logger name="RocketmqClient" level="INFO" additivity="false">
<appender-ref ref="RocketmqClientAppender"/>
</logger>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>-->
<!-- 生产环境 -->
<!--<springProfile name="prod">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
&lt;!&ndash; 只打印rocketmq client的日志 &ndash;&gt;
<logger name="RocketmqClient" level="INFO" additivity="false">
<appender-ref ref="RocketmqClientAppender"/>
</logger>
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="DEBUG_FILE"/> <appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/> <appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/> <appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/> <appender-ref ref="ERROR_FILE"/>
</root> </root>
</springProfile>-->
</configuration> </configuration>

Loading…
Cancel
Save