Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
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
huluobin
gogirl-miniapp-backend
Commits
8f257ddc
Commit
8f257ddc
authored
Jul 23, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
战术更新
parent
7bcc363d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
ShopManageController.java
...om/gogirl/interfaces/store/shop/ShopManageController.java
+1
-2
logback-spring.xml
src/main/resources/logback-spring.xml
+6
-3
No files found.
src/main/java/com/gogirl/interfaces/store/shop/ShopManageController.java
View file @
8f257ddc
...
@@ -15,7 +15,6 @@ import lombok.AllArgsConstructor;
...
@@ -15,7 +15,6 @@ import lombok.AllArgsConstructor;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestHeader
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
...
@@ -38,7 +37,7 @@ public class ShopManageController {
...
@@ -38,7 +37,7 @@ public class ShopManageController {
@AuthIgnore
@AuthIgnore
@ApiOperation
(
value
=
"获取美甲师绑定的店铺"
)
@ApiOperation
(
value
=
"获取美甲师绑定的店铺"
)
@GetMapping
(
"/technician/xcx/getTechnicianShopList"
)
@GetMapping
(
"/technician/xcx/getTechnicianShopList"
)
public
JsonResult
<
List
<
StoreManage
>>
getTechnicianShopList
(
@RequestHeader
String
token
)
{
public
JsonResult
<
List
<
StoreManage
>>
getTechnicianShopList
()
{
List
<
StoreManage
>
storeManageList
=
storeManageService
.
getTechnicianShopList
();
List
<
StoreManage
>
storeManageList
=
storeManageService
.
getTechnicianShopList
();
return
JsonResult
.
success
(
storeManageList
);
return
JsonResult
.
success
(
storeManageList
);
}
}
...
...
src/main/resources/logback-spring.xml
View file @
8f257ddc
...
@@ -6,11 +6,14 @@
...
@@ -6,11 +6,14 @@
<!-- 彩色日志 -->
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule
conversionWord=
"clr"
converterClass=
"org.springframework.boot.logging.logback.ColorConverter"
/>
<conversionRule
conversionWord=
"clr"
converterClass=
"org.springframework.boot.logging.logback.ColorConverter"
/>
<conversionRule
conversionWord=
"wex"
converterClass=
"org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"
/>
<conversionRule
conversionWord=
"wex"
<conversionRule
conversionWord=
"wEx"
converterClass=
"org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"
/>
converterClass=
"org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"
/>
<conversionRule
conversionWord=
"wEx"
converterClass=
"org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"
/>
<!-- 彩色日志格式 -->
<!-- 彩色日志格式 -->
<property
name=
"CONSOLE_LOG_PATTERN"
value=
"${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} ${traceId} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"
/>
<property
name=
"CONSOLE_LOG_PATTERN"
value=
"${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%X{traceId}) %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"
/>
<contextName>
${contextName}
</contextName>
<contextName>
${contextName}
</contextName>
...
...
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