Commit 18c88431 authored by renjie's avatar renjie

group

parent 57632dae
......@@ -121,6 +121,7 @@ public class AccountController {
@RequestMapping(path = "/authCode", method = RequestMethod.POST)
public ResultDto requestOTP(@RequestBody MobileDto mobile) {
logger.error("mobile" + mobile);
ResultDto resultDto = new ResultDto();
try {
accountService.sendSmsOtp(mobile.getMobile());
......
......@@ -18,8 +18,6 @@ public class ShopDto {
private String firstGroupId;
private String groupName;
private String link;
private String shopPlatform;
......@@ -47,8 +45,6 @@ public class ShopDto {
shopDto.setOwner(shop.getOwner());
if (shop.getLink() != null)
shopDto.setLink(shop.getLink());
if (shop.getGroupName() != null)
shopDto.setGroupName(shop.getGroupName());
shopDto.setIpResources(ipResources);
return shopDto;
}
......@@ -101,14 +97,6 @@ public class ShopDto {
this.id = id;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public String getOwner() {
return owner;
}
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" debug="false">
<property name="application.name" value="registry" />
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] %c - %m%n</pattern>
</encoder>
</appender>
<appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_ROOT}/${application.name}/info.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/info/info-%i.zip</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>7</maxHistory>
<totalSizeCap>2GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] %c - %m%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="warn_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_ROOT}/${application.name}/warn.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/warn/warn-%i.zip</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>15</maxHistory>
<totalSizeCap>2GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] %c - %m%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_ROOT}/${application.name}/error.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_ROOT}/${application.name}/%d{yyyy-MM-dd}/error/error-%i.zip</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>15</maxHistory>
<totalSizeCap>2GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] %c - %m%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<springProfile name="default,dev">
<root level="info">
<appender-ref ref="console" />
</root>
</springProfile>
<springProfile name="test">
<!-- In production env, logging info++ -->
<root level="info">
<appender-ref ref="info_file" />
<appender-ref ref="warn_file" />
<appender-ref ref="error_file" />
</root>
</springProfile>
<springProfile name="prod">
<!-- In production env, logging warn++ -->
<root level="warn">
<appender-ref ref="info_file" />
<appender-ref ref="warn_file" />
<appender-ref ref="error_file" />
</root>
</springProfile>
</configuration>
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