diff --git a/czsj-admin/pom.xml b/czsj-admin/pom.xml index c222138..615cb70 100644 --- a/czsj-admin/pom.xml +++ b/czsj-admin/pom.xml @@ -66,6 +66,46 @@ provided + + + com.czsj + czsj-core + 3.8.8 + compile + + + slf4j-api + org.slf4j + + + + + + + + + + + + + + + + + + + com.sun.mail + javax.mail + 1.6.2 + + + + + javax.activation + activation + 1.1.1 + + @@ -85,6 +125,25 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + false + + src/main/assembly/package.xml + + + + + make-assembly + + single + + package + + + org.apache.maven.plugins maven-war-plugin diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseController.java index d945ba4..1e352d7 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseController.java @@ -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 { diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseForm.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseForm.java index 13e7f39..0a745e7 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseForm.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseForm.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseResourceController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseResourceController.java index 262056b..e673b1c 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseResourceController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/BaseResourceController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/DataxJsonController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/DataxJsonController.java index d994a38..e2fe10c 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/DataxJsonController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/DataxJsonController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobApiController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobApiController.java index 8b0dd5b..0c740c8 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobApiController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobApiController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobCodeController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobCodeController.java index 23aba96..ce86ff7 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobCodeController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobCodeController.java @@ -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; /** diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobDatasourceController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobDatasourceController.java index 55a3c3a..4ccdca2 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobDatasourceController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobDatasourceController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobGroupController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobGroupController.java index 37b54ee..7780403 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobGroupController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobGroupController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobInfoController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobInfoController.java index ce304e2..738b7aa 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobInfoController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobInfoController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobLogController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobLogController.java index 842b499..94fcfd7 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobLogController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobLogController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobProjectController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobProjectController.java index fd0c6e2..1429a19 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobProjectController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobProjectController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobRegistryController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobRegistryController.java index 54b4c65..eaab1f9 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobRegistryController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobRegistryController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobTemplateController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobTemplateController.java index 28e808c..ef7f2d4 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobTemplateController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/JobTemplateController.java @@ -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; diff --git a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/MetadataController.java b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/MetadataController.java index 3661964..bebd8d8 100644 --- a/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/MetadataController.java +++ b/czsj-admin/src/main/java/com/czsj/web/controller/bigdata/MetadataController.java @@ -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; diff --git a/czsj-admin/src/main/resources/application.yml b/czsj-admin/src/main/resources/application.yml index ddf658e..a5dea08 100644 --- a/czsj-admin/src/main/resources/application.yml +++ b/czsj-admin/src/main/resources/application.yml @@ -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: diff --git a/pom.xml b/pom.xml index edd7cdb..d0477ba 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ 1.8 3.1.1 2.5.15 - 1.2.23 1.21 3.0.0 2.3.3 @@ -47,6 +46,45 @@ 4.0.63 4.12 + 1.2.8 + 2.2.2 + 1.4.1 + 1.4 + 3.2.2 + + UTF-8 + 1.8 + 1.8 + true + 3.3.2 + 1.7.28 + 1.2.2 + 2.4 + 4.12 + 42.2.5 + 5.1.47 + 2.5.8 + 3.3.1 + 1.5.21 + 4.3.25.RELEASE + 1.9.6 + 0.9.0 + 4.1.43.Final + 4.0.63 + 2.7.3 + 2.1.0 + 1.3.0 + 3.4.2 + 5.0.0-HBase-2.0 + + false + true + 1.8 + 1.8 + UTF-8 + 1.4.0.RELEASE + 1.13.6 + 2.12 @@ -261,7 +299,11 @@ czsj-common ${czsj.version} - + + org.springframework.cloud + spring-cloud-context + 2.1.4.RELEASE +