From 0d7337079326b52ac8896a10fb0b0efbe6ca6bf2 Mon Sep 17 00:00:00 2001 From: zhao xinguo Date: Mon, 13 Dec 2021 16:29:43 +0800 Subject: [PATCH 1/3] update readme --- README.md | 2 +- .../org/micai/platform/auth/LogTests.java | 34 +++++++++++++++ src/test/resources/application.properties | 42 +++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/micai/platform/auth/LogTests.java create mode 100644 src/test/resources/application.properties diff --git a/README.md b/README.md index 1d63d9b..075c155 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 6、MySQL 5.1.30
### **接口访问地址**： -http://localhost:8080/swagger-ui.html +http://localhost:8080/doc.html ### **测试用户** 最高权限用户 用户名:root 密码:root diff --git a/src/test/java/org/micai/platform/auth/LogTests.java b/src/test/java/org/micai/platform/auth/LogTests.java new file mode 100644 index 0000000..c9d5418 --- /dev/null +++ b/src/test/java/org/micai/platform/auth/LogTests.java @@ -0,0 +1,34 @@ +package org.micai.platform.auth; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @Author zhaoxinguo + * @Date 2021-12-13 15:34 + * @ClassName LogTests + * @Description 日志输出测试类 + */ +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +public class LogTests { + + Logger logger = LoggerFactory.getLogger(Logger.class); + + @Test + public void contextLoad() { + // 可以调整日志级别、日志的输出会按照这个配置的级别及以上的级别生效 + // 日志级别从低到高分为:TRACE < DEBUG < INFO < WARN < ERROR < FATAL + logger.trace("这是trace日志......"); + logger.debug("这是debug日志......"); + logger.info("这是info日志......"); + logger.warn("这是warn日志......"); + logger.error("这是error日志......"); + } + + +} diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties new file mode 100644 index 0000000..c921663 --- /dev/null +++ b/src/test/resources/application.properties @@ -0,0 +1,42 @@ +# MySQL +spring.datasource.driverClassName=com.mysql.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true +spring.datasource.username=root +spring.datasource.password=root + +# JPA +#spring.jpa.hibernate.ddl-auto=update +#spring.jpa.show-sql=true +#spring.jackson.serialization.indent_output=true +spring.mvc.pathmatch.matching-strategy=ant_path_matcher + +# JWT Config +jwt.header=Authorization +jwt.secret=NDU0NTY4amhmc3NkeHp6eGNxdzIlMjFAJTIxQCUyM2ZmNQ== +jwt.expiration=7200000 + +#mybatis-plus +mybatis-plus.global-config.db-config.insert-strategy=not_empty +mybatis-plus.global-config.db-config.update-strategy=not_empty +mybatis-plus.global-config.db-config.where-strategy=not_empty +#mybatis-plus.mapper-locations= +mybatis-plus.global-config.db-config.id-type=auto +mybatis-plus.configuration.map-underscore-to-camel-case=true +mybatis-plus.global-config.db-config.table-prefix=tb_ +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl + +#log level config +logging.level.org.micai.platform.auto=warn +logging.level.org.springframework.web=debug +#logging.level.org.hibernate=error +logging.file.name=auth.log +logging.file.path=/opt/auth/logs + +site.location=${user.dir} +site.options.storage_max_width=800 +site.options.storage_limit_size=2 +site.options.thumbnail_channel_size=200x112 +site.options.thumbnail_post_size=360x200 + + + -- Gitee From 3bcbc469d6e8bdef5df02df1c8016b56d13a6058 Mon Sep 17 00:00:00 2001 From: zhao xinguo Date: Tue, 14 Dec 2021 09:39:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9B=86=E6=88=90=E7=83=AD=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=8F=92=E4=BB=B6=EF=BC=8C=E5=BC=80=E5=90=AF=E7=83=AD?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++++ src/main/resources/application.properties | 1 + 2 files changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 693c4dd..20e3007 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,11 @@ qiniu-java-sdk ${qiniu.sdk.version} + + org.springframework.boot + spring-boot-devtools + true + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5c69959..0eadc55 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -31,5 +31,6 @@ site.options.storage_limit_size=2 site.options.thumbnail_channel_size=200x112 site.options.thumbnail_post_size=360x200 +spring.devtools.restart.enabled=true -- Gitee From e23c8e8a55fd71c2affa3d1cc9d6b321d8c6b1e5 Mon Sep 17 00:00:00 2001 From: zhao xinguo Date: Fri, 31 Dec 2021 13:45:57 +0800 Subject: [PATCH 3/3] Merge branch 'develop' into feature/zhaoxinguo # Conflicts: # src/main/resources/application-dev.yml --- .../exception/DefaultException.java | 4 +- .../exception/GlobalExceptionHandler.java | 4 +- .../exception/PlatformException.java | 2 +- .../auth/{ => base}/result/Result.java | 2 +- .../auth/{ => base}/result/UploadResult.java | 2 +- .../base/storage/impl/AbstractStorage.java | 2 +- .../base/storage/impl/OssStorageImpl.java | 2 +- .../micai/platform/auth/bo/OrganDelBo.java | 10 ++ .../micai/platform/auth/bo/OrganFindBo.java | 31 ++++++ .../micai/platform/auth/bo/OrganSaveBo.java | 10 ++ .../micai/platform/auth/bo/OrganUpdateBo.java | 10 ++ .../UserQuery.java => bo/UserQueryBo.java} | 4 +- .../controller/JwtExceptionController.java | 2 +- .../auth/controller/OrganInfoController.java | 99 ++++++++++++++++++- .../auth/controller/PermissionController.java | 4 +- .../auth/controller/RoleController.java | 4 +- .../auth/controller/SysMenuController.java | 4 +- .../auth/controller/UploadController.java | 3 +- .../auth/controller/UserController.java | 4 +- .../micai/platform/auth/entity/OrganInfo.java | 2 +- .../auth/filter/JWTAuthenticationFilter.java | 2 +- .../platform/auth/filter/JWTLoginFilter.java | 12 +-- .../CustomAuthenticationProvider.java | 2 +- .../auth/service/OrganInfoService.java | 13 +++ .../service/impl/PermissionServiceImpl.java | 2 +- .../auth/service/impl/RoleServiceImpl.java | 2 +- .../auth/service/impl/SysMenuServiceImpl.java | 2 +- .../auth/service/impl/UserServiceImpl.java | 2 +- .../org/micai/platform/auth/utils/MD5.java | 2 +- .../micai/platform/auth/vo/OrganListVo.java | 46 +++++++++ 30 files changed, 250 insertions(+), 40 deletions(-) rename src/main/java/org/micai/platform/auth/{ => base}/exception/DefaultException.java (90%) rename src/main/java/org/micai/platform/auth/{ => base}/exception/GlobalExceptionHandler.java (94%) rename src/main/java/org/micai/platform/auth/{ => base}/exception/PlatformException.java (96%) rename src/main/java/org/micai/platform/auth/{ => base}/result/Result.java (94%) rename src/main/java/org/micai/platform/auth/{ => base}/result/UploadResult.java (94%) create mode 100644 src/main/java/org/micai/platform/auth/bo/OrganDelBo.java create mode 100644 src/main/java/org/micai/platform/auth/bo/OrganFindBo.java create mode 100644 src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java create mode 100644 src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java rename src/main/java/org/micai/platform/auth/{query/UserQuery.java => bo/UserQueryBo.java} (64%) create mode 100644 src/main/java/org/micai/platform/auth/vo/OrganListVo.java diff --git a/src/main/java/org/micai/platform/auth/exception/DefaultException.java b/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java similarity index 90% rename from src/main/java/org/micai/platform/auth/exception/DefaultException.java rename to src/main/java/org/micai/platform/auth/base/exception/DefaultException.java index 646de4a..2d70094 100644 --- a/src/main/java/org/micai/platform/auth/exception/DefaultException.java +++ b/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java @@ -1,8 +1,8 @@ -package org.micai.platform.auth.exception; +package org.micai.platform.auth.base.exception; import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.result.Result; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java b/src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java similarity index 94% rename from src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java rename to src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java index 8e2e3c7..80b8ac7 100644 --- a/src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java +++ b/src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package org.micai.platform.auth.exception; +package org.micai.platform.auth.base.exception; import lombok.extern.slf4j.Slf4j; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.result.Result; import org.springframework.dao.DuplicateKeyException; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/org/micai/platform/auth/exception/PlatformException.java b/src/main/java/org/micai/platform/auth/base/exception/PlatformException.java similarity index 96% rename from src/main/java/org/micai/platform/auth/exception/PlatformException.java rename to src/main/java/org/micai/platform/auth/base/exception/PlatformException.java index 2d59187..2e5c185 100644 --- a/src/main/java/org/micai/platform/auth/exception/PlatformException.java +++ b/src/main/java/org/micai/platform/auth/base/exception/PlatformException.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.exception; +package org.micai.platform.auth.base.exception; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/micai/platform/auth/result/Result.java b/src/main/java/org/micai/platform/auth/base/result/Result.java similarity index 94% rename from src/main/java/org/micai/platform/auth/result/Result.java rename to src/main/java/org/micai/platform/auth/base/result/Result.java index 02fa1b3..bebed90 100644 --- a/src/main/java/org/micai/platform/auth/result/Result.java +++ b/src/main/java/org/micai/platform/auth/base/result/Result.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.result; +package org.micai.platform.auth.base.result; import lombok.Data; import org.micai.platform.auth.constant.ConstantEnum; diff --git a/src/main/java/org/micai/platform/auth/result/UploadResult.java b/src/main/java/org/micai/platform/auth/base/result/UploadResult.java similarity index 94% rename from src/main/java/org/micai/platform/auth/result/UploadResult.java rename to src/main/java/org/micai/platform/auth/base/result/UploadResult.java index 3440c3b..2f5ed01 100644 --- a/src/main/java/org/micai/platform/auth/result/UploadResult.java +++ b/src/main/java/org/micai/platform/auth/base/result/UploadResult.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.result; +package org.micai.platform.auth.base.result; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java b/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java index 369c8a3..fec60bb 100644 --- a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java +++ b/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java @@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.base.storage.Storage; import org.micai.platform.auth.config.SiteOptions; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.utils.FileKit; import org.micai.platform.auth.utils.FilePathUtils; import org.micai.platform.auth.utils.ImageUtils; diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java index 0681603..b1a02bf 100644 --- a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java +++ b/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.micai.platform.auth.base.storage.Storage; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.utils.FileKit; import org.springframework.stereotype.Component; import java.io.ByteArrayInputStream; diff --git a/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java b/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java new file mode 100644 index 0000000..c29c515 --- /dev/null +++ b/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java @@ -0,0 +1,10 @@ +package org.micai.platform.auth.bo; + +/** + * @Author zhaoxinguo + * @Date 2021-12-31 13:39 + * @ClassName OrganDelBo + * @Description TODO + */ +public class OrganDelBo { +} diff --git a/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java b/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java new file mode 100644 index 0000000..02e27f3 --- /dev/null +++ b/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java @@ -0,0 +1,31 @@ +package org.micai.platform.auth.bo; + +import cn.hutool.db.Page; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author liuCong + * @Date 2021/12/29 15:35 + * @ClassName OrganFindBo + * @Description + */ +@Data +@ApiModel(value = "查询组织bo") +public class OrganFindBo extends Page implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "组织编码") + private String organCode; + + @ApiModelProperty(value = "组织名称") + private String organName; + + @ApiModelProperty(value = "状态: 01 启用 02停用") + private String status; + +} diff --git a/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java b/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java new file mode 100644 index 0000000..6c0a794 --- /dev/null +++ b/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java @@ -0,0 +1,10 @@ +package org.micai.platform.auth.bo; + +/** + * @Author zhaoxinguo + * @Date 2021-12-31 13:39 + * @ClassName OrganSaveBo + * @Description TODO + */ +public class OrganSaveBo { +} diff --git a/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java b/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java new file mode 100644 index 0000000..a715f9b --- /dev/null +++ b/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java @@ -0,0 +1,10 @@ +package org.micai.platform.auth.bo; + +/** + * @Author zhaoxinguo + * @Date 2021-12-31 13:39 + * @ClassName OrganUpdateBo + * @Description TODO + */ +public class OrganUpdateBo { +} diff --git a/src/main/java/org/micai/platform/auth/query/UserQuery.java b/src/main/java/org/micai/platform/auth/bo/UserQueryBo.java similarity index 64% rename from src/main/java/org/micai/platform/auth/query/UserQuery.java rename to src/main/java/org/micai/platform/auth/bo/UserQueryBo.java index deda7c2..052c8de 100644 --- a/src/main/java/org/micai/platform/auth/query/UserQuery.java +++ b/src/main/java/org/micai/platform/auth/bo/UserQueryBo.java @@ -1,9 +1,9 @@ -package org.micai.platform.auth.query; +package org.micai.platform.auth.bo; import lombok.Data; @Data -public class UserQuery { +public class UserQueryBo { private String username; private String password; diff --git a/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java b/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java index 2caf64a..bb5a61a 100644 --- a/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java +++ b/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java @@ -7,7 +7,7 @@ import io.jsonwebtoken.UnsupportedJwtException; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.result.Result; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java b/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java index 56a4283..1a1cd03 100644 --- a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java +++ b/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java @@ -1,9 +1,23 @@ package org.micai.platform.auth.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.micai.platform.auth.bo.*; +import org.micai.platform.auth.constant.ConstantEnum; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.base.result.Result; +import org.micai.platform.auth.service.OrganInfoService; +import org.micai.platform.auth.vo.OrganListVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +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 org.springframework.stereotype.Controller; +import javax.validation.Valid; /** *

