parent
55f29157ac
commit
cd32557db0
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.controller.annotation;
|
package com.xxl.job.admin.controller.annotation;
|
||||||
|
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.controller.interceptor;
|
package com.xxl.job.admin.controller.interceptor;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.constant;
|
package com.xxl.job.admin.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job group
|
* job group
|
@ -1,3 +1,4 @@
|
|||||||
|
package com.xxl.job.admin.core.jobbean;
|
||||||
//package com.xxl.job.service.job;
|
//package com.xxl.job.service.job;
|
||||||
//
|
//
|
||||||
//import java.io.PrintWriter;
|
//import java.io.PrintWriter;
|
@ -1,3 +1,4 @@
|
|||||||
|
package com.xxl.job.admin.core.jobbean.impl;
|
||||||
//package com.xxl.job.service.job.impl;
|
//package com.xxl.job.service.job.impl;
|
||||||
//
|
//
|
||||||
//import java.util.concurrent.TimeUnit;
|
//import java.util.concurrent.TimeUnit;
|
@ -1,3 +1,4 @@
|
|||||||
|
package com.xxl.job.admin.core.jobbean.impl;
|
||||||
//package com.xxl.job.service.job.impl;
|
//package com.xxl.job.service.job.impl;
|
||||||
//
|
//
|
||||||
//import java.util.concurrent.TimeUnit;
|
//import java.util.concurrent.TimeUnit;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.model;
|
package com.xxl.job.admin.core.model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* common return
|
* common return
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.model;
|
package com.xxl.job.admin.core.model;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.model;
|
package com.xxl.job.admin.core.model;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.model;
|
package com.xxl.job.admin.core.model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* xxl-job log for glue, used to track job code process
|
* xxl-job log for glue, used to track job code process
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.util;
|
package com.xxl.job.admin.core.util;
|
||||||
|
|
||||||
import javax.servlet.http.Cookie;
|
import javax.servlet.http.Cookie;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.util;
|
package com.xxl.job.admin.core.util;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.core.util;
|
package com.xxl.job.admin.core.util;
|
||||||
|
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
@ -1,8 +1,9 @@
|
|||||||
package com.xxl.job.dao;
|
package com.xxl.job.admin.dao;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.xxl.job.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job info
|
* job info
|
@ -1,9 +1,9 @@
|
|||||||
package com.xxl.job.dao;
|
package com.xxl.job.admin.dao;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.xxl.job.core.model.XxlJobLog;
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job log
|
* job log
|
@ -1,8 +1,8 @@
|
|||||||
package com.xxl.job.dao;
|
package com.xxl.job.admin.dao;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.xxl.job.core.model.XxlJobLogGlue;
|
import com.xxl.job.admin.core.model.XxlJobLogGlue;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job log for glue
|
* job log for glue
|
@ -1,38 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
|
|
||||||
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
|
|
||||||
xsi:schemaLocation="
|
|
||||||
http://www.springframework.org/schema/beans
|
|
||||||
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
||||||
http://www.springframework.org/schema/context
|
|
||||||
http://www.springframework.org/schema/context/spring-context-3.0.xsd
|
|
||||||
http://www.springframework.org/schema/aop
|
|
||||||
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
|
||||||
http://www.springframework.org/schema/tx
|
|
||||||
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
|
|
||||||
|
|
||||||
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
|
|
||||||
<property name="dataSource" ref="dataSource" />
|
|
||||||
</bean>
|
|
||||||
|
|
||||||
<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
|
|
||||||
|
|
||||||
<tx:advice id="txAdvice" transaction-manager="transactionManager">
|
|
||||||
<tx:attributes>
|
|
||||||
<tx:method name="detail*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="visit*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="get*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="find*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="check*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="list*" propagation="SUPPORTS" />
|
|
||||||
<tx:method name="*" propagation="REQUIRED" rollback-for="exception" />
|
|
||||||
</tx:attributes>
|
|
||||||
</tx:advice>
|
|
||||||
|
|
||||||
<aop:config>
|
|
||||||
<aop:pointcut id="txoperation" expression="execution(* com.xxl.service.imp.*.*(..))" />
|
|
||||||
<aop:advisor pointcut-ref="txoperation" advice-ref="txAdvice" />
|
|
||||||
</aop:config>
|
|
||||||
|
|
||||||
</beans>
|
|
@ -1,25 +0,0 @@
|
|||||||
package com.xxl.job.service.handler;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import com.xxl.job.client.handler.IJobHandler;
|
|
||||||
import com.xxl.job.client.handler.annotation.JobHander;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* demo job handler
|
|
||||||
* @author xuxueli 2015-12-19 19:43:36
|
|
||||||
*/
|
|
||||||
@JobHander(name="demoJobHandler")
|
|
||||||
@Service
|
|
||||||
public class DemoJobHandler extends IJobHandler {
|
|
||||||
private static transient Logger logger = LoggerFactory.getLogger(DemoJobHandler.class);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public JobHandleStatus handle(String... params) throws Exception {
|
|
||||||
logger.info("XXL-JOB, Hello World.");
|
|
||||||
return JobHandleStatus.SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.glue.cache;
|
package com.xxl.job.core.glue.cache;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* chche interface
|
* chche interface
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.glue.cache;
|
package com.xxl.job.core.glue.cache;
|
||||||
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.glue.loader;
|
package com.xxl.job.core.glue.loader;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* code source loader
|
* code source loader
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.handler.annotation;
|
package com.xxl.job.core.handler.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.log;
|
package com.xxl.job.core.log;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.util;
|
package com.xxl.job.core.util;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.util;
|
package com.xxl.job.core.util;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.NetworkInterface;
|
import java.net.NetworkInterface;
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.client.util;
|
package com.xxl.job.core.util;
|
||||||
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
@ -1,6 +1,6 @@
|
|||||||
package com.xxl.job.dao;
|
package com.xxl.job.executor.loader.dao;
|
||||||
|
|
||||||
import com.xxl.job.dao.model.XxlJobInfo;
|
import com.xxl.job.executor.loader.dao.model.XxlJobInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job log for glue
|
* job log for glue
|
@ -1,4 +1,4 @@
|
|||||||
package com.xxl.job.dao.model;
|
package com.xxl.job.executor.loader.dao.model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* xxl-job info
|
* xxl-job info
|
Loading…
Reference in new issue