Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!114

site/src/main/java/com/mooctest/crowd/site/controller/UserController.java

@@ -67,6 +67,12 @@ public class UserController extends BaseController{
         return userService.getUser(userId);
     }
 
+
+    @RequestMapping(value = "/user/image/{userId}", method = RequestMethod.GET)
+    public ResponseVO<String> getUserImage(@PathVariable Long userId) {
+        return new ResponseVO<>(ServerCode.SUCCESS, userService.getUserImage(userId));
+    }
+
     @RequestMapping(value = "/user", method = RequestMethod.GET)
     public List<UserDTO> getUsers() {
         return null;

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -800,12 +800,6 @@ public class WebMediatorImpl implements ViewMediator {
 
         // 测试类型的转换
         List<String> testStringList = projectVO.getType().stream().map(testType -> {
-//            Optional<TestTypePO> testTypePO = testTypeDao.findByCode(testType);
-//            if (testTypePO.isPresent()) {
-//                return testTypePO.get().getName();
-//            } else {
-//                throw new HttpBadRequestException("请选择测试类型");
-//            }
             return commonRepo.getTypeNameByCode(testType);
         }).collect(Collectors.toList());