Weenier utc项目部署 0625

app/Http/Controllers/Api/LoginController.php

@@ -60,8 +60,8 @@ class LoginController extends webApp
             return message(1017, true);
         }
 
-        if(!$this->service->register($params)){
-            return message(MemberService::getError());
+        if(!MemberService::make()->register($params)){
+            return message(MemberService::make()->getError());
         }
 
         return message(2008);
@@ -102,11 +102,11 @@ class LoginController extends webApp
         // 手机短信
         if($type == 1){
             if(!SmsService::make()->sendCode($username, 'reg')){
-                return message(SmsService::getError()??'1003');
+                return message(SmsService::make()->getError()??'1003');
             }
         }else{
             if(!EmailService::make()->sendCode($username, 'reg')){
-                return message(EmailService::getError()??'1003');
+                return message(EmailService::make()->getError()??'1003');
             }
         }
 

app/Services/Api/MemberService.php

@@ -24,6 +24,9 @@ use App\Services\RedisService;
  */
 class MemberService extends BaseService
 {
+    // 静态对象
+    protected static $instance = null;
+
     /**
      * 构造函数
      * @since 2020/11/10

app/Services/BaseService.php

@@ -25,29 +25,15 @@ class BaseService
     // 验证类
     protected $validate;
     // 错误信息
-    public $error = '1003';
-    // 静态对象
-    protected static $instance = null;
-
-    /**
-     * 静态入口
-     * @return static|null
-     */
-    public static function make()
-    {
-        if(!self::$instance){
-            self::$instance = (new static());
-        }
-        return self::$instance;
-    }
+    protected $error = '1003';
 
     /**
      * 获得错误信息
      * @return string
      */
-    public static function getError()
+    public function getError()
     {
-        return self::make()->error;
+        return $this->error;
     }
 
     /**

app/Services/ConfigGroupService.php

@@ -22,6 +22,9 @@ use App\Models\ConfigGroupModel;
  */
 class ConfigGroupService extends BaseService
 {
+    // 静态对象
+    protected static $instance = null;
+
     /**
      * 构造函数
      * @author laravel开发员

app/Services/ConfigService.php

@@ -22,6 +22,8 @@ use App\Models\ConfigModel;
  */
 class ConfigService extends BaseService
 {
+    // 静态对象
+    protected static $instance = null;
 
     /**
      * 构造函数

app/Services/EmailService.php

@@ -30,6 +30,9 @@ class EmailService extends BaseService
      */
     protected $config = [];
 
+    // 静态对象
+    protected static $instance = null;
+
     /**
      * 初始化配置
      * @return bool

app/Services/SmsService.php

@@ -22,7 +22,8 @@ use App\Models\ConfigModel;
  */
 class SmsService extends BaseService
 {
-
+    // 静态对象
+    protected static $instance = null;
     /**
      * 静态入口
      * @return static|null