Skip to content

P
pica-cloud-analysis
提交 3050b4a7 编写于 作者: minghao.wu's avatar minghao.wu
浏览文件
操作

Merge branch 'dev_phase3' into release

上级 7bcf9152 da4f87e5
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 69 行增加 和 157 行删除
common/pom.xml
浏览文件 @ 3050b4a7
......@@ -12,7 +12,7 @@
<groupId>com.pica.cloud.online.exam</groupId>
<artifactId>pica-cloud-analysis-common</artifactId>
<name>pica-cloud-analysis-common</name>
<version>1.0.9</version>
<version>1.1.0</version>
<packaging>jar</packaging>
<properties>
......
common/src/main/java/com/pica/cloud/online/exam/analysis.common/CommonUtils.java
浏览文件 @ 3050b4a7
......@@ -2,7 +2,7 @@ package com.pica.cloud.online.exam.analysis.common;
import com.alibaba.fastjson.JSON;
import com.pica.cloud.foundation.redis.RedisClient;
import com.pica.cloud.foundation.utils.entity.PICAUser;
import com.pica.cloud.foundation.utils.entity.PicaUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -19,15 +19,15 @@ public class CommonUtils {
* @param map
* @return
*/
public static PICAUser getUser(Map<String, String> map) {
public static PicaUser getUser(Map<String, String> map) {
if (map.isEmpty()) {
return null;
}
return JSON.parseObject(JSON.toJSONString(map), PICAUser.class);
return JSON.parseObject(JSON.toJSONString(map), PicaUser.class);
}
public static PICAUser getUserByToken(RedisClient client, String token) {
PICAUser picaUser = null;
public static PicaUser getUserByToken(RedisClient client, String token) {
PicaUser picaUser = null;
try {
picaUser = CommonUtils.getUser(client.getToken(token));
} catch (Exception e) {
......
pom.xml
浏览文件 @ 3050b4a7
......@@ -12,7 +12,7 @@
<dependency>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-utils</artifactId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
server/pom.xml
浏览文件 @ 3050b4a7
......@@ -28,10 +28,22 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
......@@ -138,14 +150,14 @@
<dependency>
<groupId>com.pica.cloud.online.exam</groupId>
<artifactId>pica-cloud-analysis-common</artifactId>
<version>1.0.9</version>
<version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.pica.cloud.foundation</groupId>
<artifactId>pica-cloud-utils</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</dependency>
</dependencies>
......
server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AntiSpamController.java
浏览文件 @ 3050b4a7
......@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSONObject;
import com.pica.cloud.foundation.entity.PicaResponse;
import com.pica.cloud.foundation.entity.PicaResultCode;
import com.pica.cloud.foundation.redis.RedisClient;
import com.pica.cloud.foundation.utils.entity.PICAUser;
import com.pica.cloud.foundation.utils.entity.PicaUser;
import com.pica.cloud.online.exam.analysis.common.CommonUtils;
import com.pica.cloud.online.exam.analysis.common.util.ReturnUtil;
import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -36,7 +38,7 @@ public class AntiSpamController {
return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
}
PICAUser user = CommonUtils.getUserByToken(redisClient, token);
PicaUser user = CommonUtils.getUserByToken(redisClient, token);
if (user == null || user.getId().intValue() == 0) {
return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
......@@ -72,7 +74,7 @@ public class AntiSpamController {
return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
}
PICAUser user = CommonUtils.getUserByToken(redisClient, token);
PicaUser user = CommonUtils.getUserByToken(redisClient, token);
if (user == null || user.getId().intValue() == 0) {
return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
......
server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/AntiSpamServiceImpl.java
浏览文件 @ 3050b4a7
......@@ -15,6 +15,8 @@ import com.pica.cloud.online.exam.analysis.server.utils.HttpClient4Utils;
import com.pica.cloud.online.exam.analysis.server.utils.SignatureUtils;
import org.apache.http.Consts;
import org.apache.http.client.HttpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -28,6 +30,7 @@ import java.util.regex.Pattern;
*/
@Service
public class AntiSpamServiceImpl implements AntiSpamService {
private static Logger logger = LoggerFactory.getLogger(AntiSpamServiceImpl.class);
@Autowired
private PropertiesConfiguration properties;
......@@ -82,7 +85,7 @@ public class AntiSpamServiceImpl implements AntiSpamService {
*/
String response = HttpClient4Utils.sendPost(httpClient, properties.getNeteaseAntispamTextApiUrl(), params, Consts.UTF_8);
System.out.println("content:" + content + " response=" + response);
logger.info("content:" + content + " response=" + response);
/**
* 5. 解析返回值
......@@ -231,7 +234,7 @@ public class AntiSpamServiceImpl implements AntiSpamService {
int status = jObject.get("status").getAsInt();
String taskId = jObject.get("taskId").getAsString();
JsonArray labelArray = jObject.get("labels").getAsJsonArray();
System.out.println(String.format("taskId=%s，status=%s，name=%s，labels：", taskId, status, name));
logger.info(String.format("taskId=%s，status=%s，name=%s，labels：", taskId, status, name));
/**
* 检测失败 0：成功 610：图片下载失败 620：图片格式错误 630：其他
......@@ -253,7 +256,7 @@ public class AntiSpamServiceImpl implements AntiSpamService {
int level = lObject.get("level").getAsInt();
double rate = lObject.get("rate").getAsDouble();
if (label == 100 || label == 110 || label == 210) {
System.out.println(String.format("label:%s, level=%s, rate=%s", label, level, rate));
logger.info(String.format("label:%s, level=%s, rate=%s", label, level, rate));
if (level > maxLevel) {
maxLevel = level;
maxLable = label;
......@@ -268,7 +271,7 @@ public class AntiSpamServiceImpl implements AntiSpamService {
}
}
} else {
System.out.println(String.format("ERROR: code=%s, msg=%s", code, msg));
logger.error(String.format("ERROR: code=%s, msg=%s", code, msg));
}
/**
* 成功
......
server/src/main/resources/bootstrap-dev.properties
浏览文件 @ 3050b4a7
......@@ -31,4 +31,4 @@ management.security.enabled=false
#spring.zipkin.base-url=http://192.168.110.124:7895
#spring.sleuth.sampler.percentage=1.0
#logging.config=classpath:log4j2-dev.xml
logging.config=classpath:log4j2-dev.xml
server/src/main/resources/bootstrap-prod.properties
浏览文件 @ 3050b4a7
......@@ -31,4 +31,4 @@ management.security.enabled=true
spring.zipkin.base-url=http://172.19.137.19:7895
spring.sleuth.sampler.percentage=1.0
#logging.config=classpath:log4j2-prod.xml
\ No newline at end of file
logging.config=classpath:log4j2-prod.xml
\ No newline at end of file
server/src/main/resources/bootstrap-test1.properties
浏览文件 @ 3050b4a7
......@@ -31,4 +31,4 @@ management.security.enabled=false
spring.zipkin.base-url=http://192.168.110.133:7895
spring.sleuth.sampler.percentage=1.0
#logging.config=classpath:log4j2-test1.xml
\ No newline at end of file
logging.config=classpath:log4j2-test1.xml
\ No newline at end of file
server/src/main/resources/bootstrap-uat.properties
浏览文件 @ 3050b4a7
......@@ -31,4 +31,4 @@ management.security.enabled=false
spring.zipkin.base-url=http://192.168.110.141:7895
spring.sleuth.sampler.percentage=1.0
#logging.config=classpath:log4j2-uat.xml
\ No newline at end of file
logging.config=classpath:log4j2-uat.xml
\ No newline at end of file
server/src/main/resources/logback.xml 已删除 100644 → 0
浏览文件 @ 7bcf9152
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="true" scan="true" scanPeriod="30 seconds">
<property name="encoder.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{req.xForwardedFor} %X{req.method} %X{req.requestURL} %X{req.queryString} %X{req.userAgent} %-5level %logger{36} - %msg%n"/>
<property name="rollingPolicy.maxFileSize" value="5MB"/>
<property name="rollingPolicy.maxHistory" value="30"/>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<Target>System.out</Target>
<encoder>
<pattern>${encoder.pattern}</pattern>
</encoder>
</appender>
<appender name="TRACE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${encoder.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>TRACE</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/trace.%i.log</fileNamePattern>
<maxHistory>${rollingPolicy.maxHistory}</maxHistory>
<maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
</rollingPolicy>
</appender>
<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${encoder.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info.%i.log</fileNamePattern>
<maxHistory>${rollingPolicy.maxHistory}</maxHistory>
<maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
</rollingPolicy>
</appender>
<appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${encoder.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>DEBUG</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/debug.%i.log</fileNamePattern>
<maxHistory>${rollingPolicy.maxHistory}</maxHistory>
<maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
</rollingPolicy>
</appender>
<appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${encoder.pattern}</pattern>
<charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn.%i.log</fileNamePattern>
<maxHistory>${rollingPolicy.maxHistory}</maxHistory>
<maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
</rollingPolicy>
</appender>
<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>${encoder.pattern}</pattern>
<charset>UTF-8</charset>
</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_PATH}/%d{yyyy-MM-dd}/error.%i.log</fileNamePattern>
<maxHistory>${rollingPolicy.maxHistory}</maxHistory>
<maxFileSize>${rollingPolicy.maxFileSize}</maxFileSize>
</rollingPolicy>
</appender>
<!--logger-->
<logger name="com.ibatis" level="DEBUG" />
<logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG" />
<logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG" />
<logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" />
<logger name="java.sql.Connection" level="DEBUG" />
<logger name="java.sql.Statement" level="DEBUG" />
<logger name="java.sql.PreparedStatement" level="DEBUG" />
<!--root-->
<root level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="INFO" />
<appender-ref ref="ERROR" />
</root>
</configuration>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或