Rename

README.md

@@ -49,7 +49,7 @@ composer require asundust/dcat-wechat-work-push
 企业微信消息推送
 └用户配置
 ```
-- `用户配置`的表名默认为`wechat_work_push_users`，目前不可更改
+- `用户配置`的表名默认为`dcat_wechat_work_push_users`，目前不可更改
 - 默认中间件组为`web`，目前不可更改
 - 目前不支持多语言，后期可以考虑增加
 

src/Http/Actions/SendTestMessage.php

@@ -3,14 +3,14 @@
 namespace Asundust\DcatWechatWorkPush\Http\Actions;
 
 use Asundust\DcatWechatWorkPush\DcatWechatWorkPushServiceProvider;
-use Asundust\DcatWechatWorkPush\Http\Traits\WechatWorkPushSendMessageTrait;
-use Asundust\DcatWechatWorkPush\Models\WechatWorkPushUser;
+use Asundust\DcatWechatWorkPush\Http\Traits\DcatWechatWorkPushSendMessageTrait;
+use Asundust\DcatWechatWorkPush\Models\DcatWechatWorkPushUser;
 use Dcat\Admin\Grid\RowAction;
 use Illuminate\Http\Request;
 
 class SendTestMessage extends RowAction
 {
-    use WechatWorkPushSendMessageTrait;
+    use DcatWechatWorkPushSendMessageTrait;
 
     /**
      * 标题.
@@ -31,7 +31,7 @@ public function title()
     public function handle(Request $request)
     {
         $id = $this->getKey();
-        $user = WechatWorkPushUser::find($id);
+        $user = DcatWechatWorkPushUser::find($id);
         if ($user->is_own_wechat_work) {
             $config = [
                 'corp_id' => $user->corp_id,

src/Http/Controllers/WechatWorkPushHandleController.php → src/Http/Controllers/DcatWechatWorkPushHandleController.php

@@ -3,16 +3,16 @@
 namespace Asundust\DcatWechatWorkPush\Http\Controllers;
 
 use Asundust\DcatWechatWorkPush\DcatWechatWorkPushServiceProvider;
-use Asundust\DcatWechatWorkPush\Http\Traits\WechatWorkPushSendMessageTrait;
-use Asundust\DcatWechatWorkPush\Models\WechatWorkPushUser;
+use Asundust\DcatWechatWorkPush\Http\Traits\DcatWechatWorkPushSendMessageTrait;
+use Asundust\DcatWechatWorkPush\Models\DcatWechatWorkPushUser;
 use Dcat\Admin\Http\Controllers\AdminController;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
 use EasyWeChat\Kernel\Exceptions\RuntimeException;
 use Illuminate\Http\Request;
 
-class WechatWorkPushHandleController extends AdminController
+class DcatWechatWorkPushHandleController extends AdminController
 {
-    use WechatWorkPushSendMessageTrait;
+    use DcatWechatWorkPushSendMessageTrait;
 
     /**
      * @param $secret
@@ -30,7 +30,7 @@ public function push($secret, Request $request): array
             return ['code' => 1, 'message' => '消息标题为空'];
         }
 
-        $user = WechatWorkPushUser::where('sc_secret', $secret)
+        $user = DcatWechatWorkPushUser::where('sc_secret', $secret)
             ->where('status', 1)
             ->first();
 

src/Http/Controllers/WechatWorkPushUserController.php → src/Http/Controllers/DcatWechatWorkPushUserController.php

@@ -3,7 +3,7 @@
 namespace Asundust\DcatWechatWorkPush\Http\Controllers;
 
 use Asundust\DcatWechatWorkPush\Http\Actions\SendTestMessage;
-use Asundust\DcatWechatWorkPush\Models\WechatWorkPushUser;
+use Asundust\DcatWechatWorkPush\Models\DcatWechatWorkPushUser;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\Displayers\Actions;
@@ -12,7 +12,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
 
-class WechatWorkPushUserController extends AdminController
+class DcatWechatWorkPushUserController extends AdminController
 {
     /**
      * Title for current resource.
@@ -28,15 +28,15 @@ class WechatWorkPushUserController extends AdminController
      */
     protected function grid()
     {
-        $grid = new Grid(new WechatWorkPushUser());
+        $grid = new Grid(new DcatWechatWorkPushUser());
 
         $grid->column('id', '序号');
         $grid->column('name', '推送账号')->copyable();
         $grid->column('sc_secret', '推送密钥')->display(function ($scSecret) {
             return '<a href="javascript:void(0);" class="grid-column-copyable text-muted" data-content="'.$scSecret.'" title="" data-placement="bottom" data-original-title="已复制!"><i class="fa fa-copy"></i></a>&nbsp;***';
         });
         $grid->column('api_address', '推送Api地址')->display(function () {
-            /* @var WechatWorkPushUser $this */
+            /* @var DcatWechatWorkPushUser $this */
             $apiAddressShow = $this->api_address_show;
             $apiAddress = $this->api_address;
 
@@ -53,7 +53,7 @@ protected function grid()
 
         $grid->filter(function (Filter $filter) {
             $filter->equal('status', '账号状态')
-                ->radio(array_merge(['' => '全部'], WechatWorkPushUser::STATES));
+                ->radio(array_merge(['' => '全部'], DcatWechatWorkPushUser::STATES));
             $filter->equal('id', '序号');
             $filter->like('name', '推送账号');
             $filter->where('user_self_config', function (Builder $builder) {
@@ -70,7 +70,7 @@ protected function grid()
                         break;
                 }
             }, '自定企业微信')
-                ->radio(array_merge(['' => '全部'], WechatWorkPushUser::IS_OWN_WECHAT_WORK));
+                ->radio(array_merge(['' => '全部'], DcatWechatWorkPushUser::IS_OWN_WECHAT_WORK));
             $filter->between('created_at', '创建时间')->datetime();
             $filter->between('updated_at', '创建时间')->datetime();
         });
@@ -92,7 +92,7 @@ protected function grid()
      */
     protected function form()
     {
-        $form = new Form(new WechatWorkPushUser());
+        $form = new Form(new DcatWechatWorkPushUser());
 
         $form->text('name', '推送账号')
             ->rules('required')

src/Http/Traits/WechatWorkPushSendMessageTrait.php → src/Http/Traits/DcatWechatWorkPushSendMessageTrait.php

@@ -5,9 +5,9 @@
 use Asundust\DcatWechatWorkPush\DcatWechatWorkPushServiceProvider;
 
 /**
- * Trait WechatWorkPushSendMessageTrait.
+ * Trait DcatWechatWorkPushSendMessageTrait.
  */
-trait WechatWorkPushSendMessageTrait
+trait DcatWechatWorkPushSendMessageTrait
 {
     /**
      * 使用自定配置发送消息.

src/Http/push.php

@@ -1,5 +1,5 @@
 <?php
 
-use Asundust\DcatWechatWorkPush\Http\Controllers\WechatWorkPushHandleController;
+use Asundust\DcatWechatWorkPush\Http\Controllers\DcatWechatWorkPushHandleController;
 
-Route::match(['get', 'post'], 'push/{secret}', WechatWorkPushHandleController::class.'@push');
+Route::match(['get', 'post'], 'push/{secret}', DcatWechatWorkPushHandleController::class.'@push');

src/Http/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-use Asundust\DcatWechatWorkPush\Http\Controllers\WechatWorkPushUserController;
+use Asundust\DcatWechatWorkPush\Http\Controllers\DcatWechatWorkPushUserController;
 use Illuminate\Support\Facades\Route;
 
-Route::resource('wechatWorkPushUsers', WechatWorkPushUserController::class)->except(['show']);
+Route::resource('wechatWorkPushUsers', DcatWechatWorkPushUserController::class)->except(['show']);

src/Models/WechatWorkPushUser.php → src/Models/DcatWechatWorkPushUser.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * Asundust\DcatWechatWorkPush\Models\WechatWorkPushUser.
+ * Asundust\DcatWechatWorkPush\Models\DcatWechatWorkPushUser.
  *
  * @property int         $id
  * @property string      $name               用户的账户
@@ -23,7 +23,7 @@
  * @property Carbon|null $updated_at
  * @mixin Eloquent
  */
-class WechatWorkPushUser extends Model
+class DcatWechatWorkPushUser extends Model
 {
     protected $fillable = ['name', 'sc_secret', 'status', 'corp_id', 'agent_id', 'secret'];
 
@@ -53,7 +53,7 @@ public function __construct($attributes = [])
 
         $this->setConnection(config('admin.database.connection') ?: config('database.default'));
 
-        $this->setTable(config('admin.extensions.wechat-work-push.user_table', 'wechat_work_push_users'));
+        $this->setTable('dcat_wechat_work_push_users');
     }
 
     // is_own_wechat_work

updates/2021_02_09_084348_create_wechat_work_push_users_table.php → updates/2021_02_09_084348_create_dcat_wechat_work_push_users_table.php

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateWechatWorkPushUsersTable extends Migration
+class CreateDcatWechatWorkPushUsersTable extends Migration
 {
     /**
      * @return \Illuminate\Config\Repository|\Illuminate\Contracts\Foundation\Application|mixed|string|null
@@ -21,7 +21,7 @@ public function getConnection()
      */
     public function up()
     {
-        $table = 'wechat_work_push_users';
+        $table = 'dcat_wechat_work_push_users';
         Schema::create($table, function (Blueprint $table) {
             $table->increments('id');
             $table->string('name')->index()->comment('用户的账户');
@@ -41,7 +41,7 @@ public function up()
      */
     public function down()
     {
-        $table = 'wechat_work_push_users';
+        $table = 'dcat_wechat_work_push_users';
         Schema::dropIfExists($table);
     }
 }

version.php

@@ -3,6 +3,6 @@
 return [
     '1.0.0' => [
         '第一个版本',
-        '2021_02_09_084348_create_wechat_work_push_users_table.php',
+        '2021_02_09_084348_create_dcat_wechat_work_push_users_table.php',
     ],
 ];