fix bug:permission

nxlib · Dec 27, 2018 · aa08e78 · aa08e78
1 parent d25b567
commit aa08e78
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,10 @@ source ~/.bash_profile
 2. `tangram create moduleName`
     > create module which named `moduleName`
 
+## #Plan
+1. dependency
+2. data permission
+
 License
 -------
 

diff --git a/src/Tangram/Reflection/AnnotationReflection.php b/src/Tangram/Reflection/AnnotationReflection.php
@@ -53,8 +53,8 @@ private static function analyze(Application $application)
 //                        $requestPath = '/' . $module['uri-prefix'] . '/' . strtolower($modulePath) . '/' . strtolower(str_replace('Controller', '', $requestPath));
 //                        $requestPath = str_replace("//", "/", $requestPath);
 //                        $requestPath = str_replace("\\", "/", $requestPath);
-                        $permissionName = "";
                         $requestPath = "";
+                        $ctrlPermissionName = "";
                         if (!empty($ctrlRequestMapping)) {
                             if (is_string($ctrlRequestMapping)) {
                                 $requestPath = rtrim($ctrlRequestMapping, "/**");
@@ -65,7 +65,7 @@ private static function analyze(Application $application)
                         }
                         if (!empty($mainPermission)) {
                             if (is_string($mainPermission)) {
-                                $permissionName = rtrim($mainPermission, "/**");
+                                $ctrlPermissionName = rtrim($mainPermission, "/**");
                             }
                         }
                         //auth-handler
@@ -83,10 +83,10 @@ private static function analyze(Application $application)
                                     $main_uri = str_replace("//", "/", $main_uri);
                                     $main_uri = str_replace("\\", "/", $main_uri);
 
-                                    if(!empty($permissionName)){
-                                        $permissionName = "/".$permissionName . "/";
+                                    if(!empty($ctrlPermissionName) && strpos($ctrlPermissionName,"/") != 0){
+                                        $ctrlPermissionName = "/".$ctrlPermissionName;
                                     }
-
+                                    $permissionName = "";
                                     $requestMethod = "GET";
                                     $uri = $method->name;
 
@@ -99,13 +99,12 @@ private static function analyze(Application $application)
                                         //有method的comment
                                         $methodRequestMapping = $method->getAnnotation('RequestMapping');
                                         $methodPermission = $method->getAnnotation('Permission');
-
                                         if(!empty($methodPermission)){
                                             if (is_string($methodPermission)) {
-                                                if (empty($permissionName)) {
+                                                if (empty($ctrlPermissionName) || strpos($methodPermission,"/") === 0) {
                                                     $permissionName = $methodPermission;
                                                 } else {
-                                                    $permissionName = $permissionName . $methodPermission;
+                                                    $permissionName = $ctrlPermissionName . "/". $methodPermission;
                                                 }
                                             }
                                         }
@@ -184,6 +183,7 @@ private static function analyze(Application $application)
                                     if(!empty($permissionName)){
                                         static::$annotationMap[$applicationName]["permission"][] = $rs;
                                     }
+                                    $permissionName = "";
                                 }
                             }
                         }