更新使用说明文档等

Author: vuecmf

.gitignore

@@ -1,4 +1,6 @@
 /.idea
 /.vscode
+/vendor
 *.log
-/vendor
+.env
+composer.lock

README.md

@@ -26,12 +26,12 @@ VueCMF开发框架主要有以下功能：
 创建新项目
 
 ~~~
-composer create-project emei8/vuecmf myproject
+composer create-project vuecmf/vuecmf myproject
 ~~~
 
 若在已有基于thinkphp6的项目中安装, 则需执行下面
 ~~~
-composer require emei8/framework
+composer require vuecmf/framework
 
 php think vuecmf:publish
 ~~~
@@ -48,7 +48,7 @@ php think migrate:run
 
 ## 更新框架
 ~~~
-composer update emei8/framework
+composer update vuecmf/framework
 ~~~
 
 

app/vuecmf/common.php

@@ -2,9 +2,9 @@
 // +----------------------------------------------------------------------
 // | Copyright (c) 2019~2022 http://www.vuecmf.com All rights reserved.
 // +----------------------------------------------------------------------
-// | Licensed ( https://github.com/emei8/vuecmf/blob/master/LICENSE )
+// | Licensed ( https://github.com/vuecmf/framework/blob/main/LICENSE )
 // +----------------------------------------------------------------------
-// | Author: emei8 <2278667823@qq.com>
+// | Author: vuecmf <tulihua2004@126.com>
 // +----------------------------------------------------------------------
 
 /**
@@ -25,15 +25,20 @@ function ajaxSuccess(string $msg = '', $data = [], int $code = 0): \think\respon
 
 /**
  * ajax请求失败返回的数据结构
- * @param object $exception  异常对象
+ * @param object|string $exception  异常对象|异常信息
  * @param int $code          状态码
  * @param array $data        返回的数据
  * @return \think\response\Json
  */
 function ajaxFail($exception, int $code = 1000, array $data = []): \think\response\Json
 {
     $msg = '异常：';
-    $msg .= config('app.show_error_msg') == true ? $exception->getMessage() . ' 在文件' . $exception->getFile() . '中第' . $exception->getLine() . '行': $exception->getMessage();
+
+    if(is_object($exception)){
+        $msg .= config('app.show_error_msg') == true ? $exception->getMessage() . ' 在文件' . $exception->getFile() . '中第' . $exception->getLine() . '行': $exception->getMessage();
+    }else if(is_string($exception)){
+        $msg .= $exception;
+    }
 
     return json([
         'data'  => $data,

app/vuecmf/controller/Index.php

@@ -1,11 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | Copyright (c) 2019~2022 http://www.vuecmf.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/emei8/vuecmf/blob/master/LICENSE )
-// +----------------------------------------------------------------------
-// | Author: emei8 <2278667823@qq.com>
-// +----------------------------------------------------------------------
 declare (strict_types = 1);
 
 namespace app\vuecmf\controller;
@@ -15,7 +8,7 @@ class Index
 {
     public function index(): string
     {
-        return 'Welcome to VueCMF!';
+        return '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:) </h1><p>Welcome to VueCMF V2.<br/></p><span style="font-size:25px;">[ Powered by <a href="http://www.vuecmf.com/" target="_blank">vuecmf</a> ]</span><script src="https://hm.baidu.com/hm.js?74079f71bcec1421dd89f7c08ed21d68"></script></div>';
     }
-
 }
+        

composer.json

@@ -1,29 +1,14 @@
 {
-    "name": "emei8/vuecmf",
-	"description": "VueCMF是一款完全开源免费的内容管理快速开发框架。采用前后端分离模式搭建，2.0+版本前端使用vue3、Element Plus和TypeScript构建，后端API基于ThinkPHP6开发。可用于快速开发CMS、CRM、WMS、OMS、ERP等管理系统，开发简单、高效易用，极大减少系统的开发周期和研发成本！甚至不用写一行代码使用VueCMF就能设计出功能强大的后台管理系统。",
+    "name": "vuecmf/vuecmf",
+    "description": "VueCMF是一款完全开源免费的内容管理快速开发框架。采用前后端分离模式搭建，2.0+版本前端使用vue3、Element Plus和TypeScript构建，后端API基于ThinkPHP6开发。可用于快速开发CMS、CRM、WMS、OMS、ERP等管理系统，开发简单、高效易用，极大减少系统的开发周期和研发成本！甚至不用写一行代码使用VueCMF就能设计出功能强大的后台管理系统。",
     "keywords": [
         "framework",
         "thinkphp",
         "vuecmf"
     ],
-	"type": "project",
+    "type": "project",
     "homepage": "http://www.vuecmf.com/",
     "license": "Apache-2.0",
-    "autoload": {
-        "psr-4": {
-            "app\\vuecmf\\": "src/",
-			"app\\": "app"
-        },
-		"psr-0": {
-            "": "extend/"
-        }
-    },
-    "authors": [
-        {
-            "name": "emei8",
-            "email": "2278667823@qq.com"
-        }
-    ],
     "require": {
         "php": ">=7.2.5",
         "topthink/framework": "^6.0.0",
@@ -32,26 +17,28 @@
         "casbin/casbin": "^3.16",
         "topthink/think-multi-app": "^1.0",
         "casbin/think-authz": "^1.5",
-        "emei8/framework": "^2.0"
+        "vuecmf/framework": "^2.0"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",
         "topthink/think-trace":"^1.0"
     },
-	"config": {
+    "autoload": {
+        "psr-4": {
+            "app\\vuecmf\\": "src/",
+            "app\\": "app"
+        },
+        "psr-0": {
+            "": "extend/"
+        }
+    },
+    "config": {
         "preferred-install": "dist"
     },
-	"scripts": {
+    "scripts": {
         "post-autoload-dump": [
             "@php think service:discover",
             "@php think vendor:publish"
         ]
-    },
-	"extra": {
-        "think": {
-            "services": [
-                "app\\vuecmf\\VuecmfService"
-            ]
-        }
     }
 }

public/.htaccess

@@ -1,14 +1,8 @@
 <IfModule mod_rewrite.c>
   Options +FollowSymlinks -Multiviews
   RewriteEngine On
-  
-  # RewriteRule ^(admin|static|storage) - [L]
-  
-  RewriteCond $1 !^(admin|static|storage) 
 
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_FILENAME} !-f
-
-  #RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L]
-  RewriteRule ^(.*)$ index.php [L,E=PATH_INFO:$1]
+  RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
 </IfModule>