diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1ba2501..0bdb031 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,18 +7,13 @@ - - - + - + + - - - - \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml deleted file mode 100644 index 8dd536c..0000000 --- a/.idea/dataSources.local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - #@ - ` - - - master_key - root - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index edcfb44..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://115.159.33.152:3306 - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9.xml b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9.xml deleted file mode 100644 index 9c1bafb..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9.xml +++ /dev/null @@ -1,279 +0,0 @@ - - - - - lower/lower - InnoDB - InnoDB - 5.7.36 - - - utf8mb4_general_ci - - - 2024-06-24.16:01:07 - 2024-06-24.08:01:05 - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8mb4_general_ci - - - utf8_general_ci - - - utf8mb4_unicode_ci - - - utf8mb4_general_ci - - - 数据资源表 - InnoDB - utf8mb4_general_ci -
- - 角色表 - InnoDB - utf8mb4_general_ci -
- - 角色和资源表映射关系 - InnoDB - utf8mb4_general_ci -
- - 用户表 - InnoDB - utf8mb4_general_ci -
- - 用户表和角色表映射 - InnoDB - utf8mb4_general_ci -
- - 2 - int(11)|0s - 1 - 1 - - - 权限代号 - varchar(255)|0s - 2 - - - 路由层次 - varchar(255)|0s - 3 - - - 路由 - varchar(255)|0s - 4 - - - 功能描述 - varchar(255)|0s - 5 - - - 状态 0-废弃 1-正在使用 - tinyint(4)|0s - 6 - - - id - btree - 1 - - - 1 - 1 - PRIMARY - - - 3 - int(11)|0s - 1 - 1 - - - 角色名称 - varchar(34)|0s - 2 - - - 角色具体描述 - varchar(36)|0s - 3 - - - id - btree - 1 - - - 1 - 1 - PRIMARY - - - 4 - int(11)|0s - 1 - 1 - - - varchar(255)|0s - 2 - - - 可以访问的路由编码 - varchar(255)|0s - 3 - - - id - btree - 1 - - - 1 - 1 - PRIMARY - - - 3 - int(11)|0s - 1 - 1 - - - 用户名 - varchar(50)|0s - 2 - - - 密码 - varchar(255)|0s - 3 - - - 角色 - varchar(50)|0s - 4 - - - 手机号码 - varchar(32)|0s - 5 - - - 状态 1-正常 2-废弃 - int(11)|0s - 6 - - - 电子邮箱 - varchar(255)|0s - 7 - - - 账号 - varchar(255)|0s - 8 - - - text|0s - 9 - - - id - btree - 1 - - - 1 - 1 - PRIMARY - - - 3 - int(11)|0s - 1 - 1 - - - varchar(255)|0s - 2 - - - varchar(255)|0s - 3 - - - varchar(255)|0s - 4 - - - id - btree - 1 - - - 1 - 1 - PRIMARY - - - \ No newline at end of file diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/etl.nYkBAA.meta b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/etl.nYkBAA.meta deleted file mode 100644 index 904c6e4..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/etl.nYkBAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:etl -! [1719216067000, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/information_schema.FNRwLQ.meta deleted file mode 100644 index 1ff3db2..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/information_schema.FNRwLQ.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:information_schema -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/mysql.osA4Bg.meta deleted file mode 100644 index 86a53f1..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/mysql.osA4Bg.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:mysql -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/performance_schema.kIw0nw.meta deleted file mode 100644 index 9394db1..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/performance_schema.kIw0nw.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:performance_schema -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/sys.zb4BAA.meta b/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/sys.zb4BAA.meta deleted file mode 100644 index 2f4470b..0000000 --- a/.idea/dataSources/6b8f28b8-a5cd-487d-8bae-93c3ccefe4a9/storage_v2/_src_/schema/sys.zb4BAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:sys -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/easyCodeTableSetting.xml b/.idea/easyCodeTableSetting.xml deleted file mode 100644 index 09e6015..0000000 --- a/.idea/easyCodeTableSetting.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index ad79a25..603407b 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -15,16 +15,10 @@ - - - - - - diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index ee9f695..8d66637 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,68 +1,5 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 944e70f..d68b839 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,28 +4,16 @@ - - - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f238179..e5536fd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4b646b6..3bb657d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,48 +4,254 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + - + + + - + + - - + + + + + + + - + + + + + + + + + + + + + + + + - - - - - - - - - - - + - + 1710157283817 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/etl-auth/etl-auth-common/etl-auth-common.iml b/etl-auth/etl-auth-common/etl-auth-common.iml deleted file mode 100644 index ca87593..0000000 --- a/etl-auth/etl-auth-common/etl-auth-common.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/etl-auth/etl-auth-common/pom.xml b/etl-auth/etl-auth-common/pom.xml index 60a68f6..f1a8fab 100644 --- a/etl-auth/etl-auth-common/pom.xml +++ b/etl-auth/etl-auth-common/pom.xml @@ -52,7 +52,4 @@ compile - - - diff --git a/etl-auth/etl-auth-server/pom.xml b/etl-auth/etl-auth-server/pom.xml index 9a080dc..ac19771 100644 --- a/etl-auth/etl-auth-server/pom.xml +++ b/etl-auth/etl-auth-server/pom.xml @@ -16,11 +16,6 @@ 2021.0.5.0 - - com.bwie - etl-auth-common - 1.0-SNAPSHOT - org.springframework.boot spring-boot-starter-thymeleaf @@ -32,9 +27,9 @@ 1.4.0 - io.springfox - springfox-swagger2 - 3.0.0 + com.github.xiaoymin + knife4j-openapi2-spring-boot-starter + 4.4.0 com.bwie @@ -56,11 +51,7 @@ com.mysql mysql-connector-j - - com.github.xiaoymin - knife4j-spring-boot-starter - 3.0.3 - + com.baomidou mybatis-plus-boot-starter diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/config/MvcConfig.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/config/MvcConfig.java deleted file mode 100644 index d9d7556..0000000 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/config/MvcConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -//package com.auth.server.config; -//import com.auth.server.interceptor.UserInterceptor; -//import com.auth.server.mapper.UserMangeMapper; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -//@Configuration -//public class MvcConfig implements WebMvcConfigurer { -// @Autowired -// private UserMangeMapper userMangeMapper; -// @Override -// public void addInterceptors(InterceptorRegistry registry) { -// //添加拦截器，排除/路径和 /login路径 -// registry.addInterceptor(new UserInterceptor(userMangeMapper)) -// .excludePathPatterns("/","/user/login"); -// } -//} diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/LoginControler.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/LoginControler.java index 7aa273d..ddf260b 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/LoginControler.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/LoginControler.java @@ -2,8 +2,8 @@ package com.auth.server.controller; import com.alibaba.fastjson2.JSON; import com.alibaba.nacos.api.model.v2.Result; -import com.auth.common.entity.UserAccount; -import com.auth.common.enums.PermissionConstants; + +import com.auth.server.entity.UserAccount; import com.auth.server.service.UserManageService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.etl.common.enums.ResponseCodeEnum; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/PermissionController.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/PermissionController.java index 1569cd3..1221762 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/PermissionController.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/controller/PermissionController.java @@ -1,8 +1,8 @@ package com.auth.server.controller; -import com.auth.common.entity.PathPermission; -import com.auth.common.entity.RolesPermission; -import com.auth.common.enums.PermissionConstants; +import com.auth.server.entity.PathPermission; +import com.auth.server.entity.RolesPermission; +import com.auth.server.enums.PermissionConstants; import com.auth.server.service.PathService; import com.auth.server.service.PermissionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/PathPermission.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/PathPermission.java similarity index 96% rename from etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/PathPermission.java rename to etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/PathPermission.java index 43726c2..cf9c9f9 100644 --- a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/PathPermission.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/PathPermission.java @@ -1,4 +1,4 @@ -package com.auth.common.entity; +package com.auth.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/RolesPermission.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/RolesPermission.java similarity index 95% rename from etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/RolesPermission.java rename to etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/RolesPermission.java index 7860c7d..2fcb3b4 100644 --- a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/RolesPermission.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/RolesPermission.java @@ -1,4 +1,4 @@ -package com.auth.common.entity; +package com.auth.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/UserAccount.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/UserAccount.java similarity index 85% rename from etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/UserAccount.java rename to etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/UserAccount.java index bca0ee1..f7f32e3 100644 --- a/etl-auth/etl-auth-common/src/main/java/com/auth/common/entity/UserAccount.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/entity/UserAccount.java @@ -1,4 +1,4 @@ -package com.auth.common.entity; +package com.auth.server.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -21,4 +21,6 @@ public class UserAccount { @ApiModelProperty("密码/") private String password; +// @ApiModelProperty("uuid") +// private String UUID; } diff --git a/etl-auth/etl-auth-common/src/main/java/com/auth/common/enums/PermissionConstants.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/enums/PermissionConstants.java similarity index 93% rename from etl-auth/etl-auth-common/src/main/java/com/auth/common/enums/PermissionConstants.java rename to etl-auth/etl-auth-server/src/main/java/com/auth/server/enums/PermissionConstants.java index 25a97d9..452b326 100644 --- a/etl-auth/etl-auth-common/src/main/java/com/auth/common/enums/PermissionConstants.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/enums/PermissionConstants.java @@ -1,4 +1,4 @@ -package com.auth.common.enums; +package com.auth.server.enums; public class PermissionConstants { public static final String ROLES = "roles"; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PathMapper.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PathMapper.java index e243793..8d277f8 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PathMapper.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PathMapper.java @@ -1,7 +1,7 @@ package com.auth.server.mapper; -import com.auth.common.entity.PathPermission; -import com.auth.common.entity.RolesPermission; + +import com.auth.server.entity.PathPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface PathMapper extends BaseMapper { diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PermissionMapper.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PermissionMapper.java index 42e3bed..8ec48cc 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PermissionMapper.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/PermissionMapper.java @@ -1,7 +1,8 @@ package com.auth.server.mapper; -import com.auth.common.entity.RolesPermission; + +import com.auth.server.entity.RolesPermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface PermissionMapper extends BaseMapper { diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/UserMangeMapper.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/UserMangeMapper.java index 9a770ef..da33f1f 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/UserMangeMapper.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/mapper/UserMangeMapper.java @@ -1,7 +1,8 @@ package com.auth.server.mapper; -import com.auth.common.entity.UserAccount; + +import com.auth.server.entity.UserAccount; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PathService.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PathService.java index b555b70..487fdc9 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PathService.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PathService.java @@ -1,8 +1,7 @@ package com.auth.server.service; -import com.auth.common.entity.PathPermission; -import com.auth.common.entity.RolesPermission; -import com.auth.common.entity.UserAccount; + +import com.auth.server.entity.PathPermission; import com.baomidou.mybatisplus.extension.service.IService; public interface PathService extends IService { diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PermissionService.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PermissionService.java index d487e57..503760e 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PermissionService.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/PermissionService.java @@ -1,7 +1,7 @@ package com.auth.server.service; -import com.auth.common.entity.RolesPermission; -import com.auth.common.entity.UserAccount; + +import com.auth.server.entity.RolesPermission; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/UserManageService.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/UserManageService.java index 949f8b8..f7ed4ab 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/UserManageService.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/UserManageService.java @@ -1,8 +1,8 @@ package com.auth.server.service; import com.alibaba.nacos.api.model.v2.Result; -import com.auth.common.entity.UserAccount; +import com.auth.server.entity.UserAccount; import com.baomidou.mybatisplus.extension.service.IService; import com.etl.common.result.CommonResult; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PathServiceImpl.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PathServiceImpl.java index 8e4475a..a7888fe 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PathServiceImpl.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PathServiceImpl.java @@ -1,7 +1,7 @@ package com.auth.server.service.impl; -import com.auth.common.entity.PathPermission; -import com.auth.common.entity.RolesPermission; + +import com.auth.server.entity.PathPermission; import com.auth.server.mapper.PathMapper; import com.auth.server.mapper.PermissionMapper; import com.auth.server.service.PathService; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PermissionServiceImpl.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PermissionServiceImpl.java index dc99f92..f48a094 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PermissionServiceImpl.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/PermissionServiceImpl.java @@ -1,7 +1,8 @@ package com.auth.server.service.impl; -import com.auth.common.entity.RolesPermission; -import com.auth.common.enums.PermissionConstants; + +import com.auth.server.entity.RolesPermission; +import com.auth.server.enums.PermissionConstants; import com.auth.server.mapper.PermissionMapper; import com.auth.server.service.PermissionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/UserManageServiceImpl.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/UserManageServiceImpl.java index a594d0a..16d41d6 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/UserManageServiceImpl.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/service/impl/UserManageServiceImpl.java @@ -3,9 +3,9 @@ package com.auth.server.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.nacos.api.model.v2.Result; -import com.auth.common.entity.UserAccount; -import com.auth.common.enums.PermissionConstants; import com.auth.server.config.MD5s; +import com.auth.server.entity.UserAccount; +import com.auth.server.enums.PermissionConstants; import com.auth.server.mapper.UserMangeMapper; import com.auth.server.service.UserManageService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/etl-auth/etl-auth-server/src/main/java/com/auth/server/util/UserRealm.java b/etl-auth/etl-auth-server/src/main/java/com/auth/server/util/UserRealm.java index b9218f5..84cf367 100644 --- a/etl-auth/etl-auth-server/src/main/java/com/auth/server/util/UserRealm.java +++ b/etl-auth/etl-auth-server/src/main/java/com/auth/server/util/UserRealm.java @@ -1,7 +1,8 @@ package com.auth.server.util; -import com.auth.common.entity.UserAccount; + +import com.auth.server.entity.UserAccount; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.auth.server.service.UserManageService; import lombok.extern.slf4j.Slf4j; @@ -19,15 +20,13 @@ import org.springframework.beans.factory.annotation.Autowired; public class UserRealm extends AuthorizingRealm { @Autowired private UserManageService userManageService; - //授权 @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { - /**配置权限 *此处User实体需配置属性roles，用户权限 *获取当前用户对象 - * */ + */ SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); Subject subject= SecurityUtils.getSubject(); UserAccount currentUser =(UserAccount) subject.getPrincipal(); @@ -35,7 +34,6 @@ public class UserRealm extends AuthorizingRealm { log.info("用户权限为："+currentUser.getRoles()); return authorizationInfo; } - //认证 @Override protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException { @@ -56,9 +54,8 @@ public class UserRealm extends AuthorizingRealm { }else { log.info(user.getUsername()); } - //principal：认证的实体信息，可以是username，也可以是数据库表对应的用户的实体对象 - // Object principal = user.getUsername(); + // Object principal = user.getUsername(); ByteSource salt = ByteSource.Util.bytes(username); return new SimpleAuthenticationInfo(user.getUsername(), user.getPassword() , salt,getName()); } diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/LoginControler.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/LoginControler.class index 6be0a47..0474618 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/LoginControler.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/LoginControler.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/PermissionController.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/PermissionController.class index c2b59f8..0b76277 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/PermissionController.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/controller/PermissionController.class differ diff --git a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/PathPermission.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/PathPermission.class similarity index 96% rename from etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/PathPermission.class rename to etl-auth/etl-auth-server/target/classes/com/auth/server/entity/PathPermission.class index 47b2a17..8881032 100644 Binary files a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/PathPermission.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/PathPermission.class differ diff --git a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/RolesPermission.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/RolesPermission.class similarity index 93% rename from etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/RolesPermission.class rename to etl-auth/etl-auth-server/target/classes/com/auth/server/entity/RolesPermission.class index e0a3e5b..66080a9 100644 Binary files a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/RolesPermission.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/RolesPermission.class differ diff --git a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/UserAccount.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/UserAccount.class similarity index 90% rename from etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/UserAccount.class rename to etl-auth/etl-auth-server/target/classes/com/auth/server/entity/UserAccount.class index 7e2c105..1eb0be2 100644 Binary files a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/entity/UserAccount.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/entity/UserAccount.class differ diff --git a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/enums/PermissionConstants.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/enums/PermissionConstants.class similarity index 76% rename from etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/enums/PermissionConstants.class rename to etl-auth/etl-auth-server/target/classes/com/auth/server/enums/PermissionConstants.class index da08aaa..b062b79 100644 Binary files a/etl-auth/etl-auth-server/target/production/etl-auth-common/com/auth/common/enums/PermissionConstants.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/enums/PermissionConstants.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PathMapper.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PathMapper.class index 1b0aab4..e5c5fe0 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PathMapper.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PathMapper.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PermissionMapper.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PermissionMapper.class index 8ee9317..fa34763 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PermissionMapper.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/PermissionMapper.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/UserMangeMapper.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/UserMangeMapper.class index a8b6b55..40dbb6a 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/UserMangeMapper.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/mapper/UserMangeMapper.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PathService.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PathService.class index 88233ec..1bc22e4 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PathService.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PathService.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PermissionService.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PermissionService.class index b26615f..54c8ed6 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PermissionService.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/PermissionService.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/UserManageService.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/UserManageService.class index 41fc9a0..7491e5f 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/UserManageService.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/UserManageService.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PathServiceImpl.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PathServiceImpl.class index e8c9568..39daf28 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PathServiceImpl.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PathServiceImpl.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PermissionServiceImpl.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PermissionServiceImpl.class index 884ed9b..42e36eb 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PermissionServiceImpl.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/PermissionServiceImpl.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/UserManageServiceImpl.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/UserManageServiceImpl.class index e29edb7..9667057 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/UserManageServiceImpl.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/service/impl/UserManageServiceImpl.class differ diff --git a/etl-auth/etl-auth-server/target/classes/com/auth/server/util/UserRealm.class b/etl-auth/etl-auth-server/target/classes/com/auth/server/util/UserRealm.class index 4d29926..c82f656 100644 Binary files a/etl-auth/etl-auth-server/target/classes/com/auth/server/util/UserRealm.class and b/etl-auth/etl-auth-server/target/classes/com/auth/server/util/UserRealm.class differ diff --git a/etl-auth/etl-auth-server/target/etl-auth-server-1.0-SNAPSHOT.jar b/etl-auth/etl-auth-server/target/etl-auth-server-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..0ae55d1 Binary files /dev/null and b/etl-auth/etl-auth-server/target/etl-auth-server-1.0-SNAPSHOT.jar differ diff --git a/etl-auth/etl-auth-server/target/maven-archiver/pom.properties b/etl-auth/etl-auth-server/target/maven-archiver/pom.properties new file mode 100644 index 0000000..f68dc30 --- /dev/null +++ b/etl-auth/etl-auth-server/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jul 03 15:26:21 CST 2024 +version=1.0-SNAPSHOT +groupId=com.bwie +artifactId=etl-auth-server diff --git a/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..5642f4e --- /dev/null +++ b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,20 @@ +com\auth\server\config\MD5s.class +com\auth\server\service\PathService.class +com\auth\server\service\PermissionService.class +com\auth\server\mapper\UserMangeMapper.class +com\auth\server\mapper\PathMapper.class +com\auth\server\service\impl\PathServiceImpl.class +com\auth\server\EtlAuthServerApplication.class +com\auth\server\entity\RolesPermission.class +com\auth\server\service\impl\UserManageServiceImpl.class +com\auth\server\config\ShiroConfig.class +com\auth\server\enums\PermissionConstants.class +com\auth\server\service\UserManageService.class +com\auth\server\mapper\PermissionMapper.class +com\auth\server\entity\PathPermission.class +com\auth\server\util\UserRealm.class +com\auth\server\controller\LoginControler.class +com\auth\server\controller\PermissionController.class +com\auth\server\util\SecurityUtils.class +com\auth\server\service\impl\PermissionServiceImpl.class +com\auth\server\entity\UserAccount.class diff --git a/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..53c53d1 --- /dev/null +++ b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,21 @@ +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\entity\RolesPermission.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\UserManageService.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\enums\PermissionConstants.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\impl\UserManageServiceImpl.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\entity\UserAccount.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\EtlAuthServerApplication.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\controller\LoginControler.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\interceptor\UserInterceptor.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\impl\PathServiceImpl.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\controller\PermissionController.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\PermissionService.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\impl\PermissionServiceImpl.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\service\PathService.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\config\MD5s.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\mapper\PermissionMapper.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\util\UserRealm.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\util\SecurityUtils.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\entity\PathPermission.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\mapper\PathMapper.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\mapper\UserMangeMapper.java +D:\workspace\ETL\etl-auth\etl-auth-server\src\main\java\com\auth\server\config\ShiroConfig.java diff --git a/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..660e055 --- /dev/null +++ b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com\auth\server\EtlAuthServerApplicationTests.class diff --git a/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..2efc1f5 --- /dev/null +++ b/etl-auth/etl-auth-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +D:\workspace\ETL\etl-auth\etl-auth-server\src\test\java\com\auth\server\EtlAuthServerApplicationTests.java diff --git a/etl-common/target/etl-common-1.0-SNAPSHOT.jar b/etl-common/target/etl-common-1.0-SNAPSHOT.jar index 76abfc4..7ceaaa8 100644 Binary files a/etl-common/target/etl-common-1.0-SNAPSHOT.jar and b/etl-common/target/etl-common-1.0-SNAPSHOT.jar differ diff --git a/etl-common/target/maven-archiver/pom.properties b/etl-common/target/maven-archiver/pom.properties index a1eb5b5..0427b5a 100644 --- a/etl-common/target/maven-archiver/pom.properties +++ b/etl-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Jun 25 09:14:51 CST 2024 +#Wed Jul 03 15:15:40 CST 2024 version=1.0-SNAPSHOT groupId=com.bwie artifactId=etl-common diff --git a/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 2380f1d..25f0682 100644 --- a/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -3,6 +3,7 @@ com\etl\common\result\PageResult.class com\etl\common\constants\JwtConstants.class com\etl\common\Entity.class com\etl\common\handler\ExceptionHandlers.class +com\etl\common\exception\LimitException.class com\etl\common\util\JwtUtils.class com\etl\common\result\CommonResult.class com\etl\common\util\RequestUtil.class diff --git a/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 6074707..cd2ff3a 100644 --- a/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/etl-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -8,6 +8,7 @@ D:\workspace\ETL\etl-common\src\main\java\com\etl\common\result\CommonResult.jav D:\workspace\ETL\etl-common\src\main\java\com\etl\common\result\Result.java D:\workspace\ETL\etl-common\src\main\java\com\etl\common\constants\TokenConstants.java D:\workspace\ETL\etl-common\src\main\java\com\etl\common\util\JwtUtils.java +D:\workspace\ETL\etl-common\src\main\java\com\etl\common\exception\LimitException.java D:\workspace\ETL\etl-common\src\main\java\com\etl\common\util\RequestUtil.java D:\workspace\ETL\etl-common\src\main\java\com\etl\common\exception\AllException.java D:\workspace\ETL\etl-common\src\main\java\com\etl\common\util\StringUtils.java diff --git a/etl-auth/etl-auth-server/etl-auth-server.iml b/etl-database/etl-database-common/etl-database-common.iml similarity index 100% rename from etl-auth/etl-auth-server/etl-auth-server.iml rename to etl-database/etl-database-common/etl-database-common.iml diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/DataSources.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/DataSources.java index 737c589..a68aae7 100644 --- a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/DataSources.java +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/DataSources.java @@ -38,12 +38,11 @@ public class DataSources extends BaseMate { @ApiModelProperty(value = "状态 0-停用 1-启用") @Min(value = 0, message = "状态值不能小于0") - @Max(value = 1, message = "状态值不能大于1") private Integer status; @Size(max = 100, message = "备注不能超过100个字符") @ApiModelProperty(value = "备注") - private String explain; + private String explaina; @ApiModelProperty(value = "额外配置") private String extraEvlop; @@ -54,4 +53,11 @@ public class DataSources extends BaseMate { @TableField(exist = false) @ApiModelProperty(value = "数据库类型") private String dataSourceTypeName; + + @ApiModelProperty(value = "用户名") + private String username; + + @ApiModelProperty(value = "密码") + private String password; + } diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/File.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/File.java index 4cd0d27..8c39ac9 100644 --- a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/File.java +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/File.java @@ -2,6 +2,7 @@ package com.etl.database.common.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.etl.database.common.entity.database.BaseMate; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @ApiModel("文件") +@TableName("t_file") public class File extends BaseMate { @ApiModelProperty(value = "文件id") @TableId(value = "id",type = IdType.AUTO) @@ -31,4 +33,7 @@ public class File extends BaseMate { @ApiModelProperty(value = "说明") private String expalin; + + @ApiModelProperty(value = "1-私有文件夹 2-共有文件夹") + private Integer fileOption; } diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Node.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Node.java new file mode 100644 index 0000000..d52e57f --- /dev/null +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Node.java @@ -0,0 +1,32 @@ +package com.etl.database.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "节点实体类") +@TableName("t_node") +public class Node { + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "任务id") + private Integer taskId; + + @ApiModelProperty(value = "表名") + private String tableName; + + @ApiModelProperty(value = "类型id") + private Integer type; + + @ApiModelProperty(value = "数据源id") + private Integer dataSourceId; + + @ApiModelProperty(value = "别名") + private String alias; +} diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Rule.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Rule.java index 6626367..741f0ed 100644 --- a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Rule.java +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Rule.java @@ -32,4 +32,7 @@ public class Rule { @ApiModelProperty(value = "公开方式 1-仅自己可见 2-公开") private Integer publicWay; + + @ApiModelProperty(value = "规则唯一id") + private Integer regulationId; } diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/SelectField.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/SelectField.java new file mode 100644 index 0000000..23d2765 --- /dev/null +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/SelectField.java @@ -0,0 +1,23 @@ +package com.etl.database.common.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@TableName("t_select_field") +public class SelectField { + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "节点id") + private Integer nodeId; + + @ApiModelProperty(value = "字段名称") + private String fieldName; + + @ApiModelProperty(value = "规则id") + private Integer ruleId; +} diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Task.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Task.java index 1bb042e..c57bfe1 100644 --- a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Task.java +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/Task.java @@ -1,6 +1,7 @@ package com.etl.database.common.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.etl.database.common.entity.database.BaseMate; @@ -38,6 +39,7 @@ public class Task extends BaseMate { @ApiModelProperty(value = "任务权重") private Integer weightId; + @TableField(exist = false) @ApiModelProperty(value = "任务等级") private Integer weightName; @@ -46,5 +48,5 @@ public class Task extends BaseMate { private Integer status; @ApiModelProperty(value = "任务备注") - private String explain; + private String explaina; } diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/DruidReq.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/DruidReq.java index 9ad4177..56e929f 100644 --- a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/DruidReq.java +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/DruidReq.java @@ -15,6 +15,9 @@ import javax.validation.constraints.NotBlank; @NoArgsConstructor @ToString public class DruidReq { + @ApiModelProperty(value = "数据源id") + private Integer id; + @NotBlank(message = "数据库连接地址不能为空") @ApiModelProperty(value = "地址") private String url; diff --git a/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/FileReq.java b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/FileReq.java new file mode 100644 index 0000000..502b3f5 --- /dev/null +++ b/etl-database/etl-database-common/src/main/java/com/etl/database/common/entity/req/FileReq.java @@ -0,0 +1,19 @@ +package com.etl.database.common.entity.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("文件请求参数") +public class FileReq { + + @ApiModelProperty(value = "文件路径") + private String filePath; + + @ApiModelProperty(value = "页数") + private Integer pageNum = 1; + + @ApiModelProperty(value = "条数") + private Integer pageSize = 3; +} diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/DataSources.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/DataSources.class index da8ea5d..61e0b93 100644 Binary files a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/DataSources.class and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/DataSources.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/File.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/File.class index 4e57d37..024e692 100644 Binary files a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/File.class and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/File.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Node.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Node.class new file mode 100644 index 0000000..1af3fa3 Binary files /dev/null and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Node.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Rule.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Rule.class index 94db5c2..04fc8f3 100644 Binary files a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Rule.class and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Rule.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/SelectField.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/SelectField.class new file mode 100644 index 0000000..058ffd4 Binary files /dev/null and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/SelectField.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Task.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Task.class index 4e3e7ac..1ea70f1 100644 Binary files a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Task.class and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/Task.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/DruidReq.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/DruidReq.class index 126ddd5..e7efc58 100644 Binary files a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/DruidReq.class and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/DruidReq.class differ diff --git a/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/FileReq.class b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/FileReq.class new file mode 100644 index 0000000..97ecd6f Binary files /dev/null and b/etl-database/etl-database-common/target/classes/com/etl/database/common/entity/req/FileReq.class differ diff --git a/etl-database/etl-database-common/target/etl-database-common-1.0-SNAPSHOT.jar b/etl-database/etl-database-common/target/etl-database-common-1.0-SNAPSHOT.jar deleted file mode 100644 index b17f3a0..0000000 Binary files a/etl-database/etl-database-common/target/etl-database-common-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/etl-database/etl-database-common/target/maven-archiver/pom.properties b/etl-database/etl-database-common/target/maven-archiver/pom.properties deleted file mode 100644 index 2e9fac8..0000000 --- a/etl-database/etl-database-common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Jun 26 17:13:09 CST 2024 -version=1.0-SNAPSHOT -groupId=com.bwie -artifactId=etl-database-common diff --git a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e73a2b6..0000000 --- a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -com\etl\database\common\entity\req\DruidReq.class -com\etl\database\common\entity\resp\ColumnInfo.class -com\etl\database\common\entity\req\DataSourceReq.class -com\etl\database\common\annoation\Limit.class -com\etl\database\common\entity\DataSources.class -com\etl\database\common\entity\DataSourceType.class -com\etl\database\common\entity\constants\DataSourceConstants.class -com\etl\database\common\entity\DatabaseRedis.class -com\etl\database\common\entity\database\BaseMate.class -com\etl\database\ennum\LimitType.class diff --git a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 21c4ea7..0000000 --- a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,10 +0,0 @@ -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\annoation\Limit.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\DataSources.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\resp\ColumnInfo.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\ennum\LimitType.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\DatabaseRedis.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\DataSourceType.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\req\DruidReq.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\req\DataSourceReq.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\constants\DataSourceConstants.java -D:\workspace\ETL\etl-database\etl-database-common\src\main\java\com\etl\database\common\entity\database\BaseMate.java diff --git a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index a5211fb..0000000 --- a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\etl\database\common\EtlDatabaseCommonApplicationTests.class diff --git a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 2921f28..0000000 --- a/etl-database/etl-database-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\workspace\ETL\etl-database\etl-database-common\src\test\java\com\etl\database\common\EtlDatabaseCommonApplicationTests.java diff --git a/etl-database/etl-database-common/target/test-classes/com/etl/database/common/EtlDatabaseCommonApplicationTests.class b/etl-database/etl-database-common/target/test-classes/com/etl/database/common/EtlDatabaseCommonApplicationTests.class deleted file mode 100644 index 5e10b3c..0000000 Binary files a/etl-database/etl-database-common/target/test-classes/com/etl/database/common/EtlDatabaseCommonApplicationTests.class and /dev/null differ diff --git a/etl-auth/etl-auth.iml b/etl-database/etl-database-server/etl-database-server.iml similarity index 100% rename from etl-auth/etl-auth.iml rename to etl-database/etl-database-server/etl-database-server.iml diff --git a/etl-database/etl-database-server/pom.xml b/etl-database/etl-database-server/pom.xml index da2272f..eaae8d8 100644 --- a/etl-database/etl-database-server/pom.xml +++ b/etl-database/etl-database-server/pom.xml @@ -15,6 +15,11 @@ 2.6.13 + + org.codehaus.groovy + groovy-all + 2.4.7 + io.springfox springfox-swagger2 diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/CodeTypeController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/CodeTypeController.java new file mode 100644 index 0000000..a265322 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/CodeTypeController.java @@ -0,0 +1,25 @@ +package com.etl.database.server.controller; + +import com.etl.common.result.Result; +import com.etl.database.common.entity.CodeType; +import com.etl.database.server.service.CodeTypeService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping(value = "/codeType") +@Api(tags = "编码类型-API") +public class CodeTypeController { + @Autowired + private CodeTypeService codeTypeervice; + + @RequestMapping(value = "/findCodeType") + public Result findCodeType() { + List list = codeTypeervice.findCodeType(); + return Result.success(list); + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/FileController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/FileController.java index b2be6b5..cd8b180 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/FileController.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/FileController.java @@ -1,11 +1,15 @@ package com.etl.database.server.controller; import com.etl.common.result.Result; +import com.etl.database.common.entity.File; +import com.etl.database.common.entity.req.FileReq; import com.etl.database.server.service.FileService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 文件控制层 @@ -16,10 +20,19 @@ import org.springframework.web.bind.annotation.RestController; public class FileController { @Autowired private FileService fileService; - - @RequestMapping(value = "/createFile") + + @RequestMapping(value = "/createFile",method = RequestMethod.POST) + @ApiOperation(value = "创建文件") public Result createFile() { - fileService.createFile(); - return Result.success(); + String filePath =fileService.createFile(); + return Result.success(filePath); + } + + + @RequestMapping(value ="/fileList",method = RequestMethod.POST) + @ApiOperation(value = "文件列表") + public Result fileList(@RequestBody FileReq fileReq) { + List fileList =fileService.fileList(fileReq); + return Result.success(fileList); } } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/NodeController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/NodeController.java new file mode 100644 index 0000000..018d0fb --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/NodeController.java @@ -0,0 +1,28 @@ +package com.etl.database.server.controller; + +import com.etl.common.result.Result; +import com.etl.database.common.entity.Node; +import com.etl.database.server.service.NodeService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +/** + * 节点控制层 + */ +@RestController +@RequestMapping(value = "/node") +@Api(tags = "节点-API") +public class NodeController { + @Autowired + private NodeService nodeService; + + @RequestMapping(value = "/addNode",method = RequestMethod.POST) + public Result addNode(@RequestBody Node node){ + nodeService.addNode(node); + return Result.success(); + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RedisController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RedisController.java index 01bbc8b..9500670 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RedisController.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RedisController.java @@ -19,16 +19,17 @@ import java.util.Map; * redis控制层 */ @RestController -@RequestMapping(value ="/redis") +@RequestMapping(value = "/redis") @Api(tags = "数据源-redis") public class RedisController { @Autowired private RedisService redisService; + @PostMapping("/testDatabaseRedis") @ApiOperation(value = "测试redis连接") @Limit(key = "testDatabaseRedis", permitsPerSecond = 1, timeout = 500, msg = "当前排队人数较多，请稍后再试！") - public Result> testDatabaseRedis(@Valid @RequestBody DatabaseRedisReq databaseRedis) { - Map map = redisService.testDatabaseRedis(databaseRedis); + public Result> testDatabaseRedis(@Valid @RequestBody DatabaseRedisReq databaseRedis) { + Map map = redisService.testDatabaseRedis(databaseRedis); return Result.success(map); } } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleController.java index 8d2ea5a..c5f36ec 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleController.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleController.java @@ -3,6 +3,7 @@ package com.etl.database.server.controller; import com.etl.common.result.Result; import com.etl.database.common.entity.Code; import com.etl.database.common.entity.Rule; +import com.etl.database.common.entity.RuleType; import com.etl.database.common.entity.req.RuleReq; import com.etl.database.server.service.RuleService; import io.swagger.annotations.Api; @@ -16,15 +17,16 @@ import java.util.List; * 规则控制层 */ @RestController -@RequestMapping(value ="/rule") +@RequestMapping(value = "/rule") @Api(tags = "规则-API") public class RuleController { @Autowired private RuleService ruleService; + @GetMapping("findRule") @ApiOperation(value = "查询规则") public Result findRule(@RequestBody RuleReq ruleReq) { - List ruleList=ruleService.findRule(ruleReq); + List ruleList = ruleService.findRule(ruleReq); return Result.success(ruleList); } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleTypeController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleTypeController.java new file mode 100644 index 0000000..26d23ba --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/RuleTypeController.java @@ -0,0 +1,28 @@ +package com.etl.database.server.controller; + +import com.etl.common.result.Result; +import com.etl.database.common.entity.RuleType; +import com.etl.database.server.service.RuleTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping(value = "/ruleType") +@Api(tags = "规则类型-API") +public class RuleTypeController { + @Autowired + private RuleTypeService ruleTypeService; + + @GetMapping("/findRuleType") + @ApiOperation(value = "查询规则类型") + public Result findRuleType() { + List ruleTypeList =ruleTypeService.findRuleType(); + return Result.success(ruleTypeList); + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskController.java index 99c203a..cf42b7f 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskController.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskController.java @@ -16,37 +16,46 @@ import java.util.List; */ @RestController @Api(tags = "任务-API") -@RequestMapping(value ="/task") +@RequestMapping(value = "/task") public class TaskController { @Autowired private TaskService taskService; @GetMapping("/findTask") @ApiOperation("查询任务") - public Result> findTask(){ + public Result> findTask() { return Result.success(taskService.findTask()); } + @PostMapping("/addTask") @ApiOperation("添加任务") - public Result addTask(@RequestBody Task task){ + public Result addTask(@RequestBody Task task) { taskService.addTask(task); return Result.success(); } + @PostMapping("/updateTask") @ApiOperation("修改任务") - public Result updateTask(@RequestBody Task task){ + public Result updateTask(@RequestBody Task task) { taskService.updateTask(task); return Result.success(); } + @DeleteMapping("/deleteTask/{id}") @ApiOperation("删除任务") - public Result deleteTask(@PathVariable Long id){ + public Result deleteTask(@PathVariable Long id) { taskService.deleteTask(id); return Result.success(); } + @GetMapping("/findTaskById/{id}") @ApiOperation("根据id查询任务") - public Result findTaskById(@PathVariable Long id){ + public Result findTaskById(@PathVariable Long id) { return Result.success(taskService.findTaskById(id)); } + + @GetMapping("executeTask") + public Result executeTask(@RequestParam Integer taskId) { + return taskService.executeTask(taskId); + } } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskWeightController.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskWeightController.java index 2177850..f6fdda5 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskWeightController.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/controller/TaskWeightController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; * 任务权重 */ @RestController -@RequestMapping(value ="/taskweight") +@RequestMapping(value = "/taskweight") @Api(tags = "任务权重-API") public class TaskWeightController { @Autowired diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/MysqlMapper.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/MysqlMapper.java index 457eae6..f629be9 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/MysqlMapper.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/MysqlMapper.java @@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository; @Repository public interface MysqlMapper extends MPJBaseMapper { + } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/NodeMapper.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/NodeMapper.java new file mode 100644 index 0000000..002a048 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/NodeMapper.java @@ -0,0 +1,11 @@ +package com.etl.database.server.mapper; + +import com.etl.database.common.entity.File; +import com.etl.database.common.entity.Node; +import com.github.yulichang.base.MPJBaseMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface NodeMapper extends MPJBaseMapper { + +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/RuleMapper.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/RuleMapper.java index 706b653..e97642b 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/RuleMapper.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/RuleMapper.java @@ -2,9 +2,12 @@ package com.etl.database.server.mapper; import com.etl.database.common.entity.DataSources; import com.etl.database.common.entity.Rule; +import com.etl.database.common.entity.RuleType; import com.github.yulichang.base.MPJBaseMapper; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface RuleMapper extends MPJBaseMapper { } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/SelectFieldMapper.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/SelectFieldMapper.java new file mode 100644 index 0000000..99ad84e --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/mapper/SelectFieldMapper.java @@ -0,0 +1,11 @@ +package com.etl.database.server.mapper; + +import com.etl.database.common.entity.Code; +import com.etl.database.common.entity.SelectField; +import com.github.yulichang.base.MPJBaseMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface SelectFieldMapper extends MPJBaseMapper { + +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/CodeTypeService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/CodeTypeService.java new file mode 100644 index 0000000..c67f959 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/CodeTypeService.java @@ -0,0 +1,12 @@ +package com.etl.database.server.service; + +import com.etl.database.common.entity.CodeType; +import com.etl.database.common.entity.DataSources; +import com.etl.database.server.mapper.CodeTypeMapper; +import com.github.yulichang.base.MPJBaseService; + +import java.util.List; + +public interface CodeTypeService extends MPJBaseService { + List findCodeType(); +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/DataSouceService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/DataSouceService.java index be6f92e..011164e 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/DataSouceService.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/DataSouceService.java @@ -13,4 +13,6 @@ public interface DataSouceService extends MPJBaseService { Result updateMysqlDataSource(DataSources dataSources); Result deleteMysqlDataSource(Long id); + + DataSources findById(Integer dataSourceId); } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/FileService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/FileService.java index 802fc06..427a794 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/FileService.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/FileService.java @@ -2,10 +2,15 @@ package com.etl.database.server.service; import com.etl.database.common.entity.DataSources; import com.etl.database.common.entity.File; +import com.etl.database.common.entity.req.FileReq; import com.github.yulichang.base.MPJBaseService; +import java.util.List; public interface FileService extends MPJBaseService { - void createFile(); + String createFile(); + + List fileList(FileReq fileReq); + } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/NodeService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/NodeService.java new file mode 100644 index 0000000..43cf0bb --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/NodeService.java @@ -0,0 +1,12 @@ +package com.etl.database.server.service; + +import com.etl.database.common.entity.Node; +import com.github.yulichang.base.MPJBaseService; + +import java.util.List; + +public interface NodeService extends MPJBaseService { + void addNode(Node node); + + List findByTaskId(Integer taskId); +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleService.java index 8def3dc..894cb09 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleService.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleService.java @@ -2,6 +2,7 @@ package com.etl.database.server.service; import com.etl.database.common.entity.Code; import com.etl.database.common.entity.Rule; +import com.etl.database.common.entity.RuleType; import com.etl.database.common.entity.req.RuleReq; import com.github.yulichang.base.MPJBaseService; @@ -17,4 +18,5 @@ public interface RuleService extends MPJBaseService { void deleteRule(Long id); void addCode(Code code); + } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleTypeService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleTypeService.java new file mode 100644 index 0000000..e0a69ad --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/RuleTypeService.java @@ -0,0 +1,10 @@ +package com.etl.database.server.service; + +import com.etl.database.common.entity.RuleType; +import com.github.yulichang.base.MPJBaseService; + +import java.util.List; + +public interface RuleTypeService extends MPJBaseService { + List findRuleType(); +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/SelectFieldService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/SelectFieldService.java new file mode 100644 index 0000000..3d59068 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/SelectFieldService.java @@ -0,0 +1,10 @@ +package com.etl.database.server.service; + +import com.etl.database.common.entity.SelectField; +import com.github.yulichang.base.MPJBaseService; + +import java.util.List; + +public interface SelectFieldService extends MPJBaseService { + List findByNodeId(Integer id); +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/TaskService.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/TaskService.java index 3f96987..2ee1c63 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/TaskService.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/TaskService.java @@ -1,5 +1,6 @@ package com.etl.database.server.service; +import com.etl.common.result.Result; import com.etl.database.common.entity.Task; import com.github.yulichang.base.MPJBaseService; @@ -15,4 +16,6 @@ public interface TaskService extends MPJBaseService { void deleteTask(Long id); Task findTaskById(Long id); + + Result executeTask(Integer taskId); } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/CodeTypeServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/CodeTypeServiceImpl.java new file mode 100644 index 0000000..8f44ea7 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/CodeTypeServiceImpl.java @@ -0,0 +1,27 @@ +package com.etl.database.server.service.impl; + +import com.etl.database.common.entity.CodeType; +import com.etl.database.common.entity.File; +import com.etl.database.common.entity.Task; +import com.etl.database.server.mapper.CodeTypeMapper; +import com.etl.database.server.service.CodeTypeService; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class CodeTypeServiceImpl extends MPJBaseServiceImpl implements CodeTypeService { + @Autowired + private CodeTypeMapper codeTypeMapper; + @Override + public List findCodeType() { + MPJLambdaWrapper taskMPJLambdaWrapper = new MPJLambdaWrapper() + .selectAll(CodeType.class); + return codeTypeMapper.selectJoinList(CodeType.class, taskMPJLambdaWrapper); + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/DataSouceServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/DataSouceServiceImpl.java index 3d1685e..c974f21 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/DataSouceServiceImpl.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/DataSouceServiceImpl.java @@ -71,4 +71,10 @@ public class DataSouceServiceImpl extends MPJBaseServiceImpl implements FileService { + + @Autowired + private FileMapper fileMapper; @Value("${file.path}") String filePath; - @Override - public void createFile() { - // 指定文件夹路径 - String folderPath = filePath; + @Value("${file.name}") + String fileName; + @Override + public String createFile() { + // 指定文件夹路径 + String folderPath = filePath + fileName; // 创建File对象 java.io.File folder = new java.io.File(folderPath); - // 创建文件夹 if (!folder.exists()) { if (folder.mkdirs()) { @@ -35,5 +47,19 @@ public class FileServiceImpl extends MPJBaseServiceImpl implem } else { log.info("文件夹已存在！"); } + return folderPath; + } + + @Override + public List fileList(FileReq fileReq) { + MPJLambdaWrapper taskMPJLambdaWrapper = new MPJLambdaWrapper() + .selectAll(File.class); + if (fileReq.getFilePath() != null && !fileReq.getFilePath().isEmpty()) { + taskMPJLambdaWrapper.like(File::getFilePath, fileReq.getFilePath()); + } + Page page = new Page<>(fileReq.getPageNum(), fileReq.getPageSize()); + IPage dataSourceReqIPage = fileMapper.selectJoinPage(page, File.class, taskMPJLambdaWrapper); + List records = dataSourceReqIPage.getRecords(); + return fileMapper.selectJoinList(File.class, taskMPJLambdaWrapper); } } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/MysqlServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/MysqlServiceImpl.java index c9ed6cf..7025aaf 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/MysqlServiceImpl.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/MysqlServiceImpl.java @@ -28,8 +28,10 @@ import java.util.*; public class MysqlServiceImpl extends MPJBaseServiceImpl implements MysqlService { @Autowired private MysqlMapper mysqlMapper; + /** * 测试连接mysql + * * @param druidReq * @return */ @@ -50,6 +52,7 @@ public class MysqlServiceImpl extends MPJBaseServiceImpl findDatabaseTable(DruidReq druidReq) { List tableNames = new ArrayList<>(); @@ -100,12 +104,7 @@ public class MysqlServiceImpl extends MPJBaseServiceImpl findDatabaseTableField(DruidReq druidReq) { - if (StringUtils.isNull(druidReq.getDatabaseName())) { - throw new RuntimeException("请选择数据库"); - } - if (StringUtils.isNull(druidReq.getTableName())) { - throw new RuntimeException("请选择表"); - } + checkDruidReq(druidReq); List columnInfos = new ArrayList<>(); Connection connection = null; PreparedStatement preparedStatement = null; @@ -141,7 +140,8 @@ public class MysqlServiceImpl extends MPJBaseServiceImpl> findDatabaseTableFieldPrice(DruidReq druidReq) { List> results = new ArrayList<>(); @@ -268,7 +277,6 @@ public class MysqlServiceImpl extends MPJBaseServiceImpl implements NodeService { + @Autowired + private NodeMapper nodeMapper; + @Override + public void addNode(Node node) { + nodeMapper.insert(node); + } + + @Override + public List findByTaskId(Integer taskId) { + MPJLambdaWrapper nodeMPJLambdaWrapper = new MPJLambdaWrapper() + .selectAll(Node.class) + .eq(Node::getTaskId,taskId); + List nodes = this.selectJoinList(Node.class, nodeMPJLambdaWrapper); + return nodes; + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleServiceImpl.java index 9d21ed1..832eea1 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleServiceImpl.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleServiceImpl.java @@ -2,6 +2,7 @@ package com.etl.database.server.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.etl.common.result.Result; import com.etl.database.common.entity.*; import com.etl.database.common.entity.req.RuleReq; import com.etl.database.server.mapper.CodeMapper; @@ -23,6 +24,7 @@ public class RuleServiceImpl extends MPJBaseServiceImpl implem @Autowired private CodeMapper codeMapper; + @Override public List findRule(RuleReq ruleReq) { MPJLambdaWrapper ruleMPJLambdaWrapper = new MPJLambdaWrapper<>(); @@ -46,29 +48,30 @@ public class RuleServiceImpl extends MPJBaseServiceImpl implem @Override public void addRule(Rule rule) { - if (rule != null){ + if (rule != null) { ruleMapper.insert(rule); } } @Override public void updateRule(Rule rule) { - if (rule != null){ + if (rule != null) { ruleMapper.updateById(rule); } } @Override public void deleteRule(Long id) { - if (id != null){ + if (id != null) { ruleMapper.deleteById(id); } } @Override public void addCode(Code code) { - if (code != null){ + if (code != null) { codeMapper.insert(code); } } + } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleTypeServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleTypeServiceImpl.java new file mode 100644 index 0000000..62421b6 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/RuleTypeServiceImpl.java @@ -0,0 +1,28 @@ +package com.etl.database.server.service.impl; + +import com.etl.database.common.entity.RuleType; +import com.etl.database.server.mapper.RuleTypeMapper; +import com.etl.database.server.service.RuleTypeService; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class RuleTypeServiceImpl extends MPJBaseServiceImpl implements RuleTypeService { + @Autowired + private RuleTypeMapper ruleTypeMapper; + + + @Override + public List findRuleType() { + MPJLambdaWrapper LambdaWrapper = new MPJLambdaWrapper() + .selectAll(RuleType.class); + List ruleTypes = ruleTypeMapper.selectJoinList(RuleType.class, LambdaWrapper); + return ruleTypes; + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/SelectFieldServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/SelectFieldServiceImpl.java new file mode 100644 index 0000000..aab9fe8 --- /dev/null +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/SelectFieldServiceImpl.java @@ -0,0 +1,29 @@ +package com.etl.database.server.service.impl; + +import com.etl.database.common.entity.Node; +import com.etl.database.common.entity.SelectField; +import com.etl.database.server.mapper.SelectFieldMapper; +import com.etl.database.server.service.SelectFieldService; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class SelectFieldServiceImpl extends MPJBaseServiceImpl implements SelectFieldService { + @Autowired + private SelectFieldMapper selectFieldMapper; + @Override + public List findByNodeId(Integer id) { + MPJLambdaWrapper selectFieldMPJLambdaWrapper = new MPJLambdaWrapper() + .selectAll(SelectField.class) + .leftJoin(Node.class, Node::getId, SelectField::getNodeId) + .eq(Node::getId, id); + List selectFields = selectFieldMapper.selectJoinList(SelectField.class, selectFieldMPJLambdaWrapper); + return selectFields; + } +} diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskServiceImpl.java index 55244e9..e018f28 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskServiceImpl.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskServiceImpl.java @@ -1,16 +1,36 @@ package com.etl.database.server.service.impl; +import com.etl.common.result.Result; +import com.etl.database.common.entity.DataSources; +import com.etl.database.common.entity.Node; +import com.etl.database.common.entity.SelectField; import com.etl.database.common.entity.Task; import com.etl.database.server.mapper.TaskMapper; +import com.etl.database.server.service.DataSouceService; +import com.etl.database.server.service.NodeService; +import com.etl.database.server.service.SelectFieldService; import com.etl.database.server.service.TaskService; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import groovy.lang.Binding; +import groovy.lang.GroovyShell; +import groovy.lang.Script; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.io.File; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; -import java.util.List; @Service @Slf4j @@ -18,6 +38,15 @@ public class TaskServiceImpl extends MPJBaseServiceImpl implem @Autowired private TaskMapper taskMapper; + @Autowired + private NodeService nodeService; + + @Autowired + private DataSouceService dataSourceService; + + @Autowired + private SelectFieldService selectFieldService; + @Override public List findTask() { MPJLambdaWrapper taskMPJLambdaWrapper = new MPJLambdaWrapper() @@ -44,4 +73,154 @@ public class TaskServiceImpl extends MPJBaseServiceImpl implem public Task findTaskById(Long id) { return taskMapper.selectById(id); } + + @Override + public Result executeTask(Integer taskId) { + try { + // 根据任务id查询所有节点 + List nodes = nodeService.findByTaskId(taskId); + if (nodes == null || nodes.isEmpty()) { + return Result.error("该任务没有节点"); + } + + // 筛选输入节点 + List inputNodes = nodes.stream().filter(node -> node.getType() == 1).collect(Collectors.toList()); + if (inputNodes == null || inputNodes.isEmpty()) { + return Result.error("该任务没有输入节点"); + } + + // 查询输入节点的数据源 + DataSources dataSource = dataSourceService.findById(inputNodes.get(0).getDataSourceId()); + if (dataSource == null) { + return Result.error("输入节点的数据源不存在"); + } + // 通过节点获取所有选择字段以及对应的规则id + List selectFields = selectFieldService.findByNodeId(inputNodes.get(0).getId()); + if (selectFields.size() == 0 || CollectionUtils.isEmpty(selectFields)) { + return Result.error("该任务没有选择字段"); + } + // 创建数据源 + javax.sql.DataSource dataSource1 = createDataSource(dataSource); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource1); + + // 查询输入节点表的字段名 + String sql = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?"; + List columnNames = jdbcTemplate.query(sql, new Object[]{dataSource.getDatabaseName(), inputNodes.get(0).getTableName()}, new RowMapper() { + @Override + public String mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getString("COLUMN_NAME"); + } + }); + if (columnNames.isEmpty()) { + return Result.error("输入节点表没有字段"); + } + + // 获取输出节点 + List outputNodes = nodes.stream().filter(node -> node.getType() == 2).collect(Collectors.toList()); + if (outputNodes == null || outputNodes.isEmpty()) { + return Result.error("该任务没有输出节点"); + } + + DataSources dataSource2 = dataSourceService.findById(outputNodes.get(0).getDataSourceId()); + if (dataSource2 == null) { + return Result.error("输出节点的数据源不存在"); + } + + // 创建新的数据源 + javax.sql.DataSource newDataSource = createDataSource(dataSource2); + JdbcTemplate newJdbcTemplate = new JdbcTemplate(newDataSource); + + ArrayList> maps = new ArrayList<>(); + String groovyScript = getGroovyScriptContent(); + + // 创建Binding对象 + Binding binding = new Binding(); + + // 对于每个字段，执行Groovy脚本 + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + if (selectFields.stream().anyMatch(selectField -> selectField.getFieldName().equals(columnName))) { + // 获取字段值 + String sql1 = "SELECT " + columnName + " FROM " + inputNodes.get(0).getTableName(); + List values = jdbcTemplate.queryForList(sql1, String.class); + + // 将values绑定到脚本中 + binding.setVariable("values", values); + + // 创建GroovyShell实例，并传入Binding对象 + GroovyShell shell = new GroovyShell(binding); + + // 执行Groovy脚本，脚本应该返回处理后的values + List newValues = (List) shell.evaluate(groovyScript); + + HashMap map = new HashMap<>(); + map.put(columnName, newValues); + maps.add(map); + } + } + // 获取最大数据长度 + int maxDataSize = maps.stream() + .map(map -> map.values().stream() + .filter(val -> val instanceof List) + .map(val -> ((List) val).size()) + .max(Integer::compare) + .orElse(0)) + .max(Integer::compare) + .orElse(0); + + // 循环处理数据 + for (int i = 0; i < maxDataSize; i++) { + System.out.println("Processing data at index: " + i); + StringBuilder columnNames1 = new StringBuilder(); + StringBuilder values = new StringBuilder(); + + // 输出当前maps中的数据 + System.out.println("Data in maps: " + maps); + + for (Map map : maps) { + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + + if (value instanceof List) { + List listValue = (List) value; + if (listValue.size() > i) { + columnNames1.append(key).append(","); + values.append("'").append(listValue.get(i)).append("',"); + } + } + } + } + + if (columnNames1.length() > 0) { + String insertSql = "INSERT INTO " + outputNodes.get(0).getTableName() + " (" + columnNames1.substring(0, columnNames1.length() - 1) + ") VALUES (" + values.substring(0, values.length() - 1) + ")"; + System.out.println("Inserting data: " + insertSql); + newJdbcTemplate.update(insertSql); + } else { + System.out.println("No data to insert for index " + i); + } + } + + System.out.println("数据插入成功"); + } catch (Exception e) { + return Result.error("执行任务失败：" + e.getMessage()); + } + return Result.success(); + } + + private String getGroovyScriptContent() { + // 这里应该从某个地方获取Groovy脚本的内容 + return "values.collect { it + 'abcd' }"; + } + + private javax.sql.DataSource createDataSource(DataSources dataSource) { + // 使用DriverManagerDataSource创建数据源 + DriverManagerDataSource dataSource1 = new DriverManagerDataSource(); + // 设置数据源的驱动类名、URL、用户名和密码 + dataSource1.setDriverClassName("com.mysql.cj.jdbc.Driver"); + dataSource1.setUrl("jdbc:mysql://" + dataSource.getLinkAddress() + ":" + dataSource.getPort() + "/" + dataSource.getDatabaseName()); + dataSource1.setUsername(dataSource.getUsername()); + dataSource1.setPassword(dataSource.getPassword()); + return dataSource1; + } } diff --git a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskWeightServiceImpl.java b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskWeightServiceImpl.java index 2133ef8..b0de8bf 100644 --- a/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskWeightServiceImpl.java +++ b/etl-database/etl-database-server/src/main/java/com/etl/database/server/service/impl/TaskWeightServiceImpl.java @@ -1,12 +1,8 @@ package com.etl.database.server.service.impl; import com.etl.common.result.Result; -import com.etl.database.common.entity.DataSourceType; -import com.etl.database.common.entity.DataSources; import com.etl.database.common.entity.TaskWeight; -import com.etl.database.server.mapper.DataSourceMapper; import com.etl.database.server.mapper.TaskWeightMapper; -import com.etl.database.server.service.DataSouceService; import com.etl.database.server.service.TaskWeightService; import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; diff --git a/etl-database/etl-database-server/src/main/resources/bootstrap.yml b/etl-database/etl-database-server/src/main/resources/bootstrap.yml index 18d2451..d95858c 100644 --- a/etl-database/etl-database-server/src/main/resources/bootstrap.yml +++ b/etl-database/etl-database-server/src/main/resources/bootstrap.yml @@ -38,4 +38,5 @@ mybatis-plus: mapper-locations: classpath:/mapper/*mapper.xml typeAliasesPackage: com.etl.database.common.entity file: - path: "D:\\newFiles" + path: "D:\\" + name: "美美子新创建的文件" diff --git a/etl-database/etl-database-server/src/main/resources/bpmn.bpmn20.xml b/etl-database/etl-database-server/src/main/resources/bpmn.bpmn20.xml new file mode 100644 index 0000000..171a4e1 --- /dev/null +++ b/etl-database/etl-database-server/src/main/resources/bpmn.bpmn20.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etl-database/etl-database-server/src/main/resources/diagram.png b/etl-database/etl-database-server/src/main/resources/diagram.png new file mode 100644 index 0000000..b3fa5f4 Binary files /dev/null and b/etl-database/etl-database-server/src/main/resources/diagram.png differ diff --git a/etl-database/etl-database-server/src/test/java/com/etl/database/server/EtlDatabaseServerApplicationTests.java b/etl-database/etl-database-server/src/test/java/com/etl/database/server/EtlDatabaseServerApplicationTests.java index d281749..04ac55d 100644 --- a/etl-database/etl-database-server/src/test/java/com/etl/database/server/EtlDatabaseServerApplicationTests.java +++ b/etl-database/etl-database-server/src/test/java/com/etl/database/server/EtlDatabaseServerApplicationTests.java @@ -1,5 +1,7 @@ package com.etl.database.server; +import groovy.lang.GroovyShell; +import groovy.lang.Script; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -10,5 +12,18 @@ class EtlDatabaseServerApplicationTests { void contextLoads() { } + public static void main(String[] args) { + //创建GroovyShell + GroovyShell groovyShell = new GroovyShell(); + //装载解析脚本代码 + Script script = groovyShell.parse("package groovy\n" + + "\n" + + "def HelloWorld(){\n" + + " println \"hello world\"\n" + + "}"); + //执行 + script.invokeMethod("HelloWorld", null); + } + } diff --git a/etl-database/etl-database-server/target/classes/bootstrap.yml b/etl-database/etl-database-server/target/classes/bootstrap.yml index 18d2451..d95858c 100644 --- a/etl-database/etl-database-server/target/classes/bootstrap.yml +++ b/etl-database/etl-database-server/target/classes/bootstrap.yml @@ -38,4 +38,5 @@ mybatis-plus: mapper-locations: classpath:/mapper/*mapper.xml typeAliasesPackage: com.etl.database.common.entity file: - path: "D:\\newFiles" + path: "D:\\" + name: "美美子新创建的文件" diff --git a/etl-database/etl-database-server/target/classes/bpmn.bpmn20.xml b/etl-database/etl-database-server/target/classes/bpmn.bpmn20.xml new file mode 100644 index 0000000..171a4e1 --- /dev/null +++ b/etl-database/etl-database-server/target/classes/bpmn.bpmn20.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/CodeTypeController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/CodeTypeController.class new file mode 100644 index 0000000..b368e71 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/CodeTypeController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/FileController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/FileController.class index e35e332..b36a94a 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/FileController.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/FileController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/NodeController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/NodeController.class new file mode 100644 index 0000000..4c17692 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/NodeController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RedisController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RedisController.class index e4a7f92..793f02d 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RedisController.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RedisController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleController.class index 4f814ec..42c27f3 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleController.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleTypeController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleTypeController.class new file mode 100644 index 0000000..6f8f16d Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/RuleTypeController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/TaskController.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/TaskController.class index 25a1771..8f39f8d 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/TaskController.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/controller/TaskController.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/NodeMapper.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/NodeMapper.class new file mode 100644 index 0000000..f0f9d4d Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/NodeMapper.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/SelectFieldMapper.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/SelectFieldMapper.class new file mode 100644 index 0000000..b0d4693 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/mapper/SelectFieldMapper.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/CodeTypeService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/CodeTypeService.class new file mode 100644 index 0000000..5763430 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/CodeTypeService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/DataSouceService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/DataSouceService.class index 00fa837..e0cae32 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/DataSouceService.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/DataSouceService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/FileService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/FileService.class index fc5cc60..fe5a5db 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/FileService.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/FileService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/NodeService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/NodeService.class new file mode 100644 index 0000000..3de6253 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/NodeService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/RuleTypeService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/RuleTypeService.class new file mode 100644 index 0000000..5a4b210 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/RuleTypeService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/SelectFieldService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/SelectFieldService.class new file mode 100644 index 0000000..ebedb09 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/SelectFieldService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/TaskService.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/TaskService.class index d864387..41904fd 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/TaskService.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/TaskService.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/CodeTypeServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/CodeTypeServiceImpl.class new file mode 100644 index 0000000..f74f318 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/CodeTypeServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/DataSouceServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/DataSouceServiceImpl.class index 3dc29cf..cebf11d 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/DataSouceServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/DataSouceServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/FileServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/FileServiceImpl.class index ca13019..eaeab7b 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/FileServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/FileServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/MysqlServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/MysqlServiceImpl.class index ffa4aa9..a411b25 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/MysqlServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/MysqlServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/NodeServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/NodeServiceImpl.class new file mode 100644 index 0000000..7c6baf4 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/NodeServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleServiceImpl.class index 77904ed..3f633d4 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleTypeServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleTypeServiceImpl.class new file mode 100644 index 0000000..ee16a4a Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/RuleTypeServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/SelectFieldServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/SelectFieldServiceImpl.class new file mode 100644 index 0000000..b1fae92 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/SelectFieldServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl$1.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl$1.class new file mode 100644 index 0000000..96ca553 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl$1.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl.class index ad2fee9..a8f46a4 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskWeightServiceImpl.class b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskWeightServiceImpl.class index 6aecd57..2d93b0a 100644 Binary files a/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskWeightServiceImpl.class and b/etl-database/etl-database-server/target/classes/com/etl/database/server/service/impl/TaskWeightServiceImpl.class differ diff --git a/etl-database/etl-database-server/target/classes/diagram.png b/etl-database/etl-database-server/target/classes/diagram.png new file mode 100644 index 0000000..b3fa5f4 Binary files /dev/null and b/etl-database/etl-database-server/target/classes/diagram.png differ diff --git a/etl-database/etl-database-server/target/etl-database-server-1.0-SNAPSHOT.jar b/etl-database/etl-database-server/target/etl-database-server-1.0-SNAPSHOT.jar deleted file mode 100644 index dc72eb2..0000000 Binary files a/etl-database/etl-database-server/target/etl-database-server-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/etl-database/etl-database-server/target/maven-archiver/pom.properties b/etl-database/etl-database-server/target/maven-archiver/pom.properties deleted file mode 100644 index 586ea8e..0000000 --- a/etl-database/etl-database-server/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Jun 26 17:13:10 CST 2024 -version=1.0-SNAPSHOT -groupId=com.bwie -artifactId=etl-database-server diff --git a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index f75bd28..0000000 --- a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,17 +0,0 @@ -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\config\RedisConfig.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\aop\LimitAspect.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\RedisService.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\impl\DataSouceServiceImpl.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\controller\DataSourceController.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\exception\GlobalExceptionHandler.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\mapper\DataSourceMapper.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\DataSouceService.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\mapper\MysqlMapper.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\mapper\RedisMapper.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\EtlDatabaseServerApplication.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\impl\MysqlServiceImpl.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\impl\RedisServiceImpl.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\controller\RedisController.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\exception\LimitException.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\controller\MysqlController.java -D:\workspace\ETL\etl-database\etl-database-server\src\main\java\com\etl\database\server\service\MysqlService.java diff --git a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 2eb5e00..0000000 --- a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -com\etl\database\server\EtlDatabaseServerApplicationTests.class diff --git a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index a210432..0000000 --- a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\workspace\ETL\etl-database\etl-database-server\src\test\java\com\etl\database\server\EtlDatabaseServerApplicationTests.java diff --git a/etl-database/etl-database-server/target/test-classes/com/etl/database/server/EtlDatabaseServerApplicationTests.class b/etl-database/etl-database-server/target/test-classes/com/etl/database/server/EtlDatabaseServerApplicationTests.class deleted file mode 100644 index 76bb686..0000000 Binary files a/etl-database/etl-database-server/target/test-classes/com/etl/database/server/EtlDatabaseServerApplicationTests.class and /dev/null differ diff --git a/etl-database/etl-database.iml b/etl-database/etl-database.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/etl-database/etl-database.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/etl-easycode/etl-easycode.iml b/etl-easycode/etl-easycode.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/etl-easycode/etl-easycode.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/etl-easycode/target/etl-easycode-1.0-SNAPSHOT.jar b/etl-easycode/target/etl-easycode-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..2fca75c Binary files /dev/null and b/etl-easycode/target/etl-easycode-1.0-SNAPSHOT.jar differ diff --git a/etl-easycode/target/maven-archiver/pom.properties b/etl-easycode/target/maven-archiver/pom.properties new file mode 100644 index 0000000..8d1235c --- /dev/null +++ b/etl-easycode/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Jul 02 20:35:38 CST 2024 +version=1.0-SNAPSHOT +groupId=com.bwie +artifactId=etl-easycode diff --git a/etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-easycode/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst similarity index 100% rename from etl-database/etl-database-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst rename to etl-easycode/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/etl-easycode/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-easycode/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..3577f0e --- /dev/null +++ b/etl-easycode/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,6 @@ +D:\workspace\ETL\etl-easycode\src\main\java\com\EtlEasycodeApplication.java +D:\workspace\ETL\etl-easycode\src\main\java\com\service\impl\TUserServiceImpl.java +D:\workspace\ETL\etl-easycode\src\main\java\com\entity\TUser.java +D:\workspace\ETL\etl-easycode\src\main\java\com\mapper\TUserDao.java +D:\workspace\ETL\etl-easycode\src\main\java\com\service\TUserService.java +D:\workspace\ETL\etl-easycode\src\main\java\com\controller\TUserController.java diff --git a/etl-easycode/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/etl-easycode/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/etl-easycode/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/etl-easycode/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..235e378 --- /dev/null +++ b/etl-easycode/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +D:\workspace\ETL\etl-easycode\src\test\java\com\etl\easycode\EtlEasycodeApplicationTests.java diff --git a/etl-gateway/.gitignore b/etl-gateway/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/etl-gateway/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/etl-gateway/etl-gateway.iml b/etl-gateway/etl-gateway.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/etl-gateway/etl-gateway.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/etl-gateway/pom.xml b/etl-gateway/pom.xml index 3d93677..2ef021b 100644 --- a/etl-gateway/pom.xml +++ b/etl-gateway/pom.xml @@ -17,6 +17,11 @@ 2021.0.5 + + org.springframework.cloud + spring-cloud-starter-openfeign + 3.1.8 + com.alibaba fastjson diff --git a/etl-gateway/src/main/java/com/etl/gateway/config/FeignConfig.java b/etl-gateway/src/main/java/com/etl/gateway/config/FeignConfig.java new file mode 100644 index 0000000..14e7205 --- /dev/null +++ b/etl-gateway/src/main/java/com/etl/gateway/config/FeignConfig.java @@ -0,0 +1,19 @@ +package com.etl.gateway.config; + +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.http.HttpMessageConverters; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; + +import java.util.stream.Collectors; + +@Configuration +public class FeignConfig { + @Bean + @ConditionalOnMissingBean + public HttpMessageConverters messageConverters(ObjectProvider> converters) { + return new HttpMessageConverters(converters.orderedStream().collect(Collectors.toList())); + } +} diff --git a/etl-gateway/src/main/java/com/etl/gateway/service/PermissionService.java b/etl-gateway/src/main/java/com/etl/gateway/service/PermissionService.java new file mode 100644 index 0000000..2407dcf --- /dev/null +++ b/etl-gateway/src/main/java/com/etl/gateway/service/PermissionService.java @@ -0,0 +1,13 @@ +package com.etl.gateway.service; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(value = "cloud-roles-manage") +public interface PermissionService { + @GetMapping("/path/get") + List pathGet(@RequestParam("roles") String roles); +} diff --git a/etl-gateway/src/main/resources/bootstrap.yml b/etl-gateway/src/main/resources/bootstrap.yml index d13bfdd..515d871 100644 --- a/etl-gateway/src/main/resources/bootstrap.yml +++ b/etl-gateway/src/main/resources/bootstrap.yml @@ -31,3 +31,9 @@ auth: pwdParamName: password # 用户登录认证密码参数名称 useDefaultController: true # 是否使用默认的JwtAuthController skipValidUrl: /auth/login + ignore: + whites: # 自定义白名单 + - /auth/login + - /auth/token/refresh + + diff --git a/etl-gateway/target/classes/bootstrap.yml b/etl-gateway/target/classes/bootstrap.yml new file mode 100644 index 0000000..515d871 --- /dev/null +++ b/etl-gateway/target/classes/bootstrap.yml @@ -0,0 +1,39 @@ +server: + port: 18080 +spring: + application: + name: engine-gateway + profiles: + active: dev + cloud: + nacos: + #注册服务 + discovery: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置 + config: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置文件格式 + file-extension: yml +logging: + level: + com.bwie: DEBUG + +auth: + jwt: + enabled: true # 是否开启JWT登录认证功能 + secret: passjava # JWT 私钥，用于校验JWT令牌的合法性 + expiration: 3600000 # JWT 令牌的有效期，用于校验JWT令牌的合法性，一个小时 + header: Authorization # HTTP 请求的 Header 名称，该 Header作为参数传递 JWT 令牌 + userParamName: userId # 用户登录认证用户名参数名称 + pwdParamName: password # 用户登录认证密码参数名称 + useDefaultController: true # 是否使用默认的JwtAuthController + skipValidUrl: /auth/login + ignore: + whites: # 自定义白名单 + - /auth/login + - /auth/token/refresh + + diff --git a/etl-gateway/target/classes/com/etl/gateway/EtlGatewayApplication.class b/etl-gateway/target/classes/com/etl/gateway/EtlGatewayApplication.class new file mode 100644 index 0000000..23c8cab Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/EtlGatewayApplication.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/config/FeignConfig.class b/etl-gateway/target/classes/com/etl/gateway/config/FeignConfig.class new file mode 100644 index 0000000..e7cfb52 Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/config/FeignConfig.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/config/IgnoreWhiteConfig.class b/etl-gateway/target/classes/com/etl/gateway/config/IgnoreWhiteConfig.class new file mode 100644 index 0000000..f166ee6 Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/config/IgnoreWhiteConfig.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/config/WhiteListProperties.class b/etl-gateway/target/classes/com/etl/gateway/config/WhiteListProperties.class new file mode 100644 index 0000000..90ca155 Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/config/WhiteListProperties.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/filters/AuthFilter.class b/etl-gateway/target/classes/com/etl/gateway/filters/AuthFilter.class new file mode 100644 index 0000000..0c87ede Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/filters/AuthFilter.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/filters/JwtAuthCheckFilter.class b/etl-gateway/target/classes/com/etl/gateway/filters/JwtAuthCheckFilter.class new file mode 100644 index 0000000..b079d7c Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/filters/JwtAuthCheckFilter.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/filters/LogFilter.class b/etl-gateway/target/classes/com/etl/gateway/filters/LogFilter.class new file mode 100644 index 0000000..891232e Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/filters/LogFilter.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/service/PermissionService.class b/etl-gateway/target/classes/com/etl/gateway/service/PermissionService.class new file mode 100644 index 0000000..137eb97 Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/service/PermissionService.class differ diff --git a/etl-gateway/target/classes/com/etl/gateway/utils/GatewayUtils.class b/etl-gateway/target/classes/com/etl/gateway/utils/GatewayUtils.class new file mode 100644 index 0000000..56130b6 Binary files /dev/null and b/etl-gateway/target/classes/com/etl/gateway/utils/GatewayUtils.class differ diff --git a/etl-gateway/target/etl-gateway-1.0-SNAPSHOT.jar b/etl-gateway/target/etl-gateway-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..ecad299 Binary files /dev/null and b/etl-gateway/target/etl-gateway-1.0-SNAPSHOT.jar differ diff --git a/etl-gateway/target/maven-archiver/pom.properties b/etl-gateway/target/maven-archiver/pom.properties new file mode 100644 index 0000000..faef141 --- /dev/null +++ b/etl-gateway/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jul 03 15:15:42 CST 2024 +version=1.0-SNAPSHOT +groupId=com.bwie +artifactId=etl-gateway diff --git a/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..e0b90ed --- /dev/null +++ b/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,9 @@ +com\etl\gateway\service\PermissionService.class +com\etl\gateway\config\WhiteListProperties.class +com\etl\gateway\filters\LogFilter.class +com\etl\gateway\utils\GatewayUtils.class +com\etl\gateway\filters\JwtAuthCheckFilter.class +com\etl\gateway\EtlGatewayApplication.class +com\etl\gateway\config\IgnoreWhiteConfig.class +com\etl\gateway\config\FeignConfig.class +com\etl\gateway\filters\AuthFilter.class diff --git a/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..bb405eb --- /dev/null +++ b/etl-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,9 @@ +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\config\WhiteListProperties.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\config\IgnoreWhiteConfig.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\utils\GatewayUtils.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\filters\AuthFilter.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\EtlGatewayApplication.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\filters\JwtAuthCheckFilter.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\config\FeignConfig.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\filters\LogFilter.java +D:\workspace\ETL\etl-gateway\src\main\java\com\etl\gateway\service\PermissionService.java diff --git a/etl-groovy/etl-groovy.iml b/etl-groovy/etl-groovy.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/etl-groovy/etl-groovy.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/etl-groovy/pom.xml b/etl-groovy/pom.xml new file mode 100644 index 0000000..ae9594e --- /dev/null +++ b/etl-groovy/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + com.bwie + etl-cloud + 1.0-SNAPSHOT + + etl-groovy + etl-groovy + + 1.8 + UTF-8 + UTF-8 + + + + org.springframework.boot + spring-boot-starter-web + + + com.bwie + etl-common + 1.0-SNAPSHOT + + + com.baomidou + mybatis-plus-boot-starter + + + + + + org.springframework.boot + spring-boot-starter-data-jdbc + 2.6.13 + + + + + mysql + mysql-connector-java + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + org.codehaus.groovy + groovy-all + 2.4.7 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + diff --git a/etl-groovy/src/main/java/com/etl/groovy/SpringBootGroovyApplication.java b/etl-groovy/src/main/java/com/etl/groovy/SpringBootGroovyApplication.java new file mode 100644 index 0000000..8780772 --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/SpringBootGroovyApplication.java @@ -0,0 +1,15 @@ +package com.etl.groovy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + + +@SpringBootApplication(scanBasePackages = {"com.etl.groovy"}) +@ComponentScan("com.etl.groovy.config") +public class SpringBootGroovyApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootGroovyApplication.class, args); + } +} diff --git a/etl-groovy/src/main/java/com/etl/groovy/controller/GroovyTestController.java b/etl-groovy/src/main/java/com/etl/groovy/controller/GroovyTestController.java new file mode 100644 index 0000000..cbe7dfb --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/controller/GroovyTestController.java @@ -0,0 +1,48 @@ +package com.etl.groovy.controller; + +import groovy.lang.GroovyShell; +import groovy.lang.Script; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName GrooyTestController + * @Description 描述 + * @Author ZeZhang.Liu + * @Date 2024/6/26 16:58 + */ +@RestController +@RequestMapping("/groovy") +public class GroovyTestController { + @GetMapping("/test") + public Object test() { + // 创建GroovyShell + GroovyShell groovyShell = new GroovyShell(); + + // 装载解析脚本代码 + String scriptText = + "import com.etl.groovy.service.GroovyTestService\n" + + "import com.etl.groovy.util.SpringContextUtil\n" + + "\n" + + "def getBean() {\n" + + " GroovyTestService groovyTestService = SpringContextUtil.getBean(GroovyTestService.class);\n" + + " groovyTestService.removeDashesFromAddress()\n" + + "}\n" + + "\n" + + "// 如果需要，你可以在这里定义方法或变量来模拟静态变量的行为\n" + + "def getParam1() {\n" + + " return \"通过方法获取的模拟静态变量\"\n" + + "}\n"; + + // 解析脚本 + Script script = groovyShell.parse(scriptText); + + // 执行getBean方法 + script.invokeMethod("getBean", null); + + // 尝试获取模拟的静态变量（通过方法） + Object param1 = script.invokeMethod("getParam1", null); + return param1; + } +} diff --git a/etl-groovy/src/main/java/com/etl/groovy/entity/Address.java b/etl-groovy/src/main/java/com/etl/groovy/entity/Address.java new file mode 100644 index 0000000..d8f2757 --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/entity/Address.java @@ -0,0 +1,15 @@ +package com.etl.groovy.entity; + +import lombok.Data; + +/** + * @ClassName Address + * @Description 描述 + * @Author TingTing.Yao + * @Date 2024/06/26 14:08 + */ +@Data +public class Address { + private Integer id; + private String address; +} diff --git a/etl-groovy/src/main/java/com/etl/groovy/mapper/AddressMapper.java b/etl-groovy/src/main/java/com/etl/groovy/mapper/AddressMapper.java new file mode 100644 index 0000000..f5d8519 --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/mapper/AddressMapper.java @@ -0,0 +1,12 @@ +package com.etl.groovy.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.etl.groovy.entity.Address; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Update; + +@Mapper +public interface AddressMapper extends BaseMapper
{ + @Update("UPDATE address SET address = REPLACE(address, '-', '') WHERE address LIKE '%-%'") + void removeDashesFromAddress(); +} diff --git a/etl-groovy/src/main/java/com/etl/groovy/service/GroovyTestService.java b/etl-groovy/src/main/java/com/etl/groovy/service/GroovyTestService.java new file mode 100644 index 0000000..d33c5ec --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/service/GroovyTestService.java @@ -0,0 +1,18 @@ +package com.etl.groovy.service; + +import com.etl.groovy.mapper.AddressMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class GroovyTestService { + + @Autowired + private AddressMapper addressMapper; + + public void removeDashesFromAddress() { + addressMapper.removeDashesFromAddress(); + } + +} + diff --git a/etl-groovy/src/main/java/com/etl/groovy/util/SpringContextUtil.java b/etl-groovy/src/main/java/com/etl/groovy/util/SpringContextUtil.java new file mode 100644 index 0000000..78cc933 --- /dev/null +++ b/etl-groovy/src/main/java/com/etl/groovy/util/SpringContextUtil.java @@ -0,0 +1,57 @@ +package com.etl.groovy.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +/** + * Spring上下文获取 + */ +@Component +public class SpringContextUtil implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + SpringContextUtil.applicationContext = applicationContext; + } + + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + /** + * 通过name获取 Bean. + * + * @param name + * @return + */ + public static Object getBean(String name) { + return getApplicationContext().getBean(name); + } + + /** + * 通过class获取Bean. + * + * @param clazz + * @param + * @return + */ + public static T getBean(Class clazz) { + return getApplicationContext().getBean(clazz); + } + + /** + * 通过name,以及Clazz返回指定的Bean + * + * @param name + * @param clazz + * @param + * @return + */ + public static T getBean(String name, Class clazz) { + return getApplicationContext().getBean(name, clazz); + } +} diff --git a/etl-groovy/src/main/resources/bootstrap.yml b/etl-groovy/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..8e2143c --- /dev/null +++ b/etl-groovy/src/main/resources/bootstrap.yml @@ -0,0 +1,81 @@ +# Tomcat +server: + port: 9010 +# Spring +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://115.159.33.152:3306/lian + username: root + password: lzm@123 + main: + allow-circular-references: true + application: + # 应用名称 + name: etl-groovy + profiles: + # 环境配置 + active: dev +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + type-aliases-package: com.etl.groovy.entity + mapper-locations: classpath:mappers/*xml +liteflow: + #规则文件路径 + rule-source: config/flow.el.xml + #-----------------以下非必须----------------- + #liteflow是否开启，默认为true + enable: true + #liteflow的banner打印是否开启，默认为true + print-banner: true + #zkNode的节点，只有使用zk作为配置源的时候才起作用，默认为/lite-flow/flow + zk-node: /lite-flow/flow + #上下文的最大数量槽，默认值为1024 + slot-size: 1024 + #FlowExecutor的execute2Future的线程数，默认为64 + main-executor-works: 64 + #FlowExecutor的execute2Future的自定义线程池Builder，LiteFlow提供了默认的Builder + main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder + #自定义请求ID的生成类，LiteFlow提供了默认的生成类 + request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator + #并行节点的线程池Builder，LiteFlow提供了默认的Builder + thread-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultWhenExecutorBuilder + #异步线程最长的等待时间(只用于when)，默认值为15000 + when-max-wait-time: 15000 + #异步线程最长的等待时间(只用于when)，默认值为MILLISECONDS，毫秒 + when-max-wait-time-unit: MILLISECONDS + #when节点全局异步线程池最大线程数，默认为16 + when-max-workers: 16 + #并行循环子项线程池最大线程数，默认为16 + parallelLoop-max-workers: 16 + #并行循环子项线程池等待队列数，默认为512 + parallelLoop-queue-limit: 512 + #并行循环子项的线程池Builder，LiteFlow提供了默认的Builder + parallelLoop-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultParallelLoopExecutorBuilder + #when节点全局异步线程池等待队列数，默认为512 + when-queue-limit: 512 + #是否在启动的时候就解析规则，默认为true + parse-on-start: true + #全局重试次数，默认为0 + retry-count: 0 + #是否支持不同类型的加载方式混用，默认为false + support-multiple-type: false + #全局默认节点执行器 + node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor + #是否打印执行中过程中的日志，默认为true + print-execution-log: true + #是否开启本地文件监听，默认为false + enable-monitor-file: false + #是否开启快速解析模式，默认为false + fast-load: false + #简易监控配置选项 + monitor: + #监控是否开启，默认不开启 + enable-log: false + #监控队列存储大小，默认值为200 + queue-limit: 200 + #监控一开始延迟多少执行，默认值为300000毫秒，也就是5分钟 + delay: 300000 + #监控日志打印每过多少时间执行一次，默认值为300000毫秒，也就是5分钟 + period: 300000 diff --git a/etl-groovy/src/main/resources/config/flow.el.xml b/etl-groovy/src/main/resources/config/flow.el.xml new file mode 100644 index 0000000..ef0fc50 --- /dev/null +++ b/etl-groovy/src/main/resources/config/flow.el.xml @@ -0,0 +1,6 @@ + + + + THEN(acmp, bcmp, ccmp); + + diff --git a/etl-groovy/src/test/java/com/etl/groovy/EtlGroovyApplicationTests.java b/etl-groovy/src/test/java/com/etl/groovy/EtlGroovyApplicationTests.java new file mode 100644 index 0000000..5007638 --- /dev/null +++ b/etl-groovy/src/test/java/com/etl/groovy/EtlGroovyApplicationTests.java @@ -0,0 +1,13 @@ +package com.etl.groovy; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class EtlGroovyApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/etl-groovy/target/classes/bootstrap.yml b/etl-groovy/target/classes/bootstrap.yml new file mode 100644 index 0000000..8e2143c --- /dev/null +++ b/etl-groovy/target/classes/bootstrap.yml @@ -0,0 +1,81 @@ +# Tomcat +server: + port: 9010 +# Spring +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://115.159.33.152:3306/lian + username: root + password: lzm@123 + main: + allow-circular-references: true + application: + # 应用名称 + name: etl-groovy + profiles: + # 环境配置 + active: dev +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + type-aliases-package: com.etl.groovy.entity + mapper-locations: classpath:mappers/*xml +liteflow: + #规则文件路径 + rule-source: config/flow.el.xml + #-----------------以下非必须----------------- + #liteflow是否开启，默认为true + enable: true + #liteflow的banner打印是否开启，默认为true + print-banner: true + #zkNode的节点，只有使用zk作为配置源的时候才起作用，默认为/lite-flow/flow + zk-node: /lite-flow/flow + #上下文的最大数量槽，默认值为1024 + slot-size: 1024 + #FlowExecutor的execute2Future的线程数，默认为64 + main-executor-works: 64 + #FlowExecutor的execute2Future的自定义线程池Builder，LiteFlow提供了默认的Builder + main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder + #自定义请求ID的生成类，LiteFlow提供了默认的生成类 + request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator + #并行节点的线程池Builder，LiteFlow提供了默认的Builder + thread-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultWhenExecutorBuilder + #异步线程最长的等待时间(只用于when)，默认值为15000 + when-max-wait-time: 15000 + #异步线程最长的等待时间(只用于when)，默认值为MILLISECONDS，毫秒 + when-max-wait-time-unit: MILLISECONDS + #when节点全局异步线程池最大线程数，默认为16 + when-max-workers: 16 + #并行循环子项线程池最大线程数，默认为16 + parallelLoop-max-workers: 16 + #并行循环子项线程池等待队列数，默认为512 + parallelLoop-queue-limit: 512 + #并行循环子项的线程池Builder，LiteFlow提供了默认的Builder + parallelLoop-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultParallelLoopExecutorBuilder + #when节点全局异步线程池等待队列数，默认为512 + when-queue-limit: 512 + #是否在启动的时候就解析规则，默认为true + parse-on-start: true + #全局重试次数，默认为0 + retry-count: 0 + #是否支持不同类型的加载方式混用，默认为false + support-multiple-type: false + #全局默认节点执行器 + node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor + #是否打印执行中过程中的日志，默认为true + print-execution-log: true + #是否开启本地文件监听，默认为false + enable-monitor-file: false + #是否开启快速解析模式，默认为false + fast-load: false + #简易监控配置选项 + monitor: + #监控是否开启，默认不开启 + enable-log: false + #监控队列存储大小，默认值为200 + queue-limit: 200 + #监控一开始延迟多少执行，默认值为300000毫秒，也就是5分钟 + delay: 300000 + #监控日志打印每过多少时间执行一次，默认值为300000毫秒，也就是5分钟 + period: 300000 diff --git a/etl-groovy/target/classes/com/etl/groovy/SpringBootGroovyApplication.class b/etl-groovy/target/classes/com/etl/groovy/SpringBootGroovyApplication.class new file mode 100644 index 0000000..999765b Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/SpringBootGroovyApplication.class differ diff --git a/etl-groovy/target/classes/com/etl/groovy/controller/GroovyTestController.class b/etl-groovy/target/classes/com/etl/groovy/controller/GroovyTestController.class new file mode 100644 index 0000000..f91cabd Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/controller/GroovyTestController.class differ diff --git a/etl-groovy/target/classes/com/etl/groovy/entity/Address.class b/etl-groovy/target/classes/com/etl/groovy/entity/Address.class new file mode 100644 index 0000000..6d3c086 Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/entity/Address.class differ diff --git a/etl-groovy/target/classes/com/etl/groovy/mapper/AddressMapper.class b/etl-groovy/target/classes/com/etl/groovy/mapper/AddressMapper.class new file mode 100644 index 0000000..929b4ca Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/mapper/AddressMapper.class differ diff --git a/etl-groovy/target/classes/com/etl/groovy/service/GroovyTestService.class b/etl-groovy/target/classes/com/etl/groovy/service/GroovyTestService.class new file mode 100644 index 0000000..0706d41 Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/service/GroovyTestService.class differ diff --git a/etl-groovy/target/classes/com/etl/groovy/util/SpringContextUtil.class b/etl-groovy/target/classes/com/etl/groovy/util/SpringContextUtil.class new file mode 100644 index 0000000..e3f9433 Binary files /dev/null and b/etl-groovy/target/classes/com/etl/groovy/util/SpringContextUtil.class differ diff --git a/etl-groovy/target/classes/config/flow.el.xml b/etl-groovy/target/classes/config/flow.el.xml new file mode 100644 index 0000000..ef0fc50 --- /dev/null +++ b/etl-groovy/target/classes/config/flow.el.xml @@ -0,0 +1,6 @@ + + + + THEN(acmp, bcmp, ccmp); + + diff --git a/etl-groovy/target/etl-groovy-1.0-SNAPSHOT.jar b/etl-groovy/target/etl-groovy-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..ee0b310 Binary files /dev/null and b/etl-groovy/target/etl-groovy-1.0-SNAPSHOT.jar differ diff --git a/etl-groovy/target/maven-archiver/pom.properties b/etl-groovy/target/maven-archiver/pom.properties new file mode 100644 index 0000000..fefb8d7 --- /dev/null +++ b/etl-groovy/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Tue Jul 02 20:35:53 CST 2024 +version=1.0-SNAPSHOT +groupId=com.bwie +artifactId=etl-groovy diff --git a/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..e81cd39 --- /dev/null +++ b/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,6 @@ +com\etl\groovy\service\GroovyTestService.class +com\etl\groovy\mapper\AddressMapper.class +com\etl\groovy\controller\GroovyTestController.class +com\etl\groovy\SpringBootGroovyApplication.class +com\etl\groovy\entity\Address.class +com\etl\groovy\util\SpringContextUtil.class diff --git a/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..7fc92b4 --- /dev/null +++ b/etl-groovy/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,6 @@ +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\util\SpringContextUtil.java +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\SpringBootGroovyApplication.java +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\mapper\AddressMapper.java +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\service\GroovyTestService.java +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\controller\GroovyTestController.java +D:\workspace\ETL\etl-groovy\src\main\java\com\etl\groovy\entity\Address.java diff --git a/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..42ac1fc --- /dev/null +++ b/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com\etl\groovy\EtlGroovyApplicationTests.class diff --git a/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..d76b636 --- /dev/null +++ b/etl-groovy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +D:\workspace\ETL\etl-groovy\src\test\java\com\etl\groovy\EtlGroovyApplicationTests.java diff --git a/etl-groovy/target/test-classes/com/etl/groovy/EtlGroovyApplicationTests.class b/etl-groovy/target/test-classes/com/etl/groovy/EtlGroovyApplicationTests.class new file mode 100644 index 0000000..88ca40a Binary files /dev/null and b/etl-groovy/target/test-classes/com/etl/groovy/EtlGroovyApplicationTests.class differ diff --git a/etl-jwt-manage/target/classes/META-INF/spring-configuration-metadata.json b/etl-jwt-manage/target/classes/META-INF/spring-configuration-metadata.json index 52c9406..801feb4 100644 --- a/etl-jwt-manage/target/classes/META-INF/spring-configuration-metadata.json +++ b/etl-jwt-manage/target/classes/META-INF/spring-configuration-metadata.json @@ -10,7 +10,8 @@ { "name": "auth.jwt.enabled", "type": "java.lang.Boolean", - "sourceType": "com.etl.jwt.config.AuthJwtProperties" + "sourceType": "com.etl.jwt.config.AuthJwtProperties", + "defaultValue": true }, { "name": "auth.jwt.expiration", @@ -26,7 +27,8 @@ "name": "auth.jwt.pwd-param-name", "type": "java.lang.String", "description": "用户登录-密码参数名称", - "sourceType": "com.etl.jwt.config.AuthJwtProperties" + "sourceType": "com.etl.jwt.config.AuthJwtProperties", + "defaultValue": "password" }, { "name": "auth.jwt.secret", @@ -41,13 +43,15 @@ { "name": "auth.jwt.use-default-controller", "type": "java.lang.Boolean", - "sourceType": "com.etl.jwt.config.AuthJwtProperties" + "sourceType": "com.etl.jwt.config.AuthJwtProperties", + "defaultValue": false }, { "name": "auth.jwt.user-param-name", "type": "java.lang.String", "description": "用户登录-用户名参数名称", - "sourceType": "com.etl.jwt.config.AuthJwtProperties" + "sourceType": "com.etl.jwt.config.AuthJwtProperties", + "defaultValue": "userId" } ], "hints": [] diff --git a/etl-jwt-manage/target/etl-jwt-manage-1.0-SNAPSHOT.jar b/etl-jwt-manage/target/etl-jwt-manage-1.0-SNAPSHOT.jar index 91f4862..0bd7540 100644 Binary files a/etl-jwt-manage/target/etl-jwt-manage-1.0-SNAPSHOT.jar and b/etl-jwt-manage/target/etl-jwt-manage-1.0-SNAPSHOT.jar differ diff --git a/etl-jwt-manage/target/maven-archiver/pom.properties b/etl-jwt-manage/target/maven-archiver/pom.properties index 918f375..3b6f1e7 100644 --- a/etl-jwt-manage/target/maven-archiver/pom.properties +++ b/etl-jwt-manage/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Jun 25 09:14:52 CST 2024 +#Wed Jul 03 15:15:41 CST 2024 version=1.0-SNAPSHOT groupId=com.bwie artifactId=etl-jwt-manage diff --git a/etl-roles/etl-roles.iml b/etl-roles/etl-roles.iml new file mode 100644 index 0000000..9e3449c --- /dev/null +++ b/etl-roles/etl-roles.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/etl-roles/pom.xml b/etl-roles/pom.xml new file mode 100644 index 0000000..01010c3 --- /dev/null +++ b/etl-roles/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + com.roles + etl-roles + 0.0.1-SNAPSHOT + etl-roles + etl-roles + + 1.8 + UTF-8 + UTF-8 + 2.6.13 + 2021.0.5.0 + 2021.0.5 + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + com.bwie + etl-auth-common + 1.0-SNAPSHOT + + + com.mysql + mysql-connector-j + + + org.springframework.boot + spring-boot-starter-web + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + org.springframework.cloud + spring-cloud-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + com.etl.roles.EtlRolesApplication + true + + + + repackage + + repackage + + + + + + + + diff --git a/etl-roles/src/main/java/com/etl/roles/EtlRolesApplication.java b/etl-roles/src/main/java/com/etl/roles/EtlRolesApplication.java new file mode 100644 index 0000000..40ba81d --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/EtlRolesApplication.java @@ -0,0 +1,15 @@ +package com.etl.roles; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +@MapperScan("com.etl.roles.mapper") +public class EtlRolesApplication { + + public static void main(String[] args) { + SpringApplication.run(EtlRolesApplication.class, args); + } + +} diff --git a/etl-roles/src/main/java/com/etl/roles/controlller/PermissionController.java b/etl-roles/src/main/java/com/etl/roles/controlller/PermissionController.java new file mode 100644 index 0000000..736f502 --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/controlller/PermissionController.java @@ -0,0 +1,52 @@ +package com.etl.roles.controlller; + +import com.auth.common.entity.PathPermission; +import com.auth.common.entity.RolesPermission; +import com.auth.common.enums.PermissionConstants; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.etl.roles.service.PathService; +import com.etl.roles.service.PermissionService; +import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 角色权限 controller层 + */ +@RestController +@Api(tags ="权限-API") +@RequestMapping("/permission") +public class PermissionController { + @Autowired + private PermissionService permissionService; + + @Resource + private PathService pathService; + + @PostMapping("/permission/add") + public boolean permissionAdd(@RequestBody Map map) { + String roles = (String) map.get(PermissionConstants.ROLES); + List codeList = (List) map.get(PermissionConstants.CODE_LIST); + return permissionService.permissionAdd(roles, codeList); + } + + @GetMapping("/get") + public List pathGet(@RequestParam("roles") String roles) { + RolesPermission permission = permissionService.getOne(new QueryWrapper().eq(PermissionConstants.ROLE,roles)); + String codes = StringUtils.strip(permission.getPermissionCode(), "[]"); + List list = Arrays.asList(codes.split(",")); + List pathList = new ArrayList<>(); + for(String code:list){ + String api = pathService.getOne(new QueryWrapper().eq(PermissionConstants.PERMISSION_CODE,code.trim())).getPath(); + pathList.add(api); + } + return pathList; + } +} diff --git a/etl-roles/src/main/java/com/etl/roles/controlller/Test.java b/etl-roles/src/main/java/com/etl/roles/controlller/Test.java new file mode 100644 index 0000000..5a03f54 --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/controlller/Test.java @@ -0,0 +1,35 @@ +package com.etl.roles.controlller; + +import java.util.concurrent.TimeUnit; + +public class Test { + public static void main(String[] args) { + //设置一个钩子线程， 退出时输出日志 + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + System.out.println("JVM退出"); + })); + Thread thread = new Thread(() -> { + while (true) { + try { + // + TimeUnit.SECONDS.sleep(1); + System.out.println("线程执行中"); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }); + + // + thread.setDaemon(true); + thread.start(); + + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + + System.out.println("主线程已经退出"); + } +} diff --git a/etl-roles/src/main/java/com/etl/roles/mapper/PathMapper.java b/etl-roles/src/main/java/com/etl/roles/mapper/PathMapper.java new file mode 100644 index 0000000..ca92afc --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/mapper/PathMapper.java @@ -0,0 +1,9 @@ +package com.etl.roles.mapper; + +import com.auth.common.entity.PathPermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface PathMapper extends BaseMapper { +} diff --git a/etl-roles/src/main/java/com/etl/roles/mapper/PermissionMapper.java b/etl-roles/src/main/java/com/etl/roles/mapper/PermissionMapper.java new file mode 100644 index 0000000..0df136f --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/mapper/PermissionMapper.java @@ -0,0 +1,10 @@ +package com.etl.roles.mapper; + + +import com.auth.common.entity.RolesPermission; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface PermissionMapper extends BaseMapper { +} diff --git a/etl-roles/src/main/java/com/etl/roles/service/PathService.java b/etl-roles/src/main/java/com/etl/roles/service/PathService.java new file mode 100644 index 0000000..dc85f6c --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/service/PathService.java @@ -0,0 +1,9 @@ +package com.etl.roles.service; + +import com.auth.common.entity.PathPermission; +import com.auth.common.entity.RolesPermission; +import com.auth.common.entity.UserAccount; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface PathService extends IService { +} diff --git a/etl-roles/src/main/java/com/etl/roles/service/PermissionService.java b/etl-roles/src/main/java/com/etl/roles/service/PermissionService.java new file mode 100644 index 0000000..ae2c5b9 --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/service/PermissionService.java @@ -0,0 +1,11 @@ +package com.etl.roles.service; + +import com.auth.common.entity.RolesPermission; +import com.auth.common.entity.UserAccount; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface PermissionService extends IService { + boolean permissionAdd(String roles, List codeList); +} diff --git a/etl-roles/src/main/java/com/etl/roles/service/impl/PathServiceImpl.java b/etl-roles/src/main/java/com/etl/roles/service/impl/PathServiceImpl.java new file mode 100644 index 0000000..e57c5a1 --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/service/impl/PathServiceImpl.java @@ -0,0 +1,13 @@ +package com.etl.roles.service.impl; + +import com.auth.common.entity.PathPermission; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.etl.roles.mapper.PathMapper; +import com.etl.roles.service.PathService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class PathServiceImpl extends ServiceImpl implements PathService { +} diff --git a/etl-roles/src/main/java/com/etl/roles/service/impl/PermissionServiceImpl.java b/etl-roles/src/main/java/com/etl/roles/service/impl/PermissionServiceImpl.java new file mode 100644 index 0000000..65902f6 --- /dev/null +++ b/etl-roles/src/main/java/com/etl/roles/service/impl/PermissionServiceImpl.java @@ -0,0 +1,61 @@ +package com.etl.roles.service.impl; + +import com.auth.common.entity.RolesPermission; +import com.auth.common.enums.PermissionConstants; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.etl.roles.mapper.PermissionMapper; +import com.etl.roles.service.PermissionService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +@Service +@Slf4j +public class PermissionServiceImpl extends ServiceImpl implements PermissionService { + @Autowired + private PermissionMapper permissionMapper; + + @Override + public boolean permissionAdd(String roles, List codeList) { + RolesPermission rolesPermission = new RolesPermission(); + rolesPermission.setRole(roles); + int result = 0; + RolesPermission role = getRoleByName(roles); + + if (role != null) { + result = updateRolePermission(rolesPermission, role, codeList); + } else { + result = insertRolePermission(rolesPermission, codeList); + } + return result > 0; + } + + private RolesPermission getRoleByName(String roleName) { + return permissionMapper.selectOne(new QueryWrapper().eq(PermissionConstants.ROLE, roleName)); + } + + private int updateRolePermission(RolesPermission rolesPermission, RolesPermission role, List codeList) { + //去掉头尾括号，并转为列表 + List list = new java.util.ArrayList<>(Collections.singletonList( + StringUtils.strip(role.getPermissionCode(), "[]"))); + //将新数据添加至列表 + list.addAll(codeList); + + rolesPermission.setPermissionCode(list.toString()); + rolesPermission.setId(role.getId()); + return permissionMapper.updateById(rolesPermission); + } + + private int insertRolePermission(RolesPermission rolesPermission, List codeList) { + if (codeList != null) { + rolesPermission.setPermissionCode(codeList.toString()); + } + return permissionMapper.insert(rolesPermission); + } + +} diff --git a/etl-roles/src/main/resources/bootstrap.yml b/etl-roles/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ece1726 --- /dev/null +++ b/etl-roles/src/main/resources/bootstrap.yml @@ -0,0 +1,40 @@ +server: + port: 9097 +spring: + application: + name: engine-roles + redis: + host: 115.159.33.152 + port: 6379 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://115.159.33.152:3306/etl + username: root + password: lzm@123 + mvc: + pathmatch: + matching-strategy: ant_path_matcher + profiles: + active: dev + cloud: + nacos: + #注册服务 + discovery: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置 + config: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.bwie: DEBUG +mybatis-plus: + mapper-locations: classpath:/mapper/*mapper.xml + typeAliasesPackage: com.etl.database.common.entity + diff --git a/etl-roles/src/main/resources/static/index.html b/etl-roles/src/main/resources/static/index.html new file mode 100644 index 0000000..e2d94a2 --- /dev/null +++ b/etl-roles/src/main/resources/static/index.html @@ -0,0 +1,6 @@ + + +

