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
+
+
+