Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
e7c8beef
Commit
e7c8beef
authored
Dec 20, 2021
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.feign代理类冲突
parent
bc3ab480
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
24 deletions
+3
-24
EqVideoFeignClient.java
...ava/com/yeejoin/equipmanage/fegin/EqVideoFeignClient.java
+0
-21
VideoServiceImpl.java
...om/yeejoin/equipmanage/service/impl/VideoServiceImpl.java
+3
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/EqVideoFeignClient.java
deleted
100644 → 0
View file @
bc3ab480
package
com
.
yeejoin
.
equipmanage
.
fegin
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig
;
/**
* @description:
* @author: tw
* @createDate: 2021/10/20
*/
@FeignClient
(
name
=
"${video.fegin.name}"
,
path
=
"video"
,
configuration
=
{
MultipartSupportConfig
.
class
})
public
interface
EqVideoFeignClient
{
@RequestMapping
(
value
=
"/video-original/url/video/{indexCode}"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
String
>
videoUrlByIndexCode
(
@PathVariable
(
"indexCode"
)
String
indexCode
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java
View file @
e7c8beef
...
...
@@ -10,6 +10,7 @@ import java.util.Set;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
import
com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -49,7 +50,6 @@ import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
import
com.yeejoin.equipmanage.common.enums.IndustryEnum
;
import
com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil
;
import
com.yeejoin.equipmanage.common.utils.StringUtil
;
import
com.yeejoin.equipmanage.fegin.EqVideoFeignClient
;
import
com.yeejoin.equipmanage.mapper.VideoMapper
;
import
com.yeejoin.equipmanage.service.IBuilldService
;
import
com.yeejoin.equipmanage.service.IEquipmentCategoryService
;
...
...
@@ -105,7 +105,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
@Autowired
EqVideoFeignClient
eqV
ideoFeignClient
;
VideoFeignClient
v
ideoFeignClient
;
@Value
(
"${param.htvideo.url}"
)
...
...
@@ -534,7 +534,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
private
String
getVideoUrl
(
String
code
){
String
url
=
""
;
try
{
ResponseModel
<
String
>
da
=
eqV
ideoFeignClient
.
videoUrlByIndexCode
(
code
);
ResponseModel
<
String
>
da
=
v
ideoFeignClient
.
videoUrlByIndexCode
(
code
);
if
(!
ObjectUtils
.
isEmpty
(
da
)){
url
=
da
.
getResult
().
substring
(
da
.
getResult
().
indexOf
(
"openUrl"
));
}
...
...
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