Commit ce3fa1f0 by landerliang@163.com

将自动扫描5条改为20条

parent 5d59c4b5
...@@ -95,7 +95,7 @@ public class LogServiceImpl implements LogService { ...@@ -95,7 +95,7 @@ public class LogServiceImpl implements LogService {
assert log != null; assert log != null;
log.setRequestIp(ip); log.setRequestIp(ip);
log.setAddress(StringUtils.getCityInfo(log.getRequestIp())); log.setAddress("");
log.setMethod(methodName); log.setMethod(methodName);
log.setUsername(username); log.setUsername(username);
log.setParams(getParameter(method, joinPoint.getArgs())); log.setParams(getParameter(method, joinPoint.getArgs()));
......
...@@ -900,7 +900,7 @@ public class CarReportUtil { ...@@ -900,7 +900,7 @@ public class CarReportUtil {
MyContext.PHOTO_TABLE_NAME,MyContext.ESIGN_NULL,fldsVo.getFld(),conditionVoList,null,5); MyContext.PHOTO_TABLE_NAME,MyContext.ESIGN_NULL,fldsVo.getFld(),conditionVoList,null,5);
JSONObject body = JSONUtil.createObj(); JSONObject body = JSONUtil.createObj();
body.put("data",queryDataVo); body.put("data",queryDataVo);
body.put("rows",5); body.put("rows",20);
body.put("page",1); body.put("page",1);
body.put("sort","DetectEndTime"); body.put("sort","DetectEndTime");
body.put("order","DESC"); body.put("order","DESC");
......
...@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component; ...@@ -6,6 +6,9 @@ import org.springframework.stereotype.Component;
import java.io.File; import java.io.File;
/**
* @author Lander
*/
@Slf4j @Slf4j
@Component @Component
public class PdfUtil { public class PdfUtil {
...@@ -34,15 +37,7 @@ public class PdfUtil { ...@@ -34,15 +37,7 @@ public class PdfUtil {
// 非windows 系统 // 非windows 系统
toPdfTool = MyContext.WKHTMLTOPDF_NOTWINDOWS_PATH; toPdfTool = MyContext.WKHTMLTOPDF_NOTWINDOWS_PATH;
} }
/*cmd.append(toPdfTool);
cmd.append(" ");
cmd.append("--page-size A4");
cmd.append(" ");
cmd.append(" \"");
cmd.append(srcPath);
cmd.append("\" ");
cmd.append(" ");
cmd.append(destPath);*/
cmd.append(toPdfTool); cmd.append(toPdfTool);
cmd.append(" "); cmd.append(" ");
cmd.append("-s A4"); cmd.append("-s A4");
......
...@@ -91,5 +91,5 @@ uploadFilePath: C:\\reptiles\\uploadPicture\\ ...@@ -91,5 +91,5 @@ uploadFilePath: C:\\reptiles\\uploadPicture\\
signature: signature:
carSignature: carSignature:
url: http://127.0.0.1:9988/car-signature/start url: http://127.0.0.1:9988/car-signature/start
logging:
config: classpath:logback.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="30 seconds" debug="false"> <configuration scan="true" scanPeriod="30 seconds" debug="false">
<contextName>elAdmin</contextName> <contextName>reptiles</contextName>
<property name="log.charset" value="utf-8" /> <property name="log.charset" value="utf-8" />
<property name="log.pattern" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)" /> <property name="log.pattern" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment