获取配置信息接口返回json结果

core/src/main/java/com/mooctest/crowd/domain/repository/CommonRepo.java

@@ -210,7 +210,7 @@ public class CommonRepo {
     public List<CrowdTestProject> getProjectList(Pageable pageable, String code, String keyword) {
         Specifications<CrowdTestProjectPO> where = Specifications.where(getCode(code, keyword));
         //添加排序
-        Sort sort = new Sort(Sort.Direction.ASC,"status");
+        Sort sort = new Sort(Sort.Direction.ASC, "status");
         return crowdTestProjectDao.findAll(where, sort).stream().map(crowdTestProjectPO -> Converter.convert(CrowdTestProject.class, crowdTestProjectPO)).collect(Collectors.toList());
     }
 
@@ -240,7 +240,7 @@ public class CommonRepo {
                     predicatesList.add(codePredicate);
                 }
                 if (keyword != null && keyword != "") {
-                    Predicate namePredicate = cb.like(root.get("name"), '%'+StringUtils.trim(keyword)+'%');
+                    Predicate namePredicate = cb.like(root.get("name"), '%' + StringUtils.trim(keyword) + '%');
                     predicatesList.add(namePredicate);
                 }
                 //最终将查询条件拼好然后return
@@ -319,7 +319,7 @@ public class CommonRepo {
     }
 
     public Map<String, String> getConfigurationList() {
-        Map<String, String> configurationMap = configurationDao.findAll().stream().collect(Collectors.toMap(configurationPO -> configurationPO.getName(), configurationPO -> configurationPO.getValue()));
-        return configurationMap;
+        return configurationDao.findAll().stream()
+                .collect(Collectors.toMap(configurationPO -> configurationPO.getName(), configurationPO -> configurationPO.getValue()));
     }
 }

site/src/main/java/com/mooctest/crowd/site/data/vo/ConfigurationVO.java

@@ -1,24 +1,18 @@
 package com.mooctest.crowd.site.data.vo;
 
-import com.mooctest.crowd.domain.domainobject.Configuration;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author guochao
  */
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 public class ConfigurationVO implements Serializable{
-    private Long id;
-    private String name;
-    private String value;
-
-    public ConfigurationVO(Configuration configuration){
-        id = configuration.getId();
-        name = configuration.getName();
-        value = configuration.getValue();
-    }
+    private Map<String, String> configurationList;
 }

site/src/main/java/com/mooctest/crowd/site/service/CommonService.java

@@ -57,5 +57,5 @@ public interface CommonService {
 
     List<Map.Entry<String, Long>> getAgencyProjectCount();
 
-    Map<String, String> getConfigurationList();
+    ConfigurationVO getConfigurationList();
 }

site/src/main/java/com/mooctest/crowd/site/service/impl/CommonServiceImpl.java

@@ -319,9 +319,8 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Map<String, String> getConfigurationList() {
-        return commonRepo.getConfigurationList();
-
+    public ConfigurationVO getConfigurationList() {
+        return new ConfigurationVO(commonRepo.getConfigurationList());
     }
 
     Pageable getPageable(SearchConditionVO searchConditionVO) {

site/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev-localhost
+    active: private-cloud-localhost
 #    active: private-cloud-localhost
   cache:
     guava:
@@ -84,8 +84,6 @@ user:
 website:
   domain: 127.0.0.1
 
-
-
 ---
 spring:
   profiles: private-cloud-localhost
@@ -93,27 +91,27 @@ spring:
     url: jdbc:mysql://127.0.0.1:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: root
     password: Customs2019
-  #  redis:
-  #    host: redis
-  #    port: 6379
-  #    #    password: '#2019@callforttest@!'
-  #    jedis:
-  #      pool:
-  #        max-active: 8
-  #        max-idle: 8
-  #        max-wait: -1
-  #        min-idle: 0
-  #    database: 0
-
   redis:
     host: 127.0.0.1
-    password:
-    pool:
-      max-active: 8
-      max-idle: 8
-      max-wait: -1
-      min-idle: 0
     port: 6379
+    password:
+    jedis:
+      pool:
+        max-active: 8
+        max-idle: 8
+        max-wait: -1
+        min-idle: 0
+    database: 0
+
+#  redis:
+#    host: 127.0.0.1
+#    password:
+#    pool:
+#      max-active: 8
+#      max-idle: 8
+#      max-wait: -1
+#      min-idle: 0
+#    port: 6379
 
 feature:
   client:
@@ -133,7 +131,7 @@ website:
 
 ---
 spring:
-  profiles:
+  profiles: dev-localhost
   datasource:
     url: jdbc:mysql://101.37.175.111:3306/crowd-test-service?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     username: mooctest