Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Y
yudao-cloud
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
hblj
yudao-cloud
Commits
e28d73a7
提交
e28d73a7
authored
2月 10, 2023
作者:
gaibu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 临时提交
上级
cca9807a
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
79 行增加
和
45 行删除
+79
-45
pom.xml
yudao-dependencies/pom.xml
+6
-5
pom.xml
yudao-framework/yudao-common/pom.xml
+2
-2
pom.xml
yudao-framework/yudao-spring-boot-starter-web/pom.xml
+5
-9
org.springframework.boot.autoconfigure.AutoConfiguration.imports
...ingframework.boot.autoconfigure.AutoConfiguration.imports
+1
-2
pom.xml
yudao-gateway/pom.xml
+15
-7
SpringDocConfiguration.java
.../iocoder/yudao/gateway/config/SpringDocConfiguration.java
+35
-0
pom.xml
yudao-module-infra/yudao-module-infra-api/pom.xml
+1
-5
InfraServerApplication.java
...cn/iocoder/yudao/module/infra/InfraServerApplication.java
+3
-1
pom.xml
yudao-module-system/yudao-module-system-api/pom.xml
+1
-5
ErrorCodeApi.java
...coder/yudao/module/system/api/errorcode/ErrorCodeApi.java
+1
-1
TenantApi.java
.../cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
+1
-1
AdminUserApiImpl.java
...ocoder/yudao/module/system/api/user/AdminUserApiImpl.java
+4
-4
UserController.java
...o/module/system/controller/admin/user/UserController.java
+4
-3
没有找到文件。
yudao-dependencies/pom.xml
浏览文件 @
e28d73a7
...
...
@@ -199,14 +199,15 @@
</dependency>
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-openapi3-spring-boot-starter
</artifactId>
<version>
${knife4j.version}
</version>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-webflux-ui
</artifactId>
<version>
1.6.14
</version>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-
ui
</artifactId>
<version>
${springdoc.version}
</version>
<artifactId>
springdoc-openapi-
webmvc-core
</artifactId>
<version>
1.6.14
</version>
</dependency>
<!-- DB 相关 -->
...
...
yudao-framework/yudao-common/pom.xml
浏览文件 @
e28d73a7
...
...
@@ -60,8 +60,8 @@
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-
ui
</artifactId>
<scope>
provided
</scope>
<!-- 设置为 provided,主要是 PageParam 使用到 --
>
<artifactId>
springdoc-openapi-
webmvc-core
</artifactId>
<scope>
compile
</scope
>
</dependency>
<!-- 监控相关 -->
...
...
yudao-framework/yudao-spring-boot-starter-web/pom.xml
浏览文件 @
e28d73a7
...
...
@@ -21,6 +21,11 @@
<artifactId>
yudao-common
</artifactId>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-webmvc-core
</artifactId>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
@@ -33,15 +38,6 @@
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-openapi3-spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-ui
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-validation
</artifactId>
...
...
yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
浏览文件 @
e28d73a7
cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration
cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration
com.github.xiaoymin.knife4j.spring.configuration.Knife4jAutoConfiguration
cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration
cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration
cn.iocoder.yudao.framework.
xss.config.YudaoXss
AutoConfiguration
cn.iocoder.yudao.framework.
apilog.config.YudaoApiLogRpc
AutoConfiguration
yudao-gateway/pom.xml
浏览文件 @
e28d73a7
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
yudao
</artifactId>
<groupId>
cn.iocoder.cloud
</groupId>
...
...
@@ -26,11 +26,23 @@
<dependency>
<groupId>
cn.iocoder.cloud
</groupId>
<artifactId>
yudao-spring-boot-starter-banner
</artifactId>
<exclusions>
<exclusion>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-webmvc-core
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
cn.iocoder.cloud
</groupId>
<artifactId>
yudao-module-system-api
</artifactId>
<version>
${revision}
</version>
<exclusions>
<exclusion>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-webmvc-core
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Gateway 网关相关 -->
...
...
@@ -44,13 +56,9 @@
<artifactId>
javax.servlet-api
</artifactId>
</dependency>
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-openapi3-spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-ui
</artifactId>
<artifactId>
springdoc-openapi-
webflux-
ui
</artifactId>
</dependency>
<!-- RPC 远程调用相关 -->
...
...
yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/config/SpringDocConfiguration.java
0 → 100644
浏览文件 @
e28d73a7
package
cn
.
iocoder
.
yudao
.
gateway
.
config
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springdoc.core.GroupedOpenApi
;
import
org.springframework.cloud.gateway.route.RouteDefinition
;
import
org.springframework.cloud.gateway.route.RouteDefinitionLocator
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Lazy
;
import
java.util.ArrayList
;
import
java.util.List
;
@Slf4j
@Configuration
public
class
SpringDocConfiguration
{
private
static
final
String
SERVER_NAME_SUFFIX
=
"-api"
;
@Bean
@Lazy
(
false
)
public
List
<
GroupedOpenApi
>
apis
(
RouteDefinitionLocator
locator
)
{
List
<
GroupedOpenApi
>
groups
=
new
ArrayList
<>();
List
<
RouteDefinition
>
definitions
=
locator
.
getRouteDefinitions
().
collectList
().
block
();
for
(
RouteDefinition
definition
:
definitions
)
{
log
.
info
(
"id: "
+
definition
.
getId
()
+
" "
+
definition
.
getUri
().
toString
());
}
definitions
.
stream
()
.
filter
(
routeDefinition
->
routeDefinition
.
getId
().
matches
(
".*"
+
SERVER_NAME_SUFFIX
))
.
forEach
(
routeDefinition
->
{
String
name
=
routeDefinition
.
getId
().
replaceAll
(
SERVER_NAME_SUFFIX
,
""
);
GroupedOpenApi
.
builder
().
pathsToMatch
(
"/"
+
name
+
"/**"
).
group
(
name
).
build
();
});
return
groups
;
}
}
yudao-module-infra/yudao-module-infra-api/pom.xml
浏览文件 @
e28d73a7
...
...
@@ -23,13 +23,9 @@
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-openapi3-spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-
ui
</artifactId>
<artifactId>
springdoc-openapi-
webmvc-core
</artifactId>
</dependency>
<!-- 参数校验 -->
...
...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/InfraServerApplication.java
浏览文件 @
e28d73a7
package
cn
.
iocoder
.
yudao
.
module
.
infra
;
import
io.swagger.v3.oas.annotations.OpenAPIDefinition
;
import
io.swagger.v3.oas.annotations.info.Info
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
/**
* 项目的启动类
*
*
<p>
* 如果你碰到启动的问题,请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
* 如果你碰到启动的问题,请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
* 如果你碰到启动的问题,请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
...
...
yudao-module-system/yudao-module-system-api/pom.xml
浏览文件 @
e28d73a7
...
...
@@ -23,13 +23,9 @@
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>
com.github.xiaoymin
</groupId>
<artifactId>
knife4j-openapi3-spring-boot-starter
</artifactId>
</dependency>
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-
ui
</artifactId>
<artifactId>
springdoc-openapi-
webmvc-core
</artifactId>
</dependency>
<!-- 参数校验 -->
...
...
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
浏览文件 @
e28d73a7
...
...
@@ -27,7 +27,7 @@ public interface ErrorCodeApi {
@PostMapping
(
PREFIX
+
"/auto-generate"
)
@Operation
(
summary
=
"自动创建错误码"
)
CommonResult
<
Boolean
>
autoGenerateErrorCode
s
(
@Valid
@RequestBody
List
<
ErrorCodeAutoGenerateReqDTO
>
autoGenerateDTOs
);
CommonResult
<
Boolean
>
autoGenerateErrorCode
List
(
@Valid
@RequestBody
List
<
ErrorCodeAutoGenerateReqDTO
>
autoGenerateDTOs
);
@GetMapping
(
PREFIX
+
"/list"
)
@Operation
(
summary
=
"增量获得错误码数组"
,
description
=
"如果 minUpdateTime 为空时,则获取所有错误码"
)
...
...
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
浏览文件 @
e28d73a7
...
...
@@ -19,7 +19,7 @@ public interface TenantApi {
@GetMapping
(
PREFIX
+
"/id-list"
)
@Operation
(
summary
=
"获得所有租户编号"
)
CommonResult
<
List
<
Long
>>
getTenantId
s
();
CommonResult
<
List
<
Long
>>
getTenantId
List
();
@GetMapping
(
PREFIX
+
"/valid"
)
@Operation
(
summary
=
"校验租户是否合法"
)
...
...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
浏览文件 @
e28d73a7
...
...
@@ -33,25 +33,25 @@ public class AdminUserApiImpl implements AdminUserApi {
}
@Override
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
List
(
Collection
<
Long
>
ids
)
{
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
s
(
Collection
<
Long
>
ids
)
{
List
<
AdminUserDO
>
users
=
userService
.
getUserList
(
ids
);
return
success
(
UserConvert
.
INSTANCE
.
convertList4
(
users
));
}
@Override
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
List
ByDeptIds
(
Collection
<
Long
>
deptIds
)
{
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
s
ByDeptIds
(
Collection
<
Long
>
deptIds
)
{
List
<
AdminUserDO
>
users
=
userService
.
getUserListByDeptIds
(
deptIds
);
return
success
(
UserConvert
.
INSTANCE
.
convertList4
(
users
));
}
@Override
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
List
ByPostIds
(
Collection
<
Long
>
postIds
)
{
public
CommonResult
<
List
<
AdminUserRespDTO
>>
getUser
s
ByPostIds
(
Collection
<
Long
>
postIds
)
{
List
<
AdminUserDO
>
users
=
userService
.
getUserListByPostIds
(
postIds
);
return
success
(
UserConvert
.
INSTANCE
.
convertList4
(
users
));
}
@Override
public
CommonResult
<
Boolean
>
validUser
List
(
Set
<
Long
>
ids
)
{
public
CommonResult
<
Boolean
>
validUser
s
(
Set
<
Long
>
ids
)
{
userService
.
validateUserList
(
ids
);
return
success
(
true
);
}
...
...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
浏览文件 @
e28d73a7
...
...
@@ -113,7 +113,7 @@ public class UserController {
@Operation
(
summary
=
"获取用户精简信息列表"
,
description
=
"只包含被开启的用户,主要用于前端的下拉选项"
)
public
CommonResult
<
List
<
UserSimpleRespVO
>>
getSimpleUsers
()
{
// 获用户门列表,只要开启状态的
List
<
AdminUserDO
>
list
=
userService
.
getUser
s
ByStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
List
<
AdminUserDO
>
list
=
userService
.
getUser
List
ByStatus
(
CommonStatusEnum
.
ENABLE
.
getStatus
());
// 排序后,返回给前端
return
success
(
UserConvert
.
INSTANCE
.
convertList04
(
list
));
}
...
...
@@ -133,7 +133,7 @@ public class UserController {
public
void
exportUsers
(
@Validated
UserExportReqVO
reqVO
,
HttpServletResponse
response
)
throws
IOException
{
// 获得用户列表
List
<
AdminUserDO
>
users
=
userService
.
getUser
s
(
reqVO
);
List
<
AdminUserDO
>
users
=
userService
.
getUser
List
(
reqVO
);
// 获得拼接需要的数据
Collection
<
Long
>
deptIds
=
convertList
(
users
,
AdminUserDO:
:
getDeptId
);
...
...
@@ -183,7 +183,7 @@ public class UserController {
public
CommonResult
<
UserImportRespVO
>
importExcel
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@RequestParam
(
value
=
"updateSupport"
,
required
=
false
,
defaultValue
=
"false"
)
Boolean
updateSupport
)
throws
Exception
{
List
<
UserImportExcelVO
>
list
=
ExcelUtils
.
read
(
file
,
UserImportExcelVO
.
class
);
return
success
(
userService
.
importUser
s
(
list
,
updateSupport
));
return
success
(
userService
.
importUser
List
(
list
,
updateSupport
));
}
}
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论