处理一些bug

Author: pl1998

README.md

@@ -55,3 +55,6 @@ php artisan serve --port 9091
 ```shell script
 php artisan queue:work redis --sleep=3
 ```
+
+#### 更新日志 
+  * 2021-04-17 新增用户评论所属区域显示 新增归档a链接 新增评论删除模型监听

apiblog/.DS_Store

@@ -75,12 +75,12 @@ protected function detail($id)
      */
     protected function form()
     {
-        return Form::make(new Topic(), function (Form $form) {
+        return Form::make(new Topics(), function (Form $form) {
             $form->display('id');
             $form->text('article_id');
             $form->text('topic_id');
             $form->text('user_id');
-            $form->text('content');
+
             $form->text('address');
             $form->text('ip');
 

apiblog/app/Admin/Controllers/TopicController.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\WebsiteFooter;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class WebsiteFooterController extends AdminController
+{
+    protected $title ='网址信息';
+
+    protected static $status=[
+        0=>'正常',
+        1=>'禁用'
+    ];
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new WebsiteFooter(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('logo')->image();
+            $grid->column('name','标题');
+            $grid->column('license');
+            $grid->column('license_url');
+//            $grid->column('website');
+            $grid->column('status')->select(static::$status);
+            $grid->column('created_at');
+            $grid->column('updated_at')->sortable();
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new WebsiteFooter(), function (Show $show) {
+            $show->field('id');
+            $show->field('name');
+            $show->field('logo');
+            $show->field('license');
+            $show->field('license_url');
+            $show->field('website');
+            $show->field('status');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new WebsiteFooter(), function (Form $form) {
+            $form->display('id');
+            $form->text('name')->required();
+            $form->image('logo')->disk('public')->required();
+            $form->text('license','备案/许可证编号')->required();
+            $form->text('license_url')->required();
+
+            //赣ICP备19000975号-1 //https://www.miit.gov.cn/
+            $form->table('website', function ($table) {
+                $table->text('title');
+                $table->image('website_img')->disk('public');
+                $table->text('website_url');
+            })->saving(function ($v) {
+                return json_encode($v);
+            });
+            $form->select('status')->options(static::$status)->default(0);
+
+            $form->display('created_at');
+            $form->display('updated_at');
+
+            $form->saving(function (Form $form){
+                if($form->isEditing() && $form->status==1){
+                    //清除缓存
+                    cache()->delete('get_website_info');
+                }
+            });
+        });
+    }
+}

apiblog/app/Admin/Controllers/WebsiteFooterController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\WebsiteFooter as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class WebsiteFooter extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

apiblog/app/Admin/Repositories/WebsiteFooter.php

@@ -17,5 +17,6 @@
     $router->resource('/users', 'UsersController');
     $router->resource('/visitor-registry', 'VisitorRegistryController');
     $router->resource('/topics', 'TopicController');
+    $router->resource('/website', 'WebsiteFooterController');
 
 });

apiblog/app/Admin/routes.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Created By PhpStorm.
+ * User : Latent
+ * Date : 2021/4/18
+ * Time : 2:40 下午
+ **/
+
+namespace App\Http\Controllers;
+
+
+use App\Models\WebsiteFooter;
+use Illuminate\Support\Facades\Redis;
+
+class AppController extends Controller
+{
+    public function getWebsiteInfo()
+    {
+        $data = Redis::get('get_website_info');
+       if(!$data){
+           $data =   WebsiteFooter::query()->where('status',0)
+               ->first(['name','logo','license','license_url','website'])->toArray();
+
+           $data['logo'] = env('APP_URL').'/storage/'.$data['logo'];
+
+           foreach ($data['website'] as &$val){
+
+               $val['website_img'] = env('APP_URL').'/storage/'.$val['website_img'];
+           }
+           Redis::set('get_website_info',json_encode($data));
+       }else{
+           $data = json_decode($data,true);
+       }
+      return $this->success($data);
+    }
+
+}

apiblog/app/Http/Controllers/AppController.php

@@ -19,10 +19,12 @@ public function githubCallBack()
     {
         $auth = new SocialiteAuth(config('oauth.github'));
         $user = $auth->driver('github')->user();
+
         $users = User::query()->where('oauth_id',$user->id)->first();
+
         if(!$users){
             $users= User::query()->create([
-                'name'=>$user->name,
+                'name'=> empty($user->name) ?? $user->login,
                 'email'=>$user->email,
                 'avatar'=>$user->avatar_url,
                 'oauth_id'=>$user->id,
@@ -36,6 +38,7 @@ public function giteeCallBack()
     {
         $auth = new SocialiteAuth(config('oauth.gitee'));
         $user = $auth->driver('gitee')->user();
+
         $users = User::query()->where('oauth_id',$user->id)->first();
 
         if(!$users){
@@ -54,13 +57,14 @@ public function weiboCallBack()
     {
         $auth = new SocialiteAuth(config('oauth.weibo'));
         $user = $auth->driver('weibo')->user();
+
         $users = User::query()->where('oauth_id',$user->id)->first();
 
         if(!$users){
             $users= User::query()->create([
                 'name'=>$user->name,
-                'email'=>$user->email,
-                'avatar'=>$user->avatar_url,
+                'email'=>'',
+                'avatar'=>$user->avatar_large,
                 'oauth_id'=>$user->id,
                 'bound_oauth'=>2
             ]);

apiblog/app/Http/Controllers/OauthController.php

@@ -26,7 +26,7 @@ public function index($id)
     {
       $data =   Topics::query()->with('user')
           ->where('article_id',$id)
-          ->get(['id','content','created_at','user_id']);
+          ->get(['id','content','created_at','user_id','address']);
 
       return $this->success($data);
     }
@@ -37,6 +37,7 @@ public function store(Request $request)
             'contents' => ['required','min:2'],
             'article_id' => ['required','exists:articles,id']
         ]);
+         $ipInfo = geoip($request->getClientIp());
          if(is_numeric($request->topic_id)){
             if( Topics::query()->where('topic_id',$request->topic_id)->exists())
             {
@@ -45,18 +46,19 @@ public function store(Request $request)
                     'content'=> $request->contents,
                     'article_id'=> $request->article_id,
                     'user_id'=>Auth::id(),
-                    'ip'=>$request->getClientIp()
+                    'ip'=>$request->getClientIp(),
+                    'address'=>$ipInfo->country.' '.$ipInfo->city
                 ]);
                 Articles::query()->findOrFail($request->article_id)->increment('browse_count');
             }
              return $this->fail('当前评论已删除或不存在');
          } else{
-             Log::info('test',[$request->all()]);
              Topics::query()->create([
                  'content'=> $request->contents,
                  'article_id'=> $request->article_id,
                  'user_id'=>Auth::id(),
-                 'ip'=>$request->getClientIp()
+                 'ip'=>$request->getClientIp(),
+                 'address'=>$ipInfo->country.' '.$ipInfo->city,
              ]);
              Articles::query()->findOrFail($request->article_id)->increment('browse_count');
          }
@@ -65,9 +67,8 @@ public function store(Request $request)
 
     public function delete($id)
     {
-        Log::info('user_id',[Auth::id()]);
         if(Topics::query()->where('user_id',Auth::id())->where('id',$id)->exists()) {
-            Topics::query()->where('user_id',Auth::id())->where('id',$id)->delete();
+            Topics::destroy($id);
             return $this->success();
         }else{
             return $this->fail('无权限删除该评论或该评论已删除',[],500,200);

apiblog/app/Http/Controllers/TopicsController.php

@@ -21,6 +21,7 @@ public function handle(Request $request, Closure $next)
         if($request->route()->uri == 'api/article/{id}' && env('APP_DEBUG') == false){
             VisitorsToRecordJob::dispatch($request->getClientIp(),$request->id);
         }
+
         return $next($request);
     }
 }