fix: 修复代码删除表名前缀 #77

make password hidden

README.md

@@ -26,9 +26,6 @@
 
 我深信，付费后台管理系统将为您带来更多的价值和便利，帮助您提升工作效率
 
-## ⚠️Thinkphp 用户注意
-由于新版本使用 `Laravel` 开发，所以请使用 `thinkphp` 分支或者 tag2.6.2，thinkphp 版本已经非常稳定了。
-
 ## 功能
 - [x] 用户管理 后台用户管理
 - [x] 部门管理 配置公司的部门结构，支持树形结构
@@ -47,7 +44,7 @@
 - 加入 Q 群 `302266230` 暗号 `catchadmin`。
 - 加微信入群，新建🆕
 
-<img src="wechat.png" width="300"/>
+<img src="wechat.png" width="200"/>
 
 ## 项目地址
 - [github catchadmin](https://github.com/jaguarjack/catch-admin)

composer.json

@@ -14,15 +14,14 @@
         "php": "^8.2",
         "ext-pdo": "*",
         "ext-zip": "*",
-        "guzzlehttp/guzzle": "^7.8.1",
+        "laravel/framework": "^v12.8.1",
-        "laravel/framework": "^11.0",
+        "laravel/tinker": "^v2.10.1",
-        "laravel/tinker": "^v2.9.0",
+        "catchadmin/core": "^0.4.5"
-        "catchadmin/core": "^0.3.7"
     },
     "require-dev": {
-        "fakerphp/faker": "^v1.23.1",
+        "fakerphp/faker": "^v1.24.1",
-        "mockery/mockery": "^1.6.9",
+        "mockery/mockery": "^1.6.12",
-        "pestphp/pest": "^v2.34.2"
+        "pestphp/pest": "^v3.7.2"
     },
     "autoload": {
         "psr-4": {
@@ -53,6 +52,10 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ],
+        "dev": [
+            "Composer\\Config::disableProcessTimeout",
+            "npx concurrently -c \"#93c5fd,#c4b5fd\" \"cd web && yarn dev\" \"php artisan serve\" --names='vite,server'"
+        ],
         "cs-diff": "./fixer/vendor/bin/php-cs-fixer fix --dry-run --diff",
         "cs": "./fixer/vendor/bin/php-cs-fixer fix"
     },

config/filesystems.php

@@ -71,6 +71,9 @@ return [
 
     'links' => [
         public_path('storage') => storage_path('app/public'),
+
+        // 创建 storage 对应的软连接
+        public_path('uploads') => storage_path('uploads')
     ],
 
 ];

modules/Common/Repository/Options/Schemas.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\Common\Repository\Options;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+class Schemas implements OptionInterface
+{
+    public function get(): array
+    {
+        $options = [];
+
+        $connection = DB::connection();
+        $databaseName = $connection->getDatabaseName();
+        $tablePrefix = $connection->getTablePrefix();
+
+        foreach (Schema::getTables($databaseName) as $table) {
+            $tableName = Str::of($table['name'])->replaceStart($tablePrefix, '');
+
+            $options[] = [
+                'label' => $tableName . "\t\t\t\t" . $table['comment'],
+                'value' => $tableName,
+            ];
+        }
+
+        return $options;
+    }
+}

modules/Develop/Models/Schemas.php

@@ -48,6 +48,18 @@ class Schemas extends CatchModel
      */
     public function storeBy(array $data): bool
     {
+        // 从已有 schema 中选择
+        if (isset($data['schema_name'])) {
+            $columns = SchemaFacade::getColumnListing($data['schema_name']);
+
+            return parent::storeBy([
+                'module' => $data['module'],
+                'name' => $data['schema_name'],
+                'columns' => implode(',', $columns),
+                'is_soft_delete' => isset($columns['deleted_at']) ? Status::Enable : Status::Disable,
+            ]);
+        }
+
         $schema = $data['schema'];
 
         $structures = $data['structures'];

modules/Develop/Support/Generate/stubs/vue/form.stub

@@ -8,8 +8,8 @@
 </template>
 
 <script lang="ts" setup>
-import { useCreate } from '/admin/composables/curd/useCreate'
+import { useCreate } from '@/composables/curd/useCreate'
-import { useShow } from '/admin/composables/curd/useShow'
+import { useShow } from '@/composables/curd/useShow'
 import { onMounted } from 'vue'
 
 const props = defineProps({

modules/Develop/Support/Generate/stubs/vue/table.stub

@@ -28,9 +28,9 @@
 <script lang="ts" setup>
 import { computed, onMounted } from 'vue'
 import Create from './create.vue'
-import { useGetList } from '/admin/composables/curd/useGetList'
+import { useGetList } from '@/composables/curd/useGetList'
-import { useDestroy } from '/admin/composables/curd/useDestroy'
+import { useDestroy } from '@/composables/curd/useDestroy'
-import { useOpen } from '/admin/composables/curd/useOpen'
+import { useOpen } from '@/composables/curd/useOpen'
 
 const api = '{api}'
 

modules/Permissions/Http/Controllers/RolesController.php

@@ -6,7 +6,9 @@ namespace Modules\Permissions\Http\Controllers;
 
 use Catch\Base\CatchController as Controller;
 use Catch\Exceptions\FailedException;
+use Catch\Support\ResponseBuilder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Exceptions\ReportableHandler;
 use Illuminate\Http\Request;
 use Modules\Permissions\Enums\DataRange;
 use Modules\Permissions\Models\Roles;

modules/User/Models/LogOperate.php

@@ -6,17 +6,17 @@ use Catch\CatchAdmin;
 use Catch\Traits\DB\BaseOperate;
 use Catch\Traits\DB\ScopeTrait;
 use Catch\Traits\DB\Trans;
+use Catch\Traits\DB\WithAttributes;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpFoundation\Response;
 
 class LogOperate extends Model
 {
-    use BaseOperate, Trans, ScopeTrait;
+    use BaseOperate, Trans, ScopeTrait, WithAttributes;
 
     protected $table = 'log_operate';
 

modules/User/Models/User.php

@@ -32,6 +32,8 @@ class User extends Model implements AuthenticatableContract
         'id', 'username', 'email', 'avatar', 'password', 'remember_token', 'creator_id', 'status', 'department_id', 'login_ip', 'login_at', 'created_at', 'updated_at', 'deleted_at'
     ];
 
+    protected array $defaultHidden = ['password', 'remember_token'];
+
     /**
      * @var array|string[]
      */