@@ -13,9 +27,86 @@ import org.springframework.stereotype.Controller; * @author liucong * @since 2021-12-06 */ -@Controller -@RequestMapping("/Tb/organInfo") +@RestController +@RequestMapping("/organ") +@Api(tags = "组织管理", value = "组织管理") +@Slf4j public class OrganInfoController { + @Autowired + private OrganInfoService organInfoService; + + @ApiOperation(value = "获取组织列表", notes = "获取组织列表") + @PostMapping("/getOrganList") + @PreAuthorize("hasAnyAuthority('root')") + public Result getOrganList(@RequestBody OrganFindBo bo){ + Result result; + try { + Page page = organInfoService.getOrganList(bo); + result = new Result(ConstantEnum.SUCCESS,page); + } catch (PlatformException e) { + log.error("error info:",e); + result = new Result(e.getErrorCode(), e.getErrorMessage()); + } catch (Exception e) { + log.error("error info:",e); + result = new Result(ConstantEnum.FAIL); + } + return result; + } + + + @ApiOperation(value = "更新组织信息", notes = "更新组织信息") + @PostMapping("/updateOrgan") + @PreAuthorize("hasAnyAuthority('root')") + public Result updateOrgan(@RequestBody @Valid OrganUpdateBo bo){ + Result result; + try { + organInfoService.updateOrgan(bo); + result = new Result(ConstantEnum.SUCCESS); + } catch (PlatformException e) { + log.error("error info:",e); + result = new Result(e.getErrorCode(), e.getErrorMessage()); + } catch (Exception e) { + log.error("error info:",e); + result = new Result(ConstantEnum.FAIL); + } + return result; + } + + @ApiOperation(value = "新增组织", notes = "新增组织") + @PostMapping("/saveOrgan") + @PreAuthorize("hasAnyAuthority('root')") + public Result saveOrgan(@RequestBody @Valid OrganSaveBo bo){ + Result result; + try { + organInfoService.saveOrgan(bo); + result = new Result(ConstantEnum.SUCCESS); + } catch (PlatformException e) { + log.error("error info:",e); + result = new Result(e.getErrorCode(), e.getErrorMessage()); + } catch (Exception e) { + log.error("error info:",e); + result = new Result(ConstantEnum.FAIL); + } + return result; + } + + @ApiOperation(value = "删除组织", notes = "删除组织") + @PostMapping("/delOrgan") + @PreAuthorize("hasAnyAuthority('root')") + public Result delOrgan(@RequestBody @Valid OrganDelBo bo){ + Result result; + try { + organInfoService.delOrgan(bo); + result = new Result(ConstantEnum.SUCCESS); + } catch (PlatformException e) { + log.error("error info:",e); + result = new Result(e.getErrorCode(), e.getErrorMessage()); + } catch (Exception e) { + log.error("error info:",e); + result = new Result(ConstantEnum.FAIL); + } + return result; + } } diff --git a/src/main/java/org/micai/platform/auth/controller/PermissionController.java b/src/main/java/org/micai/platform/auth/controller/PermissionController.java index 70fbb5f..4fc5cea 100644 --- a/src/main/java/org/micai/platform/auth/controller/PermissionController.java +++ b/src/main/java/org/micai/platform/auth/controller/PermissionController.java @@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.PermissionFindBo; import org.micai.platform.auth.bo.PermissionSaveBo; import org.micai.platform.auth.bo.PermissionUpdateBo; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.base.result.Result; import org.micai.platform.auth.service.PermissionService; import org.micai.platform.auth.vo.RoleListVo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/micai/platform/auth/controller/RoleController.java b/src/main/java/org/micai/platform/auth/controller/RoleController.java index 06c0cef..9118018 100644 --- a/src/main/java/org/micai/platform/auth/controller/RoleController.java +++ b/src/main/java/org/micai/platform/auth/controller/RoleController.java @@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.RoleFindBo; import org.micai.platform.auth.bo.RoleSaveBo; import org.micai.platform.auth.bo.RoleUpdateBo; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.base.result.Result; import org.micai.platform.auth.service.RoleService; import org.micai.platform.auth.vo.UserListVo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java b/src/main/java/org/micai/platform/auth/controller/SysMenuController.java index 7827620..b769d3c 100644 --- a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java +++ b/src/main/java/org/micai/platform/auth/controller/SysMenuController.java @@ -9,8 +9,8 @@ import org.micai.platform.auth.bo.MenuDelBo; import org.micai.platform.auth.bo.MenuSaveBo; import org.micai.platform.auth.bo.MenuUpdateBo; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.base.result.Result; import org.micai.platform.auth.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/org/micai/platform/auth/controller/UploadController.java b/src/main/java/org/micai/platform/auth/controller/UploadController.java index 7bfe958..cc6ff85 100644 --- a/src/main/java/org/micai/platform/auth/controller/UploadController.java +++ b/src/main/java/org/micai/platform/auth/controller/UploadController.java @@ -5,8 +5,7 @@ import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.constant.ConstantCode; -import org.micai.platform.auth.result.UploadResult; +import org.micai.platform.auth.base.result.UploadResult; import org.micai.platform.auth.utils.FileKit; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/src/main/java/org/micai/platform/auth/controller/UserController.java b/src/main/java/org/micai/platform/auth/controller/UserController.java index 1f0cd3a..92b720f 100644 --- a/src/main/java/org/micai/platform/auth/controller/UserController.java +++ b/src/main/java/org/micai/platform/auth/controller/UserController.java @@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.UserSaveBo; import org.micai.platform.auth.bo.UserUpdateBo; import org.micai.platform.auth.constant.ConstantEnum; import org.micai.platform.auth.entity.User; -import org.micai.platform.auth.exception.PlatformException; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.base.result.Result; import org.micai.platform.auth.vo.UserListVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java b/src/main/java/org/micai/platform/auth/entity/OrganInfo.java index 2768cae..9064c21 100644 --- a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java +++ b/src/main/java/org/micai/platform/auth/entity/OrganInfo.java @@ -27,7 +27,7 @@ public class OrganInfo implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty(value = "机构编码") diff --git a/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java b/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java index 1243c55..d9870e5 100644 --- a/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java +++ b/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java @@ -6,7 +6,7 @@ import io.jsonwebtoken.*; import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.service.GrantedAuthorityImpl; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java b/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java index f6a8227..1e986b5 100644 --- a/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java +++ b/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java @@ -7,9 +7,9 @@ import io.jsonwebtoken.SignatureAlgorithm; import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; -import org.micai.platform.auth.exception.PlatformException; -import org.micai.platform.auth.query.UserQuery; -import org.micai.platform.auth.result.Result; +import org.micai.platform.auth.base.exception.PlatformException; +import org.micai.platform.auth.bo.UserQueryBo; +import org.micai.platform.auth.base.result.Result; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -56,11 +56,11 @@ public class JWTLoginFilter extends UsernamePasswordAuthenticationFilter { public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res) throws AuthenticationException { Authentication authenticate = null; try { - UserQuery userQuery = new ObjectMapper().readValue(req.getInputStream(), UserQuery.class); + UserQueryBo userQueryBo = new ObjectMapper().readValue(req.getInputStream(), UserQueryBo.class); authenticate = authenticationManager.authenticate( new UsernamePasswordAuthenticationToken( - userQuery.getUsername(), - userQuery.getPassword(), + userQueryBo.getUsername(), + userQueryBo.getPassword(), new ArrayList<>()) ); } catch (IOException e) { diff --git a/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java b/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java index 536ee62..e95cbe2 100644 --- a/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java +++ b/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; import org.micai.platform.auth.entity.*; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.service.*; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java b/src/main/java/org/micai/platform/auth/service/OrganInfoService.java index d834234..5016f2f 100644 --- a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java +++ b/src/main/java/org/micai/platform/auth/service/OrganInfoService.java @@ -1,7 +1,13 @@ package org.micai.platform.auth.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.micai.platform.auth.bo.OrganDelBo; +import org.micai.platform.auth.bo.OrganFindBo; +import org.micai.platform.auth.bo.OrganSaveBo; +import org.micai.platform.auth.bo.OrganUpdateBo; import org.micai.platform.auth.entity.OrganInfo; import com.baomidou.mybatisplus.extension.service.IService; +import org.micai.platform.auth.vo.OrganListVo; /** *

@@ -13,4 +19,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface OrganInfoService extends IService { + Page getOrganList(OrganFindBo bo); + + void updateOrgan(OrganUpdateBo bo); + + void saveOrgan(OrganSaveBo bo); + + void delOrgan(OrganDelBo bo); } diff --git a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java index 462f734..0c7c3b5 100644 --- a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java +++ b/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java @@ -14,7 +14,7 @@ import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; import org.micai.platform.auth.dto.UserAuthenticationDto; import org.micai.platform.auth.entity.Permission; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.mapper.PermissionMapper; import org.micai.platform.auth.service.PermissionService; import org.micai.platform.auth.utils.AuthenticationManger; diff --git a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java index a64e275..8e7c88d 100644 --- a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java +++ b/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java @@ -14,7 +14,7 @@ import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; import org.micai.platform.auth.dto.UserAuthenticationDto; import org.micai.platform.auth.entity.Role; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.mapper.RoleMapper; import org.micai.platform.auth.service.RoleService; import org.micai.platform.auth.utils.AuthenticationManger; diff --git a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java index a8e5135..f12f6ea 100644 --- a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java @@ -17,7 +17,7 @@ import org.micai.platform.auth.dto.UserAuthenticationDto; import org.micai.platform.auth.entity.Permission; import org.micai.platform.auth.entity.PermissionMenu; import org.micai.platform.auth.entity.SysMenu; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.mapper.PermissionMapper; import org.micai.platform.auth.mapper.PermissionMenuMapper; import org.micai.platform.auth.mapper.SysMenuMapper; diff --git a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java index 7b7b933..d85bc90 100644 --- a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java +++ b/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java @@ -15,7 +15,7 @@ import org.micai.platform.auth.constant.ConstantCode; import org.micai.platform.auth.constant.ConstantEnum; import org.micai.platform.auth.dto.UserAuthenticationDto; import org.micai.platform.auth.entity.User; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import org.micai.platform.auth.mapper.UserMapper; import org.micai.platform.auth.service.UserService; import org.micai.platform.auth.utils.AuthenticationManger; diff --git a/src/main/java/org/micai/platform/auth/utils/MD5.java b/src/main/java/org/micai/platform/auth/utils/MD5.java index 086c54b..9399672 100644 --- a/src/main/java/org/micai/platform/auth/utils/MD5.java +++ b/src/main/java/org/micai/platform/auth/utils/MD5.java @@ -1,7 +1,7 @@ package org.micai.platform.auth.utils; import org.apache.commons.lang3.StringUtils; -import org.micai.platform.auth.exception.PlatformException; +import org.micai.platform.auth.base.exception.PlatformException; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/src/main/java/org/micai/platform/auth/vo/OrganListVo.java b/src/main/java/org/micai/platform/auth/vo/OrganListVo.java new file mode 100644 index 0000000..c799fe9 --- /dev/null +++ b/src/main/java/org/micai/platform/auth/vo/OrganListVo.java @@ -0,0 +1,46 @@ +package org.micai.platform.auth.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author liuCong + * @Date 2021/12/29 15:38 + * @ClassName RoleListVo + * @Description + */ +@Data +@ApiModel(value = "组织列表") +public class OrganListVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id") + private Long id; + + @ApiModelProperty(value = "机构编码") + private String code; + + @ApiModelProperty(value = "机构名称") + private String name; + + @ApiModelProperty(value = "机构类型") + private String type; + + @ApiModelProperty(value = "创建人") + private Long createUserId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改人") + private Long updateUserId; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} -- Gitee