Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
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
ZTGK
hzsomms
Commits
ec9df5b9
Commit
ec9df5b9
authored
Jul 03, 2023
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.代码提交
parent
5f2bd8be
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
1295 additions
and
1296 deletions
+1295
-1296
Result.java
...se-core/src/main/java/org/jeecg/common/api/vo/Result.java
+159
-152
RestDesformUtil.java
.../src/main/java/org/jeecg/common/util/RestDesformUtil.java
+2
-2
FileTypeFilter.java
...ain/java/org/jeecg/common/util/filter/FileTypeFilter.java
+53
-53
Swagger2Config.java
...e-core/src/main/java/org/jeecg/config/Swagger2Config.java
+5
-5
ShiroConfig.java
...ore/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+73
-73
SectionStationMap.java
...jeecg/modules/subwayNetwork/entity/SectionStationMap.java
+0
-63
LightRailServiceImpl.java
...ules/subwayNetwork/service/impl/LightRailServiceImpl.java
+0
-1
CommonController.java
...org/jeecg/modules/system/controller/CommonController.java
+57
-52
SysRoleController.java
...rg/jeecg/modules/system/controller/SysRoleController.java
+402
-394
SysUserController.java
...rg/jeecg/modules/system/controller/SysUserController.java
+539
-499
SysUserServiceImpl.java
...jeecg/modules/system/service/impl/SysUserServiceImpl.java
+1
-0
pom.xml
pom.xml
+4
-2
No files found.
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
View file @
ec9df5b9
...
...
@@ -9,169 +9,176 @@ import org.jeecg.common.constant.CommonConstant;
import
java.io.Serializable
;
/**
* 接口返回数据格式
* 接口返回数据格式
*
* @author scott
* @email jeecgos@163.com
* @date
2019年1月19日
* @date 2019年1月19日
*/
@Data
@ApiModel
(
value
=
"接口返回对象"
,
description
=
"接口返回对象"
)
@ApiModel
(
value
=
"接口返回对象"
,
description
=
"接口返回对象"
)
public
class
Result
<
T
>
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 成功标志
*/
@ApiModelProperty
(
value
=
"成功标志"
)
private
boolean
success
=
true
;
/**
* 返回处理消息
*/
@ApiModelProperty
(
value
=
"返回处理消息"
)
private
String
message
=
""
;
/**
* 返回代码
*/
@ApiModelProperty
(
value
=
"返回代码"
)
private
Integer
code
=
0
;
/**
* 返回数据对象 data
*/
@ApiModelProperty
(
value
=
"返回数据对象"
)
private
T
result
;
/**
* 时间戳
*/
@ApiModelProperty
(
value
=
"时间戳"
)
private
long
timestamp
=
System
.
currentTimeMillis
();
public
Result
()
{
}
private
static
final
long
serialVersionUID
=
1L
;
public
void
setSuccess
(
boolean
success
)
{
this
.
success
=
success
;
this
.
code
=
200
;
}
/**
* 成功标志
*/
@ApiModelProperty
(
value
=
"成功标志"
)
private
boolean
success
=
true
;
/**
* 返回处理消息
*/
@ApiModelProperty
(
value
=
"返回处理消息"
)
private
String
message
=
""
;
/**
* 返回代码
*/
@ApiModelProperty
(
value
=
"返回代码"
)
private
Integer
code
=
0
;
/**
* 返回数据对象 data
*/
@ApiModelProperty
(
value
=
"返回数据对象"
)
private
T
result
;
/**
* 时间戳
*/
@ApiModelProperty
(
value
=
"时间戳"
)
private
long
timestamp
=
System
.
currentTimeMillis
();
public
Result
()
{
}
/**
* 兼容VUE3版token失效不跳转登录页面
*
* @param code
* @param message
*/
public
Result
(
Integer
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
Result
<
T
>
success
(
String
message
)
{
this
.
message
=
message
;
this
.
code
=
CommonConstant
.
SC_OK_200
;
this
.
success
=
true
;
return
this
;
}
public
static
<
T
>
Result
<
T
>
ok
()
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
ok
(
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r
.
setResult
((
T
)
msg
);
r
.
setMessage
(
msg
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
ok
(
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
()
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
return
r
;
}
/**
* 此方法是为了兼容升级所创建
*
* @param msg
* @param <T>
* @return
*/
public
static
<
T
>
Result
<
T
>
OK
(
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setMessage
(
msg
);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r
.
setResult
((
T
)
msg
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
(
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
(
String
msg
,
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setMessage
(
msg
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
error
(
String
msg
,
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
false
);
r
.
setCode
(
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
);
r
.
setMessage
(
msg
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
error
(
String
msg
)
{
return
error
(
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
,
msg
);
}
public
static
<
T
>
Result
<
T
>
error
(
int
code
,
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setCode
(
code
);
r
.
setMessage
(
msg
);
r
.
setSuccess
(
false
);
return
r
;
}
public
Result
<
T
>
error500
(
String
message
)
{
this
.
message
=
message
;
this
.
code
=
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
;
this
.
success
=
false
;
return
this
;
}
/**
* 无权限访问返回结果
*/
public
static
<
T
>
Result
<
T
>
noauth
(
String
msg
)
{
return
error
(
CommonConstant
.
SC_JEECG_NO_AUTHZ
,
msg
);
}
@JsonIgnore
private
String
onlTable
;
public
Result
(
Integer
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
Result
<
T
>
success
(
String
message
)
{
this
.
message
=
message
;
this
.
code
=
CommonConstant
.
SC_OK_200
;
this
.
success
=
true
;
return
this
;
}
public
static
<
T
>
Result
<
T
>
ok
()
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
ok
(
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r
.
setResult
((
T
)
msg
);
r
.
setMessage
(
msg
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
ok
(
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
()
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
return
r
;
}
/**
* 此方法是为了兼容升级所创建
*
* @param msg
* @param <T>
* @return
*/
public
static
<
T
>
Result
<
T
>
OK
(
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setMessage
(
msg
);
//Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D
r
.
setResult
((
T
)
msg
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
(
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
OK
(
String
msg
,
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
true
);
r
.
setCode
(
CommonConstant
.
SC_OK_200
);
r
.
setMessage
(
msg
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
error
(
String
msg
,
T
data
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setSuccess
(
false
);
r
.
setCode
(
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
);
r
.
setMessage
(
msg
);
r
.
setResult
(
data
);
return
r
;
}
public
static
<
T
>
Result
<
T
>
error
(
String
msg
)
{
return
error
(
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
,
msg
);
}
public
static
<
T
>
Result
<
T
>
error
(
int
code
,
String
msg
)
{
Result
<
T
>
r
=
new
Result
<
T
>();
r
.
setCode
(
code
);
r
.
setMessage
(
msg
);
r
.
setSuccess
(
false
);
return
r
;
}
public
Result
<
T
>
error500
(
String
message
)
{
this
.
message
=
message
;
this
.
code
=
CommonConstant
.
SC_INTERNAL_SERVER_ERROR_500
;
this
.
success
=
false
;
return
this
;
}
/**
* 无权限访问返回结果
*/
public
static
<
T
>
Result
<
T
>
noauth
(
String
msg
)
{
return
error
(
CommonConstant
.
SC_JEECG_NO_AUTHZ
,
msg
);
}
@JsonIgnore
private
String
onlTable
;
}
\ No newline at end of file
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java
View file @
ec9df5b9
...
...
@@ -14,8 +14,8 @@ import org.springframework.http.ResponseEntity;
*/
public
class
RestDesformUtil
{
p
rivate
static
String
domain
=
null
;
p
rivate
static
String
path
=
null
;
p
ublic
static
String
domain
=
null
;
p
ublic
static
String
path
=
null
;
static
{
domain
=
SpringContextUtils
.
getDomain
();
...
...
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java
View file @
ec9df5b9
...
...
@@ -25,59 +25,59 @@ public class FileTypeFilter {
static
{
FILE_TYPE_MAP
.
put
(
"3c25402070616765206c"
,
"jsp"
);
FILE_TYPE_MAP
.
put
(
"3c3f7068700a0a2f2a2a0a202a205048"
,
"php"
);
/* fileTypeMap
.put("ffd8ffe000104a464946", "jpg");
fileTypeMap
.put("89504e470d0a1a0a0000", "png");
fileTypeMap
.put("47494638396126026f01", "gif");
fileTypeMap
.put("49492a00227105008037", "tif");
fileTypeMap
.put("424d228c010000000000", "bmp");
fileTypeMap
.put("424d8240090000000000", "bmp");
fileTypeMap
.put("424d8e1b030000000000", "bmp");
fileTypeMap
.put("41433130313500000000", "dwg");
fileTypeMap
.put("3c21444f435459504520", "html");
fileTypeMap
.put("3c21646f637479706520", "htm");
fileTypeMap
.put("48544d4c207b0d0a0942", "css");
fileTypeMap
.put("696b2e71623d696b2e71", "js");
fileTypeMap
.put("7b5c727466315c616e73", "rtf");
fileTypeMap
.put("38425053000100000000", "psd");
fileTypeMap
.put("46726f6d3a203d3f6762", "eml");
fileTypeMap
.put("d0cf11e0a1b11ae10000", "doc");
fileTypeMap
.put("5374616E64617264204A", "mdb");
fileTypeMap
.put("252150532D41646F6265", "ps");
fileTypeMap
.put("255044462d312e350d0a", "pdf");
fileTypeMap
.put("2e524d46000000120001", "rmvb");
fileTypeMap
.put("464c5601050000000900", "flv");
fileTypeMap
.put("00000020667479706d70", "mp4");
fileTypeMap
.put("49443303000000002176", "mp3");
fileTypeMap
.put("000001ba210001000180", "mpg");
fileTypeMap
.put("3026b2758e66cf11a6d9", "wmv");
fileTypeMap
.put("52494646e27807005741", "wav");
fileTypeMap
.put("52494646d07d60074156", "avi");
fileTypeMap
.put("4d546864000000060001", "mid");
fileTypeMap
.put("504b0304140000000800", "zip");
fileTypeMap
.put("526172211a0700cf9073", "rar");
fileTypeMap
.put("235468697320636f6e66", "ini");
fileTypeMap
.put("504b03040a0000000000", "jar");
fileTypeMap
.put("4d5a9000030000000400", "exe");
fileTypeMap
.put("3c25402070616765206c", "jsp");
fileTypeMap
.put("4d616e69666573742d56", "mf");
fileTypeMap
.put("3c3f786d6c2076657273", "xml");
fileTypeMap
.put("494e5345525420494e54", "sql");
fileTypeMap
.put("7061636b616765207765", "java");
fileTypeMap
.put("406563686f206f66660d", "bat");
fileTypeMap
.put("1f8b0800000000000000", "gz");
fileTypeMap
.put("6c6f67346a2e726f6f74", "properties");
fileTypeMap
.put("cafebabe0000002e0041", "class");
fileTypeMap
.put("49545346030000006000", "chm");
fileTypeMap
.put("04000000010000001300", "mxp");
fileTypeMap
.put("504b0304140006000800", "docx");
fileTypeMap
.put("6431303a637265617465", "torrent");
fileTypeMap
.put("6D6F6F76", "mov");
fileTypeMap
.put("FF575043", "wpd");
fileTypeMap
.put("CFAD12FEC5FD746F", "dbx");
fileTypeMap
.put("2142444E", "pst");
fileTypeMap
.put("AC9EBD8F", "qdf");
fileTypeMap
.put("E3828596", "pwl");
fileTypeMap.put("2E7261FD", "ram");*/
FILE_TYPE_MAP
.
put
(
"ffd8ffe000104a464946"
,
"jpg"
);
FILE_TYPE_MAP
.
put
(
"89504e470d0a1a0a0000"
,
"png"
);
FILE_TYPE_MAP
.
put
(
"47494638396126026f01"
,
"gif"
);
FILE_TYPE_MAP
.
put
(
"49492a00227105008037"
,
"tif"
);
FILE_TYPE_MAP
.
put
(
"424d228c010000000000"
,
"bmp"
);
FILE_TYPE_MAP
.
put
(
"424d8240090000000000"
,
"bmp"
);
FILE_TYPE_MAP
.
put
(
"424d8e1b030000000000"
,
"bmp"
);
FILE_TYPE_MAP
.
put
(
"41433130313500000000"
,
"dwg"
);
FILE_TYPE_MAP
.
put
(
"3c21444f435459504520"
,
"html"
);
FILE_TYPE_MAP
.
put
(
"3c21646f637479706520"
,
"htm"
);
FILE_TYPE_MAP
.
put
(
"48544d4c207b0d0a0942"
,
"css"
);
FILE_TYPE_MAP
.
put
(
"696b2e71623d696b2e71"
,
"js"
);
FILE_TYPE_MAP
.
put
(
"7b5c727466315c616e73"
,
"rtf"
);
FILE_TYPE_MAP
.
put
(
"38425053000100000000"
,
"psd"
);
FILE_TYPE_MAP
.
put
(
"46726f6d3a203d3f6762"
,
"eml"
);
FILE_TYPE_MAP
.
put
(
"d0cf11e0a1b11ae10000"
,
"doc"
);
FILE_TYPE_MAP
.
put
(
"5374616E64617264204A"
,
"mdb"
);
FILE_TYPE_MAP
.
put
(
"252150532D41646F6265"
,
"ps"
);
FILE_TYPE_MAP
.
put
(
"255044462d312e350d0a"
,
"pdf"
);
FILE_TYPE_MAP
.
put
(
"2e524d46000000120001"
,
"rmvb"
);
FILE_TYPE_MAP
.
put
(
"464c5601050000000900"
,
"flv"
);
FILE_TYPE_MAP
.
put
(
"00000020667479706d70"
,
"mp4"
);
FILE_TYPE_MAP
.
put
(
"49443303000000002176"
,
"mp3"
);
FILE_TYPE_MAP
.
put
(
"000001ba210001000180"
,
"mpg"
);
FILE_TYPE_MAP
.
put
(
"3026b2758e66cf11a6d9"
,
"wmv"
);
FILE_TYPE_MAP
.
put
(
"52494646e27807005741"
,
"wav"
);
FILE_TYPE_MAP
.
put
(
"52494646d07d60074156"
,
"avi"
);
FILE_TYPE_MAP
.
put
(
"4d546864000000060001"
,
"mid"
);
FILE_TYPE_MAP
.
put
(
"504b0304140000000800"
,
"zip"
);
FILE_TYPE_MAP
.
put
(
"526172211a0700cf9073"
,
"rar"
);
FILE_TYPE_MAP
.
put
(
"235468697320636f6e66"
,
"ini"
);
FILE_TYPE_MAP
.
put
(
"504b03040a0000000000"
,
"jar"
);
FILE_TYPE_MAP
.
put
(
"4d5a9000030000000400"
,
"exe"
);
FILE_TYPE_MAP
.
put
(
"3c25402070616765206c"
,
"jsp"
);
FILE_TYPE_MAP
.
put
(
"4d616e69666573742d56"
,
"mf"
);
FILE_TYPE_MAP
.
put
(
"3c3f786d6c2076657273"
,
"xml"
);
FILE_TYPE_MAP
.
put
(
"494e5345525420494e54"
,
"sql"
);
FILE_TYPE_MAP
.
put
(
"7061636b616765207765"
,
"java"
);
FILE_TYPE_MAP
.
put
(
"406563686f206f66660d"
,
"bat"
);
FILE_TYPE_MAP
.
put
(
"1f8b0800000000000000"
,
"gz"
);
FILE_TYPE_MAP
.
put
(
"6c6f67346a2e726f6f74"
,
"properties"
);
FILE_TYPE_MAP
.
put
(
"cafebabe0000002e0041"
,
"class"
);
FILE_TYPE_MAP
.
put
(
"49545346030000006000"
,
"chm"
);
FILE_TYPE_MAP
.
put
(
"04000000010000001300"
,
"mxp"
);
FILE_TYPE_MAP
.
put
(
"504b0304140006000800"
,
"docx"
);
FILE_TYPE_MAP
.
put
(
"6431303a637265617465"
,
"torrent"
);
FILE_TYPE_MAP
.
put
(
"6D6F6F76"
,
"mov"
);
FILE_TYPE_MAP
.
put
(
"FF575043"
,
"wpd"
);
FILE_TYPE_MAP
.
put
(
"CFAD12FEC5FD746F"
,
"dbx"
);
FILE_TYPE_MAP
.
put
(
"2142444E"
,
"pst"
);
FILE_TYPE_MAP
.
put
(
"AC9EBD8F"
,
"qdf"
);
FILE_TYPE_MAP
.
put
(
"E3828596"
,
"pwl"
);
FILE_TYPE_MAP
.
put
(
"2E7261FD"
,
"ram"
);
}
/**
...
...
jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
View file @
ec9df5b9
...
...
@@ -19,13 +19,11 @@ import springfox.documentation.builders.ApiInfoBuilder;
import
springfox.documentation.builders.ParameterBuilder
;
import
springfox.documentation.builders.PathSelectors
;
import
springfox.documentation.builders.RequestHandlerSelectors
;
import
springfox.documentation.oas.annotations.EnableOpenApi
;
import
springfox.documentation.schema.ModelRef
;
import
springfox.documentation.service.*
;
import
springfox.documentation.spi.DocumentationType
;
import
springfox.documentation.spi.service.contexts.SecurityContext
;
import
springfox.documentation.spring.web.plugins.Docket
;
import
springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider
;
import
springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider
;
import
springfox.documentation.swagger2.annotations.EnableSwagger2
;
...
...
@@ -45,7 +43,6 @@ import java.util.stream.Collectors;
public
class
Swagger2Config
implements
WebMvcConfigurer
{
/**
*
* 显示swagger-ui.html文档展示页,还必须注入swagger资源:
*
* @param registry
...
...
@@ -89,8 +86,10 @@ public class Swagger2Config implements WebMvcConfigurer {
SecurityScheme
securityScheme
()
{
return
new
ApiKey
(
CommonConstant
.
X_ACCESS_TOKEN
,
CommonConstant
.
X_ACCESS_TOKEN
,
"header"
);
}
/**
* JWT token
*
* @return
*/
private
List
<
Parameter
>
setHeaderToken
()
{
...
...
@@ -115,7 +114,7 @@ public class Swagger2Config implements WebMvcConfigurer {
// 描述
.
description
(
"后台API接口"
)
// 作者
.
contact
(
new
Contact
(
" "
,
" "
,
" "
))
.
contact
(
new
Contact
(
" "
,
" "
,
" "
))
.
license
(
"The Apache License, Version 2.0"
)
.
licenseUrl
(
"http://www.apache.org/licenses/LICENSE-2.0.html"
)
.
build
();
...
...
@@ -143,6 +142,7 @@ public class Swagger2Config implements WebMvcConfigurer {
/**
* 解决springboot2.6 和springfox不兼容问题
*
* @return
*/
@Bean
...
...
@@ -151,7 +151,7 @@ public class Swagger2Config implements WebMvcConfigurer {
@Override
public
Object
postProcessAfterInitialization
(
Object
bean
,
String
beanName
)
throws
BeansException
{
if
(
bean
instanceof
WebMvcRequestHandlerProvider
||
bean
instanceof
WebFluxRequestHandlerProvider
)
{
if
(
bean
instanceof
WebMvcRequestHandlerProvider
)
{
customizeSpringfoxHandlerMappings
(
getHandlerMappings
(
bean
));
}
return
bean
;
...
...
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View file @
ec9df5b9
This diff is collapsed.
Click to expand it.
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/entity/SectionStationMap.java
deleted
100644 → 0
View file @
5f2bd8be
package
org
.
jeecg
.
modules
.
subwayNetwork
.
entity
;
import
java.io.Serializable
;
import
java.io.UnsupportedEncodingException
;
import
java.util.Date
;
import
java.math.BigDecimal
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableLogic
;
import
lombok.Data
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.jeecgframework.poi.excel.annotation.Excel
;
import
org.jeecg.common.aspect.annotation.Dict
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
/**
* @Description: 线路车站-区间站点映射
* @Author: jeecg-boot
* @Date: 2023-06-15
* @Version: V1.0
*/
@Data
@TableName
(
"t_sn_section_station_map"
)
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
false
)
@ApiModel
(
value
=
"t_sn_section_station_map对象"
,
description
=
"线路车站-区间站点映射"
)
public
class
SectionStationMap
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**主键*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ApiModelProperty
(
value
=
"主键"
)
private
java
.
lang
.
String
id
;
/**创建人*/
@ApiModelProperty
(
value
=
"创建人"
)
private
java
.
lang
.
String
createBy
;
/**创建日期*/
@JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"创建日期"
)
private
java
.
util
.
Date
createTime
;
/**更新人*/
@ApiModelProperty
(
value
=
"更新人"
)
private
java
.
lang
.
String
updateBy
;
/**更新日期*/
@JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
value
=
"更新日期"
)
private
java
.
util
.
Date
updateTime
;
/**区间id*/
@Excel
(
name
=
"区间id"
,
width
=
15
)
@ApiModelProperty
(
value
=
"区间id"
)
private
java
.
lang
.
String
sectionId
;
/**车站id*/
@Excel
(
name
=
"车站id"
,
width
=
15
)
@ApiModelProperty
(
value
=
"车站id"
)
private
java
.
lang
.
String
stationId
;
}
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/service/impl/LightRailServiceImpl.java
View file @
ec9df5b9
...
...
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
org.jeecg.common.api.dto.PageSearch
;
import
org.jeecg.modules.subwayNetwork.dto.LightRailQueryDTO
;
import
org.jeecg.modules.subwayNetwork.entity.LightRail
;
import
org.jeecg.modules.subwayNetwork.entity.SectionStationMap
;
import
org.jeecg.modules.subwayNetwork.mapper.LightRailMapper
;
import
org.jeecg.modules.subwayNetwork.service.ILightRailService
;
import
org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO
;
...
...
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View file @
ec9df5b9
This diff is collapsed.
Click to expand it.
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
View file @
ec9df5b9
This diff is collapsed.
Click to expand it.
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View file @
ec9df5b9
This diff is collapsed.
Click to expand it.
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
View file @
ec9df5b9
...
...
@@ -156,6 +156,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
result
.
setSuccess
(
true
);
result
.
setResult
(
pageList
);
result
.
setCode
(
200
);
//log.info(pageList.toString());
return
result
;
}
...
...
pom.xml
View file @
ec9df5b9
...
...
@@ -28,8 +28,10 @@
<xxl-job-core.version>
2.2.0
</xxl-job-core.version>
<fastjson.version>
1.2.83
</fastjson.version>
<pegdown.version>
1.6.0
</pegdown.version>
<knife4j-spring-boot-starter.version>
3.0.3
</knife4j-spring-boot-starter.version>
<knife4j-spring-ui.version>
2.0.9
</knife4j-spring-ui.version>
<knife4j-spring-boot-starter.version>
2.0.2
</knife4j-spring-boot-starter.version>
<knife4j-spring-ui.version>
2.0.2
</knife4j-spring-ui.version>
<!-- <knife4j-spring-ui.version>2.0.9</knife4j-spring-ui.version>
<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>-->
<!-- 数据库驱动 -->
<postgresql.version>
42.2.25
</postgresql.version>
<ojdbc6.version>
11.2.0.3
</ojdbc6.version>
...
...
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