修复在Windows系统上代码自动生成报错的bug

yuan1994 · Jan 4, 2017 · 0a21599 · 0a21599
1 parent 7ea690f
commit 0a21599
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/extend/Generate.php b/extend/Generate.php
@@ -493,7 +493,7 @@ private function buildEdit($path, $pathTemplate, $fileName, $tableName, $code, $
         $file = $path . "edit.html";
 
         //TODO 自定义模板路径
-        if ($this->module == Request::instance()->module()) {
+        if ($this->module == Request::instance()->module() || !$this->module) {
             $module = '';
         } else {
             $module = Request::instance()->module() . '@';
@@ -1190,7 +1190,8 @@ private function readConfig($module, $scope, $name = null, $default = '')
      */
     private function parseCamelCase($name)
     {
-        return preg_replace_callback('/((^|\\' . quotemeta(DS) . ')([a-z]))/', function ($matches) {
+        $pattern = DS == '\\' ? '/((^|\\\\)([a-z]))/' : '/((^|\\/)([a-z]))/';
+        return preg_replace_callback($pattern, function ($matches) {
             return strtoupper($matches[3]);
         }, trim($name, DS));
     }