Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
多鱼的夏天
RuoYi-Cloud-Docker
提交
2f3949d7
R
RuoYi-Cloud-Docker
项目概览
多鱼的夏天
/
RuoYi-Cloud-Docker
通知
210
Star
7
Fork
6
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Cloud-Docker
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2f3949d7
编写于
5月 27, 2021
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级Spring Cloud相关组件到最新版
上级
79c8b17b
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
71 addition
and
46 deletion
+71
-46
pom.xml
pom.xml
+11
-7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
...m/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+1
-1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
...om/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
+1
-1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
...m/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+1
-1
ruoyi-common/ruoyi-common-core/pom.xml
ruoyi-common/ruoyi-common-core/pom.xml
+14
-8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
...rc/main/java/com/ruoyi/common/core/utils/StringUtils.java
+24
-0
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
.../com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+10
-10
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
...src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+0
-9
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
...-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
+2
-2
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
...-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
+2
-2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
...rc/main/java/com/ruoyi/system/RuoYiSystemApplication.java
+2
-2
ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
...va/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
+3
-3
未找到文件。
pom.xml
浏览文件 @
2f3949d7
...
@@ -17,10 +17,10 @@
...
@@ -17,10 +17,10 @@
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<java.version>
1.8
</java.version>
<spring-boot.version>
2.
3.7.RELEASE
</spring-boot.version>
<spring-boot.version>
2.
5.0
</spring-boot.version>
<spring-cloud.version>
Hoxton.SR9
</spring-cloud.version>
<spring-cloud.version>
2020.0.2
</spring-cloud.version>
<spring-cloud-alibaba.version>
2
.2.5.RELEASE
</spring-cloud-alibaba.version>
<spring-cloud-alibaba.version>
2
021.1
</spring-cloud-alibaba.version>
<spring-boot-admin.version>
2.
3
.1
</spring-boot-admin.version>
<spring-boot-admin.version>
2.
4
.1
</spring-boot-admin.version>
<spring-boot.mybatis>
2.1.4
</spring-boot.mybatis>
<spring-boot.mybatis>
2.1.4
</spring-boot.mybatis>
<swagger.fox.version>
2.9.2
</swagger.fox.version>
<swagger.fox.version>
2.9.2
</swagger.fox.version>
<swagger.core.version>
1.5.24
</swagger.core.version>
<swagger.core.version>
1.5.24
</swagger.core.version>
...
@@ -28,12 +28,12 @@
...
@@ -28,12 +28,12 @@
<kaptcha.version>
2.3.2
</kaptcha.version>
<kaptcha.version>
2.3.2
</kaptcha.version>
<pagehelper.boot.version>
1.3.0
</pagehelper.boot.version>
<pagehelper.boot.version>
1.3.0
</pagehelper.boot.version>
<druid.version>
1.2.6
</druid.version>
<druid.version>
1.2.6
</druid.version>
<dynamic-ds.version>
3.
2.1
</dynamic-ds.version>
<dynamic-ds.version>
3.
3.2
</dynamic-ds.version>
<commons.io.version>
2.5
</commons.io.version>
<commons.io.version>
2.5
</commons.io.version>
<commons.fileupload.version>
1.3.3
</commons.fileupload.version>
<commons.fileupload.version>
1.3.3
</commons.fileupload.version>
<velocity.version>
1.7
</velocity.version>
<velocity.version>
1.7
</velocity.version>
<fastjson.version>
1.2.76
</fastjson.version>
<fastjson.version>
1.2.76
</fastjson.version>
<minio.version>
8.
0.3
</minio.version>
<minio.version>
8.
2.1
</minio.version>
<poi.version>
4.1.2
</poi.version>
<poi.version>
4.1.2
</poi.version>
<common-pool.version>
2.6.2
</common-pool.version>
<common-pool.version>
2.6.2
</common-pool.version>
</properties>
</properties>
...
@@ -234,7 +234,11 @@
...
@@ -234,7 +234,11 @@
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<dependencies>
<dependencies>
<!-- bootstrap 启动器 -->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-bootstrap
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
浏览文件 @
2f3949d7
...
@@ -2,12 +2,12 @@ package com.ruoyi.system.api.factory;
...
@@ -2,12 +2,12 @@ package com.ruoyi.system.api.factory;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.cloud.openfeign.FallbackFactory
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.system.api.RemoteFileService
;
import
com.ruoyi.system.api.RemoteFileService
;
import
com.ruoyi.system.api.domain.SysFile
;
import
com.ruoyi.system.api.domain.SysFile
;
import
feign.hystrix.FallbackFactory
;
/**
/**
* 文件服务降级处理
* 文件服务降级处理
...
...
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
浏览文件 @
2f3949d7
...
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;
...
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.cloud.openfeign.FallbackFactory
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.system.api.RemoteLogService
;
import
com.ruoyi.system.api.RemoteLogService
;
import
com.ruoyi.system.api.domain.SysOperLog
;
import
com.ruoyi.system.api.domain.SysOperLog
;
import
feign.hystrix.FallbackFactory
;
/**
/**
* 日志服务降级处理
* 日志服务降级处理
...
...
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
浏览文件 @
2f3949d7
...
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;
...
@@ -2,11 +2,11 @@ package com.ruoyi.system.api.factory;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.cloud.openfeign.FallbackFactory
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.system.api.RemoteUserService
;
import
com.ruoyi.system.api.RemoteUserService
;
import
com.ruoyi.system.api.model.LoginUser
;
import
com.ruoyi.system.api.model.LoginUser
;
import
feign.hystrix.FallbackFactory
;
/**
/**
* 用户服务降级处理
* 用户服务降级处理
...
...
ruoyi-common/ruoyi-common-core/pom.xml
浏览文件 @
2f3949d7
...
@@ -17,23 +17,29 @@
...
@@ -17,23 +17,29 @@
<dependencies>
<dependencies>
<!-- SpringCloud Openfeign -->
<!-- SpringCloud Openfeign -->
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
</dependency>
<!-- SpringCloud Loadbalancer -->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-loadbalancer
</artifactId>
</dependency>
<!-- Spring Context Support -->
<!-- Spring Context Support -->
<dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
<artifactId>
spring-context-support
</artifactId>
</dependency>
</dependency>
<!-- Spring Web -->
<!-- Spring Web -->
<dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
<artifactId>
spring-web
</artifactId>
</dependency>
</dependency>
<!-- Apache Commons Pool2 -->
<!-- Apache Commons Pool2 -->
<dependency>
<dependency>
...
...
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
浏览文件 @
2f3949d7
...
@@ -236,6 +236,30 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
...
@@ -236,6 +236,30 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
return
str
.
substring
(
start
,
end
);
return
str
.
substring
(
start
,
end
);
}
}
/**
* 判断是否为空,并且不是空白字符
*
* @param str 要判断的value
* @return 结果
*/
public
static
boolean
hasText
(
String
str
)
{
return
(
str
!=
null
&&
!
str
.
isEmpty
()
&&
containsText
(
str
));
}
private
static
boolean
containsText
(
CharSequence
str
)
{
int
strLen
=
str
.
length
();
for
(
int
i
=
0
;
i
<
strLen
;
i
++)
{
if
(!
Character
.
isWhitespace
(
str
.
charAt
(
i
)))
{
return
true
;
}
}
return
false
;
}
/**
/**
* 格式化文本, {} 表示占位符<br>
* 格式化文本, {} 表示占位符<br>
* 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
* 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
...
...
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
浏览文件 @
2f3949d7
...
@@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.PatternMatchUtils
;
import
org.springframework.util.PatternMatchUtils
;
import
org.springframework.util.StringUtils
;
import
com.ruoyi.common.core.exception.PreAuthorizeException
;
import
com.ruoyi.common.core.exception.PreAuthorizeException
;
import
com.ruoyi.common.core.utils.StringUtils
;
import
com.ruoyi.common.security.annotation.PreAuthorize
;
import
com.ruoyi.common.security.annotation.PreAuthorize
;
import
com.ruoyi.common.security.service.TokenService
;
import
com.ruoyi.common.security.service.TokenService
;
import
com.ruoyi.system.api.model.LoginUser
;
import
com.ruoyi.system.api.model.LoginUser
;
...
@@ -50,7 +50,7 @@ public class PreAuthorizeAspect
...
@@ -50,7 +50,7 @@ public class PreAuthorizeAspect
return
point
.
proceed
();
return
point
.
proceed
();
}
}
if
(
!
StringUtils
.
is
Empty
(
annotation
.
hasPermi
()))
if
(
StringUtils
.
isNot
Empty
(
annotation
.
hasPermi
()))
{
{
if
(
hasPermi
(
annotation
.
hasPermi
()))
if
(
hasPermi
(
annotation
.
hasPermi
()))
{
{
...
@@ -58,7 +58,7 @@ public class PreAuthorizeAspect
...
@@ -58,7 +58,7 @@ public class PreAuthorizeAspect
}
}
throw
new
PreAuthorizeException
();
throw
new
PreAuthorizeException
();
}
}
else
if
(
!
StringUtils
.
is
Empty
(
annotation
.
lacksPermi
()))
else
if
(
StringUtils
.
isNot
Empty
(
annotation
.
lacksPermi
()))
{
{
if
(
lacksPermi
(
annotation
.
lacksPermi
()))
if
(
lacksPermi
(
annotation
.
lacksPermi
()))
{
{
...
@@ -74,7 +74,7 @@ public class PreAuthorizeAspect
...
@@ -74,7 +74,7 @@ public class PreAuthorizeAspect
}
}
throw
new
PreAuthorizeException
();
throw
new
PreAuthorizeException
();
}
}
else
if
(
!
StringUtils
.
is
Empty
(
annotation
.
hasRole
()))
else
if
(
StringUtils
.
isNot
Empty
(
annotation
.
hasRole
()))
{
{
if
(
hasRole
(
annotation
.
hasRole
()))
if
(
hasRole
(
annotation
.
hasRole
()))
{
{
...
@@ -82,7 +82,7 @@ public class PreAuthorizeAspect
...
@@ -82,7 +82,7 @@ public class PreAuthorizeAspect
}
}
throw
new
PreAuthorizeException
();
throw
new
PreAuthorizeException
();
}
}
else
if
(
!
StringUtils
.
is
Empty
(
annotation
.
lacksRole
()))
else
if
(
StringUtils
.
isNot
Empty
(
annotation
.
lacksRole
()))
{
{
if
(
lacksRole
(
annotation
.
lacksRole
()))
if
(
lacksRole
(
annotation
.
lacksRole
()))
{
{
...
@@ -111,7 +111,7 @@ public class PreAuthorizeAspect
...
@@ -111,7 +111,7 @@ public class PreAuthorizeAspect
public
boolean
hasPermi
(
String
permission
)
public
boolean
hasPermi
(
String
permission
)
{
{
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
if
(
StringUtils
.
is
Empty
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getPermissions
()))
if
(
StringUtils
.
is
Null
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getPermissions
()))
{
{
return
false
;
return
false
;
}
}
...
@@ -138,7 +138,7 @@ public class PreAuthorizeAspect
...
@@ -138,7 +138,7 @@ public class PreAuthorizeAspect
public
boolean
hasAnyPermi
(
String
[]
permissions
)
public
boolean
hasAnyPermi
(
String
[]
permissions
)
{
{
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
if
(
StringUtils
.
is
Empty
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getPermissions
()))
if
(
StringUtils
.
is
Null
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getPermissions
()))
{
{
return
false
;
return
false
;
}
}
...
@@ -162,7 +162,7 @@ public class PreAuthorizeAspect
...
@@ -162,7 +162,7 @@ public class PreAuthorizeAspect
public
boolean
hasRole
(
String
role
)
public
boolean
hasRole
(
String
role
)
{
{
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
if
(
StringUtils
.
is
Empty
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getRoles
()))
if
(
StringUtils
.
is
Null
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getRoles
()))
{
{
return
false
;
return
false
;
}
}
...
@@ -196,7 +196,7 @@ public class PreAuthorizeAspect
...
@@ -196,7 +196,7 @@ public class PreAuthorizeAspect
public
boolean
hasAnyRoles
(
String
[]
roles
)
public
boolean
hasAnyRoles
(
String
[]
roles
)
{
{
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
LoginUser
userInfo
=
tokenService
.
getLoginUser
();
if
(
StringUtils
.
is
Empty
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getRoles
()))
if
(
StringUtils
.
is
Null
(
userInfo
)
||
CollectionUtils
.
isEmpty
(
userInfo
.
getRoles
()))
{
{
return
false
;
return
false
;
}
}
...
@@ -220,6 +220,6 @@ public class PreAuthorizeAspect
...
@@ -220,6 +220,6 @@ public class PreAuthorizeAspect
private
boolean
hasPermissions
(
Collection
<
String
>
authorities
,
String
permission
)
private
boolean
hasPermissions
(
Collection
<
String
>
authorities
,
String
permission
)
{
{
return
authorities
.
stream
().
filter
(
StringUtils:
:
hasText
)
return
authorities
.
stream
().
filter
(
StringUtils:
:
hasText
)
.
anyMatch
(
x
->
ALL_PERMISSION
.
contains
(
x
)
||
PatternMatchUtils
.
simpleMatch
(
permission
,
x
));
.
anyMatch
(
x
->
ALL_PERMISSION
.
contains
(
x
)
||
PatternMatchUtils
.
simpleMatch
(
x
,
permission
));
}
}
}
}
ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
浏览文件 @
2f3949d7
package
com.ruoyi.gateway.config
;
package
com.ruoyi.gateway.config
;
import
org.springframework.cloud.gateway.filter.GlobalFilter
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.Ordered
;
import
org.springframework.core.Ordered
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.core.annotation.Order
;
import
com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter
;
import
com.ruoyi.gateway.handler.SentinelFallbackHandler
;
import
com.ruoyi.gateway.handler.SentinelFallbackHandler
;
/**
/**
...
@@ -22,11 +20,4 @@ public class GatewayConfig
...
@@ -22,11 +20,4 @@ public class GatewayConfig
{
{
return
new
SentinelFallbackHandler
();
return
new
SentinelFallbackHandler
();
}
}
@Bean
@Order
(-
1
)
public
GlobalFilter
sentinelGatewayFilter
()
{
return
new
SentinelGatewayFilter
();
}
}
}
\ No newline at end of file
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java
浏览文件 @
2f3949d7
package
com.ruoyi.gen
;
package
com.ruoyi.gen
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.
cloud.client.SpringCloud
Application
;
import
org.springframework.
boot.autoconfigure.SpringBoot
Application
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@EnableCustomConfig
@EnableCustomConfig
@EnableCustomSwagger2
@EnableCustomSwagger2
@EnableRyFeignClients
@EnableRyFeignClients
@Spring
Cloud
Application
@Spring
Boot
Application
public
class
RuoYiGenApplication
public
class
RuoYiGenApplication
{
{
public
static
void
main
(
String
[]
args
)
public
static
void
main
(
String
[]
args
)
...
...
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java
浏览文件 @
2f3949d7
package
com.ruoyi.job
;
package
com.ruoyi.job
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.
cloud.client.SpringCloud
Application
;
import
org.springframework.
boot.autoconfigure.SpringBoot
Application
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@EnableCustomConfig
@EnableCustomConfig
@EnableCustomSwagger2
@EnableCustomSwagger2
@EnableRyFeignClients
@EnableRyFeignClients
@Spring
Cloud
Application
@Spring
Boot
Application
public
class
RuoYiJobApplication
public
class
RuoYiJobApplication
{
{
public
static
void
main
(
String
[]
args
)
public
static
void
main
(
String
[]
args
)
...
...
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
浏览文件 @
2f3949d7
package
com.ruoyi.system
;
package
com.ruoyi.system
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.
cloud.client.SpringCloud
Application
;
import
org.springframework.
boot.autoconfigure.SpringBoot
Application
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableCustomConfig
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.security.annotation.EnableRyFeignClients
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
import
com.ruoyi.common.swagger.annotation.EnableCustomSwagger2
;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
...
@@ -14,7 +14,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@EnableCustomConfig
@EnableCustomConfig
@EnableCustomSwagger2
@EnableCustomSwagger2
@EnableRyFeignClients
@EnableRyFeignClients
@Spring
Cloud
Application
@Spring
Boot
Application
public
class
RuoYiSystemApplication
public
class
RuoYiSystemApplication
{
{
public
static
void
main
(
String
[]
args
)
public
static
void
main
(
String
[]
args
)
...
...
ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java
浏览文件 @
2f3949d7
package
com.ruoyi.modules.monitor
;
package
com.ruoyi.modules.monitor
;
import
de.codecentric.boot.admin.server.config.EnableAdminServer
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.cloud.client.SpringCloudApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
de.codecentric.boot.admin.server.config.EnableAdminServer
;
/**
/**
* 监控中心
* 监控中心
...
@@ -10,7 +10,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
...
@@ -10,7 +10,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
* @author ruoyi
* @author ruoyi
*/
*/
@EnableAdminServer
@EnableAdminServer
@Spring
Cloud
Application
@Spring
Boot
Application
public
class
RuoYiMonitorApplication
public
class
RuoYiMonitorApplication
{
{
public
static
void
main
(
String
[]
args
)
public
static
void
main
(
String
[]
args
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录