Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
cee572f2
Commit
cee572f2
authored
Jul 19, 2020
by
RuoYi
Browse files
若依 3.0
parent
0d341f1a
Changes
279
Hide whitespace changes
Inline
Side-by-side
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysMenuController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysMenuController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping;
...
@@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.Constants
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysMenu
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.framework.web.service.TokenService
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.system.service.ISysMenuService
;
import
com.ruoyi.framework.security.LoginUser
;
import
com.ruoyi.framework.security.service.TokenService
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.project.system.domain.SysMenu
;
import
com.ruoyi.project.system.service.ISysMenuService
;
/**
/**
* 菜单信息
* 菜单信息
...
...
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysNoticeController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysNoticeController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping;
...
@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.system.domain.SysNotice
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.system.service.ISysNoticeService
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.framework.web.page.TableDataInfo
;
import
com.ruoyi.project.system.domain.SysNotice
;
import
com.ruoyi.project.system.service.ISysNoticeService
;
/**
/**
* 公告 信息操作处理
* 公告 信息操作处理
...
...
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysPostController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysPostController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
...
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.system.domain.SysPost
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.system.service.ISysPostService
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.framework.web.page.TableDataInfo
;
import
com.ruoyi.project.system.domain.SysPost
;
import
com.ruoyi.project.system.service.ISysPostService
;
/**
/**
* 岗位信息操作处理
* 岗位信息操作处理
...
...
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysProfileController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysProfileController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.io.IOException
;
import
java.io.IOException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.config.RuoYiConfig
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.file.FileUploadUtils
;
import
com.ruoyi.common.utils.file.FileUploadUtils
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.framework.web.service.TokenService
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.system.service.ISysUserService
;
import
com.ruoyi.framework.config.RuoYiConfig
;
import
com.ruoyi.framework.security.LoginUser
;
import
com.ruoyi.framework.security.service.TokenService
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.project.system.domain.SysUser
;
import
com.ruoyi.project.system.service.ISysUserService
;
/**
/**
* 个人信息 业务处理
* 个人信息 业务处理
...
...
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysRoleController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysRoleController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
...
@@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysRole
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.system.service.ISysRoleService
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.framework.web.page.TableDataInfo
;
import
com.ruoyi.project.system.domain.SysRole
;
import
com.ruoyi.project.system.service.ISysRoleService
;
/**
/**
* 角色信息
* 角色信息
...
@@ -151,4 +151,4 @@ public class SysRoleController extends BaseController
...
@@ -151,4 +151,4 @@ public class SysRoleController extends BaseController
{
{
return
AjaxResult
.
success
(
roleService
.
selectRoleAll
());
return
AjaxResult
.
success
(
roleService
.
selectRoleAll
());
}
}
}
}
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/
project/system
/controller/SysUserController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web
/controller/
system/
SysUserController.java
View file @
cee572f2
package
com.ruoyi.
project.system
.controller
;
package
com.ruoyi.
web
.controller
.system
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RequestBody;
...
@@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.constant.UserConstants
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysRole
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.framework.aspectj.lang.annotation.Log
;
import
com.ruoyi.framework.web.service.TokenService
;
import
com.ruoyi.framework.aspectj.lang.enums.BusinessType
;
import
com.ruoyi.system.service.ISysPostService
;
import
com.ruoyi.framework.security.LoginUser
;
import
com.ruoyi.system.service.ISysRoleService
;
import
com.ruoyi.framework.security.service.TokenService
;
import
com.ruoyi.system.service.ISysUserService
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
com.ruoyi.framework.web.page.TableDataInfo
;
import
com.ruoyi.project.system.domain.SysRole
;
import
com.ruoyi.project.system.domain.SysUser
;
import
com.ruoyi.project.system.service.ISysPostService
;
import
com.ruoyi.project.system.service.ISysRoleService
;
import
com.ruoyi.project.system.service.ISysUserService
;
/**
/**
* 用户信息
* 用户信息
...
@@ -198,4 +198,4 @@ public class SysUserController extends BaseController
...
@@ -198,4 +198,4 @@ public class SysUserController extends BaseController
user
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
user
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
return
toAjax
(
userService
.
updateUserStatus
(
user
));
return
toAjax
(
userService
.
updateUserStatus
(
user
));
}
}
}
}
\ No newline at end of file
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
0 → 100644
View file @
cee572f2
package
com.ruoyi.web.controller.tool
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
com.ruoyi.common.core.controller.BaseController
;
/**
* swagger 接口
*
* @author ruoyi
*/
@Controller
@RequestMapping
(
"/tool/swagger"
)
public
class
SwaggerController
extends
BaseController
{
@PreAuthorize
(
"@ss.hasPermi('tool:swagger:view')"
)
@GetMapping
()
public
String
index
()
{
return
redirect
(
"/swagger-ui.html"
);
}
}
ruoyi/src/main/java/com/ruoyi/
project/tool/swagger
/TestController.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web/controller/tool
/TestController.java
View file @
cee572f2
package
com.ruoyi.
project.tool.swagger
;
package
com.ruoyi.
web.controller.tool
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
...
@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
...
@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.framework.web.controller.BaseController
;
import
com.ruoyi.framework.web.domain.AjaxResult
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
...
...
ruoyi/src/main/java/com/ruoyi/
framew
or
k
/config/SwaggerConfig.java
→
ruoyi
-admin
/src/main/java/com/ruoyi/
web/c
or
e
/config/SwaggerConfig.java
View file @
cee572f2
package
com.ruoyi.
framew
or
k
.config
;
package
com.ruoyi.
web.c
or
e
.config
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
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
com.ruoyi.common.config.RuoYiConfig
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
springfox.documentation.builders.ApiInfoBuilder
;
import
springfox.documentation.builders.ApiInfoBuilder
;
import
springfox.documentation.builders.PathSelectors
;
import
springfox.documentation.builders.PathSelectors
;
...
...
ruoyi/src/main/resources/META-INF/spring-devtools.properties
→
ruoyi
-admin
/src/main/resources/META-INF/spring-devtools.properties
View file @
cee572f2
File moved
ruoyi/src/main/resources/application-druid.yml
→
ruoyi
-admin
/src/main/resources/application-druid.yml
View file @
cee572f2
File moved
ruoyi/src/main/resources/application.yml
→
ruoyi
-admin
/src/main/resources/application.yml
View file @
cee572f2
...
@@ -3,7 +3,7 @@ ruoyi:
...
@@ -3,7 +3,7 @@ ruoyi:
# 名称
# 名称
name
:
RuoYi
name
:
RuoYi
# 版本
# 版本
version
:
2.3
.0
version
:
3.0
.0
# 版权年份
# 版权年份
copyrightYear
:
2019
copyrightYear
:
2019
# 实例演示开关
# 实例演示开关
...
@@ -87,9 +87,9 @@ token:
...
@@ -87,9 +87,9 @@ token:
# MyBatis配置
# MyBatis配置
mybatis
:
mybatis
:
# 搜索指定包别名
# 搜索指定包别名
typeAliasesPackage
:
com.ruoyi.
project.
**.domain
typeAliasesPackage
:
com.ruoyi.**.domain
# 配置mapper的扫描,找到所有的mapper.xml映射文件
# 配置mapper的扫描,找到所有的mapper.xml映射文件
mapperLocations
:
classpath*:m
ybatis
/**/*Mapper.xml
mapperLocations
:
classpath*:m
apper
/**/*Mapper.xml
# 加载全局的配置文件
# 加载全局的配置文件
configLocation
:
classpath:mybatis/mybatis-config.xml
configLocation
:
classpath:mybatis/mybatis-config.xml
...
@@ -115,14 +115,3 @@ xss:
...
@@ -115,14 +115,3 @@ xss:
excludes
:
/system/notice/*
excludes
:
/system/notice/*
# 匹配链接
# 匹配链接
urlPatterns
:
/system/*,/monitor/*,/tool/*
urlPatterns
:
/system/*,/monitor/*,/tool/*
# 代码生成
gen
:
# 作者
author
:
ruoyi
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName
:
com.ruoyi.project.system
# 自动去除表前缀,默认是true
autoRemovePre
:
false
# 表前缀(生成类名不会包含表前缀,多个用逗号分隔)
tablePrefix
:
sys_
\ No newline at end of file
ruoyi/src/main/resources/banner.txt
→
ruoyi
-admin
/src/main/resources/banner.txt
View file @
cee572f2
File moved
ruoyi/src/main/resources/i18n/messages.properties
→
ruoyi
-admin
/src/main/resources/i18n/messages.properties
View file @
cee572f2
File moved
ruoyi/src/main/resources/logback.xml
→
ruoyi
-admin
/src/main/resources/logback.xml
View file @
cee572f2
File moved
ruoyi/src/main/resources/mybatis/mybatis-config.xml
→
ruoyi
-admin
/src/main/resources/mybatis/mybatis-config.xml
View file @
cee572f2
File moved
ruoyi-common/pom.xml
0 → 100644
View file @
cee572f2
<?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"
>
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
3.0.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
ruoyi-common
</artifactId>
<description>
common通用工具
</description>
<dependencies>
<!-- Spring框架基本的核心工具 -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context-support
</artifactId>
</dependency>
<!-- SpringWeb模块 -->
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-web
</artifactId>
</dependency>
<!-- spring security 安全认证 -->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-security
</artifactId>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>
com.github.pagehelper
</groupId>
<artifactId>
pagehelper-spring-boot-starter
</artifactId>
</dependency>
<!-- 自定义验证注解 -->
<dependency>
<groupId>
javax.validation
</groupId>
<artifactId>
validation-api
</artifactId>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-lang3
</artifactId>
</dependency>
<!-- JSON工具类 -->
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>
commons-io
</groupId>
<artifactId>
commons-io
</artifactId>
</dependency>
<!-- 文件上传工具类 -->
<dependency>
<groupId>
commons-fileupload
</groupId>
<artifactId>
commons-fileupload
</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
</dependency>
<!-- yml解析器 -->
<dependency>
<groupId>
org.yaml
</groupId>
<artifactId>
snakeyaml
</artifactId>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>
io.jsonwebtoken
</groupId>
<artifactId>
jjwt
</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-redis
</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-pool2
</artifactId>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>
eu.bitwalker
</groupId>
<artifactId>
UserAgentUtils
</artifactId>
</dependency>
<!-- servlet包 -->
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/
framework/aspectj/lang
/annotation/DataScope.java
→
ruoyi
-common
/src/main/java/com/ruoyi/
common
/annotation/DataScope.java
View file @
cee572f2
package
com.ruoyi.
framework.aspectj.lang
.annotation
;
package
com.ruoyi.
common
.annotation
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.ElementType
;
...
...
ruoyi/src/main/java/com/ruoyi/
framework/aspectj/lang
/annotation/DataSource.java
→
ruoyi
-common
/src/main/java/com/ruoyi/
common
/annotation/DataSource.java
View file @
cee572f2
package
com.ruoyi.
framework.aspectj.lang
.annotation
;
package
com.ruoyi.
common
.annotation
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.ElementType
;
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Inherited;
...
@@ -6,7 +6,7 @@ import java.lang.annotation.Inherited;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
java.lang.annotation.Target
;
import
com.ruoyi.
framework.aspectj.lang
.enums.DataSourceType
;
import
com.ruoyi.
common
.enums.DataSourceType
;
/**
/**
* 自定义多数据源切换注解
* 自定义多数据源切换注解
...
...
ruoyi/src/main/java/com/ruoyi/
framework/aspectj/lang
/annotation/Excel.java
→
ruoyi
-common
/src/main/java/com/ruoyi/
common
/annotation/Excel.java
View file @
cee572f2
package
com.ruoyi.framework.aspectj.lang.annotation
;
package
com.ruoyi.common.annotation
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
java.lang.annotation.Target
;
/**
/**
* 自定义导出Excel数据注解
* 自定义导出Excel数据注解
*
*
* @author ruoyi
* @author ruoyi
*/
*/
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Target
(
ElementType
.
FIELD
)
@Target
(
ElementType
.
FIELD
)
public
@interface
Excel
public
@interface
Excel
{
{
/**
/**
* 导出时在excel中排序
* 导出时在excel中排序
*/
*/
public
int
sort
()
default
Integer
.
MAX_VALUE
;
public
int
sort
()
default
Integer
.
MAX_VALUE
;
/**
/**
* 导出到Excel中的名字.
* 导出到Excel中的名字.
*/
*/
public
String
name
()
default
""
;
public
String
name
()
default
""
;
/**
/**
* 日期格式, 如: yyyy-MM-dd
* 日期格式, 如: yyyy-MM-dd
*/
*/
public
String
dateFormat
()
default
""
;
public
String
dateFormat
()
default
""
;
/**
/**
* 读取内容转表达式 (如: 0=男,1=女,2=未知)
* 读取内容转表达式 (如: 0=男,1=女,2=未知)
*/
*/
public
String
readConverterExp
()
default
""
;
public
String
readConverterExp
()
default
""
;
/**
/**
* 导出类型(0数字 1字符串)
* 导出类型(0数字 1字符串)
*/
*/
public
ColumnType
cellType
()
default
ColumnType
.
STRING
;
public
ColumnType
cellType
()
default
ColumnType
.
STRING
;
/**
/**
* 导出时在excel中每个列的高度 单位为字符
* 导出时在excel中每个列的高度 单位为字符
*/
*/
public
double
height
()
default
14
;
public
double
height
()
default
14
;
/**
/**
* 导出时在excel中每个列的宽 单位为字符
* 导出时在excel中每个列的宽 单位为字符
*/
*/
public
double
width
()
default
16
;
public
double
width
()
default
16
;
/**
/**
* 文字后缀,如% 90 变成90%
* 文字后缀,如% 90 变成90%
*/
*/
public
String
suffix
()
default
""
;
public
String
suffix
()
default
""
;
/**
/**
* 当值为空时,字段的默认值
* 当值为空时,字段的默认值
*/
*/
public
String
defaultValue
()
default
""
;
public
String
defaultValue
()
default
""
;
/**
/**
* 提示信息
* 提示信息
*/
*/
public
String
prompt
()
default
""
;
public
String
prompt
()
default
""
;
/**
/**
* 设置只能选择不能输入的列内容.
* 设置只能选择不能输入的列内容.
*/
*/
public
String
[]
combo
()
default
{};
public
String
[]
combo
()
default
{};
/**
/**
* 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
* 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
*/
*/
public
boolean
isExport
()
default
true
;
public
boolean
isExport
()
default
true
;
/**
/**
* 另一个类中的属性名称,支持多级获取,以小数点隔开
* 另一个类中的属性名称,支持多级获取,以小数点隔开
*/
*/
public
String
targetAttr
()
default
""
;
public
String
targetAttr
()
default
""
;
/**
/**
* 字段类型(0:导出导入;1:仅导出;2:仅导入)
* 字段类型(0:导出导入;1:仅导出;2:仅导入)
*/
*/
Type
type
()
default
Type
.
ALL
;
Type
type
()
default
Type
.
ALL
;
public
enum
Type
public
enum
Type
{
{
ALL
(
0
),
EXPORT
(
1
),
IMPORT
(
2
);
ALL
(
0
),
EXPORT
(
1
),
IMPORT
(
2
);
private
final
int
value
;
private
final
int
value
;
Type
(
int
value
)
Type
(
int
value
)
{
{
this
.
value
=
value
;
this
.
value
=
value
;
}
}
public
int
value
()
public
int
value
()
{
{
return
this
.
value
;
return
this
.
value
;
}
}
}
}
public
enum
ColumnType
public
enum
ColumnType
{
{
NUMERIC
(
0
),
STRING
(
1
);
NUMERIC
(
0
),
STRING
(
1
);
private
final
int
value
;
private
final
int
value
;
ColumnType
(
int
value
)
ColumnType
(
int
value
)
{
{
this
.
value
=
value
;
this
.
value
=
value
;
}
}
public
int
value
()
public
int
value
()
{
{
return
this
.
value
;
return
this
.
value
;
}
}
}
}
}
}
\ No newline at end of file
Prev
1
2
3
4
5
6
…
14
Next
Write
Preview
Supports
Markdown
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