Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
browser-backend
Commits
18c88431
Commit
18c88431
authored
Mar 07, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
group
parent
57632dae
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
12 deletions
+93
-12
AccountController.java
.../browserbackend/account/controller/AccountController.java
+1
-0
ShopDto.java
...in/java/com/edgec/browserbackend/browser/dto/ShopDto.java
+0
-12
logback-spring.xml
src/main/resources/logback-spring.xml
+92
-0
No files found.
src/main/java/com/edgec/browserbackend/account/controller/AccountController.java
View file @
18c88431
...
@@ -121,6 +121,7 @@ public class AccountController {
...
@@ -121,6 +121,7 @@ public class AccountController {
@RequestMapping
(
path
=
"/authCode"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
path
=
"/authCode"
,
method
=
RequestMethod
.
POST
)
public
ResultDto
requestOTP
(
@RequestBody
MobileDto
mobile
)
{
public
ResultDto
requestOTP
(
@RequestBody
MobileDto
mobile
)
{
logger
.
error
(
"mobile"
+
mobile
);
ResultDto
resultDto
=
new
ResultDto
();
ResultDto
resultDto
=
new
ResultDto
();
try
{
try
{
accountService
.
sendSmsOtp
(
mobile
.
getMobile
());
accountService
.
sendSmsOtp
(
mobile
.
getMobile
());
...
...
src/main/java/com/edgec/browserbackend/browser/dto/ShopDto.java
View file @
18c88431
...
@@ -18,8 +18,6 @@ public class ShopDto {
...
@@ -18,8 +18,6 @@ public class ShopDto {
private
String
firstGroupId
;
private
String
firstGroupId
;
private
String
groupName
;
private
String
link
;
private
String
link
;
private
String
shopPlatform
;
private
String
shopPlatform
;
...
@@ -47,8 +45,6 @@ public class ShopDto {
...
@@ -47,8 +45,6 @@ public class ShopDto {
shopDto
.
setOwner
(
shop
.
getOwner
());
shopDto
.
setOwner
(
shop
.
getOwner
());
if
(
shop
.
getLink
()
!=
null
)
if
(
shop
.
getLink
()
!=
null
)
shopDto
.
setLink
(
shop
.
getLink
());
shopDto
.
setLink
(
shop
.
getLink
());
if
(
shop
.
getGroupName
()
!=
null
)
shopDto
.
setGroupName
(
shop
.
getGroupName
());
shopDto
.
setIpResources
(
ipResources
);
shopDto
.
setIpResources
(
ipResources
);
return
shopDto
;
return
shopDto
;
}
}
...
@@ -101,14 +97,6 @@ public class ShopDto {
...
@@ -101,14 +97,6 @@ public class ShopDto {
this
.
id
=
id
;
this
.
id
=
id
;
}
}
public
String
getGroupName
()
{
return
groupName
;
}
public
void
setGroupName
(
String
groupName
)
{
this
.
groupName
=
groupName
;
}
public
String
getOwner
()
{
public
String
getOwner
()
{
return
owner
;
return
owner
;
}
}
...
...
src/main/resources/logback-spring.xml
0 → 100644
View file @
18c88431
<?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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment