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
e339736a
Commit
e339736a
authored
May 21, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):去除common包中的seata依赖
parent
33a43393
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
24 deletions
+30
-24
pom.xml
amos-boot-biz-common/pom.xml
+2
-7
FeignAuthRequestInterceptor.java
...os/boot/biz/common/feign/FeignAuthRequestInterceptor.java
+0
-4
MultipartSupportConfig.java
...in/amos/boot/biz/common/feign/MultipartSupportConfig.java
+1
-10
pom.xml
...m-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml
+5
-0
FeignConfiguration.java
...amos/boot/module/jg/flc/api/fegin/FeignConfiguration.java
+21
-0
TaskV2FeignService.java
...amos/boot/module/jg/flc/api/fegin/TaskV2FeignService.java
+0
-1
WorkFlowFeignService.java
...os/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java
+1
-2
No files found.
amos-boot-biz-common/pom.xml
View file @
e339736a
...
@@ -127,15 +127,10 @@
...
@@ -127,15 +127,10 @@
<version>
5.1.10
</version>
<version>
5.1.10
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
io.seata
</groupId>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
seata-spring-boot-starter
</artifactId>
<artifactId>
httpcore
</artifactId>
<version>
1.8.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpcore
</artifactId>
</dependency>
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpclient
</artifactId>
<artifactId>
httpclient
</artifactId>
</dependency>
</dependency>
...
...
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignAuthRequestInterceptor.java
View file @
e339736a
...
@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.common.feign;
...
@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.common.feign;
import
feign.RequestInterceptor
;
import
feign.RequestInterceptor
;
import
feign.RequestTemplate
;
import
feign.RequestTemplate
;
import
io.seata.core.context.RootContext
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
...
@@ -46,8 +45,5 @@ public class FeignAuthRequestInterceptor implements RequestInterceptor {
...
@@ -46,8 +45,5 @@ public class FeignAuthRequestInterceptor implements RequestInterceptor {
template
.
header
(
"appKey"
,
RequestContext
.
getAppKey
());
template
.
header
(
"appKey"
,
RequestContext
.
getAppKey
());
template
.
header
(
"product"
,
RequestContext
.
getProduct
());
template
.
header
(
"product"
,
RequestContext
.
getProduct
());
}
}
if
(
StringUtils
.
hasText
(
RootContext
.
getXID
())){
template
.
header
(
RootContext
.
KEY_XID
,
RootContext
.
getXID
());
}
}
}
}
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/MultipartSupportConfig.java
View file @
e339736a
...
@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.common.feign;
...
@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.biz.common.feign;
import
feign.RequestInterceptor
;
import
feign.RequestInterceptor
;
import
feign.RequestTemplate
;
import
feign.RequestTemplate
;
import
io.seata.core.context.RootContext
;
import
org.springframework.beans.factory.ObjectFactory
;
import
org.springframework.beans.factory.ObjectFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.http.HttpMessageConverters
;
import
org.springframework.boot.autoconfigure.http.HttpMessageConverters
;
...
@@ -20,7 +19,7 @@ import feign.form.spring.SpringFormEncoder;
...
@@ -20,7 +19,7 @@ import feign.form.spring.SpringFormEncoder;
* @Date: 2020/3/30 16:26
* @Date: 2020/3/30 16:26
*/
*/
@Configuration
@Configuration
public
class
MultipartSupportConfig
implements
RequestInterceptor
{
public
class
MultipartSupportConfig
{
@Autowired
@Autowired
private
ObjectFactory
<
HttpMessageConverters
>
messageConverters
;
private
ObjectFactory
<
HttpMessageConverters
>
messageConverters
;
...
@@ -37,12 +36,4 @@ public class MultipartSupportConfig implements RequestInterceptor {
...
@@ -37,12 +36,4 @@ public class MultipartSupportConfig implements RequestInterceptor {
public
RequestContextListener
requestInterceptor
()
{
public
RequestContextListener
requestInterceptor
()
{
return
new
RequestContextListener
();
return
new
RequestContextListener
();
}
}
@Override
public
void
apply
(
RequestTemplate
template
)
{
String
xid
=
RootContext
.
getXID
();
if
(
StringUtils
.
hasText
(
xid
)){
template
.
header
(
RootContext
.
KEY_XID
,
xid
);
}
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml
View file @
e339736a
...
@@ -31,6 +31,11 @@
...
@@ -31,6 +31,11 @@
<artifactId>
shedlock-spring
</artifactId>
<artifactId>
shedlock-spring
</artifactId>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
io.seata
</groupId>
<artifactId>
seata-spring-boot-starter
</artifactId>
<version>
1.8.0
</version>
</dependency>
<dependency>
<groupId>
net.javacrumbs.shedlock
</groupId>
<groupId>
net.javacrumbs.shedlock
</groupId>
<artifactId>
shedlock-provider-redis-spring
</artifactId>
<artifactId>
shedlock-provider-redis-spring
</artifactId>
</dependency>
</dependency>
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/FeignConfiguration.java
0 → 100644
View file @
e339736a
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
flc
.
api
.
fegin
;
import
com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig
;
import
feign.RequestInterceptor
;
import
feign.RequestTemplate
;
import
io.seata.core.context.RootContext
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.util.StringUtils
;
@Configuration
public
class
FeignConfiguration
extends
MultipartSupportConfig
implements
RequestInterceptor
{
@Override
public
void
apply
(
RequestTemplate
template
)
{
String
xid
=
RootContext
.
getXID
();
if
(
StringUtils
.
hasText
(
xid
)){
template
.
header
(
RootContext
.
KEY_XID
,
xid
);
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/TaskV2FeignService.java
View file @
e339736a
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
flc
.
api
.
fegin
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
flc
.
api
.
fegin
;
import
com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration
;
import
com.yeejoin.amos.component.feign.config.InnerInvokException
;
import
com.yeejoin.amos.component.feign.config.InnerInvokException
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.systemctl.model.TaskV2Model
;
import
com.yeejoin.amos.feign.systemctl.model.TaskV2Model
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java
View file @
e339736a
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
flc
.
api
.
fegin
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
flc
.
api
.
fegin
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.workflow.model.*
;
import
com.yeejoin.amos.feign.workflow.model.*
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
@@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
...
@@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@FeignClient
(
name
=
"AMOS-API-WORKFLOW"
,
path
=
"workflow"
,
configuration
=
{
MultipartSupportConfig
.
class
})
@FeignClient
(
name
=
"AMOS-API-WORKFLOW"
,
path
=
"workflow"
,
configuration
=
{
FeignConfiguration
.
class
})
public
interface
WorkFlowFeignService
{
public
interface
WorkFlowFeignService
{
/***
/***
...
...
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