kris/czsj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【feat】基于若水，添加admin的依赖和配置

Browse Source
This commit is contained in:
Kris 2024-12-31 10:58:47 +08:00
parent 08fb14d3b8
commit 184e3b0afc
17 changed files with 258 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
czsj-admin/pom.xml
View File

@ -66,6 +66,46 @@
<scope>provided</scope>
</dependency>
<!-- datax-core -->
<dependency>
<groupId>com.czsj</groupId>
<artifactId>czsj-core</artifactId>
<version>3.8.8</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.flink</groupId>-->
<!-- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>-->
<!-- <version>${flink.version}</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.czsj</groupId>-->
<!-- <artifactId>czsj-flink-validation</artifactId>-->
<!-- <version>3.8.2</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.activation/activation -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>
@ -85,6 +125,25 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>

24
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseController.java
View File

@ -3,17 +3,17 @@ package com.czsj.web.controller.bigdata;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoshui.common.constant.HttpStatus;
import com.ruoshui.common.core.domain.AjaxResult;
import com.ruoshui.common.core.domain.model.LoginUser;
import com.ruoshui.common.core.page.PageDomain;
import com.ruoshui.common.core.page.TableDataInfo;
import com.ruoshui.common.core.page.TableSupport;
import com.ruoshui.common.utils.DateUtils;
import com.ruoshui.common.utils.PageUtils;
import com.ruoshui.common.utils.SecurityUtils;
import com.ruoshui.common.utils.StringUtils;
import com.ruoshui.common.utils.sql.SqlUtil;
import com.czsj.common.constant.HttpStatus;
import com.czsj.common.core.domain.AjaxResult;
import com.czsj.common.core.domain.model.LoginUser;
import com.czsj.common.core.page.PageDomain;
import com.czsj.common.core.page.TableDataInfo;
import com.czsj.common.core.page.TableSupport;
import com.czsj.common.utils.DateUtils;
import com.czsj.common.utils.PageUtils;
import com.czsj.common.utils.SecurityUtils;
import com.czsj.common.utils.StringUtils;
import com.czsj.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@ -26,7 +26,7 @@ import java.util.List;
/**
* web层通用数据处理
*
* @author ruoshui
* @author czsj
*/
public class BaseController extends ApiController
{

4
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseForm.java
View File

@ -6,8 +6,8 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoshui.bigdata.util.PageUtils;
import com.ruoshui.bigdata.util.ServletUtils;
import com.czsj.bigdata.util.PageUtils;
import com.czsj.bigdata.util.ServletUtils;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;

8
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseResourceController.java
View File

@ -1,9 +1,9 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.entity.BaseResource;
import com.ruoshui.bigdata.mapper.BaseResourceMapper;
import com.ruoshui.bigdata.util.AESUtil;
import com.ruoshui.core.biz.model.ReturnT;
import com.czsj.bigdata.entity.BaseResource;
import com.czsj.bigdata.mapper.BaseResourceMapper;
import com.czsj.bigdata.util.AESUtil;
import com.czsj.core.biz.model.ReturnT;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

6
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/DataxJsonController.java
View File

@ -1,9 +1,9 @@
package com.czsj.web.controller.bigdata;
import com.baomidou.mybatisplus.extension.api.R;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.dto.DataXJsonBuildDto;
import com.ruoshui.bigdata.service.DataxJsonService;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.dto.DataXJsonBuildDto;
import com.czsj.bigdata.service.DataxJsonService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

16
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobApiController.java
View File

@ -1,14 +1,14 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.conf.JobAdminConfig;
import com.ruoshui.bigdata.core.util.JacksonUtil;
import com.ruoshui.core.biz.AdminBiz;
import com.ruoshui.core.biz.model.HandleCallbackParam;
import com.ruoshui.core.biz.model.HandleProcessCallbackParam;
import com.ruoshui.core.biz.model.RegistryParam;
import com.ruoshui.core.biz.model.ReturnT;
import com.ruoshui.core.util.JobRemotingUtil;
import com.czsj.bigdata.core.conf.JobAdminConfig;
import com.czsj.bigdata.core.util.JacksonUtil;
import com.czsj.core.biz.AdminBiz;
import com.czsj.core.biz.model.HandleCallbackParam;
import com.czsj.core.biz.model.HandleProcessCallbackParam;
import com.czsj.core.biz.model.RegistryParam;
import com.czsj.core.biz.model.ReturnT;
import com.czsj.core.util.JobRemotingUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

14
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobCodeController.java
View File

@ -1,11 +1,11 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.entity.JobInfo;
import com.ruoshui.bigdata.entity.JobLogGlue;
import com.ruoshui.bigdata.mapper.JobInfoMapper;
import com.ruoshui.bigdata.mapper.JobLogGlueMapper;
import com.ruoshui.core.biz.model.ReturnT;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.entity.JobInfo;
import com.czsj.bigdata.entity.JobLogGlue;
import com.czsj.bigdata.mapper.JobInfoMapper;
import com.czsj.bigdata.mapper.JobLogGlueMapper;
import com.czsj.core.biz.model.ReturnT;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import static com.ruoshui.core.biz.model.ReturnT.FAIL_CODE;
import static com.czsj.core.biz.model.ReturnT.FAIL_CODE;
/**

6
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobDatasourceController.java
View File

@ -3,9 +3,9 @@ package com.czsj.web.controller.bigdata;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.ruoshui.bigdata.core.util.LocalCacheUtil;
import com.ruoshui.bigdata.entity.JobDatasource;
import com.ruoshui.bigdata.service.JobDatasourceService;
import com.czsj.bigdata.core.util.LocalCacheUtil;
import com.czsj.bigdata.entity.JobDatasource;
import com.czsj.bigdata.service.JobDatasourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

16
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobGroupController.java
View File

@ -1,13 +1,13 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.entity.JobGroup;
import com.ruoshui.bigdata.entity.JobRegistry;
import com.ruoshui.bigdata.mapper.JobGroupMapper;
import com.ruoshui.bigdata.mapper.JobInfoMapper;
import com.ruoshui.bigdata.mapper.JobRegistryMapper;
import com.ruoshui.core.biz.model.ReturnT;
import com.ruoshui.core.enums.RegistryConfig;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.entity.JobGroup;
import com.czsj.bigdata.entity.JobRegistry;
import com.czsj.bigdata.mapper.JobGroupMapper;
import com.czsj.bigdata.mapper.JobInfoMapper;
import com.czsj.bigdata.mapper.JobRegistryMapper;
import com.czsj.core.biz.model.ReturnT;
import com.czsj.core.enums.RegistryConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

20
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobInfoController.java
View File

@ -1,16 +1,16 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.cron.CronExpression;
import com.ruoshui.bigdata.core.thread.JobTriggerPoolHelper;
import com.ruoshui.bigdata.core.trigger.TriggerTypeEnum;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.dto.DataXBatchJsonBuildDto;
import com.ruoshui.bigdata.dto.TriggerJobDto;
import com.ruoshui.bigdata.entity.JobInfo;
import com.ruoshui.bigdata.service.JobService;
import com.ruoshui.core.biz.model.ReturnT;
import com.ruoshui.core.util.DateUtil;
import com.czsj.bigdata.core.cron.CronExpression;
import com.czsj.bigdata.core.thread.JobTriggerPoolHelper;
import com.czsj.bigdata.core.trigger.TriggerTypeEnum;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.dto.DataXBatchJsonBuildDto;
import com.czsj.bigdata.dto.TriggerJobDto;
import com.czsj.bigdata.entity.JobInfo;
import com.czsj.bigdata.service.JobService;
import com.czsj.core.biz.model.ReturnT;
import com.czsj.core.util.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

22
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobLogController.java
View File

@ -1,17 +1,17 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.kill.KillJob;
import com.ruoshui.bigdata.core.scheduler.JobScheduler;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.entity.JobInfo;
import com.ruoshui.bigdata.entity.JobLog;
import com.ruoshui.bigdata.mapper.JobInfoMapper;
import com.ruoshui.bigdata.mapper.JobLogMapper;
import com.ruoshui.core.biz.ExecutorBiz;
import com.ruoshui.core.biz.model.LogResult;
import com.ruoshui.core.biz.model.ReturnT;
import com.ruoshui.core.util.DateUtil;
import com.czsj.bigdata.core.kill.KillJob;
import com.czsj.bigdata.core.scheduler.JobScheduler;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.entity.JobInfo;
import com.czsj.bigdata.entity.JobLog;
import com.czsj.bigdata.mapper.JobInfoMapper;
import com.czsj.bigdata.mapper.JobLogMapper;
import com.czsj.core.biz.ExecutorBiz;
import com.czsj.core.biz.model.LogResult;
import com.czsj.core.biz.model.ReturnT;
import com.czsj.core.util.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;

4
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobProjectController.java
View File

@ -3,8 +3,8 @@ package com.czsj.web.controller.bigdata;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.ruoshui.bigdata.entity.JobProject;
import com.ruoshui.bigdata.service.JobProjectService;
import com.czsj.bigdata.entity.JobProject;
import com.czsj.bigdata.service.JobProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

6
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobRegistryController.java
View File

@ -4,9 +4,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.ruoshui.bigdata.entity.JobRegistry;
import com.ruoshui.bigdata.service.JobRegistryService;
import com.ruoshui.bigdata.util.PageUtils;
import com.czsj.bigdata.entity.JobRegistry;
import com.czsj.bigdata.service.JobRegistryService;
import com.czsj.bigdata.util.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

12
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobTemplateController.java
View File

@ -1,12 +1,12 @@
package com.czsj.web.controller.bigdata;
import com.ruoshui.bigdata.core.cron.CronExpression;
import com.ruoshui.bigdata.core.util.I18nUtil;
import com.ruoshui.bigdata.entity.JobTemplate;
import com.ruoshui.bigdata.service.JobTemplateService;
import com.ruoshui.core.biz.model.ReturnT;
import com.ruoshui.core.util.DateUtil;
import com.czsj.bigdata.core.cron.CronExpression;
import com.czsj.bigdata.core.util.I18nUtil;
import com.czsj.bigdata.entity.JobTemplate;
import com.czsj.bigdata.service.JobTemplateService;
import com.czsj.core.biz.model.ReturnT;
import com.czsj.core.util.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

2
czsj-admin/src/main/java/com/czsj/web/controller/bigdata/MetadataController.java
View File

@ -1,7 +1,7 @@
package com.czsj.web.controller.bigdata;
import com.baomidou.mybatisplus.extension.api.R;
import com.ruoshui.bigdata.service.DatasourceQueryService;
import com.czsj.bigdata.service.DatasourceQueryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

83
czsj-admin/src/main/resources/application.yml
View File

@ -47,6 +47,27 @@ user:
# Spring配置
spring:
datasource:
username: root
password: czsj@2024
url: jdbc:mysql://134.175.52.143:3306/czsj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
driver-class-name: com.mysql.cj.jdbc.Driver
# datax-web email
mail:
host: smtp
port: 465
username:
password:
authorization: kwzfbpemiqzwebgf
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
socketFactory:
class: javax.net.ssl.SSLSocketFactory
# 资源信息
messages:
# 国际化资源文件路径
@ -97,14 +118,60 @@ token:
# 令牌有效期（默认30分钟）
expireTime: 30
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.czsj.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
#datax-job, access token
datax:
job:
accessToken:
#i18n (default empty as chinese, "en" as english)
i18n:
## triggerpool max size
triggerpool:
fast:
max: 200
slow:
max: 100
### log retention days
logretentiondays: 30
executor:
dataxPyHome: D:\datax\bin\datax.py
dataxHome: D:\datax\bin
## MyBatis配置
#mybatis:
# # 搜索指定包别名
# typeAliasesPackage: com.czsj.**.domain
# # 配置mapper的扫描，找到所有的mapper.xml映射文件
# mapperLocations: classpath*:mapper/**/*Mapper.xml
# # 加载全局的配置文件
# configLocation: classpath:mybatis/mybatis-config.xml
mybatis-plus:
# mapper.xml文件扫描
mapper-locations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔
type-aliases-package: com.czsj.**.domain
global-config:
# 数据库相关配置
db-config:
# 主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
# 字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
# 驼峰下划线转换
column-underline: true
# 逻辑删除
logic-delete-value: 0
logic-not-delete-value: 1
# 数据库类型
db-type: mysql
banner: false
# mybatis原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
type-handlers-package: com.czsj.core.handler
# PageHelper分页插件
pagehelper:

46
pom.xml
View File

@ -18,7 +18,6 @@
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<spring-boot.version>2.5.15</spring-boot.version>
<druid.version>1.2.23</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
@ -47,6 +46,45 @@
<hessian.version>4.0.63</hessian.version>
<junit.version>4.12</junit.version>
<druid.version>1.2.8</druid.version>
<mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
<pagehelper.boot.version>1.4.1</pagehelper.boot.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.test.skip>true</maven.test.skip>
<commons-lang3.version>3.3.2</commons-lang3.version>
<slf4j-api.version>1.7.28</slf4j-api.version>
<logback-classic.version>1.2.2</logback-classic.version>
<commons-io.version>2.4</commons-io.version>
<junit.version>4.12</junit.version>
<postgresql.version>42.2.5</postgresql.version>
<mysql-connector.version>5.1.47</mysql-connector.version>
<groovy.version>2.5.8</groovy.version>
<mybatisplus.version>3.3.1</mybatisplus.version>
<swagger-models.version>1.5.21</swagger-models.version>
<spring.version>4.3.25.RELEASE</spring.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
<jjwt.version>0.9.0</jjwt.version>
<netty.version>4.1.43.Final</netty.version>
<hessian.version>4.0.63</hessian.version>
<hadoop.version>2.7.3</hadoop.version>
<hive.jdbc.version>2.1.0</hive.jdbc.version>
<hbase.version>1.3.0</hbase.version>
<mongo-java-driver.version>3.4.2</mongo-java-driver.version>
<phoenix.version>5.0.0-HBase-2.0</phoenix.version>
<maven.test.skip>false</maven.test.skip>
<downloadSources>true</downloadSources>
<java_source_version>1.8</java_source_version>
<java_target_version>1.8</java_target_version>
<file_encoding>UTF-8</file_encoding>
<flink_streaming_version>1.4.0.RELEASE</flink_streaming_version>
<flink.version>1.13.6</flink.version>
<scala.binary.version>2.12</scala.binary.version>
</properties>
<!-- 依赖声明 -->
@ -261,7 +299,11 @@
<artifactId>czsj-common</artifactId>
<version>${czsj.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
<version>2.1.4.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>