lip пре 3 месеци
родитељ
комит
86038d4d15
2 измењених фајлова са 12 додато и 4 уклоњено
  1. 4 3
      app/manage/controller/Config.php
  2. 8 1
      app/manage/model/Config.php

+ 4 - 3
app/manage/controller/Config.php

@@ -21,7 +21,7 @@ class Config extends BaseController
     public function getInfo()
     {
         $name=$this->request->param('name');
-        $data = Conf::where(['name'=>$name])->value('value');
+        $data = Conf::where(['field'=>$name])->value('val');
         return success('', $data);
     }
 
@@ -32,7 +32,8 @@ class Config extends BaseController
     public function getAllConfig()
     {
         $name=['sysInfo','chatInfo','smtp','fileUpload','compass'];
-        $list = Conf::where(['name'=>$name])->select();
+        $list = Conf::where(['field'=>$name])->select();
+        $list = Conf::changeList($list);
         return success('', $list);
     }
 
@@ -95,7 +96,7 @@ class Config extends BaseController
         if(!$email || !(\utils\Regular::is_email($email))){
             return warning(lang('email.input'));
         }
-        $conf=Conf::where(['name'=>'smtp'])->value('value');
+        $conf=Conf::where(['field'=>'smtp'])->value('val');
         $mail=new \mail\Mail($conf);
         $mail->sendEmail([$email],lang('email.testTitle'),lang('email.testContent'));
         return success(lang('system.sendOk'));

+ 8 - 1
app/manage/model/Config.php

@@ -11,7 +11,14 @@ class Config extends BaseModel
 {
     protected $json = ['val'];
     protected $jsonAssoc = true;
-
+    
+    public static function changeList($list) {
+        foreach($list as &$item) {
+            $item['name'] = $item['field'];
+            $item['value'] = $item['val'];
+        }
+        return $list;
+    }
     // 获取系统配置信息
     public static function getSystemInfo($update=false){
         $name='systemInfo';