fix bug in dubbo service

mooctest-site-server/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>oauth2-dubbo-api</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.7</version>
         </dependency>
 
         <!--dubbo-service-api-->

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/configure/ApplicationStartup.java

@@ -16,8 +16,8 @@ public class ApplicationStartup implements ApplicationListener<ContextRefreshedE
         System.out.println("-----------------------------------------------------------------------------------------");
         System.out.println("listener");
         ExamController examController = event.getApplicationContext().getBean(ExamController.class);
-//        examController.updateStatusForAllTask();
-//        examController.startInitExamSchedulerMap();
+        examController.updateStatusForAllTask();
+        examController.startInitExamSchedulerMap();
         System.out.println("exam scheduler map initialized");
         System.out.println("-----------------------------------------------------------------------------------------");
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/ExamServiceImpl.java

@@ -1,67 +0,0 @@
-//package cn.iselab.mooctest.site.rpc.Oauth2.impl;
-//
-//import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
-//import cn.iselab.mooctest.site.models.Task;
-//import cn.iselab.mooctest.site.rpc.oauth2.api.ExamService;
-//import cn.iselab.mooctest.site.rpc.oauth2.data.*;
-//import cn.iselab.mooctest.site.web.data.fromDev.PluginResultVO;
-//import cn.iselab.mooctest.site.web.data.fromKibug.ReportScriptResultVO;
-//import cn.iselab.mooctest.site.web.data.fromKibug.ReportVO;
-//import cn.iselab.mooctest.site.web.logic.ReportLogic;
-//import cn.iselab.mooctest.site.web.logic.fromDev.PluginLogic;
-//import cn.iselab.mooctest.site.web.util.Converter;
-//import com.alibaba.dubbo.config.annotation.Service;
-//import org.springframework.beans.factory.annotation.Autowired;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by shanshan on 2017/8/14.
-// */
-//@Service(version = "1.0.7")
-//public class ExamServiceImpl implements ExamService {
-//    @Autowired
-//    private ReportLogic reportLogic;
-//    @Autowired
-//    private PluginLogic pluginLogic;
-//
-//    @Override
-//    public TaskVO getCaseList(Long userId, Long taskId, Long subsiteId) throws Exception {
-//        PluginResultVO vo = pluginLogic.getCaseList(userId, taskId, new Long(SubsiteConstants.KIKBUG_SUBSITE_ID));
-//        TaskVO taskVO = Converter.convert(TaskVO.class, vo);
-//        List<CaseItemVO> caseList = new ArrayList<>();
-//        vo.getCases().stream().forEach(caseItem -> {
-//            caseList.add(Converter.convert(CaseItemVO.class, caseItem));
-//        });
-//        taskVO.setCases(caseList);
-//        return taskVO;
-//    }
-//
-//    @Override
-//    public KibugCaseVO getKibugCase(Long userId, Long taskId, Long caseId) throws Exception {
-//        cn.iselab.mooctest.site.web.data.fromKibug.KibugCaseVO kibugCaseVO = pluginLogic.getKibugCase(userId,taskId,caseId);
-//        return Converter.convert(KibugCaseVO.class, kibugCaseVO);
-//    }
-//
-//    @Override
-//    public Long createReport(ReportVO4Oauth vo) throws Exception {
-//        ReportVO reportVO = Converter.convert(ReportVO.class, vo);
-//        return reportLogic.createReport(reportVO);
-//    }
-//
-//    @Override
-//    public void updateReport(ReportVO4Oauth vo) throws Exception {
-//        if(vo.getId()==null){
-//            throw new IllegalArgumentException("no reportId");
-//        }
-//        ReportVO reportVO = Converter.convert(ReportVO.class, vo);
-//        reportLogic.updateReport(reportVO);
-//    }
-//
-//    @Override
-//    public void recordReportScript(long reportId, ReportScriptResultVO4Oauth vo) throws Exception {
-//        ReportScriptResultVO reportScriptResultVO = Converter.convert(ReportScriptResultVO.class, vo);
-//        reportLogic.recordReportScript(reportId, reportScriptResultVO);
-//    }
-//}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/ExamServiceImpl2.java

@@ -0,0 +1,69 @@
+package cn.iselab.mooctest.site.rpc.Oauth2.impl;
+
+import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.models.Task;
+import cn.iselab.mooctest.site.rpc.oauth2.api.ExamService;
+import cn.iselab.mooctest.site.rpc.oauth2.data.*;
+import cn.iselab.mooctest.site.web.data.fromDev.PluginResultVO;
+import cn.iselab.mooctest.site.web.data.fromKibug.ReportScriptResultVO;
+import cn.iselab.mooctest.site.web.data.fromKibug.ReportVO;
+import cn.iselab.mooctest.site.web.logic.ReportLogic;
+import cn.iselab.mooctest.site.web.logic.fromDev.PluginLogic;
+import cn.iselab.mooctest.site.web.util.Converter;
+import com.alibaba.dubbo.config.annotation.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by shanshan on 2017/8/14.
+ */
+@Service(version = "1.0.7")
+@Component
+public class ExamServiceImpl2 implements ExamService {
+    @Autowired
+    private ReportLogic reportLogic;
+    @Autowired
+    private PluginLogic pluginLogic;
+
+    @Override
+    public TaskVO getCaseList(Long userId, Long taskId, Long subsiteId) throws Exception {
+        PluginResultVO vo = pluginLogic.getCaseList(userId, taskId, new Long(SubsiteConstants.KIKBUG_SUBSITE_ID));
+        TaskVO taskVO = Converter.convert(TaskVO.class, vo);
+        List<CaseItemVO> caseList = new ArrayList<>();
+        vo.getCases().stream().forEach(caseItem -> {
+            caseList.add(Converter.convert(CaseItemVO.class, caseItem));
+        });
+        taskVO.setCases(caseList);
+        return taskVO;
+    }
+
+    @Override
+    public KibugCaseVO getKibugCase(Long userId, Long taskId, Long caseId) throws Exception {
+        cn.iselab.mooctest.site.web.data.fromKibug.KibugCaseVO kibugCaseVO = pluginLogic.getKibugCase(userId,taskId,caseId);
+        return Converter.convert(KibugCaseVO.class, kibugCaseVO);
+    }
+
+    @Override
+    public Long createReport(ReportVO4Oauth vo) throws Exception {
+        ReportVO reportVO = Converter.convert(ReportVO.class, vo);
+        return reportLogic.createReport(reportVO);
+    }
+
+    @Override
+    public void updateReport(ReportVO4Oauth vo) throws Exception {
+        if(vo.getId()==null){
+            throw new IllegalArgumentException("no reportId");
+        }
+        ReportVO reportVO = Converter.convert(ReportVO.class, vo);
+        reportLogic.updateReport(reportVO);
+    }
+
+    @Override
+    public void recordReportScript(long reportId, ReportScriptResultVO4Oauth vo) throws Exception {
+        ReportScriptResultVO reportScriptResultVO = Converter.convert(ReportScriptResultVO.class, vo);
+        reportLogic.recordReportScript(reportId, reportScriptResultVO);
+    }
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/Oauth2ServiceImpl.java

@@ -7,6 +7,7 @@ import cn.iselab.mooctest.site.web.data.UserVO;
 import cn.iselab.mooctest.site.web.logic.UserLogic;
 import com.alibaba.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -14,7 +15,8 @@ import java.util.ArrayList;
 /**
  * Created by csc on 2017/8/11.
  */
-@Service(version = "1.0.3")
+@Service(version = "1.0.7")
+@Component
 public class Oauth2ServiceImpl implements UserService{
 
     @Autowired

mooctest-site-server/src/main/resources/application.yaml

@@ -57,10 +57,10 @@ spring:
         username: mooctest
         password: secr3t!
     dubbo:
-        application.name: dubbo-main-site
+        application.name: local-dubbo-main-site-provider-consumer2
         registry.address: zookeeper://101.37.175.111:2181
         protocol.name: dubbo
-        protocol.port: 20880
+        protocol.port: 20881
 #        protocol.host: 106.14.81.62
         scan: cn.iselab.mooctest.site.rpc
         monitor.protocal: registry
@@ -94,7 +94,7 @@ spring:
         username: mooctest
         password: secr3t!
     dubbo:
-        application.name: dubbo-consumer
+        application.name: pre-dubbo-main-site-provider-consumer
         registry.address: zookeeper://101.37.175.111:2181
         protocol.name: dubbo
         protocol.port: 20880