Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
app-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SuperHive
back-end
app-service
Commits
f5264226
Commit
f5264226
authored
Aug 17, 2020
by
lius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了所有的customer service 为 customer support
parent
7d89e4d0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
35 deletions
+31
-35
AuthFilter.java
...in/java/com/esv/freight/app/common/filter/AuthFilter.java
+2
-2
CustomerSupportInterface.java
...a/com/esv/freight/app/feign/CustomerSupportInterface.java
+3
-3
DriverCustomerSupportController.java
...ersupport/controller/DriverCustomerSupportController.java
+12
-15
OwnerCustomerSupportController.java
...mersupport/controller/OwnerCustomerSupportController.java
+12
-13
CustomerSupportVO.java
...ight/app/module/customersupport/vo/CustomerSupportVO.java
+2
-2
No files found.
src/main/java/com/esv/freight/app/common/filter/AuthFilter.java
View file @
f5264226
...
...
@@ -45,8 +45,8 @@ public class AuthFilter implements Filter {
"/app/ownerBackend/account/stop"
,
"/app/driverBackend/password/reset"
,
"/app/esvActuator/health/diskSpace"
,
"/app/driverBackend/carrier/customers
ervice
"
,
"/app/goodsowner/customers
ervice
"
"/app/driverBackend/carrier/customers
upport
"
,
"/app/goodsowner/customers
upport
"
};
@Autowired
...
...
src/main/java/com/esv/freight/app/feign/CustomerS
ervice
Interface.java
→
src/main/java/com/esv/freight/app/feign/CustomerS
upport
Interface.java
View file @
f5264226
...
...
@@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.PostMapping;
* @version: 1.0
*/
@FeignClient
(
value
=
"freight-customer-service"
)
public
interface
CustomerS
ervice
Interface
{
public
interface
CustomerS
upport
Interface
{
/**
* 获取货主客服电话
* author 刘胜
* createTime 2020/8/12 14:15
**/
@PostMapping
(
value
=
"/customer/goodsowner/customers
ervice
"
)
@PostMapping
(
value
=
"/customer/goodsowner/customers
upport
"
)
JSONObject
ownerCustomer
();
/**
* 获取司机客服电话
* author 刘胜
* createTime 2020/8/12 14:17
**/
@PostMapping
(
value
=
"/customer/carrier/customers
ervice
"
)
@PostMapping
(
value
=
"/customer/carrier/customers
upport
"
)
JSONObject
driverCustomer
();
}
src/main/java/com/esv/freight/app/module/customers
ervice/controller/DriverCustomerService
Controller.java
→
src/main/java/com/esv/freight/app/module/customers
upport/controller/DriverCustomerSupport
Controller.java
View file @
f5264226
package
com
.
esv
.
freight
.
app
.
module
.
customers
ervice
.
controller
;
package
com
.
esv
.
freight
.
app
.
module
.
customers
upport
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.esv.freight.app.common.component.TokenComponent
;
import
com.esv.freight.app.common.response.EResponse
;
import
com.esv.freight.app.feign.CustomerS
ervice
Interface
;
import
com.esv.freight.app.module.customers
ervice.vo.CustomerService
VO
;
import
com.esv.freight.app.feign.CustomerS
upport
Interface
;
import
com.esv.freight.app.module.customers
upport.vo.CustomerSupport
VO
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -25,15 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping
(
"/driverBackend/carrier"
)
@Slf4j
@Validated
public
class
DriverCustomerS
ervice
Controller
{
public
class
DriverCustomerS
upport
Controller
{
private
CustomerServiceInterface
customerServiceInterface
;
private
TokenComponent
tokenComponent
;
private
CustomerSupportInterface
customerSupportInterface
;
@Autowired
public
DriverCustomerServiceController
(
CustomerServiceInterface
customerServiceInterface
,
TokenComponent
tokenComponent
)
{
this
.
customerServiceInterface
=
customerServiceInterface
;
this
.
tokenComponent
=
tokenComponent
;
public
DriverCustomerSupportController
(
CustomerSupportInterface
customerSupportInterface
)
{
this
.
customerSupportInterface
=
customerSupportInterface
;;
}
/**
...
...
@@ -43,15 +40,15 @@ public class DriverCustomerServiceController {
* author 刘胜
* createTime 2020/8/12 14:50
**/
@PostMapping
(
"/customers
ervice
"
)
@PostMapping
(
"/customers
upport
"
)
public
EResponse
driverCustomer
(){
JSONObject
result
=
customerService
Interface
.
driverCustomer
();
JSONObject
result
=
customerSupport
Interface
.
driverCustomer
();
if
(
result
.
getInteger
(
"code"
)
!=
200
)
{
return
EResponse
.
error
(
result
.
getInteger
(
"code"
),
result
.
getString
(
"message"
));
}
CustomerS
erviceVO
customerServiceVO
=
new
CustomerService
VO
();
CustomerS
upportVO
customerSupportVO
=
new
CustomerSupport
VO
();
JSONObject
data
=
result
.
getJSONObject
(
"data"
);
customerS
ervice
VO
.
setPhone
(
data
.
getString
(
"phone"
));
return
EResponse
.
ok
(
customerS
ervice
VO
);
customerS
upport
VO
.
setPhone
(
data
.
getString
(
"phone"
));
return
EResponse
.
ok
(
customerS
upport
VO
);
}
}
src/main/java/com/esv/freight/app/module/customers
ervice/controller/OwnerCustomerService
Controller.java
→
src/main/java/com/esv/freight/app/module/customers
upport/controller/OwnerCustomerSupport
Controller.java
View file @
f5264226
package
com
.
esv
.
freight
.
app
.
module
.
customers
ervice
.
controller
;
package
com
.
esv
.
freight
.
app
.
module
.
customers
upport
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.esv.freight.app.common.component.TokenComponent
;
import
com.esv.freight.app.common.response.EResponse
;
import
com.esv.freight.app.feign.CustomerS
ervice
Interface
;
import
com.esv.freight.app.module.customers
ervice.vo.CustomerService
VO
;
import
com.esv.freight.app.feign.CustomerS
upport
Interface
;
import
com.esv.freight.app.module.customers
upport.vo.CustomerSupport
VO
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -25,13 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping
(
"/goodsowner"
)
@Slf4j
@Validated
public
class
OwnerCustomerS
ervice
Controller
{
public
class
OwnerCustomerS
upport
Controller
{
private
CustomerS
erviceInterface
customerService
Interface
;
private
CustomerS
upportInterface
customerSupport
Interface
;
@Autowired
public
OwnerCustomerS
erviceController
(
CustomerServiceInterface
customerService
Interface
)
{
this
.
customerS
erviceInterface
=
customerService
Interface
;
public
OwnerCustomerS
upportController
(
CustomerSupportInterface
customerSupport
Interface
)
{
this
.
customerS
upportInterface
=
customerSupport
Interface
;
}
/**
...
...
@@ -41,17 +40,17 @@ public class OwnerCustomerServiceController {
* author 刘胜
* createTime 2020/8/12 14:35
**/
@PostMapping
(
"/customers
ervice
"
)
@PostMapping
(
"/customers
upport
"
)
public
EResponse
ownerCustomer
(){
JSONObject
result
=
customerService
Interface
.
ownerCustomer
();
JSONObject
result
=
customerSupport
Interface
.
ownerCustomer
();
if
(
result
.
getInteger
(
"code"
)
!=
200
)
{
return
EResponse
.
error
(
result
.
getInteger
(
"code"
),
result
.
getString
(
"message"
));
}
CustomerS
erviceVO
customerServiceVO
=
new
CustomerService
VO
();
CustomerS
upportVO
customerSupportVO
=
new
CustomerSupport
VO
();
JSONObject
data
=
result
.
getJSONObject
(
"data"
);
customerS
ervice
VO
.
setPhone
(
data
.
getString
(
"phone"
));
return
EResponse
.
ok
(
customerS
ervice
VO
);
customerS
upport
VO
.
setPhone
(
data
.
getString
(
"phone"
));
return
EResponse
.
ok
(
customerS
upport
VO
);
}
}
src/main/java/com/esv/freight/app/module/customers
ervice/vo/CustomerService
VO.java
→
src/main/java/com/esv/freight/app/module/customers
upport/vo/CustomerSupport
VO.java
View file @
f5264226
package
com
.
esv
.
freight
.
app
.
module
.
customers
ervice
.
vo
;
package
com
.
esv
.
freight
.
app
.
module
.
customers
upport
.
vo
;
import
lombok.Data
;
...
...
@@ -12,7 +12,7 @@ import lombok.Data;
* @version: 1.0
*/
@Data
public
class
CustomerS
ervice
VO
{
public
class
CustomerS
upport
VO
{
/**
* 客服电话
*/
...
...
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