hello word!!!

+

this is a html page

+ + \ No newline at end of file diff --git a/etl-roles/src/test/java/com/etl/roles/EtlRolesApplicationTests.java b/etl-roles/src/test/java/com/etl/roles/EtlRolesApplicationTests.java new file mode 100644 index 0000000..ea3ca5e --- /dev/null +++ b/etl-roles/src/test/java/com/etl/roles/EtlRolesApplicationTests.java @@ -0,0 +1,13 @@ +package com.etl.roles; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class EtlRolesApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/etl-roles/target/classes/bootstrap.yml b/etl-roles/target/classes/bootstrap.yml new file mode 100644 index 0000000..ece1726 --- /dev/null +++ b/etl-roles/target/classes/bootstrap.yml @@ -0,0 +1,40 @@ +server: + port: 9097 +spring: + application: + name: engine-roles + redis: + host: 115.159.33.152 + port: 6379 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://115.159.33.152:3306/etl + username: root + password: lzm@123 + mvc: + pathmatch: + matching-strategy: ant_path_matcher + profiles: + active: dev + cloud: + nacos: + #注册服务 + discovery: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置 + config: + server-addr: 115.159.33.152:8848 + namespace: f9f293d4-55ce-45c1-aa15-124ca461c060 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.bwie: DEBUG +mybatis-plus: + mapper-locations: classpath:/mapper/*mapper.xml + typeAliasesPackage: com.etl.database.common.entity + diff --git a/etl-roles/target/classes/com/etl/roles/EtlRolesApplication.class b/etl-roles/target/classes/com/etl/roles/EtlRolesApplication.class new file mode 100644 index 0000000..aba539a Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/EtlRolesApplication.class differ diff --git a/etl-roles/target/classes/com/etl/roles/controlller/PermissionController.class b/etl-roles/target/classes/com/etl/roles/controlller/PermissionController.class new file mode 100644 index 0000000..378758e Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/controlller/PermissionController.class differ diff --git a/etl-roles/target/classes/com/etl/roles/controlller/Test.class b/etl-roles/target/classes/com/etl/roles/controlller/Test.class new file mode 100644 index 0000000..daa515a Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/controlller/Test.class differ diff --git a/etl-roles/target/classes/com/etl/roles/mapper/PathMapper.class b/etl-roles/target/classes/com/etl/roles/mapper/PathMapper.class new file mode 100644 index 0000000..60ff541 Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/mapper/PathMapper.class differ diff --git a/etl-roles/target/classes/com/etl/roles/mapper/PermissionMapper.class b/etl-roles/target/classes/com/etl/roles/mapper/PermissionMapper.class new file mode 100644 index 0000000..60d37a5 Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/mapper/PermissionMapper.class differ diff --git a/etl-roles/target/classes/com/etl/roles/service/PathService.class b/etl-roles/target/classes/com/etl/roles/service/PathService.class new file mode 100644 index 0000000..e7a6fb2 Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/service/PathService.class differ diff --git a/etl-roles/target/classes/com/etl/roles/service/PermissionService.class b/etl-roles/target/classes/com/etl/roles/service/PermissionService.class new file mode 100644 index 0000000..5bcb8ee Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/service/PermissionService.class differ diff --git a/etl-roles/target/classes/com/etl/roles/service/impl/PathServiceImpl.class b/etl-roles/target/classes/com/etl/roles/service/impl/PathServiceImpl.class new file mode 100644 index 0000000..a619284 Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/service/impl/PathServiceImpl.class differ diff --git a/etl-roles/target/classes/com/etl/roles/service/impl/PermissionServiceImpl.class b/etl-roles/target/classes/com/etl/roles/service/impl/PermissionServiceImpl.class new file mode 100644 index 0000000..78c24c8 Binary files /dev/null and b/etl-roles/target/classes/com/etl/roles/service/impl/PermissionServiceImpl.class differ diff --git a/etl-roles/target/classes/static/index.html b/etl-roles/target/classes/static/index.html new file mode 100644 index 0000000..e2d94a2 --- /dev/null +++ b/etl-roles/target/classes/static/index.html @@ -0,0 +1,6 @@ + + +

hello word!!!

+

this is a html page

+ + \ No newline at end of file diff --git a/etl-roles/target/test-classes/com/etl/roles/EtlRolesApplicationTests.class b/etl-roles/target/test-classes/com/etl/roles/EtlRolesApplicationTests.class new file mode 100644 index 0000000..6b20eda Binary files /dev/null and b/etl-roles/target/test-classes/com/etl/roles/EtlRolesApplicationTests.class differ