修改Configuration的value为object

src/main/java/com/mooctest/controller/TaskController.java

@@ -7,8 +7,7 @@ import com.mooctest.data.SimpleResponse;
 import com.mooctest.data.TaskDTO;
 import com.mooctest.model.*;
 import com.mooctest.service.*;
-import com.mooctest.service.impl.ConfigurationService;
-import com.mooctest.util.ImportDataMap;
+import com.mooctest.service.ConfigurationService;
 import com.mooctest.util.ReportUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -225,10 +224,10 @@ public class TaskController {
     @ResponseBody
     public SimpleResponse addCrowdTaskDefault(@RequestParam("name")String name, @RequestParam("description")String description,@RequestParam("collaborativeType")int collaborativeType,
                                               @RequestParam("threePageUrl") String threePageUrl, @RequestParam("fileName") String fileName){
-        Map<String, String> configurationMap = configurationService.getConfigurationMap();
-        String os = configurationMap.get("os");
+        Map<String, Object> configurationMap = configurationService.getConfigurationMap();
+        String os = configurationMap.get("os").toString();
         // 后边generatePaperType方法中会根据;进行split
-        os = os.replaceAll(",", ";");
+        os = os.replaceAll(",", ";").replaceAll(" ", "").replaceAll("\\[", "").replaceAll("\\]", "");
 
         if(threePageUrl == null || threePageUrl.equals("")) {
             return new SimpleResponse(400,"请提交三级页面");

src/main/java/com/mooctest/model/Configuration.java

@@ -27,5 +27,5 @@ public class Configuration {
     private String name;
 
     @Field("value")
-    private String value;
+    private Object value;
 }

src/main/java/com/mooctest/service/impl/ConfigurationService.java → src/main/java/com/mooctest/service/ConfigurationService.java

@@ -1,4 +1,4 @@
-package com.mooctest.service.impl;
+package com.mooctest.service;
 
 import com.mooctest.model.Configuration;
 
@@ -12,7 +12,7 @@ import java.util.Map;
 public interface ConfigurationService {
 	List<Configuration> getConfigurationList();
 
-	Map<String, String> getConfigurationMap();
+	Map<String, Object> getConfigurationMap();
 
-	String getConfigurationByName(String name);
+	Object getConfigurationByName(String name);
 }

src/main/java/com/mooctest/service/TaskService.java

@@ -11,7 +11,6 @@ import com.mooctest.data.TaskDTO;
 import com.mooctest.data.enums.CollaborativeType;
 import com.mooctest.model.CrowdTask;
 import com.mooctest.model.Task;
-import com.mooctest.service.impl.ConfigurationService;
 import com.mooctest.util.EncodeUtil;
 import com.mooctest.util.TimeUtil;
 import org.springframework.beans.BeanUtils;

src/main/java/com/mooctest/service/impl/ConfigurationServiceImpl.java

@@ -1,8 +1,8 @@
 package com.mooctest.service.impl;
 
-import com.mooctest.annotation.AutoValue;
 import com.mooctest.dao.ConfigurationDao;
 import com.mooctest.model.Configuration;
+import com.mooctest.service.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.stereotype.Service;
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
  * @date 2021-05-11 11:39
  */
 @Service
-public class ConfigurationServiceImpl implements ConfigurationService{
+public class ConfigurationServiceImpl implements ConfigurationService {
 	@Autowired
 	private ConfigurationDao configurationDao;
 
@@ -27,12 +27,12 @@ public class ConfigurationServiceImpl implements ConfigurationService{
 	}
 
 	@Override
-	public Map<String, String> getConfigurationMap() {
+	public Map<String, Object> getConfigurationMap() {
 		return configurationDao.findAll().stream().collect(Collectors.toMap(configuration -> configuration.getName(), configuration -> configuration.getValue()));
 	}
 
 	@Override
-	public String getConfigurationByName(String name) {
+	public Object getConfigurationByName(String name) {
 		Optional<Configuration> configurationOptional = configurationDao.findByName(name);
 		if(!configurationOptional.isPresent()){
 			throw new ConcurrencyFailureException(name + "配置不存在");