Merge branch 'master' of https://gitee.com/zouxuan/mec into zouxuan

mec-task/src/main/resources/config/mybatis/TaskMapper.xml

@@ -31,17 +31,17 @@
   <select id="get" resultMap="TaskResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from p2p_task
+    from sys_task
     where id_ = #{id,jdbcType=INTEGER}
   </select>
   
   <delete id="delete" parameterType="java.lang.Integer" >
-    delete from p2p_task
+    delete from sys_task
     where id_ = #{id,jdbcType=INTEGER}
   </delete>
   
   <insert id="insert" parameterType="com.ym.mec.task.dal.model.Task" >
-    insert into p2p_task (id_, name_, group_, 
+    insert into sys_task (id_, name_, group_, 
       job_class_, time_exp_, status_, 
       description_, create_on_, modify_on_
       )
@@ -52,7 +52,7 @@
   </insert>
   
   <update id="update" parameterType="com.ym.mec.task.dal.model.Task" >
-    update p2p_task
+    update sys_task
     set name_ = #{name,jdbcType=VARCHAR},
       group_ = #{group,jdbcType=VARCHAR},
       job_class_ = #{jobClass,jdbcType=VARCHAR},
@@ -65,28 +65,28 @@
   </update>
   
   <select id="queryAvailableTasks" resultMap="TaskResultMap">
-    select  * from p2p_task
+    select  * from sys_task
     where status_ != 0 and status_ != 2
   </select>
   
   <select id="queryTaskByNameAndGroup" resultMap="TaskResultMap" parameterType="java.util.Map" >
     select 
     <include refid="Base_Column_List" />
-    from p2p_task
+    from sys_task
     where name_ = #{name} and group_ = #{group}
   </select>
   
   <update id="updateStatusById" parameterType="java.util.Map">
-  	update p2p_task set status_ = #{curStatus},modify_on_ = now() where id_ = #{id} and status_ = #{oldStatus} 
+  	update sys_task set status_ = #{curStatus},modify_on_ = now() where id_ = #{id} and status_ = #{oldStatus} 
   </update>
   
   <select id="queryCount" parameterType="map" resultType="int">
-  	select count(*) from  p2p_task
+  	select count(*) from  sys_task
    <include refid="queryCondition"/>
   </select>
 
   <select id="queryPage" parameterType="map" resultMap="TaskResultMap">
- 	 select * from p2p_task
+ 	 select * from sys_task
    <include refid="queryCondition"/>
    <include refid="global.orderby"/>
    <include refid="global.limit"/>
@@ -95,7 +95,7 @@
 	<select id="getLocked" resultMap="TaskResultMap" parameterType="java.lang.Integer">
 		select
 		<include refid="Base_Column_List" />
-		from p2p_task
+		from sys_task
 		where id_ = #{id,jdbcType=INTEGER} for update
 	</select>
 </mapper>

pom.xml

@@ -40,12 +40,6 @@
 				<artifactId>spring-boot-admin-starter-server</artifactId>
 				<version>2.1.6</version>
 			</dependency>
-			
-			<dependency>
-				<groupId>org.mybatis.spring.boot</groupId>
-				<artifactId>mybatis-spring-boot-starter</artifactId>
-				<version>1.3.2</version>
-			</dependency>
 	
 			<dependency>
 				<groupId>com.ym</groupId>