1

qiniu/command/MakeAdmin.php

@@ -105,7 +105,7 @@ class MakeAdmin extends Command
         //模型
         list($modelNamespace, $modelName, $modelFile, $modelArr) = $this->getModelData($path, $table);
         list($serviceNamespace, $serviceName, $serviceFile, $serviceArr) = $this->getServicesData($path, $table);
-        list($controllerNamespace, $controllerName, $controllerFile, $controllerArr, $controllerPath, $resourceName) = $this->getControllerData($path, $table);
+        list($controllerNamespace, $controllerName, $controllerFile, $controllerArr, $controllerPath) = $this->getControllerData($path, $table);
         list($validateNamespace, $validateName, $validateFile, $validateArr) = $this->getValidateData($path, $table);
 
         if ($delete) {
@@ -284,7 +284,7 @@ class MakeAdmin extends Command
                 'table' => $table,
                 'tableComment' => $tableComment,
                 'tableName' => $modelTableName,
-                'resourceName' => $resourceName,
+                'resourceName' => $table,
                 'path' => $controllerPath,
                 'pk' => $priKey,
                 'controllerNamespace' => $controllerNamespace,
@@ -770,19 +770,13 @@ EOD;
             $path = str_replace(['.', '/', '\\'], '/', $path);
             $arr = explode('/', $path);
         }
-        $resourceName = $table;
-        foreach ($arr as $v) {
-            if (strpos($resourceName, $v . '_') === 0) {
-                $resourceName = substr($resourceName, strlen($v . '_'));
-            }
-        }
         $parseArr = $arr;
         array_push($parseArr, $parseName);
         $appNamespace = Config::get('app.app_namespace');
         $parseNamespace = "{$appNamespace}\\{$type}" . (in_array($type, ['controller', 'validate']) ? '\\admin' : '') . ($arr ? "\\" . implode("\\", $arr) : "");
         $moduleDir = $this->app->getRootPath() . 'app' . DS . $type . DS . ((in_array($type, ['controller', 'validate']) ? 'admin' : '') . DS);
         $parseFile = $moduleDir . ($arr ? implode(DS, $arr) . DS : '') . $parseName . '.php';
-        return [$parseNamespace, $parseName, $parseFile, $parseArr, ($arr ? implode('.', $arr) . '.' : ''), $resourceName];
+        return [$parseNamespace, $parseName, $parseFile, $parseArr, ($arr ? implode('.', $arr) . '.' : '')];
     }