diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/pom.xml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/pom.xml index fc1fd10..915e75c 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/pom.xml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/pom.xml @@ -1,83 +1,78 @@ - - 4.0.0 - - com.schisandra.system - schisandra-cloud-storage-system - 1.0-SNAPSHOT - - - schisandra-cloud-storage-system-domain - jar - - schisandra-cloud-storage-system-domain - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 1.8 - 1.8 - UTF-8 - - - org.projectlombok - lombok - 1.18.24 - - - - org.mapstruct - mapstruct-processor - 1.4.2.Final - - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - - com.mybatis-flex - mybatis-flex-processor - 1.9.0 - - - - - - - - - 8 - 8 - 1.8 - UTF-8 - UTF-8 - - - - - com.schisandra.system - schisandra-cloud-storage-system-infra - 1.0-SNAPSHOT - - - com.schisandra.system - schisandra-cloud-storage-system-common - 1.0-SNAPSHOT - - - com.xuxueli - xxl-job-core - 2.4.0 - - - org.springframework - spring-context - 5.3.27 - - - + + 4.0.0 + + com.schisandra.system + schisandra-cloud-storage-system + 1.0-SNAPSHOT + + + schisandra-cloud-storage-system-domain + jar + + schisandra-cloud-storage-system-domain + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + UTF-8 + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + com.mybatis-flex + mybatis-flex-processor + 1.9.0 + + + + + + + + + 8 + 8 + 1.8 + UTF-8 + UTF-8 + + + + + com.schisandra.system + schisandra-cloud-storage-system-infra + 1.0-SNAPSHOT + + + com.schisandra.system + schisandra-cloud-storage-system-common + 1.0-SNAPSHOT + + + org.springframework + spring-context + 5.3.27 + + + diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/config/XxlJobConfig.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/config/XxlJobConfig.java deleted file mode 100644 index 7fa6dca..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/config/XxlJobConfig.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.schisandra.system.domain.config; - -import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * xxl-job config - * - * @author xuxueli 2017-04-28 - */ -@Configuration -public class XxlJobConfig { - private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); - - @Value("${xxl.job.admin.addresses}") - private String adminAddresses; - - @Value("${xxl.job.accessToken}") - private String accessToken; - - @Value("${xxl.job.executor.appname}") - private String appname; - - @Value("${xxl.job.executor.address}") - private String address; - - @Value("${xxl.job.executor.ip}") - private String ip; - - @Value("${xxl.job.executor.port}") - private int port; - - @Value("${xxl.job.executor.logpath}") - private String logPath; - - @Value("${xxl.job.executor.logretentiondays}") - private int logRetentionDays; - - - @Bean - public XxlJobSpringExecutor xxlJobExecutor() { - logger.info(">>>>>>>>>>> xxl-job config init."); - XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); - xxlJobSpringExecutor.setAdminAddresses(adminAddresses); - xxlJobSpringExecutor.setAppname(appname); - xxlJobSpringExecutor.setAddress(address); - xxlJobSpringExecutor.setIp(ip); - xxlJobSpringExecutor.setPort(port); - xxlJobSpringExecutor.setAccessToken(accessToken); - xxlJobSpringExecutor.setLogPath(logPath); - xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); - - return xxlJobSpringExecutor; - } - - /** - * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP; - * - * 1、引入依赖: - * - * org.springframework.cloud - * spring-cloud-commons - * ${version} - * - * - * 2、配置文件,或者容器启动变量 - * spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.' - * - * 3、获取IP - * String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); - */ - - -} \ No newline at end of file diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml index 454ccaa..4fdc3be 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml @@ -82,17 +82,3 @@ mybatis-flex: mapper-locations: - "classpath*:/mapper/**/*.xml" -# xxl-job配置 -xxl: - job: - admin: - addresses: http://1.95.0.111:8088/xxl-job-admin - accessToken: default_token - executor: - appname: schisandra-cloud-storage-system - address: - ip: 1.95.0.111 - port: 9998 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: 30 -