Merge branch 'DEV' into fix-plugin-signature

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

@@ -10,4 +10,6 @@ public class ThirdPartConstants {
     public final static int ANHENG=2;
 
     public final static int ZEZHONG=3;
+
+    public final static String THIRDEMAIL="anheng@mooctest.net";
 }

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

@@ -2,9 +2,11 @@ package cn.iselab.mooctest.site.rpc.Oauth2.impl;
 
 import cn.iselab.mooctest.site.common.constant.Constants;
 import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
 import cn.iselab.mooctest.site.dao.Exam2CaseDao;
 import cn.iselab.mooctest.site.dao.OpenId2UserIdDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
+import cn.iselab.mooctest.site.dao.UserDao;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.models.instancePermission.TaskPermission;
 import cn.iselab.mooctest.site.rpc.oauth2.api.ExamService;
@@ -59,6 +61,8 @@ public class ExamServiceImpl2 implements ExamService {
     private TaskService taskService;
     @Autowired
     private ExamStatusService examStatusService;
+    @Autowired
+    private UserDao userDao;
 
 
 
@@ -176,6 +180,12 @@ public class ExamServiceImpl2 implements ExamService {
     private Paper savePaperAndPaper2Case(String paperName, HashMap<Long, String> caseNameMap) {
         Paper paper = new Paper();
         paper.setName(paperName+"试卷");
+        User thirdUser = userDao.findByEmail(ThirdPartConstants.THIRDEMAIL);
+        if(thirdUser != null) {
+            paper.setOwnerId(new Long(thirdUser.getId()));
+        }else {
+            paper.setOwnerId(-1L);
+        }
         paper = paperService.createOrUpdate(paper);
         for(Long id: caseNameMap.keySet()) {
             Task2Case task2Case = new Task2Case();

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

@@ -85,7 +85,7 @@ public class Oauth2ServiceImpl implements UserService{
 
     @Override
     public UserDTO loginInOauth(String s) {
-        UserDTO result = null;
+        UserDTO result = new UserDTO();
         UserVO userVO = userLogic.loginForOauth2(s);
         if(userVO!=null) {
             result.setMobile(userVO.getMobile());

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

@@ -1,9 +1,11 @@
 package cn.iselab.mooctest.site.service.impl;
 
 import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
 import cn.iselab.mooctest.site.dao.Exam2PaperDao;
 import cn.iselab.mooctest.site.dao.PaperDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
+import cn.iselab.mooctest.site.dao.UserDao;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.service.BaseService;
 import cn.iselab.mooctest.site.service.PaperService;
@@ -45,6 +47,8 @@ public class PaperServiceImpl extends BaseService implements PaperService {
     TaskService taskService;
     @Autowired
     private CaseBlockVOWrapper caseBlockVOWrapper;
+    @Autowired
+    private UserDao userDao;
 
     @Override
     public Paper getById(long paperId) {
@@ -168,6 +172,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
     }
 
     private Specification<Paper> getWhereClause(Long ownerId, String keyword) {
+        User thirdUser = userDao.findByEmail(ThirdPartConstants.THIRDEMAIL);
         return new Specification<Paper>() {
             @Override
             public Predicate toPredicate(Root<Paper> a, CriteriaQuery<?> q, CriteriaBuilder cb) {
@@ -176,6 +181,12 @@ public class PaperServiceImpl extends BaseService implements PaperService {
                     predicate.getExpressions().add(
                             cb.equal(a.<Long>get("ownerId"), ownerId)
                     );
+                }else {
+                    if(thirdUser!=null) {
+                        predicate.getExpressions().add(
+                                cb.notEqual(a.get("ownerId"), thirdUser.getId())
+                        );
+                    }
                 }
                 if(keyword!=null) {
                     predicate.getExpressions().add(

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

@@ -239,7 +239,9 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
         if(user == null){
             return null;
         }
-        return userVOWrapper.wrap(user);
+        UserVO userVO = userVOWrapper.wrap(user);
+        userVO.setPassword(user.getPassword());
+        return userVO;
     }
 
     @Override