Merge branch 'laravel' into chanpter_progress

app/Http/Controllers/SentPrController.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\SentPr;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+
+class SentPrController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+        if(!isset($_COOKIE['user_uid'])){
+            return $this->error('not login');
+        }
+        
+        $data = $request->all();
+        if($data['channel'] == '7fea264d-7a26-40f8-bef7-bc95102760fb' && $data['book']==65 && $data['para']>2056 && $data['para']<2192){
+            $url = "https://oapi.dingtalk.com/robot/send?access_token=34143dbec80a8fc09c1cb5897a5639ee3a9a32ecfe31835ad29bf7013bdb9fdf";
+            $param = [
+            "actionCard"=> [
+                "title"=> "说慧地品", 
+                "text"=> " wikipali: 来自{$_COOKIE['user_uid']}的修改建议：{$data['text']}", 
+                "btnOrientation"=> "0", 
+                "singleTitle" => "详情",
+                "singleURL"=>"https://staging.wikipali.org/app/article/index.php?view=para&book={$data['book']}&par={$data['para']}&channal={$data['channel']}&display=sent&mode=edit"
+            ], 
+            "msgtype"=>"actionCard"
+            ];
+
+            $response = Http::post($url, $param);
+            if($response->successful()){
+                return $this->ok($response->body);
+            }else{
+                return $this->error($response->body);
+            }            
+        }else{
+            return $this->ok();
+        }
+
+        
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\SentPr  $sentPr
+     * @return \Illuminate\Http\Response
+     */
+    public function show(SentPr $sentPr)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\SentPr  $sentPr
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, SentPr $sentPr)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\SentPr  $sentPr
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(SentPr $sentPr)
+    {
+        //
+    }
+}

public/app/term/note.js

@@ -1930,6 +1930,7 @@ function note_pr_save(obj) {
 		sent_save_callback
 	);
 
+
 	if (sent_tran_div) {
 		$(sent_tran_div).addClass("loading");
 	}
@@ -1962,6 +1963,23 @@ function note_sent_save_a(obj) {
 		lang: "zh",
 	})
 		.done(function (data) {
+            let result = JSON.parse(data);
+            if(result.commit_type==3){
+                $.post(
+                    "/api/v2/sentpr",
+                    {
+                        book: book,
+                        para: para,
+                        begin: begin,
+                        end: end,
+                        channel: channal,
+                        text: text,
+                    },
+                    function(data){
+                        console.log('pr robot',data);
+                    }
+                );
+            }
 			sent_save_callback(data);
 		})
 		.fail(function (xhr, error, data) {

routes/api.php

@@ -7,11 +7,14 @@ use App\Http\Controllers\DhammaTermController;
 use App\Http\Controllers\SentenceController;
 use App\Http\Controllers\ProgressChapterController;
 use App\Http\Controllers\SentenceInfoController;
+use App\Http\Controllers\SentPrController;
 use App\Http\Controllers\TagController;
 use App\Http\Controllers\ViewController;
 use App\Http\Controllers\LikeController;
 use App\Http\Controllers\SentHistoryController;
 use App\Http\Controllers\PaliTextController;
+
+
 /*
 |--------------------------------------------------------------------------
 | API Routes
@@ -31,6 +34,7 @@ Route::group(['prefix' => 'v2'],function(){
 	Route::apiResource('wbw_templates',WbwTemplateController::class);
 	Route::apiResource('terms',DhammaTermController::class);
 	Route::apiResource('sentence',SentenceController::class);
+	Route::apiResource('sentpr',SentPrController::class);
 	Route::apiResource('progress',ProgressChapterController::class);
 	Route::apiResource('tag',TagController::class);
 	Route::apiResource('view',ViewController::class);
@@ -39,4 +43,5 @@ Route::group(['prefix' => 'v2'],function(){
     Route::apiResource('like',LikeController::class);
     Route::apiResource('sent_history',SentHistoryController::class);
     Route::apiResource('palitext',PaliTextController::class);
+
 });