Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
有来技术
youlai-mall
提交
1e5755f4
Y
youlai-mall
项目概览
有来技术
/
youlai-mall
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
youlai-mall
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1e5755f4
编写于
1月 27, 2021
作者:
H
hxrui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix:springcloud升级2020版本和springcloudalibaba冲突临时解决(降低openfeign版本)
上级
a0d09931
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
188 addition
and
19 deletion
+188
-19
.gitignore
.gitignore
+1
-1
mall-oms/oms-api/pom.xml
mall-oms/oms-api/pom.xml
+0
-4
mall-oms/pom.xml
mall-oms/pom.xml
+36
-0
mall-pms/pms-api/pom.xml
mall-pms/pms-api/pom.xml
+0
-4
mall-pms/pom.xml
mall-pms/pom.xml
+38
-0
mall-sms/pom.xml
mall-sms/pom.xml
+37
-0
mall-sms/sms-api/pom.xml
mall-sms/sms-api/pom.xml
+1
-4
mall-ums/pom.xml
mall-ums/pom.xml
+0
-1
youlai-admin/admin-api/pom.xml
youlai-admin/admin-api/pom.xml
+1
-4
youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java
.../src/main/java/com/youlai/admin/api/UserFeignService.java
+1
-1
youlai-admin/pom.xml
youlai-admin/pom.xml
+37
-0
youlai-auth/pom.xml
youlai-auth/pom.xml
+36
-0
未找到文件。
.gitignore
浏览文件 @
1e5755f4
...
...
@@ -10,5 +10,5 @@ gen
target
*.log
**/naco
s
log
s
!**/nacos/target
mall-oms/oms-api/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -16,10 +16,6 @@
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-okhttp
</artifactId>
...
...
mall-oms/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -27,6 +27,42 @@
<artifactId>
common-core
</artifactId>
<version>
${youlai.version}
</version>
</dependency>
<!-- spring cloud 2020.0.0内置的openfeign3.0.0和spring cloud alibaba框架nacos、seata冲突临时解决方案-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
2.2.6.RELEASE
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
</dependencies>
</project>
mall-pms/pms-api/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -16,10 +16,6 @@
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-okhttp
</artifactId>
...
...
mall-pms/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -28,6 +28,44 @@
<artifactId>
common-core
</artifactId>
<version>
${youlai.version}
</version>
</dependency>
<!-- spring cloud 2020.0.0内置的openfeign3.0.0和spring cloud alibaba框架nacos、seata冲突临时解决方案-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
2.2.6.RELEASE
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
</dependencies>
</project>
mall-sms/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -27,5 +27,42 @@
<artifactId>
common-core
</artifactId>
<version>
${youlai.version}
</version>
</dependency>
<!-- spring cloud 2020.0.0内置的openfeign3.0.0和spring cloud alibaba框架nacos、seata冲突临时解决方案-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
2.2.6.RELEASE
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
</dependencies>
</project>
mall-sms/sms-api/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -23,10 +23,7 @@
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-okhttp
</artifactId>
...
...
mall-ums/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -29,7 +29,6 @@
</dependency>
<!-- -->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
...
...
youlai-admin/admin-api/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -20,10 +20,7 @@
<groupId>
com.baomidou
</groupId>
<artifactId>
mybatis-plus-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-okhttp
</artifactId>
...
...
youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java
浏览文件 @
1e5755f4
...
...
@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
@FeignClient
(
"youlai-admin"
)
@FeignClient
(
value
=
"youlai-admin"
)
public
interface
UserFeignService
{
@GetMapping
(
"/users/username/{username}"
)
...
...
youlai-admin/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -27,6 +27,43 @@
<artifactId>
common-core
</artifactId>
<version>
${youlai.version}
</version>
</dependency>
<!-- spring cloud 2020.0.0内置的openfeign3.0.0和spring cloud alibaba框架nacos、seata冲突临时解决方案-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
2.2.6.RELEASE
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
</dependencies>
</project>
youlai-auth/pom.xml
浏览文件 @
1e5755f4
...
...
@@ -104,6 +104,42 @@
</dependency>
<!-- spring cloud 2020.0.0内置的openfeign3.0.0和spring cloud alibaba框架nacos、seata冲突临时解决方案-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
2.2.6.RELEASE
</version>
<exclusions>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-openfeign-core
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-commons
</artifactId>
<version>
2.2.6.RELEASE
</version>
</dependency>
</dependencies>
<build>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录