Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ssssssss-team
magic-api
提交
fc9ee496
M
magic-api
项目概览
ssssssss-team
/
magic-api
10 个月 前同步成功
通知
41
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
magic-api
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
fc9ee496
编写于
2月 28, 2022
作者:
M
mxd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复接口注册时少拼接了前缀的BUG
上级
92864e9f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
14 deletion
+17
-14
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
...gicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
+1
-1
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicDynamicRegistryConfiguration.java
...pring/boot/starter/MagicDynamicRegistryConfiguration.java
+2
-2
magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/ApiInfoMagicResourceStorage.java
...gicapi/core/service/impl/ApiInfoMagicResourceStorage.java
+9
-1
magic-api/src/main/java/org/ssssssss/magicapi/utils/Mapping.java
...pi/src/main/java/org/ssssssss/magicapi/utils/Mapping.java
+5
-10
未找到文件。
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
浏览文件 @
fc9ee496
...
...
@@ -355,7 +355,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
List
<
Plugin
>
plugins
=
pluginConfigurations
.
stream
().
map
(
MagicPluginConfiguration:
:
plugin
).
collect
(
Collectors
.
toList
());
// 构建UI请求处理器
String
base
=
properties
.
getWeb
();
Mapping
mapping
=
Mapping
.
create
(
requestMappingHandlerMapping
,
base
,
properties
.
getPrefix
()
);
Mapping
mapping
=
Mapping
.
create
(
requestMappingHandlerMapping
,
base
);
MagicWorkbenchController
magicWorkbenchController
=
new
MagicWorkbenchController
(
configuration
,
properties
,
plugins
);
if
(
base
!=
null
)
{
configuration
.
setEnableWeb
(
true
);
...
...
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicDynamicRegistryConfiguration.java
浏览文件 @
fc9ee496
...
...
@@ -38,13 +38,13 @@ public class MagicDynamicRegistryConfiguration {
@Bean
@ConditionalOnMissingBean
public
ApiInfoMagicResourceStorage
apiInfoMagicResourceStorage
()
{
return
new
ApiInfoMagicResourceStorage
();
return
new
ApiInfoMagicResourceStorage
(
properties
.
getPrefix
()
);
}
@Bean
@ConditionalOnMissingBean
public
RequestMagicDynamicRegistry
magicRequestMagicDynamicRegistry
(
ApiInfoMagicResourceStorage
apiInfoMagicResourceStorage
)
throws
NoSuchMethodException
{
return
new
RequestMagicDynamicRegistry
(
apiInfoMagicResourceStorage
,
Mapping
.
create
(
requestMappingHandlerMapping
,
properties
.
getWeb
()
,
properties
.
getPrefix
()
),
properties
.
isAllowOverride
());
return
new
RequestMagicDynamicRegistry
(
apiInfoMagicResourceStorage
,
Mapping
.
create
(
requestMappingHandlerMapping
,
properties
.
getWeb
()),
properties
.
isAllowOverride
());
}
@Bean
...
...
magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/ApiInfoMagicResourceStorage.java
浏览文件 @
fc9ee496
package
org.ssssssss.magicapi.core.service.impl
;
import
org.apache.commons.lang3.StringUtils
;
import
org.ssssssss.magicapi.core.model.ApiInfo
;
import
org.ssssssss.magicapi.core.service.AbstractPathMagicResourceStorage
;
import
org.ssssssss.magicapi.utils.PathUtils
;
public
class
ApiInfoMagicResourceStorage
extends
AbstractPathMagicResourceStorage
<
ApiInfo
>
{
private
String
prefix
;
public
ApiInfoMagicResourceStorage
(
String
prefix
)
{
this
.
prefix
=
StringUtils
.
defaultIfBlank
(
prefix
,
""
)
+
"/"
;
}
@Override
public
String
folder
()
{
return
"api"
;
...
...
@@ -17,7 +25,7 @@ public class ApiInfoMagicResourceStorage extends AbstractPathMagicResourceStorag
@Override
public
String
buildMappingKey
(
ApiInfo
info
)
{
return
info
.
getMethod
().
toUpperCase
()
+
":"
+
buildMappingKey
(
info
,
magicResourceService
.
getGroupPath
(
info
.
getGroupId
(
)));
return
info
.
getMethod
().
toUpperCase
()
+
":"
+
PathUtils
.
replaceSlash
(
this
.
prefix
+
buildMappingKey
(
info
,
magicResourceService
.
getGroupPath
(
info
.
getGroupId
()
)));
}
@Override
...
...
magic-api/src/main/java/org/ssssssss/magicapi/utils/Mapping.java
浏览文件 @
fc9ee496
...
...
@@ -21,26 +21,21 @@ public class Mapping {
private
final
String
base
;
private
final
String
prefix
;
private
final
RequestMappingInfo
.
BuilderConfiguration
config
;
private
Map
<
String
,
RequestMappingInfo
>
cached
=
new
HashMap
<>();
private
static
final
boolean
HAS_GET_PATTERN_PARSER
=
JavaReflection
.
getMethod
(
RequestMappingHandlerMapping
.
class
,
"getPatternParser"
)
!=
null
;
private
Mapping
(
AbstractHandlerMethodMapping
<
RequestMappingInfo
>
methodMapping
,
RequestMappingInfo
.
BuilderConfiguration
config
,
String
base
,
String
prefix
)
{
private
Mapping
(
AbstractHandlerMethodMapping
<
RequestMappingInfo
>
methodMapping
,
RequestMappingInfo
.
BuilderConfiguration
config
,
String
base
)
{
this
.
methodMapping
=
methodMapping
;
this
.
config
=
config
;
this
.
base
=
StringUtils
.
defaultIfBlank
(
base
,
""
);
this
.
prefix
=
StringUtils
.
defaultIfBlank
(
prefix
,
""
);
}
public
static
Mapping
create
(
RequestMappingHandlerMapping
mapping
)
{
return
create
(
mapping
,
null
,
null
);
return
create
(
mapping
,
null
);
}
public
static
Mapping
create
(
RequestMappingHandlerMapping
mapping
,
String
base
,
String
prefix
)
{
public
static
Mapping
create
(
RequestMappingHandlerMapping
mapping
,
String
base
)
{
if
(
HAS_GET_PATTERN_PARSER
)
{
RequestMappingInfo
.
BuilderConfiguration
config
=
new
RequestMappingInfo
.
BuilderConfiguration
();
config
.
setTrailingSlashMatch
(
mapping
.
useTrailingSlashMatch
());
...
...
@@ -50,9 +45,9 @@ public class Mapping {
}
else
{
config
.
setPathMatcher
(
mapping
.
getPathMatcher
());
}
return
new
Mapping
(
mapping
,
config
,
base
,
prefix
);
return
new
Mapping
(
mapping
,
config
,
base
);
}
return
new
Mapping
(
mapping
,
null
,
base
,
prefix
);
return
new
Mapping
(
mapping
,
null
,
base
);
}
public
RequestMappingInfo
.
Builder
paths
(
String
...
paths
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录