Commit c04b0b82 by 阳浪

配置信息

parent 374bd859
package com.yizhi.application.job.domain;
import lombok.Data;
/**
* 创建Job实体类
* @author yinyuyan 2018/06/06
*
*/
@Data
public class VmyJob {
/**
* 任务分组
*/
private String group;
/**
* 任务名称
*/
private String jobName;
/**
* 任务job的class名
*/
private String jobClassName;
/**
* 秒
*/
private String second="0";
/**
* 分
*/
private String minute="*";
/**
* 时
*/
private String hour="*";
/**
* 天
*/
private String day="*";
/**
* 月
*/
private String month="*";
/**
* 星期
*/
private String week="?";
/**
* 年
*/
private String year="2099";
}
package com.yizhi.application.job.remote;
import com.yizhi.application.job.domain.VmyJob;
import org.springframework.cloud.openfeign.FeignClient;
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.RequestParam;
@FeignClient(value = "job", contextId = "JobClient")
public interface JobClient {
/**
* 新增任务
*
* @param job
* @throws Exception
*/
@RequestMapping(value = "/remote/job/insert", method = RequestMethod.POST)
void insert(@RequestBody VmyJob job) throws Exception;
/**
* 修改任务
*
* @param job
* @throws Exception
*/
@RequestMapping(value = "/remote/job/update", method = RequestMethod.POST)
void update(@RequestBody VmyJob job) throws Exception;
/**
* 删除任务
*
* @param jobKey
* @throws Exception
*/
@RequestMapping(value = "/remote/job/delete", method = RequestMethod.POST)
void delete(@RequestParam("jobKey") String jobKey) throws Exception;
}
D:\深蓝云校\cloud-job\cloud-job-api\src\main\java\com\fulan\application\job\remote\JobClient.java
D:\深蓝云校\cloud-job\cloud-job-api\src\main\java\com\fulan\application\job\domain\VmyJob.java
D:\work\hqzhdj\cloud-job\cloud-job-api\src\main\java\com\yizhi\application\job\domain\VmyJob.java
D:\work\hqzhdj\cloud-job\cloud-job-api\src\main\java\com\yizhi\application\job\remote\JobClient.java
......@@ -18,7 +18,8 @@
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-common-service</artifactId>
<artifactId>cloud-common-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
......@@ -43,64 +44,75 @@
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-site-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 专辑api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-album-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 本地依赖 -->
<!-- 课程api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-course-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 报表 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-statistics-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 培训项目api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-training-project-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 签到api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-sign-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 学习日志api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-course-studyLog-api</artifactId>
<artifactId>cloud-course-study-log-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 积分api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-point-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 考试api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-exam-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 调研api 依赖 -->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-research-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--微信服务依赖-->
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-wechat-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
......@@ -108,20 +120,24 @@
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>library-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-system-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-newMessage-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-aliyun-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
......@@ -160,6 +176,12 @@
<artifactId>wsdl4j</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-course</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
......
......@@ -2,10 +2,11 @@ package com.yizhi.application;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@SpringBootApplication(exclude = {RabbitAutoConfiguration.class})
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yizhi"})
public class JobApplication {
......
......@@ -16,6 +16,11 @@ import java.util.UUID;
import javax.annotation.Resource;
import com.yizhi.util.application.constant.ReturnCode;
import com.yizhi.util.application.domain.Response;
import com.yizhi.util.application.date.DateUtil;
import com.yizhi.util.application.str.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.quartz.CronExpression;
import org.quartz.JobDataMap;
......@@ -41,10 +46,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.yizhi.application.constant.JobError;
import com.yizhi.application.handle.quartz.QuartzConfigration;
import com.yizhi.application.util.constant.ReturnCode;
import com.yizhi.application.util.date.DateUtil;
import com.yizhi.application.util.domain.Response;
import com.yizhi.application.util.str.StringUtil;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......
......@@ -19,6 +19,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.yizhi.util.application.date.DateUtil;
import com.yizhi.util.application.str.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.quartz.CronExpression;
import org.quartz.JobDataMap;
......@@ -44,8 +46,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.yizhi.application.handle.quartz.QuartzConfigration;
import com.yizhi.application.util.date.DateUtil;
import com.yizhi.application.util.str.StringUtil;
/**
* schedeule任务类
......
......@@ -9,7 +9,10 @@ import java.io.IOException;
import java.util.List;
import javax.annotation.Resource;
import javax.xml.ws.Response;
import com.yizhi.core.application.exception.BizException;
import com.yizhi.util.application.constant.ReturnCode;
import org.quartz.CronExpression;
import org.quartz.JobDetail;
import org.quartz.JobKey;
......@@ -26,11 +29,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.yizhi.application.constant.JobError;
import com.yizhi.application.exception.BizException;
import com.yizhi.application.handle.quartz.QuartzConfigration;
import com.yizhi.application.job.domain.VmyJob;
import com.yizhi.application.util.constant.ReturnCode;
import com.yizhi.application.util.domain.Response;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......
......@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import com.yizhi.util.application.file.FileUtils;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.TriggerKey;
......@@ -21,7 +22,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import com.yizhi.application.util.file.FileUtils;
/**
* Quartz配置类
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.AliyunClient;
import com.yizhi.aliyun.application.feign.AliyunClient;
import com.yizhi.application.handle.quartz.BaseJob;
import lombok.extern.log4j.Log4j2;
import org.quartz.InterruptableJob;
......
......@@ -3,6 +3,7 @@ package com.yizhi.application.handle.quartz.job;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.yizhi.album.application.feign.AlbumJobHandleClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -11,7 +12,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.application.feign.AlbumJobHandleClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class AlbumUnLockJob implements BaseJob, InterruptableJob {
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.BannerManageFeignClients;
import com.yizhi.application.handle.quartz.BaseJob;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
......@@ -9,7 +8,6 @@ import org.quartz.JobExecutionException;
import org.quartz.UnableToInterruptJobException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
*
......@@ -21,11 +19,6 @@ public class BannerUpJob implements BaseJob, InterruptableJob {
private final Logger LOG = LoggerFactory.getLogger(BannerUpJob.class);
// @Autowired
// SystemMessageClient messageClient;
@Autowired
BannerManageFeignClients bannerManageFeignClient;
@Override
......@@ -34,7 +27,6 @@ public class BannerUpJob implements BaseJob, InterruptableJob {
LOG.info("执行banner上架的操作:"+id);
try {
bannerManageFeignClient.upBanner(id);
} catch (Exception e) {
LOG.error("=====================",e);
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.course.application.feign.CourseReportClient;
import com.yizhi.library.application.feign.StatisticStudentCaseClient;
import com.yizhi.statistics.application.feign.StatisticsCourseClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -8,9 +11,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.api.feign.StatisticStudentCaseClient;
import com.yizhi.application.feign.CourseReportClient;
import com.yizhi.application.feign.StatisticsCourseClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class CourseIntoTableJob implements BaseJob, InterruptableJob {
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.CourseClient;
import com.yizhi.application.feign.InformationManageFeignClients;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.course.application.feign.CourseClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.CourseStudyHourRankingClient;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.application.system.remote.SiteClient;
import com.yizhi.course.application.feign.CourseStudyHourRankingClient;
import com.yizhi.system.application.system.remote.SiteClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......
package com.yizhi.application.handle.quartz.job;
import cn.hutool.core.date.DateUtil;
import com.yizhi.application.feign.RemoteDaIndicatorCourseClient;
import com.yizhi.application.feign.RemoteDaIndicatorTpClient;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.application.system.remote.RemoteDaIndicatorSystemClient;
import com.yizhi.application.system.remote.SiteClient;
import com.yizhi.application.vo.RemoteDaIndicatorVo;
import com.yizhi.course.application.feign.RemoteDaIndicatorCourseClient;
import com.yizhi.system.application.system.remote.RemoteDaIndicatorSystemClient;
import com.yizhi.system.application.system.remote.SiteClient;
import com.yizhi.system.application.vo.RemoteDaIndicatorVo;
import com.yizhi.training.application.feign.RemoteDaIndicatorTpClient;
import org.apache.commons.collections.CollectionUtils;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
......@@ -69,7 +69,8 @@ public class DashboardJob implements BaseJob, InterruptableJob {
try {
log.info("-------------------- dashboard 课程完成数 开始处理 site_id: {} ----------------------", siteId);
courseClient.courseFinish(new RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
courseClient.courseFinish(new
com.yizhi.course.application.vo.RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
log.info("-------------------- dashboard 课程完成数 处理完成 site_id: {} ----------------------", siteId);
} catch (Exception e) {
e.printStackTrace();
......@@ -77,7 +78,8 @@ public class DashboardJob implements BaseJob, InterruptableJob {
try {
log.info("-------------------- dashboard 课程学习时长 开始处理 site_id: {} ----------------------", siteId);
courseClient.courseTime(new RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
courseClient.courseTime(new
com.yizhi.course.application.vo.RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
log.info("-------------------- dashboard 课程学习时长 处理完成 site_id: {} ----------------------", siteId);
} catch (Exception e) {
e.printStackTrace();
......@@ -85,7 +87,8 @@ public class DashboardJob implements BaseJob, InterruptableJob {
try {
log.info("-------------------- dashboard 项目通过率 开始处理 site_id: {} ----------------------", siteId);
tpClient.tpFinish(new RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
tpClient.tpFinish(new
com.yizhi.training.application.vo.RemoteDaIndicatorVo(siteId, startOfWeek, endOfWeek, null, now));
log.info("-------------------- dashboard 项目通过率 处理完成 site_id: {} ----------------------", siteId);
} catch (Exception e) {
e.printStackTrace();
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.exam.application.feign.StatisticsExamMetadataClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -7,7 +8,6 @@ import org.quartz.UnableToInterruptJobException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.api.feign.StatisticsExamMetadataClient;
import com.yizhi.application.handle.quartz.BaseJob;
......
......@@ -9,6 +9,8 @@
*/
package com.yizhi.application.handle.quartz.job;
import com.yizhi.exam.application.feign.ExamQuestionApiClient;
import com.yizhi.exam.application.vo.exam.ExamAnswerVO;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -17,8 +19,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.api.feign.ExamQuestionApiClient;
import com.yizhi.api.vo.exam.ExamAnswerVO;
import com.yizhi.application.handle.quartz.BaseJob;
/**
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.InformationManageFeignClients;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.site.application.feign.InformationManageFeignClients;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.application.system.remote.OrganizationClient;
import com.yizhi.system.application.system.remote.OrganizationClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.cache.CacheNamespace;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.application.system.remote.OrganizationClient;
import com.yizhi.core.application.cache.CacheNamespace;
import com.yizhi.system.application.system.remote.OrganizationClient;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.collections.CollectionUtils;
import org.quartz.InterruptableJob;
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.research.application.feign.ResearchReportClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -8,7 +9,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.application.feign.ResearchReportClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class ResearchIntoTable implements BaseJob, InterruptableJob {
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.application.feign.remote.RemoteJobHandleClient;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.message.application.feign.remote.RemoteJobHandleClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.sign.application.feign.ReportSignClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -8,7 +9,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.application.feign.ReportSignClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class SignInToTable implements BaseJob, InterruptableJob {
......
package com.yizhi.application.handle.quartz.job;
import com.yizhi.training.application.feign.TrainingProjectReportClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
......@@ -8,7 +9,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.application.feign.TrainingProjectReportClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class StatisticsTrainingProjectJob implements BaseJob, InterruptableJob {
......
......@@ -11,20 +11,19 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.yizhi.application.feign.SydPointAcctranClient;
import com.yizhi.application.handle.quartz.BaseJob;
public class SydPointAcctranJob implements BaseJob, InterruptableJob {
private final Logger LOG = LoggerFactory.getLogger(AlbumUnLockJob.class);
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/*
@Autowired
private SydPointAcctranClient sydPointAcctranClient;
private SydPointAcctranClient sydPointAcctranClient;*/
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
LOG.info("定时任务开始处理江苏银行苏银豆积分,当前时间:" + format.format(new Date()));
try {
sydPointAcctranClient.AsynchronousPointAcctran(null, null, null, null);
//sydPointAcctranClient.AsynchronousPointAcctran(null, null, null, null);
} catch (Exception e) {
LOG.error("处理江苏银行苏银豆积分异常!!!",e);
}
......
package com.yizhi.application.handle.quartz.job;
import com.alibaba.fastjson.JSONArray;
import com.yizhi.application.cache.RedisCache;
import com.yizhi.application.domain.Chapter;
import com.yizhi.application.domain.Recorde;
import com.yizhi.application.domain.StudyLog;
import com.yizhi.application.event.EventWrapper;
import com.yizhi.application.feign.*;
import com.yizhi.application.handle.quartz.BaseJob;
import com.yizhi.application.publish.CloudEventPublisher;
import com.yizhi.application.task.AbstractTaskHandler;
import com.yizhi.application.task.TaskExecutor;
import com.yizhi.application.util.constant.QueueConstant;
import com.yizhi.application.util.event.TrainingProjectEvent;
import com.yizhi.application.vo.PointParamVO;
import com.yizhi.training.application.feign.TrainingProjectClient;
import com.yizhi.wechat.application.feign.WeiXinClient;
import org.quartz.InterruptableJob;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.UnableToInterruptJobException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
......
......@@ -7,4 +7,4 @@ spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.proper
spring.cloud.nacos.config.namespace=${spring.profiles.active}
spring.cloud.nacos.config.prefix=${spring.application.name}
spring.cloud.nacos.config.file-extension=properties
spring.cloud.nacos.config.server-addr=192.168.0.203:8848
\ No newline at end of file
spring.cloud.nacos.config.server-addr=10.23.1.183:8848
\ No newline at end of file
......@@ -32,7 +32,7 @@ org.quartz.jobStore.misfireThreshold = 5000
#dataSource
org.quartz.dataSource.qzDS.driver = com.mysql.jdbc.Driver
org.quartz.dataSource.qzDS.driver = com.mysql.cj.jdbc.Driver
org.quartz.dataSource.qzDS.URL = ${spring.datasource.url}
org.quartz.dataSource.qzDS.user = ${spring.datasource.username}
org.quartz.dataSource.qzDS.password = ${spring.datasource.password}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment