Merge branch 'Test' of http://git.mooctest.net/summer/main-site into Test

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/ThirdPartConstants.java

@@ -0,0 +1,13 @@
+package cn.iselab.mooctest.site.common.constant;
+
+/**
+ * Created by ROGK on 2017/8/18.
+ */
+public class ThirdPartConstants {
+
+    public final static int TEST=0;
+
+    public final static int ANHENG=1;
+
+    public final static int ZEZHONG=2;
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/OpenId2UserIdService.java

@@ -0,0 +1,11 @@
+package cn.iselab.mooctest.site.service;
+
+/**
+ * Created by csc on 2017/8/18.
+ */
+public interface OpenId2UserIdService {
+
+    public long findUserIdByOpenId(String openId);
+    public String findOpenIdByUserId(long userId);
+
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/OpenId2UseridServiceImpl.java

@@ -0,0 +1,26 @@
+package cn.iselab.mooctest.site.service.impl;
+
+import cn.iselab.mooctest.site.dao.OpenId2UserIdDao;
+import cn.iselab.mooctest.site.service.OpenId2UserIdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by csc on 2017/8/18.
+ */
+@Service
+public class OpenId2UseridServiceImpl implements OpenId2UserIdService{
+
+    @Autowired
+    private OpenId2UserIdDao openId2UserIdDao;
+
+    @Override
+    public long findUserIdByOpenId(String openId) {
+        return openId2UserIdDao.findByOpenId(openId).getUserId();
+    }
+
+    @Override
+    public String findOpenIdByUserId(long userId) {
+        return openId2UserIdDao.findByUserId(userId).getOpenId();
+    }
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/TestController.java

@@ -3,6 +3,7 @@ package cn.iselab.mooctest.site.web.ctrl;
 import cn.iselab.mooctest.site.common.enums.SessionKey;
 import cn.iselab.mooctest.site.configure.realm.DefaultUsernamepasswordToken;
 import cn.iselab.mooctest.site.models.User;
+import cn.iselab.mooctest.site.service.OpenId2UserIdService;
 import cn.iselab.mooctest.site.util.data.EncryptionUtil;
 import cn.iselab.mooctest.site.web.data.UserVO;
 import cn.iselab.mooctest.site.web.data.wrapper.UserVOWrapper;
@@ -45,6 +46,9 @@ public class TestController {
     @Autowired
     private PermissionLogic permissionLogic;
 
+    @Autowired
+    private OpenId2UserIdService openId2UserIdService;
+
     private Logger LOG = LoggerFactory.getLogger(getClass());
 
     @RequestMapping(value = "/api/test/getSession", method = RequestMethod.GET)
@@ -104,6 +108,7 @@ public class TestController {
             User user = userVOWrapper.unwrap(userVO);
             userVO.setMenuVOs(menuLogic.getMenuListByUserId(user.getId()));
             currentUser.getSession().setAttribute("User", user);
+            userVO.setOpenId(openId2UserIdService.findOpenIdByUserId(userVO.getId()));
             return userVO;
         } else {
             token.clear();

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/fromKibug/BugController.java

@@ -14,6 +14,7 @@ import cn.iselab.mooctest.site.service.fromKibug.BugService;
 import cn.iselab.mooctest.site.service.fromKibug.KibugCaseService;
 import cn.iselab.mooctest.site.service.fromKibug.KibugTaskService;
 import cn.iselab.mooctest.site.service.fromKibug.ReportService;
+import cn.iselab.mooctest.site.web.ctrl.BaseController;
 import cn.iselab.mooctest.site.web.data.fromKibug.BugVO;
 import cn.iselab.mooctest.site.web.exception.IllegalOperationException;
 import cn.iselab.mooctest.site.web.util.Converter;
@@ -32,7 +33,7 @@ import java.util.Map;
  * Created by shanshan on 2017/7/3.
  */
 @RestController
-public class BugController {
+public class BugController extends BaseController{
     @Autowired
     private ReportService reportService;
     @Autowired

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/CaseExtendsVO.java

@@ -19,4 +19,5 @@ public class CaseExtendsVO extends CaseVO{
     private long reportId;
     private String caseReportUrl;
     private long taskId;
-}
+    private String entrance;
+}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/UserVO.java

@@ -36,4 +36,6 @@ public class UserVO extends BaseVO{
     private String captcha;
 
     private List<MenuVO> menuVOs;
+
+    private String openId;
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

@@ -1,6 +1,7 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
 import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.models.fromKibug.Application;
@@ -88,6 +89,9 @@ public class CaseLogicImpl implements CaseLogic {
     @Autowired
     private Exam2CaseService exam2CaseService;
 
+    @Autowired
+    private OpenId2UserIdService openId2UserIdService;
+
     @Override
     public List<CaseVO> getManagerPublicCases() {
 
@@ -244,6 +248,10 @@ public class CaseLogicImpl implements CaseLogic {
                 if (isManager)
                     caseExtendsVO.setCaseReportUrl("/report/list/" + examId + "/" + caseid);
             }
+            if (caseExtendsVO.getSubsiteId() == SubsiteConstants.KIJAM_SUBSITE_ID) {
+                String openId=openId2UserIdService.findOpenIdByUserId(userId);
+                caseExtendsVO.setEntrance("http://api.mooctest.net/oauth/thirdPart?opendId="+openId+"&taskId="+examId+"&thirdPartId="+ ThirdPartConstants.ZEZHONG+"&caseId="+caseid);
+            }
             caseVoList.add(caseExtendsVO);
         }
         return caseVoList;

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

@@ -58,7 +58,7 @@ spring:
         password: secr3t!
     dubbo:
         application.name: local-dubbo-main-site-provider-consumer2
-        registry.address: zookeeper://118.178.131.206:2181
+        registry.address: zookeeper://101.37.175.111:2181
         protocol.name: dubbo
         protocol.port: 20881
 #        protocol.host: 106.14.81.62

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImplTest.java

@@ -59,6 +59,8 @@ public class CaseLogicImplTest {
     private ExamService examService;
     @Mock
     private Exam2CaseService exam2CaseService;
+    @Mock
+    private OpenId2UserIdService openId2UserIdService;
 
     @Before
     public void setUp() {
@@ -290,6 +292,7 @@ public class CaseLogicImplTest {
         when(caseService.getCaseExtendsById(anyLong())).thenReturn(caseExtends);
         when(applicationService.getAppById(anyLong())).thenReturn(application);
         when(reportService.getReport(anyLong(),anyLong(),anyLong())).thenReturn(report);
+        when(openId2UserIdService.findOpenIdByUserId(anyLong())).thenReturn("test");
 
         List<CaseExtendsVO> result=caseLogic.getCasesForExam(1L,1L,1L);