From 8590412ed7538a0a132e126abca8bfd978e09e9c Mon Sep 17 00:00:00 2001 From: zwzw1219 Date: Sun, 15 Oct 2017 18:33:49 +0800 Subject: [PATCH] 1 --- .../server/advice/ExceptionHandlerAdvice.java | 13 -------- .../security/server/advice/LogAdvice.java | 2 ++ .../server/controller/ExcelController.java | 10 +++---- .../server/controller/FileController.java | 28 ++++++++--------- .../server/controller/GenerateController.java | 16 +++++----- .../server/controller/JobController.java | 30 +++++++++---------- .../server/controller/RoleController.java | 25 ++++++++-------- .../boot/security/server/dao/FileInfoDao.java | 2 +- .../com/boot/security/server/dao/JobDao.java | 2 +- .../com/boot/security/server/dao/MailDao.java | 4 +-- .../boot/security/server/dao/NoticeDao.java | 8 ++--- .../security/server/dao/PermissionDao.java | 2 +- .../com/boot/security/server/dao/RoleDao.java | 2 +- .../boot/security/server/dao/SysLogsDao.java | 2 +- .../com/boot/security/server/dao/UserDao.java | 12 ++++---- .../security/server/job/SpringBeanJob.java | 1 + .../security/server/service/UserService.java | 12 ++++---- .../server/service/impl/FileServiceImpl.java | 8 ++--- .../service/impl/GenerateServiceImpl.java | 10 +++---- .../server/service/impl/JobServiceImpl.java | 8 ++--- .../server/service/impl/MailServiceImpl.java | 10 +++---- .../service/impl/PermissionServiceImpl.java | 6 ++-- .../server/service/impl/RoleServiceImpl.java | 8 ++--- .../service/impl/SendMailSeviceImpl.java | 2 +- 24 files changed, 105 insertions(+), 118 deletions(-) diff --git a/src/main/java/com/boot/security/server/advice/ExceptionHandlerAdvice.java b/src/main/java/com/boot/security/server/advice/ExceptionHandlerAdvice.java index 9ad2d20..8810472 100644 --- a/src/main/java/com/boot/security/server/advice/ExceptionHandlerAdvice.java +++ b/src/main/java/com/boot/security/server/advice/ExceptionHandlerAdvice.java @@ -29,19 +29,6 @@ public class ExceptionHandlerAdvice { return ResponseInfo.builder().code(HttpStatus.BAD_REQUEST.value() + "").message(exception.getMessage()).build(); } - @ExceptionHandler({ UnknownAccountException.class, IncorrectCredentialsException.class }) - @ResponseStatus(HttpStatus.UNAUTHORIZED) - public ResponseInfo loginException(Exception exception) { - return ResponseInfo.builder().code(HttpStatus.UNAUTHORIZED.value() + "").message(exception.getMessage()) - .build(); - } - - @ExceptionHandler({ UnauthorizedException.class }) - @ResponseStatus(HttpStatus.FORBIDDEN) - public ResponseInfo forbidden(Exception exception) { - return ResponseInfo.builder().code(HttpStatus.FORBIDDEN.value() + "").message(exception.getMessage()).build(); - } - @ExceptionHandler({ MissingServletRequestParameterException.class, HttpMessageNotReadableException.class, UnsatisfiedServletRequestParameterException.class, MethodArgumentTypeMismatchException.class }) @ResponseStatus(HttpStatus.BAD_REQUEST) diff --git a/src/main/java/com/boot/security/server/advice/LogAdvice.java b/src/main/java/com/boot/security/server/advice/LogAdvice.java index 6ab43a5..100d759 100644 --- a/src/main/java/com/boot/security/server/advice/LogAdvice.java +++ b/src/main/java/com/boot/security/server/advice/LogAdvice.java @@ -9,6 +9,8 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.model.SysLogs; +import com.boot.security.server.service.SysLogService; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/boot/security/server/controller/ExcelController.java b/src/main/java/com/boot/security/server/controller/ExcelController.java index f9dd311..de22ae6 100644 --- a/src/main/java/com/boot/security/server/controller/ExcelController.java +++ b/src/main/java/com/boot/security/server/controller/ExcelController.java @@ -8,16 +8,16 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.zw.admin.server.annotation.LogAnnotation; -import com.zw.admin.server.utils.ExcelUtil; +import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.utils.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,7 +59,7 @@ public class ExcelController { @LogAnnotation @ApiOperation("根据sql导出excel") @PostMapping - @RequiresPermissions("excel:down") + @PreAuthorize("hasAuthority('excel:down')") public void downloadExcel(String sql, String fileName, HttpServletResponse response) { sql = getAndCheckSql(sql); List> list = jdbcTemplate.queryForList(sql); @@ -92,7 +92,7 @@ public class ExcelController { @LogAnnotation @ApiOperation("根据sql在页面显示结果") @PostMapping("/show-datas") - @RequiresPermissions("excel:show:datas") + @PreAuthorize("hasAuthority('excel:show:datas')") public List showData(String sql) { sql = getAndCheckSql(sql); List> list = jdbcTemplate.queryForList(sql); diff --git a/src/main/java/com/boot/security/server/controller/FileController.java b/src/main/java/com/boot/security/server/controller/FileController.java index 7820c52..ec00a79 100644 --- a/src/main/java/com/boot/security/server/controller/FileController.java +++ b/src/main/java/com/boot/security/server/controller/FileController.java @@ -3,8 +3,8 @@ package com.boot.security.server.controller; import java.io.IOException; import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.zw.admin.server.annotation.LogAnnotation; -import com.zw.admin.server.dao.FileInfoDao; -import com.zw.admin.server.dto.LayuiFile; -import com.zw.admin.server.dto.LayuiFile.LayuiFileData; -import com.zw.admin.server.model.FileInfo; -import com.zw.admin.server.page.table.PageTableRequest; -import com.zw.admin.server.page.table.PageTableHandler; -import com.zw.admin.server.page.table.PageTableResponse; -import com.zw.admin.server.page.table.PageTableHandler.CountHandler; -import com.zw.admin.server.page.table.PageTableHandler.ListHandler; -import com.zw.admin.server.service.FileService; +import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.dao.FileInfoDao; +import com.boot.security.server.dto.LayuiFile; +import com.boot.security.server.dto.LayuiFile.LayuiFileData; +import com.boot.security.server.model.FileInfo; +import com.boot.security.server.page.table.PageTableHandler; +import com.boot.security.server.page.table.PageTableHandler.CountHandler; +import com.boot.security.server.page.table.PageTableHandler.ListHandler; +import com.boot.security.server.page.table.PageTableRequest; +import com.boot.security.server.page.table.PageTableResponse; +import com.boot.security.server.service.FileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -71,7 +71,7 @@ public class FileController { @GetMapping @ApiOperation(value = "文件查询") - @RequiresPermissions("sys:file:query") + @PreAuthorize("hasAuthority('sys:file:query')") public PageTableResponse listFiles(PageTableRequest request) { return PageTableHandler. builder().countHandler(new CountHandler() { @@ -92,7 +92,7 @@ public class FileController { @LogAnnotation @DeleteMapping("/{id}") @ApiOperation(value = "文件删除") - @RequiresPermissions("sys:file:del") + @PreAuthorize("hasAuthority('sys:file:del')") public void delete(@PathVariable String id) { fileService.delete(id); } diff --git a/src/main/java/com/boot/security/server/controller/GenerateController.java b/src/main/java/com/boot/security/server/controller/GenerateController.java index 669115d..7c67a40 100644 --- a/src/main/java/com/boot/security/server/controller/GenerateController.java +++ b/src/main/java/com/boot/security/server/controller/GenerateController.java @@ -2,19 +2,19 @@ package com.boot.security.server.controller; import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.zw.admin.server.annotation.LogAnnotation; -import com.zw.admin.server.dto.BeanField; -import com.zw.admin.server.dto.GenerateDetail; -import com.zw.admin.server.dto.GenerateInput; -import com.zw.admin.server.service.GenerateService; +import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.dto.BeanField; +import com.boot.security.server.dto.GenerateDetail; +import com.boot.security.server.dto.GenerateInput; +import com.boot.security.server.service.GenerateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,7 +35,7 @@ public class GenerateController { @ApiOperation("根据表名显示表信息") @GetMapping(params = { "tableName" }) - @RequiresPermissions("generate:edit") + @PreAuthorize("hasAuthority('generate:edit')") public GenerateDetail generateByTableName(String tableName) { GenerateDetail detail = new GenerateDetail(); detail.setBeanName(generateService.upperFirstChar(tableName)); @@ -48,7 +48,7 @@ public class GenerateController { @LogAnnotation @ApiOperation("生成代码") @PostMapping - @RequiresPermissions("generate:edit") + @PreAuthorize("hasAuthority('generate:edit')") public void save(@RequestBody GenerateInput input) { generateService.saveCode(input); } diff --git a/src/main/java/com/boot/security/server/controller/JobController.java b/src/main/java/com/boot/security/server/controller/JobController.java index 1147f94..7930cf2 100644 --- a/src/main/java/com/boot/security/server/controller/JobController.java +++ b/src/main/java/com/boot/security/server/controller/JobController.java @@ -7,12 +7,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.quartz.CronExpression; import org.quartz.SchedulerException; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -23,15 +23,15 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.zw.admin.server.annotation.LogAnnotation; -import com.zw.admin.server.dao.JobDao; -import com.zw.admin.server.model.JobModel; -import com.zw.admin.server.page.table.PageTableHandler; -import com.zw.admin.server.page.table.PageTableHandler.CountHandler; -import com.zw.admin.server.page.table.PageTableHandler.ListHandler; -import com.zw.admin.server.page.table.PageTableRequest; -import com.zw.admin.server.page.table.PageTableResponse; -import com.zw.admin.server.service.JobService; +import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.dao.JobDao; +import com.boot.security.server.model.JobModel; +import com.boot.security.server.page.table.PageTableHandler; +import com.boot.security.server.page.table.PageTableHandler.CountHandler; +import com.boot.security.server.page.table.PageTableHandler.ListHandler; +import com.boot.security.server.page.table.PageTableRequest; +import com.boot.security.server.page.table.PageTableResponse; +import com.boot.security.server.service.JobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,7 +49,7 @@ public class JobController { @LogAnnotation @ApiOperation("添加定时任务") @PostMapping - @RequiresPermissions("job:add") + @PreAuthorize("hasAuthority('job:add')") public void add(@RequestBody JobModel jobModel) { JobModel model = jobDao.getByName(jobModel.getJobName()); if (model != null) { @@ -63,7 +63,7 @@ public class JobController { @LogAnnotation @ApiOperation("修改定时任务") @PutMapping - @RequiresPermissions("job:add") + @PreAuthorize("hasAuthority('job:add')") public void update(@RequestBody JobModel jobModel) { jobModel.setStatus(1); jobService.saveJob(jobModel); @@ -72,21 +72,21 @@ public class JobController { @LogAnnotation @ApiOperation("删除定时任务") @DeleteMapping("/{id}") - @RequiresPermissions("job:del") + @PreAuthorize("hasAuthority('job:del')") public void delete(@PathVariable Long id) throws SchedulerException { jobService.deleteJob(id); } @ApiOperation("根据id获取定时任务") @GetMapping("/{id}") - @RequiresPermissions("job:query") + @PreAuthorize("hasAuthority('job:query')") public JobModel getById(@PathVariable Long id) { return jobDao.getById(id); } @GetMapping @ApiOperation(value = "定时任务列表") - @RequiresPermissions("job:query") + @PreAuthorize("hasAuthority('job:query')") public PageTableResponse list(PageTableRequest request) { return PageTableHandler. builder().countHandler(new CountHandler() { diff --git a/src/main/java/com/boot/security/server/controller/RoleController.java b/src/main/java/com/boot/security/server/controller/RoleController.java index 0f9e9ed..e508cc5 100644 --- a/src/main/java/com/boot/security/server/controller/RoleController.java +++ b/src/main/java/com/boot/security/server/controller/RoleController.java @@ -2,9 +2,8 @@ package com.boot.security.server.controller; import java.util.List; -import org.apache.shiro.authz.annotation.Logical; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -13,17 +12,17 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.boot.security.server.annotation.LogAnnotation; +import com.boot.security.server.dao.RoleDao; +import com.boot.security.server.dto.RoleDto; +import com.boot.security.server.model.Role; +import com.boot.security.server.page.table.PageTableHandler; +import com.boot.security.server.page.table.PageTableHandler.CountHandler; +import com.boot.security.server.page.table.PageTableHandler.ListHandler; +import com.boot.security.server.page.table.PageTableRequest; +import com.boot.security.server.page.table.PageTableResponse; +import com.boot.security.server.service.RoleService; import com.google.common.collect.Maps; -import com.zw.admin.server.annotation.LogAnnotation; -import com.zw.admin.server.dao.RoleDao; -import com.zw.admin.server.dto.RoleDto; -import com.zw.admin.server.model.Role; -import com.zw.admin.server.page.table.PageTableRequest; -import com.zw.admin.server.page.table.PageTableHandler; -import com.zw.admin.server.page.table.PageTableResponse; -import com.zw.admin.server.page.table.PageTableHandler.CountHandler; -import com.zw.admin.server.page.table.PageTableHandler.ListHandler; -import com.zw.admin.server.service.RoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -81,7 +80,7 @@ public class RoleController { @GetMapping("/all") @ApiOperation(value = "所有角色") - @RequiresPermissions(value = { "sys:user:query", "sys:role:query" }, logical = Logical.OR) + @PreAuthorize("hasAnyAuthority('sys:user:query','sys:role:query')") public List roles() { return roleDao.list(Maps.newHashMap(), null, null); } diff --git a/src/main/java/com/boot/security/server/dao/FileInfoDao.java b/src/main/java/com/boot/security/server/dao/FileInfoDao.java index e685761..6bdfdf6 100644 --- a/src/main/java/com/boot/security/server/dao/FileInfoDao.java +++ b/src/main/java/com/boot/security/server/dao/FileInfoDao.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.zw.admin.server.model.FileInfo; +import com.boot.security.server.model.FileInfo; @Mapper public interface FileInfoDao { diff --git a/src/main/java/com/boot/security/server/dao/JobDao.java b/src/main/java/com/boot/security/server/dao/JobDao.java index 954687f..4ccc6a8 100644 --- a/src/main/java/com/boot/security/server/dao/JobDao.java +++ b/src/main/java/com/boot/security/server/dao/JobDao.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.zw.admin.server.model.JobModel; +import com.boot.security.server.model.JobModel; @Mapper public interface JobDao { diff --git a/src/main/java/com/boot/security/server/dao/MailDao.java b/src/main/java/com/boot/security/server/dao/MailDao.java index caff017..387bd69 100644 --- a/src/main/java/com/boot/security/server/dao/MailDao.java +++ b/src/main/java/com/boot/security/server/dao/MailDao.java @@ -9,8 +9,8 @@ import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.zw.admin.server.model.Mail; -import com.zw.admin.server.model.MailTo; +import com.boot.security.server.model.Mail; +import com.boot.security.server.model.MailTo; @Mapper public interface MailDao { diff --git a/src/main/java/com/boot/security/server/dao/NoticeDao.java b/src/main/java/com/boot/security/server/dao/NoticeDao.java index 0cb1ca2..43fa9ca 100644 --- a/src/main/java/com/boot/security/server/dao/NoticeDao.java +++ b/src/main/java/com/boot/security/server/dao/NoticeDao.java @@ -11,9 +11,9 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.zw.admin.server.dto.NoticeReadVO; -import com.zw.admin.server.model.Notice; -import com.zw.admin.server.model.User; +import com.boot.security.server.dto.NoticeReadVO; +import com.boot.security.server.model.Notice; +import com.boot.security.server.model.SysUser; @Mapper public interface NoticeDao { @@ -39,7 +39,7 @@ public interface NoticeDao { @Insert("insert ignore into t_notice_read(noticeId, userId, createTime) values(#{noticeId}, #{userId}, now())") int saveReadRecord(@Param("noticeId") Long noticeId, @Param("userId") Long userId); - List listReadUsers(Long noticeId); + List listReadUsers(Long noticeId); @Select("select count(1) from t_notice t left join t_notice_read r on r.noticeId = t.id and r.userId = #{userId} where t.status = 1 and r.userId is null") int countUnread(Long userId); diff --git a/src/main/java/com/boot/security/server/dao/PermissionDao.java b/src/main/java/com/boot/security/server/dao/PermissionDao.java index 3214b8f..d17b2e9 100644 --- a/src/main/java/com/boot/security/server/dao/PermissionDao.java +++ b/src/main/java/com/boot/security/server/dao/PermissionDao.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.zw.admin.server.model.Permission; +import com.boot.security.server.model.Permission; @Mapper public interface PermissionDao { diff --git a/src/main/java/com/boot/security/server/dao/RoleDao.java b/src/main/java/com/boot/security/server/dao/RoleDao.java index b48f016..9ac83a8 100644 --- a/src/main/java/com/boot/security/server/dao/RoleDao.java +++ b/src/main/java/com/boot/security/server/dao/RoleDao.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.zw.admin.server.model.Role; +import com.boot.security.server.model.Role; @Mapper public interface RoleDao { diff --git a/src/main/java/com/boot/security/server/dao/SysLogsDao.java b/src/main/java/com/boot/security/server/dao/SysLogsDao.java index 6fd627a..af98af0 100644 --- a/src/main/java/com/boot/security/server/dao/SysLogsDao.java +++ b/src/main/java/com/boot/security/server/dao/SysLogsDao.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.zw.admin.server.model.SysLogs; +import com.boot.security.server.model.SysLogs; @Mapper public interface SysLogsDao { diff --git a/src/main/java/com/boot/security/server/dao/UserDao.java b/src/main/java/com/boot/security/server/dao/UserDao.java index 2b24c27..4a28657 100644 --- a/src/main/java/com/boot/security/server/dao/UserDao.java +++ b/src/main/java/com/boot/security/server/dao/UserDao.java @@ -11,27 +11,27 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.zw.admin.server.model.User; +import com.boot.security.server.model.SysUser; @Mapper public interface UserDao { @Options(useGeneratedKeys = true, keyProperty = "id") @Insert("insert into sys_user(username, password, salt, nickname, headImgUrl, phone, telephone, email, birthday, sex, status, createTime, updateTime) values(#{username}, #{password}, #{salt}, #{nickname}, #{headImgUrl}, #{phone}, #{telephone}, #{email}, #{birthday}, #{sex}, #{status}, now(), now())") - int save(User user); + int save(SysUser user); @Select("select * from sys_user t where t.id = #{id}") - User getById(Long id); + SysUser getById(Long id); @Select("select * from sys_user t where t.username = #{username}") - User getUser(String username); + SysUser getUser(String username); @Update("update sys_user t set t.password = #{password} where t.id = #{id}") int changePassword(@Param("id") Long id, @Param("password") String password); Integer count(@Param("params") Map params); - List list(@Param("params") Map params, @Param("offset") Integer offset, + List list(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); @Delete("delete from sys_role_user where userId = #{userId}") @@ -39,5 +39,5 @@ public interface UserDao { int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List roleIds); - int update(User user); + int update(SysUser user); } diff --git a/src/main/java/com/boot/security/server/job/SpringBeanJob.java b/src/main/java/com/boot/security/server/job/SpringBeanJob.java index 8aece8c..e7538fd 100644 --- a/src/main/java/com/boot/security/server/job/SpringBeanJob.java +++ b/src/main/java/com/boot/security/server/job/SpringBeanJob.java @@ -7,6 +7,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.scheduling.quartz.QuartzJobBean; import com.boot.security.server.config.JobConfig; +import com.boot.security.server.service.JobService; public class SpringBeanJob extends QuartzJobBean { diff --git a/src/main/java/com/boot/security/server/service/UserService.java b/src/main/java/com/boot/security/server/service/UserService.java index 77b0406..1528d92 100644 --- a/src/main/java/com/boot/security/server/service/UserService.java +++ b/src/main/java/com/boot/security/server/service/UserService.java @@ -1,17 +1,15 @@ package com.boot.security.server.service; -import com.zw.admin.server.dto.UserDto; -import com.zw.admin.server.model.User; +import com.boot.security.server.dto.UserDto; +import com.boot.security.server.model.SysUser; public interface UserService { - User saveUser(UserDto userDto); - - User updateUser(UserDto userDto); + SysUser saveUser(UserDto userDto); - String passwordEncoder(String credentials, String salt); + SysUser updateUser(UserDto userDto); - User getUser(String username); + SysUser getUser(String username); void changePassword(String username, String oldPassword, String newPassword); diff --git a/src/main/java/com/boot/security/server/service/impl/FileServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/FileServiceImpl.java index a1327e9..5afcd9e 100644 --- a/src/main/java/com/boot/security/server/service/impl/FileServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/FileServiceImpl.java @@ -7,10 +7,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import com.zw.admin.server.dao.FileInfoDao; -import com.zw.admin.server.model.FileInfo; -import com.zw.admin.server.service.FileService; -import com.zw.admin.server.utils.FileUtil; +import com.boot.security.server.dao.FileInfoDao; +import com.boot.security.server.model.FileInfo; +import com.boot.security.server.service.FileService; +import com.boot.security.server.utils.FileUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/boot/security/server/service/impl/GenerateServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/GenerateServiceImpl.java index b4e77b0..50c8fe5 100644 --- a/src/main/java/com/boot/security/server/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/GenerateServiceImpl.java @@ -13,12 +13,12 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import com.boot.security.server.dto.BeanField; +import com.boot.security.server.dto.GenerateInput; +import com.boot.security.server.service.GenerateService; +import com.boot.security.server.utils.StrUtil; +import com.boot.security.server.utils.TemplateUtil; import com.google.common.collect.Maps; -import com.zw.admin.server.dto.BeanField; -import com.zw.admin.server.dto.GenerateInput; -import com.zw.admin.server.service.GenerateService; -import com.zw.admin.server.utils.StrUtil; -import com.zw.admin.server.utils.TemplateUtil; @Service public class GenerateServiceImpl implements GenerateService { diff --git a/src/main/java/com/boot/security/server/service/impl/JobServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/JobServiceImpl.java index 5b01b2b..1f5f6b6 100644 --- a/src/main/java/com/boot/security/server/service/impl/JobServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/JobServiceImpl.java @@ -20,10 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import com.zw.admin.server.dao.JobDao; -import com.zw.admin.server.job.SpringBeanJob; -import com.zw.admin.server.model.JobModel; -import com.zw.admin.server.service.JobService; +import com.boot.security.server.dao.JobDao; +import com.boot.security.server.job.SpringBeanJob; +import com.boot.security.server.model.JobModel; +import com.boot.security.server.service.JobService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/boot/security/server/service/impl/MailServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/MailServiceImpl.java index 0aff854..776ca05 100644 --- a/src/main/java/com/boot/security/server/service/impl/MailServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/MailServiceImpl.java @@ -6,11 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.zw.admin.server.dao.MailDao; -import com.zw.admin.server.model.Mail; -import com.zw.admin.server.service.MailService; -import com.zw.admin.server.service.SendMailSevice; -import com.zw.admin.server.utils.UserUtil; +import com.boot.security.server.dao.MailDao; +import com.boot.security.server.model.Mail; +import com.boot.security.server.service.MailService; +import com.boot.security.server.service.SendMailSevice; +import com.boot.security.server.utils.UserUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/boot/security/server/service/impl/PermissionServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/PermissionServiceImpl.java index 3c74dc5..0dfc78c 100644 --- a/src/main/java/com/boot/security/server/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/PermissionServiceImpl.java @@ -4,9 +4,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.zw.admin.server.dao.PermissionDao; -import com.zw.admin.server.model.Permission; -import com.zw.admin.server.service.PermissionService; +import com.boot.security.server.dao.PermissionDao; +import com.boot.security.server.model.Permission; +import com.boot.security.server.service.PermissionService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/boot/security/server/service/impl/RoleServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/RoleServiceImpl.java index a52a778..fe792be 100644 --- a/src/main/java/com/boot/security/server/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/RoleServiceImpl.java @@ -7,10 +7,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.zw.admin.server.dao.RoleDao; -import com.zw.admin.server.dto.RoleDto; -import com.zw.admin.server.model.Role; -import com.zw.admin.server.service.RoleService; +import com.boot.security.server.dao.RoleDao; +import com.boot.security.server.dto.RoleDto; +import com.boot.security.server.model.Role; +import com.boot.security.server.service.RoleService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/boot/security/server/service/impl/SendMailSeviceImpl.java b/src/main/java/com/boot/security/server/service/impl/SendMailSeviceImpl.java index d06d60e..3addb53 100644 --- a/src/main/java/com/boot/security/server/service/impl/SendMailSeviceImpl.java +++ b/src/main/java/com/boot/security/server/service/impl/SendMailSeviceImpl.java @@ -11,7 +11,7 @@ import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; -import com.zw.admin.server.service.SendMailSevice; +import com.boot.security.server.service.SendMailSevice; @Service public class SendMailSeviceImpl implements SendMailSevice {