From 108611da11364c9e9c104204080ab5492b455a56 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 19 May 2022 14:32:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9swagger2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++- cdp-iaas/gateway-server/pom.xml | 5 +++ .../config/RouterFunctionConfiguration.java | 6 +-- .../com/baiye/handler/SwaggerUiHandler.java | 40 ------------------- .../com/baiye/mapper/PredicateMapper.java | 3 +- .../src/main/resources/config/application.yml | 2 - pom.xml | 10 ++++- 7 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java diff --git a/README.md b/README.md index d88fc0a..74b1a08 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,12 @@ ## 相关主体结构 cdp-common 公用 + - cdp-common-core 基础模块用于公用类 + - cdp-common-exception 公用异常 + - cdp-common-mybatist-plus mybatis-plus封装 + - cdp-common-security 鉴权服务 cdp-iaas 基础服务 - - authorization-server 授权验证 + - authorization-server 授权验证管理在线用户 - gateway-server 网关服务 cdp-manager - account-manager-server 账号管理服务 @@ -29,4 +33,4 @@ ## 内部服务结构 xxx xxx-api 做api接口-打成jar -> 给下面的service提供依赖 - xxx-service 具体的服务逻辑-打成war \ No newline at end of file + xxx-service 具体的服务逻辑-打成war diff --git a/cdp-iaas/gateway-server/pom.xml b/cdp-iaas/gateway-server/pom.xml index 2092cb0..7aea2e9 100644 --- a/cdp-iaas/gateway-server/pom.xml +++ b/cdp-iaas/gateway-server/pom.xml @@ -90,6 +90,11 @@ + + io.springfox + springfox-swagger2 + + org.springframework.boot spring-boot-starter-test diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java index f5f6986..ee57372 100644 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java +++ b/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java @@ -2,7 +2,6 @@ package com.baiye.config; import com.baiye.handler.SwaggerResourceHandler; import com.baiye.handler.SwaggerSecurityHandler; -import com.baiye.handler.SwaggerUiHandler; import com.baiye.handler.ValidateCodeHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,7 +13,7 @@ import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; /** - * + * * @description 路由配置类 * @author Enzo * @date 2020-07-29 @@ -30,7 +29,6 @@ public class RouterFunctionConfiguration { private final SwaggerSecurityHandler swaggerSecurityHandler; - private final SwaggerUiHandler swaggerUiHandler; @SuppressWarnings("rawtypes") @Bean @@ -41,8 +39,6 @@ public class RouterFunctionConfiguration { validateCodeHandler) .andRoute(RequestPredicates.GET("/swagger-resources").and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler) .andRoute(RequestPredicates.GET("/swagger-resources/configuration/security") .and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler); } diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java deleted file mode 100644 index 44670d8..0000000 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.baiye.handler; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.UiConfiguration; -import springfox.documentation.swagger.web.UiConfigurationBuilder; - -import java.util.Optional; - -/** - * @author Lengleng - * @date 2018-07-19 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class SwaggerUiHandler implements HandlerFunction { - - private final UiConfiguration uiConfiguration; - - /** - * Handle the given request. - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(BodyInserters - .fromValue(Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()))); - } - -} diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java index 259a4b7..523625e 100644 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java +++ b/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java @@ -2,12 +2,11 @@ package com.baiye.mapper; import com.baiye.entity.Predicate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import java.util.Set; /** - * + * * @description * @author Enzo * @date 2020-08-28 16:42 diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application.yml b/cdp-iaas/gateway-server/src/main/resources/config/application.yml index ef8191b..ff2bd00 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application.yml @@ -62,8 +62,6 @@ spring: profiles: active: dev - - security: decode: private-key: MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKmB93JM4cIFilnvcV1gSuPc3GlFUwo3JGGbOTkL9JP0W9Vz5CsbYbVbEtU+gnw6m3//4DSmOYeqlJJzsylVLdSe4flx2MsCceXxudsE4dHKqYU6zxBvsZB+FNFRoA2kjAtSJDaBCRryP5zXYVUYtVZW16pHkco/I35NwDevkvsJAgMBAAECgYEAkb5SoO9jyOv0mgFbirrJiYQT61uU25qv6FCLcfZKk5AuCai8jSfc6g7lcX5uuRu3KeY6w2oM2w4a8pUSfb5kSR4SAzSL6A94GIKfr3FDBxhrMxB+ko5vDoOwmmDi6jLGUFhxpiwT2Dz2c/Jz2kZJVb6RetOhh8fzdh3cz8jNQoECQQDg3+rX4d7WTS8xIFf3aQ8UKSCyDYpoNCVEsh9jaCsLrhsNXHMw8IX4KTjxsMvf3djztYuNsULHtwMkywGOA1ixAkEAwPg00MkqhBH1we4N8MCnXajZ+/UWch5b40QFBZrcbvx2k/CI25xH52FccmsEvVfuv1uFPto4sPTn7zAcKOzd2QJBANNEK3tkvhkx7ItH6r0LW9pCBXCiXg0mKHlQq0KWRBK2IL49xA8PeZ27BL+0rOWGpGPahOC6z5WYMADqJGzKYhECQQC1xZjKy5QXEGv1n+7VyERfv3yHEJlyKhLYg+xPGU9n5L02IjBo3lAFLvtMdG7khP5Kl0VurVUVq70G3MTJ8EYRAkEAm2hy1mCTMTWJYSlXieWnZxJaXn0MOrv4RyRsoXUTH1tgZ6MCqm0a7YxU0byPU0h1W2kLXXZa8P+vu2finQkvCA== diff --git a/pom.xml b/pom.xml index b471af1..ed3caf9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.1.0 5.7.21 3.11.0 - 3.0.0 + 2.9.2 1.2.70 2.10 2.2.5 @@ -83,6 +83,8 @@ swagger-annotations + + com.baomidou @@ -260,6 +262,12 @@ ${ip2region.version} + + + io.springfox + springfox-swagger2 + ${swagger2.version} + From 5674bfbffa4623f084d11e84fee4fe4ad2525a37 Mon Sep 17 00:00:00 2001 From: bynt Date: Mon, 23 May 2022 17:52:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=86=85=E5=AE=B9=20=E5=A2=9E=E5=BC=BAlogback=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/baiye/core/annotation/SelectType.java | 36 -------- cdp-entrance/cdp-entrance-service/pom.xml | 5 +- cdp-iaas/authorization-server/pom.xml | 2 +- .../{logback.xml => logback-spring.xml} | 0 .../src/main/resources/config/application.yml | 4 +- .../src/main/resources/logback-spring.xml | 77 +++++++++++++++++ .../com/baiye/query/DeptQueryCriteria.java | 18 ++-- .../baiye/query/DictDetailQueryCriteria.java | 9 +- .../com/baiye/query/DictQueryCriteria.java | 4 +- .../com/baiye/query/JobQueryCriteria.java | 7 +- .../com/baiye/query/MenuQueryCriteria.java | 15 ++-- .../com/baiye/query/RoleQueryCriteria.java | 7 +- .../com/baiye/query/UserQueryCriteria.java | 13 +-- .../backstage-manger-server-service/pom.xml | 2 +- .../com/baiye/controller/DictController.java | 2 - .../controller/DictDetailController.java | 2 - .../com/baiye/controller/JobController.java | 1 - .../com/baiye/controller/MenuController.java | 2 - .../baiye/controller/MonitorController.java | 2 - .../com/baiye/controller/RoleController.java | 2 - .../resources/config/application-prod.yml | 2 +- .../src/main/resources/logback-spring.xml | 77 +++++++++++++++++ .../src/main/resources/logback.xml | 83 ------------------- cdp-manager/backstage-manger-server/pom.xml | 2 + cdp-manager/pom.xml | 12 +++ 25 files changed, 214 insertions(+), 172 deletions(-) delete mode 100644 cdp-common/cdp-common-core/src/main/java/com/baiye/core/annotation/SelectType.java rename cdp-iaas/authorization-server/src/main/resources/{logback.xml => logback-spring.xml} (100%) create mode 100644 cdp-iaas/gateway-server/src/main/resources/logback-spring.xml create mode 100644 cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback-spring.xml delete mode 100644 cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback.xml diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/annotation/SelectType.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/annotation/SelectType.java deleted file mode 100644 index 2c4e606..0000000 --- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/annotation/SelectType.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baiye.core.annotation; - -/** - * @author Enzo - * @date 2022-05-14 - */ -public enum SelectType { - - // jie 2019/6/4 相等 - EQUAL - // 大于 - ,GREATER_THAN_NQ - // Dong ZhaoYang 2017/8/7 大于等于 - , GREATER_THAN - // Dong ZhaoYang 2017/8/7 小于 - , LESS_THAN_NQ - // Dong ZhaoYang 2017/8/7 小于等于 - , LESS_THAN - // Dong ZhaoYang 2017/8/7 中模糊查询 - , INNER_LIKE - // Dong ZhaoYang 2017/8/7 左模糊查询 - , LEFT_LIKE - // Dong ZhaoYang 2017/8/7 右模糊查询 - , RIGHT_LIKE - // jie 2019/6/4 包含 - , IN - // 不等于 - , NOT_EQUAL - // between - , BETWEEN - // 不为空 - , NOT_NULL - // 为空 - , IS_NULL - -} diff --git a/cdp-entrance/cdp-entrance-service/pom.xml b/cdp-entrance/cdp-entrance-service/pom.xml index 0be9c43..2fa1bfb 100644 --- a/cdp-entrance/cdp-entrance-service/pom.xml +++ b/cdp-entrance/cdp-entrance-service/pom.xml @@ -19,7 +19,7 @@ com.baiye - cdp-common + cdp-common-core 1.0-SNAPSHOT @@ -29,4 +29,5 @@ - \ No newline at end of file + + diff --git a/cdp-iaas/authorization-server/pom.xml b/cdp-iaas/authorization-server/pom.xml index 01eb0c2..55d6d77 100644 --- a/cdp-iaas/authorization-server/pom.xml +++ b/cdp-iaas/authorization-server/pom.xml @@ -71,7 +71,7 @@ org.springframework.boot spring-boot-maven-plugin - com.baiye.GatewayServerApplication + com.baiye.auth.AuthApplication ZIP diff --git a/cdp-iaas/authorization-server/src/main/resources/logback.xml b/cdp-iaas/authorization-server/src/main/resources/logback-spring.xml similarity index 100% rename from cdp-iaas/authorization-server/src/main/resources/logback.xml rename to cdp-iaas/authorization-server/src/main/resources/logback-spring.xml diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application.yml b/cdp-iaas/gateway-server/src/main/resources/config/application.yml index ff2bd00..63a19d0 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application.yml @@ -6,9 +6,9 @@ spring: redis: #数据库索引 database: 0 - host: 127.0.0.1 + host: 8.130.96.163 port: 6379 - password: '012099' + password: datasource: url: jdbc:mysql://${MYSQL_HOST:8.130.96.163}:${MYSQL_PORT:3306}/${MYSQL_DB:gateway}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true driver-class-name: com.mysql.jdbc.Driver diff --git a/cdp-iaas/gateway-server/src/main/resources/logback-spring.xml b/cdp-iaas/gateway-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..4584a2d --- /dev/null +++ b/cdp-iaas/gateway-server/src/main/resources/logback-spring.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DeptQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DeptQueryCriteria.java index dee1db2..8477fd4 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DeptQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DeptQueryCriteria.java @@ -15,8 +15,8 @@ */ package com.baiye.query; -import com.baiye.core.annotation.DataPermission; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; import java.sql.Timestamp; @@ -27,21 +27,19 @@ import java.util.List; * @date 2019-03-25 */ @Data -@DataPermission(fieldName = "id") -public class DeptQueryCriteria{ +public class DeptQueryCriteria { - @Query(type = Query.Type.INNER_LIKE) + @Query(type = SelectType.INNER_LIKE) private String name; @Query private Boolean enabled; - @Query + @Query(type = SelectType.EQUAL,value = "pid") private Long pid; - @Query(type = Query.Type.IS_NULL, propName = "pid") - private Boolean pidIsNull; - @Query(type = Query.Type.BETWEEN) + @Query(type = SelectType.BETWEEN) private List createTime; -} \ No newline at end of file + +} diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictDetailQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictDetailQueryCriteria.java index 49d93f0..9566127 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictDetailQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictDetailQueryCriteria.java @@ -15,7 +15,8 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; /** @@ -25,9 +26,9 @@ import lombok.Data; @Data public class DictDetailQueryCriteria { - @Query(type = Query.Type.INNER_LIKE) + @Query(type = SelectType.INNER_LIKE) private String label; - @Query(propName = "name",joinName = "dict") + @Query(value = "name") private String dictName; -} \ No newline at end of file +} diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictQueryCriteria.java index ef6a5f4..69d39b2 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/DictQueryCriteria.java @@ -15,7 +15,7 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; import lombok.Data; /** @@ -25,6 +25,6 @@ import lombok.Data; @Data public class DictQueryCriteria { - @Query(blurry = "name,description") + @Query(blurry = {"name","description"}) private String blurry; } diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/JobQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/JobQueryCriteria.java index c9e1355..5eabb7d 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/JobQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/JobQueryCriteria.java @@ -15,7 +15,8 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; import lombok.NoArgsConstructor; @@ -30,12 +31,12 @@ import java.util.List; @NoArgsConstructor public class JobQueryCriteria { - @Query(type = Query.Type.INNER_LIKE) + @Query(type = SelectType.INNER_LIKE) private String name; @Query private Boolean enabled; - @Query(type = Query.Type.BETWEEN) + @Query(type = SelectType.BETWEEN) private List createTime; } diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/MenuQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/MenuQueryCriteria.java index 153388b..4d86985 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/MenuQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/MenuQueryCriteria.java @@ -15,12 +15,14 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; -import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.List; + /** * @author Zheng Jie * 公共查询类 @@ -28,14 +30,11 @@ import java.util.List; @Data public class MenuQueryCriteria { - @Query(blurry = "title,component,permission") + @Query(blurry = {"title","component","permission"}) private String blurry; - @Query(type = Query.Type.BETWEEN) - private List createTime; - - @Query(type = Query.Type.IS_NULL, propName = "pid") - private Boolean pidIsNull; + @Query(type = SelectType.BETWEEN) + private List createTime; @Query private Long pid; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/RoleQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/RoleQueryCriteria.java index 44fa0a7..b856b60 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/RoleQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/RoleQueryCriteria.java @@ -15,7 +15,8 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; import java.sql.Timestamp; @@ -28,9 +29,9 @@ import java.util.List; @Data public class RoleQueryCriteria { - @Query(blurry = "name,description") + @Query(blurry = {"name","description"}) private String blurry; - @Query(type = Query.Type.BETWEEN) + @Query(type = SelectType.BETWEEN) private List createTime; } diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/UserQueryCriteria.java b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/UserQueryCriteria.java index cbd18aa..1324969 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/UserQueryCriteria.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-model/src/main/java/com/baiye/query/UserQueryCriteria.java @@ -15,7 +15,8 @@ */ package com.baiye.query; -import com.baiye.core.annotation.Query; +import com.baiye.annotation.Query; +import com.baiye.annotation.type.SelectType; import lombok.Data; import java.io.Serializable; @@ -31,20 +32,22 @@ import java.util.Set; @Data public class UserQueryCriteria implements Serializable { - @Query + private static final long serialVersionUID = -8942145971476050045L; + @Query(value = "user_id") private Long id; - @Query(propName = "id", type = Query.Type.IN, joinName = "dept") + private Set deptIds = new HashSet<>(); - @Query(blurry = "email,username,nickName") + @Query(blurry = {"email","username","nickName"}) private String blurry; @Query private Boolean enabled; + @Query private Long deptId; - @Query(type = Query.Type.BETWEEN) + @Query(type = SelectType.BETWEEN) private List createTime; } diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml index 76459ec..bb2bd4a 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml @@ -129,7 +129,7 @@ org.springframework.boot spring-boot-maven-plugin - com.baiye.AdPlatformManagementApplication + com.baiye.SystemServiceApplication ZIP diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java index 0614a3f..56e1fab 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictController.java @@ -8,8 +8,6 @@ import com.baiye.service.IDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; - -import lombok.extern.java.Log; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java index b1a214c..e820494 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/DictDetailController.java @@ -9,8 +9,6 @@ import com.baiye.service.IDictDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; - -import lombok.extern.java.Log; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java index 56991c2..3fca777 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/JobController.java @@ -8,7 +8,6 @@ import com.baiye.service.IJobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import lombok.extern.java.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java index 8025233..edf8837 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MenuController.java @@ -14,8 +14,6 @@ import com.baiye.vo.MenuVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; - -import lombok.extern.java.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MonitorController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MonitorController.java index 22fa77e..0931da7 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MonitorController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/MonitorController.java @@ -4,8 +4,6 @@ import com.baiye.service.IMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; - -import lombok.extern.java.Log; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java index 47779fb..7880093 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/controller/RoleController.java @@ -12,8 +12,6 @@ import com.baiye.util.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; - -import lombok.extern.java.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml index badd26e..7c58991 100644 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848} redis: database: 2 - host: 127.0.0.1 + host: 8.130.96.163 timeout: 5000 datasource: druid: diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback-spring.xml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..4584a2d --- /dev/null +++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback-spring.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + + + + + + diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback.xml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback.xml deleted file mode 100644 index c2ce9ac..0000000 --- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/logback.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - elAdmin - - - - - - - - - - %highlight([%-5level]) %cyan(%d{yyyy-MM-dd#HH:mm:ss.SSS}) %yellow([Thread:%thread]) %magenta([Logger:%logger]) -> %msg%n - utf-8 - - - - - - ${LOG_DIR}/log.log - - - - ${LOG_DIR}/history/%d{yyyy-MM-dd}.gz - 30 - - - true - - - ${LOG_PATTERN} - utf-8 - - - - - INFO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cdp-manager/backstage-manger-server/pom.xml b/cdp-manager/backstage-manger-server/pom.xml index 7dc9f21..5867b6a 100644 --- a/cdp-manager/backstage-manger-server/pom.xml +++ b/cdp-manager/backstage-manger-server/pom.xml @@ -21,4 +21,6 @@ 8 + + diff --git a/cdp-manager/pom.xml b/cdp-manager/pom.xml index e46fcaa..871f3c0 100644 --- a/cdp-manager/pom.xml +++ b/cdp-manager/pom.xml @@ -70,5 +70,17 @@ org.hibernate.validator hibernate-validator + + + com.baiye + cdp-common-mybatis-plus + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + +