Merge pull request #2034 from visuddhinanda/laravel

contentType===json 时 判断 数据是否为数组

app/Http/Api/MdRender.php

@@ -359,21 +359,26 @@ class MdRender{
             if($this->options['contentType'] === "json"){
                 $json = json_decode($markdown);
                 $nissayaWord = [];
-                foreach ($json as $word) {
-                    if(count($word->sn) === 1){
-                        //只输出第一层级
-                        $str = "{{nissaya|";
-                        if(isset($word->word->value)){
-                            $str .= $word->word->value;
-                        }
-                        $str .= "|";
-                        if(isset($word->meaning->value)){
-                            $str .= $word->meaning->value;
+                if(is_array($json)){
+                    foreach ($json as $word) {
+                        if(count($word->sn) === 1){
+                            //只输出第一层级
+                            $str = "{{nissaya|";
+                            if(isset($word->word->value)){
+                                $str .= $word->word->value;
+                            }
+                            $str .= "|";
+                            if(isset($word->meaning->value)){
+                                $str .= $word->meaning->value;
+                            }
+                            $str .= "}}";
+                            $nissayaWord[] = $str;
                         }
-                        $str .= "}}";
-                        $nissayaWord[] = $str;
                     }
+                }else{
+                    Log::error('json data is not array',['data'=>$markdown]);
                 }
+
                 $markdown = implode('',$nissayaWord);
             }else if($this->options['contentType'] === "markdown"){
                 $lines = explode("\n",$markdown);

app/Http/Controllers/CourseController.php

@@ -21,7 +21,10 @@ class CourseController extends Controller
     {
         //
 		$result=false;
-		$indexCol = ['id','title','subtitle','cover','content','content_type','teacher','start_at','end_at','publicity','updated_at','created_at'];
+		$indexCol = ['id','title','subtitle',
+                     'cover','content','content_type',
+                     'teacher','start_at','end_at','join',
+                     'publicity','updated_at','created_at'];
 		switch ($request->get('view')) {
             case 'new':
                 //最新公开课程列表

database/migrations/2024_03_09_132721_add_ver_in_sentences.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddVerInSentences extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('sentences', function (Blueprint $table) {
+            //
+            $table->integer('ver')->index()->default(2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('sentences', function (Blueprint $table) {
+            //
+            $table->dropColumn('ver');
+        });
+    }
+}

public/pali_title/pali_serieses.csv

@@ -86,17 +86,17 @@ id,book,paragraph,title
 85,79,3,yamakapāḷi
 86,80,3,yamakapāḷi
 87,81,3,paṭṭhānapāḷi
-88,82,3,dasakanipātapāḷi
-89,83,3,ekādasakanipātapāḷi
-90,84,3,ekakanipātapāḷi
-91,85,3,dukanipātapāḷi
-92,86,3,tikanipātapāḷi
-93,87,3,catukkanipātapāḷi
-94,88,3,pañcakanipātapāḷi
-95,89,3,chakkanipātapāḷi
-96,90,3,sattakanipātapāḷi
-97,91,3,aṭṭhakanipātapāḷi
-98,92,3,navakanipātapāḷi
+88,82,3,aṅguttaranikāyapāḷi
+89,83,3,aṅguttaranikāyapāḷi
+90,84,3,aṅguttaranikāyapāḷi
+91,85,3,aṅguttaranikāyapāḷi
+92,86,3,aṅguttaranikāyapāḷi
+93,87,3,aṅguttaranikāyapāḷi
+94,88,3,aṅguttaranikāyapāḷi
+95,89,3,aṅguttaranikāyapāḷi
+96,90,3,aṅguttaranikāyapāḷi
+97,91,3,aṅguttaranikāyapāḷi
+98,92,3,aṅguttaranikāyapāḷi
 99,93,3,dīghanikāyapāḷi
 100,94,3,dīghanikāyapāḷi
 101,95,3,dīghanikāyapāḷi