Merge branch 'eclipse-api' into 'DEV'

Eclipse api







See merge request !153

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

@@ -124,10 +124,10 @@ public class PaperServiceImpl extends BaseService implements PaperService {
                 task2Case.setCaseId(caseId);
                 task2Case.setTaskId(paperId);
                 if(total_score / average >1){
-                    task2Case.setWeight((double)average);
+                    task2Case.setWeight((double)average/100);
                     total_score -= average;
                 } else
-                    task2Case.setWeight((double)(average+remainder));
+                    task2Case.setWeight((double)(average+remainder)/100);
                 task2Case.setAutoSelect(caseBlock.getAutoSelect());
                 task2Case.setCaseIndex(maxCaseIndex);
                 task2Case.setCount(0);

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

@@ -11,6 +11,7 @@ import cn.iselab.mooctest.site.web.logic.GroupLogic;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -38,6 +39,7 @@ public class GroupController extends BaseController {
     }
 
     @RequiresPermissions("groups:view")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "group", method = RequestMethod.GET)
     public List<GroupVO> getOwnerGroups(@RequestParam(value = "ownerId", required = false) Long ownerId) {
         ownerId = ((User)SecurityUtils.getSubject().getSession().getAttribute("User")).getId();
@@ -45,6 +47,7 @@ public class GroupController extends BaseController {
     }
 
     @RequiresPermissions("groups:view")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "pageableGroup", method = RequestMethod.GET)
     public Page<GroupVO> getOwnerGroups(@RequestParam(value = "ownerId", required = false) Long ownerId,HttpServletRequest request) {
         ownerId = ((User)SecurityUtils.getSubject().getSession().getAttribute("User")).getId();
@@ -59,6 +62,7 @@ public class GroupController extends BaseController {
 
 
     @RequiresPermissions("group:create")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "group", method = RequestMethod.POST)
     public GroupVO createGroup(@RequestBody GroupVO groupVO){
         return groupLogic.createGroup(groupVO);
@@ -87,6 +91,7 @@ public class GroupController extends BaseController {
     }
 
     @RequiresPermissions("groupWorkers:add")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "group/{id:\\d+}/user", method = RequestMethod.POST)
     public UserVO addUserToGroup(@PathVariable("id") long groupId,@RequestBody UserVO userVO){
         User user = (User) SecurityUtils.getSubject().getSession().getAttribute("User");
@@ -148,6 +153,7 @@ public class GroupController extends BaseController {
     }
 
     @RequiresPermissions("groupInfo:update")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "group/allowJoin/{groupId:\\d+}", method = RequestMethod.PUT)
     public GroupVO updateAllowJoin(@PathVariable("groupId") long groupId){
         User user = (User) SecurityUtils.getSubject().getSession().getAttribute("User");
@@ -176,6 +182,7 @@ public class GroupController extends BaseController {
     }
 
     @RequiresPermissions("groupWorkers:delete")
+    @RequiresRoles(value = "manager")
     @RequestMapping(value = UrlConstants.API + "group/{groupId:\\d+}/user/{userId:\\d+}", method = RequestMethod.DELETE)
     public UserVO deleteUserFromGroup(@PathVariable("groupId") long groupId, @PathVariable("userId") long userId){
         return groupLogic.deleteUserFromGroup(userId,groupId);

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

@@ -11,14 +11,13 @@ import cn.iselab.mooctest.site.util.data.EncryptionUtil;
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import cn.iselab.mooctest.site.web.data.fromDev.AddGradeVO;
 import cn.iselab.mooctest.site.web.data.fromDev.PluginResultVO;
+import cn.iselab.mooctest.site.web.exception.HttpUnauthorizedException;
 import cn.iselab.mooctest.site.web.logic.BaseLogic;
 import cn.iselab.mooctest.site.web.logic.CaseLogic;
 import cn.iselab.mooctest.site.web.logic.fromDev.PluginLogic;
 import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -176,8 +175,8 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     @Override
     public PluginResultVO loginFromPlugin(String email, String token, String taskId) {
         User user = userService.findByEmail(email);
-        if(!EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
-            throw new UnauthorizedException("unauthorized");
+        if(user == null || !EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
+            throw new HttpUnauthorizedException("账号或密码错误");
         }
         Task task = null;
         List<TaskPermission> taskPermissions = taskPermissionService.getByUserIdAndInstanceId(user.getId(),Long.parseLong(taskId));
@@ -192,8 +191,8 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     @Override
     public PluginResultVO getCaseList(String email, String token, String taskId) throws Exception{
         User user = userService.findByEmail(email);
-        if(!EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
-            throw new UnauthorizedException("unauthorized");
+        if(user == null || !EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
+            throw new HttpUnauthorizedException("账号或密码错误");
         }
         Task task = null;
         List<TaskPermission> taskPermissions = taskPermissionService.getByUserIdAndInstanceId(user.getId(),Long.parseLong(taskId));