diff --git a/src/main/java/com/lovenav/controller/ConfigController.java b/src/main/java/com/lovenav/controller/ConfigController.java
index 3bc8924..e7c6625 100644
--- a/src/main/java/com/lovenav/controller/ConfigController.java
+++ b/src/main/java/com/lovenav/controller/ConfigController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 
 @RestController
 public class ConfigController {
@@ -50,7 +51,24 @@ public class ConfigController {
         }catch (NullPointerException e){
            return "请输入配置信息";
         }
-
-
     }
+    @RequestMapping("/getAllEmailConfig")
+    public HashMap<String,String> getAllEmailConfig(){
+        return configService.selectEmailConfig();
+    }
+
+    @RequestMapping("/getConfig")
+    public HashMap<String,Object>  getAllEmailConfig(Config config){
+        HashMap<String,Object> map=new HashMap<>();
+        Config config1;
+        config1 =configService.selectAlreadyExist(config);
+        if (config1!=null){
+            map.put(config1.getName(),config1);
+            return map;
+        }else {
+            map.put("msg","没有该配置！");
+            return map;
+        }
+    }
+
 }