Merge remote-tracking branch 'origin/develop' into develop

bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/SystemConfigController.java

@@ -1,6 +1,7 @@
 package com.bocloud.sms.booter.controller;
 
 import com.alibaba.fastjson.JSONArray;
+import com.bocloud.sms.entity.SystemConfig;
 import com.bocloud.sms.interfaces.SystemConfigService;
 import com.bocloud.sms.model.ConfigModel;
 import com.megatron.common.model.GeneralResult;
@@ -101,4 +102,10 @@ public class SystemConfigController {
     public Result configTest(@RequestParam(value = "category") String category) {
         return systemConfigService.configTest(category);
     }
+
+    @Operation(summary = "通过code查询系统配置信息")
+    @GetMapping("/configs/queryByCode")
+    public GeneralResult<SystemConfig> queryByCode(@RequestParam(value = "code") String code) {
+        return systemConfigService.queryByCode(code);
+    }
 }

bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/SystemConfigService.java

@@ -49,4 +49,6 @@ public interface SystemConfigService {
      * @return
      */
     Result configTest(String category);
+
+    GeneralResult<SystemConfig> queryByCode(String code);
 }

bocloud.sms.service/src/main/java/com/bocloud/sms/service/SystemConfigServiceImpl.java

@@ -331,4 +331,25 @@ public class SystemConfigServiceImpl implements SystemConfigService {
         }
         return Result.FAILED("测试连接失败");
     }
+
+    @Override
+    public GeneralResult<SystemConfig> queryByCode(String code) {
+        String errorMsg;
+
+        try {
+            SystemConfig config = systemConfigRepository.queryByCode(code);
+            if (config == null) {
+                return new GeneralResult<>(false, "未查询到code为" + code + "的配置信息");
+            }
+            String value = config.getValue();
+            if (value != null) {
+                config.setValue(value.trim());
+            }
+            return new GeneralResult<>(true, config, "查询成功");
+        } catch (Exception e) {
+            errorMsg = "通过code查询系统配置信息出错，" + e.getMessage();
+            log.error(errorMsg, e);
+            return new GeneralResult<>(false, errorMsg);
+        }
+    }
 }