Merge branch 'master-hutao' into 'master'

修改

See merge request fairylandcloudschool/cloud-message!2

cloud-newMessage-service/pom.xml

@@ -22,12 +22,12 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.yizhi</groupId>
-            <artifactId>cloud-job-api</artifactId>
-            <scope>provided</scope>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yizhi</groupId>-->
+<!--            <artifactId>cloud-job-api</artifactId>-->
+<!--            <scope>provided</scope>-->
+<!--            <version>1.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.yizhi</groupId>
@@ -76,10 +76,16 @@
         </dependency>
         <dependency>
             <groupId>com.yizhi</groupId>
-            <artifactId>cloud-course-studyLog-api</artifactId>
+            <artifactId>cloud-course-study-log-api</artifactId>
             <scope>provided</scope>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.yizhi</groupId>
+            <artifactId>cloud-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
@@ -96,4 +102,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

cloud-newMessage-service/src/main/java/com/yizhi/message/application/controller/util/BuildJob.java

 package com.yizhi.message.application.controller.util;
 
-import com.yizhi.application.job.remote.JobClient;
-import com.yizhi.application.job.remote.vo.VmyJobVO;
-import com.yizhi.message.application.constans.Constans;
-import com.yizhi.util.application.date.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 
 @Component
 public class BuildJob {
-
-    @Autowired
-    private JobClient jobClient;
+//
+//    @Autowired
+//    private JobClient jobClient;
 
     private static final Logger logger = LoggerFactory.getLogger(BuildJob.class);
 
@@ -26,43 +21,43 @@ public class BuildJob {
      * @throws Exception
      */
     public void buildJob(String jobName,Date sendTime) throws Exception {
-        VmyJobVO job = new VmyJobVO();
-        job.setGroup(Constans.JOBGROUP);
-        job.setJobName(jobName);
-        job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
-        logger.info("********************************上架消息的发送时间={},时间戳={}",
-                sendTime, sendTime.getTime());
-
-        logger.info("**************************************当前系统时间={}", (new Date()).getTime());
-        String cron = DateUtil.getCron(sendTime);
-        logger.info("**************************************cron={}", cron);
-        String[] cronArr = cron.split(" ");
-        job.setSecond(cronArr[0]);
-        job.setMinute(cronArr[1]);
-        job.setHour(cronArr[2]);
-        job.setDay(cronArr[3]);
-        job.setMonth(cronArr[4]);
-        job.setWeek(cronArr[5]);
-        job.setYear(cronArr[6]);
-        jobClient.insert(job);
+//        VmyJobVO job = new VmyJobVO();
+//        job.setGroup(Constans.JOBGROUP);
+//        job.setJobName(jobName);
+//        job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
+//        logger.info("********************************上架消息的发送时间={},时间戳={}",
+//                sendTime, sendTime.getTime());
+//
+//        logger.info("**************************************当前系统时间={}", (new Date()).getTime());
+//        String cron = DateUtil.getCron(sendTime);
+//        logger.info("**************************************cron={}", cron);
+//        String[] cronArr = cron.split(" ");
+//        job.setSecond(cronArr[0]);
+//        job.setMinute(cronArr[1]);
+//        job.setHour(cronArr[2]);
+//        job.setDay(cronArr[3]);
+//        job.setMonth(cronArr[4]);
+//        job.setWeek(cronArr[5]);
+//        job.setYear(cronArr[6]);
+//        jobClient.insert(job);
     }
 
     public void buildJobDefault(String jobName) throws Exception {
-        VmyJobVO job = new VmyJobVO();
-        job.setGroup(Constans.JOBGROUP);
-        job.setJobName(jobName);
-        job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
-
-        logger.info("**************************************当前系统时间={}", (new Date()).getTime());
-
-        job.setSecond("0");
-        job.setMinute("0/5");
-        job.setHour("*");
-        job.setDay("*");
-        job.setMonth("*");
-        job.setWeek("?");
-        job.setYear("*");
-        jobClient.insert(job);
+//        VmyJobVO job = new VmyJobVO();
+//        job.setGroup(Constans.JOBGROUP);
+//        job.setJobName(jobName);
+//        job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
+//
+//        logger.info("**************************************当前系统时间={}", (new Date()).getTime());
+//
+//        job.setSecond("0");
+//        job.setMinute("0/5");
+//        job.setHour("*");
+//        job.setDay("*");
+//        job.setMonth("*");
+//        job.setWeek("?");
+//        job.setYear("*");
+//        jobClient.insert(job);
     }
 
-}
\ No newline at end of file
+}

cloud-newMessage-service/src/main/java/com/yizhi/message/application/service/impl/MessageServiceImple.java

@@ -3,7 +3,6 @@ package com.yizhi.message.application.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yizhi.application.job.remote.JobClient;
 import com.yizhi.application.orm.id.IdGenerator;
 import com.yizhi.core.application.context.ContextHolder;
 import com.yizhi.core.application.context.RequestContext;
@@ -15,9 +14,8 @@ import com.yizhi.message.application.controller.util.QueryAccount;
 import com.yizhi.message.application.domain.*;
 import com.yizhi.message.application.enums.MessageStatus;
 import com.yizhi.message.application.mapper.MessageMapper;
-import com.yizhi.message.application.vo.*;
 import com.yizhi.message.application.service.*;
-import com.yizhi.message.application.vo.MessageRemindVo;
+import com.yizhi.message.application.vo.*;
 import com.yizhi.system.application.vo.AccountVO;
 import com.yizhi.system.application.vo.OrgVO;
 import org.apache.commons.collections.CollectionUtils;
@@ -42,8 +40,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> implements MessageService {
-    @Autowired
-    private JobClient jobClient;
+
 
     @Autowired
     private IdGenerator idGenerator;
@@ -734,4 +731,4 @@ public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> imp
         }
         return map;
     }
-}
\ No newline at end of file
+}