#448 Console system config need to be case sensitive

Author: lzw2006

saturn-console-api/src/main/java/com/vip/saturn/job/console/controller/gui/ConsoleConfigController.java

@@ -104,7 +104,7 @@ public SuccessResponseEntity getConfigs() throws IOException, SaturnJobConsoleEx
 		//获取配置meta
 		Map<String, List<JobConfigMeta>> jobConfigGroups = getSystemConfigMeta();
 		//返回所有配置信息
-		List<SystemConfig> systemConfigs = systemConfigService.getSystemConfigsDirectly(null);
+		List<SystemConfig> systemConfigs = systemConfigService.getAllSystemConfigs();
 		//剔除EXECUTOR_CONFIGS
 		removeExecutorConfigs(systemConfigs);
 

saturn-console-api/src/main/java/com/vip/saturn/job/console/mybatis/repository/SystemConfigRepository.java

@@ -20,4 +20,7 @@ public interface SystemConfigRepository {
 
 	Integer updateById(SystemConfig systemConfig);
 
+	List<SystemConfig> selectByProperty(String property);
+
+	List<SystemConfig> selectAllConfig();
 }

saturn-console-api/src/main/java/com/vip/saturn/job/console/mybatis/service/SystemConfig4SqlService.java

@@ -1,13 +1,18 @@
 package com.vip.saturn.job.console.mybatis.service;
 
 import com.vip.saturn.job.console.mybatis.entity.SystemConfig;
+
 import java.util.List;
 
 /**
  * @author hebelala
  */
 public interface SystemConfig4SqlService {
 
+	List<SystemConfig> selectAllConfig();
+
+	List<SystemConfig> selectByProperty(String property);
+
 	List<SystemConfig> selectByPropertiesAndLastly(List<String> properties);
 
 	List<SystemConfig> selectByLastly();

saturn-console-api/src/main/java/com/vip/saturn/job/console/mybatis/service/impl/SystemConfig4SqlServiceImpl.java

@@ -18,6 +18,16 @@ public class SystemConfig4SqlServiceImpl implements SystemConfig4SqlService {
 	@Autowired
 	private SystemConfigRepository systemConfigRepository;
 
+	@Override
+	public List<SystemConfig> selectAllConfig() {
+		return systemConfigRepository.selectAllConfig();
+	}
+
+	@Override
+	public List<SystemConfig> selectByProperty(String property) {
+		return systemConfigRepository.selectByProperty(property);
+	}
+
 	@Transactional(readOnly = true)
 	@Override
 	public List<SystemConfig> selectByPropertiesAndLastly(List<String> properties) {

saturn-console-api/src/main/java/com/vip/saturn/job/console/service/SystemConfigService.java

@@ -22,6 +22,8 @@ public interface SystemConfigService {
 
 	boolean getBooleanValue(String property, boolean defaultValue);
 
+	List<SystemConfig> getAllSystemConfigs();
+
 	List<SystemConfig> getSystemConfigsDirectly(List<String> properties) throws SaturnJobConsoleException;
 
 	List<SystemConfig> getSystemConfigsByPrefix(String prefix) throws SaturnJobConsoleException;

saturn-console-api/src/main/java/com/vip/saturn/job/console/service/impl/SystemConfigServiceImpl.java

@@ -136,6 +136,11 @@ public boolean getBooleanValue(String property, boolean defaultValue) {
 		}
 	}
 
+	@Override
+	public List<SystemConfig> getAllSystemConfigs() {
+		return systemConfig4SqlService.selectAllConfig();
+	}
+
 	@Override
 	public List<SystemConfig> getSystemConfigsDirectly(List<String> properties) throws SaturnJobConsoleException {
 		return properties != null && !properties.isEmpty() ?
@@ -194,9 +199,18 @@ public Integer insertOrUpdate(SystemConfig systemConfig) throws SaturnJobConsole
 	public Integer createConfig(SystemConfig systemConfig) throws SaturnJobConsoleException {
 		List<String> properties = new ArrayList<>();
 		properties.add(systemConfig.getProperty());
-		List<SystemConfig> systemConfigs = systemConfig4SqlService.selectByPropertiesAndLastly(properties);
+		List<SystemConfig> systemConfigs = systemConfig4SqlService.selectByProperty(systemConfig.getProperty());
+
+		boolean found = false;
+		for (int i = 0; i < systemConfigs.size(); i++) {
+			SystemConfig config = systemConfigs.get(i);
+			if (StringUtils.equals(config.getProperty(), systemConfig.getProperty())) {
+				found = true;
+				break;
+			}
+		}
 
-		if (systemConfig != null && systemConfigs.size() > 0) {
+		if (systemConfig != null && systemConfigs.size() > 0 && found) {
 			throw new SaturnJobConsoleException(
 					String.format("systemConfig %s already existed", systemConfig.getProperty()));
 		}
@@ -210,14 +224,22 @@ public Integer createConfig(SystemConfig systemConfig) throws SaturnJobConsoleEx
 	public Integer updateConfig(SystemConfig systemConfig) throws SaturnJobConsoleException {
 		List<String> properties = new ArrayList<>();
 		properties.add(systemConfig.getProperty());
-		List<SystemConfig> systemConfigs = systemConfig4SqlService.selectByPropertiesAndLastly(properties);
+		List<SystemConfig> systemConfigs = systemConfig4SqlService.selectByProperty(systemConfig.getProperty());
 
-		if (systemConfig == null || systemConfigs.size() == 0) {
+		SystemConfig targetConfig = null;
+		for (int i = 0; i < systemConfigs.size(); i++) {
+			SystemConfig config = systemConfigs.get(i);
+			if (StringUtils.equals(config.getProperty(), systemConfig.getProperty())) {
+				targetConfig = config;
+				break;
+			}
+		}
+		if (targetConfig == null) {
 			throw new SaturnJobConsoleException(
 					String.format("systemConfig %s not existed, update fail", systemConfig.getProperty()));
 		}
 
-		SystemConfig config = systemConfigs.get(0);
+		SystemConfig config = targetConfig;
 		config.setProperty(systemConfig.getProperty());
 		config.setValue(systemConfig.getValue());
 		int result = systemConfig4SqlService.updateById(config);

saturn-console-api/src/main/resources/mapper/SystemConfigMapper.xml

@@ -9,6 +9,17 @@
     <sql id="Base_Column_List">
         id, property, value
     </sql>
+    <select id="selectAllConfig" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_config
+    </select>
+    <select id="selectByProperty" resultMap="BaseResultMap">
+        select 
+        <include refid="Base_Column_List"/>
+        from sys_config
+        where property = #{property}
+    </select>
     <select id="selectByPropertiesAndLastly" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

saturn-console-core/src/main/resources/mapper/SystemConfigMapper.xml

@@ -9,6 +9,17 @@
     <sql id="Base_Column_List">
         id, property, value
     </sql>
+    <select id="selectAllConfig" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_config
+    </select>
+    <select id="selectByProperty" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_config
+        where property = #{property}
+    </select>
     <select id="selectByPropertiesAndLastly" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>