浏览代码

regenerated business and data access

tags/0.1.0
Robin Thoni 9 年前
父节点
当前提交
14fa75e2e7

+ 2
- 2
src/Auth/Business/LuticateGroupsBusiness.php 查看文件

7
 use Luticate\Auth\DBO\LuticateGroupsDbo;
7
 use Luticate\Auth\DBO\LuticateGroupsDbo;
8
 
8
 
9
 class LuticateGroupsBusiness extends LuBusiness {
9
 class LuticateGroupsBusiness extends LuBusiness {
10
-    public function __construct()
10
+    protected static function getDataAccess()
11
     {
11
     {
12
-        $this->dataAccess = new LuticateGroupsDataAccess();
12
+        return new LuticateGroupsDataAccess();
13
     }
13
     }
14
 }
14
 }

+ 2
- 2
src/Auth/Business/LuticatePermissionsBusiness.php 查看文件

7
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
7
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
8
 
8
 
9
 class LuticatePermissionsBusiness extends LuBusiness {
9
 class LuticatePermissionsBusiness extends LuBusiness {
10
-    public function __construct()
10
+    protected static function getDataAccess()
11
     {
11
     {
12
-        $this->dataAccess = new LuticatePermissionsDataAccess();
12
+        return new LuticatePermissionsDataAccess();
13
     }
13
     }
14
 
14
 
15
     public static function getUserPermission($user_id, $permission_name)
15
     public static function getUserPermission($user_id, $permission_name)

+ 2
- 2
src/Auth/Business/LuticatePermissionsGroupsBusiness.php 查看文件

7
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
7
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
8
 
8
 
9
 class LuticatePermissionsGroupsBusiness extends LuBusiness {
9
 class LuticatePermissionsGroupsBusiness extends LuBusiness {
10
-    public function __construct()
10
+    protected static function getDataAccess()
11
     {
11
     {
12
-        $this->dataAccess = new LuticatePermissionsGroupsDataAccess();
12
+        return new LuticatePermissionsGroupsDataAccess();
13
     }
13
     }
14
 }
14
 }

+ 2
- 2
src/Auth/Business/LuticatePermissionsUsersBusiness.php 查看文件

7
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
7
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
8
 
8
 
9
 class LuticatePermissionsUsersBusiness extends LuBusiness {
9
 class LuticatePermissionsUsersBusiness extends LuBusiness {
10
-    public function __construct()
10
+    protected static function getDataAccess()
11
     {
11
     {
12
-        $this->dataAccess = new LuticatePermissionsUsersDataAccess();
12
+        return new LuticatePermissionsUsersDataAccess();
13
     }
13
     }
14
 }
14
 }

+ 5
- 4
src/Auth/Business/LuticateUsersBusiness.php 查看文件

15
 
15
 
16
     const TOKEN_HEADER = "X-Authentication";
16
     const TOKEN_HEADER = "X-Authentication";
17
 
17
 
18
-    public function __construct()
18
+    protected static function getDataAccess()
19
     {
19
     {
20
-        $this->dataAccess = new LuticateUsersDataAccess();
20
+        return new LuticateUsersDataAccess();
21
     }
21
     }
22
 
22
 
23
     public static function getCurrentUser()
23
     public static function getCurrentUser()
37
             $data = JwtHelper::decode($token);
37
             $data = JwtHelper::decode($token);
38
             if ($data != null) {
38
             if ($data != null) {
39
                 $user_id = $data[JwtHelper::USER_KEY];
39
                 $user_id = $data[JwtHelper::USER_KEY];
40
-                self::$_currentUser = LuticateUsersBusiness::getById($user_id);
40
+                self::$_currentUser = self::getById($user_id);
41
             }
41
             }
42
         }
42
         }
43
 
43
 
46
         }
46
         }
47
 
47
 
48
         foreach ($permissions as $permission) {
48
         foreach ($permissions as $permission) {
49
-            if (!LuticatePermissionsBusiness::getUserPermission(self::$_currentUser->getId(), $permission)) {
49
+            $value = LuticatePermissionsBusiness::getUserPermission(self::$_currentUser->getId(), $permission);
50
+            if (!$value->getVal()) {
50
                 return false;
51
                 return false;
51
             }
52
             }
52
         }
53
         }

+ 2
- 3
src/Auth/DataAccess/LuticateGroupsDataAccess.php 查看文件

7
 use Luticate\Auth\DBO\LuticateGroupsDbo;
7
 use Luticate\Auth\DBO\LuticateGroupsDbo;
8
 
8
 
9
 class LuticateGroupsDataAccess extends LuDataAccess {
9
 class LuticateGroupsDataAccess extends LuDataAccess {
10
-    public function __construct()
10
+    protected static function getModel()
11
     {
11
     {
12
-        parent::__construct();
13
-        $this->model = new LuticateGroups();
12
+        return new LuticateGroups();
14
     }
13
     }
15
 }
14
 }

+ 2
- 3
src/Auth/DataAccess/LuticatePermissionsDataAccess.php 查看文件

8
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
8
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
9
 
9
 
10
 class LuticatePermissionsDataAccess extends LuDataAccess {
10
 class LuticatePermissionsDataAccess extends LuDataAccess {
11
-    public function __construct()
11
+    protected static function getModel()
12
     {
12
     {
13
-        parent::__construct();
14
-        $this->model = new LuticatePermissions();
13
+        return new LuticatePermissions();
15
     }
14
     }
16
 
15
 
17
     public static function getUserPermission($user_id, $permission_name)
16
     public static function getUserPermission($user_id, $permission_name)

+ 2
- 3
src/Auth/DataAccess/LuticatePermissionsGroupsDataAccess.php 查看文件

7
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
7
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
8
 
8
 
9
 class LuticatePermissionsGroupsDataAccess extends LuDataAccess {
9
 class LuticatePermissionsGroupsDataAccess extends LuDataAccess {
10
-    public function __construct()
10
+    protected static function getModel()
11
     {
11
     {
12
-        parent::__construct();
13
-        $this->model = new LuticatePermissionsGroups();
12
+        return new LuticatePermissionsGroups();
14
     }
13
     }
15
 }
14
 }

+ 2
- 3
src/Auth/DataAccess/LuticatePermissionsUsersDataAccess.php 查看文件

7
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
7
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
8
 
8
 
9
 class LuticatePermissionsUsersDataAccess extends LuDataAccess {
9
 class LuticatePermissionsUsersDataAccess extends LuDataAccess {
10
-    public function __construct()
10
+    protected static function getModel()
11
     {
11
     {
12
-        parent::__construct();
13
-        $this->model = new LuticatePermissionsUsers();
12
+        return new LuticatePermissionsUsers();
14
     }
13
     }
15
 }
14
 }

+ 2
- 3
src/Auth/DataAccess/LuticateUsersDataAccess.php 查看文件

7
 use Luticate\Auth\DBO\LuticateUsersDbo;
7
 use Luticate\Auth\DBO\LuticateUsersDbo;
8
 
8
 
9
 class LuticateUsersDataAccess extends LuDataAccess {
9
 class LuticateUsersDataAccess extends LuDataAccess {
10
-    public function __construct()
10
+    protected static function getModel()
11
     {
11
     {
12
-        parent::__construct();
13
-        $this->model = new LuticateUsers();
12
+        return new LuticateUsers();
14
     }
13
     }
15
 }
14
 }

正在加载...
取消
保存