Merge branch 'develop'

.env.example

@@ -31,7 +31,7 @@ APOLLO_CONFIG_SERVER=http://127.0.0.1:18080
 #nodeos 节点
 RPC_NODE_URL=https://api.cypherglass.com
 #钱包服务 节点
-RPC_KEOSD_URL=https://api.cypherglass.com
+RPC_KEOSD_URL=htt://0.0.0.0:8900
 #oss 存储地址
 OSS_URL=https://oss.caihongxingqiu.com/
 #当前服务地址

app/Http/Controllers/MetaController.php

@@ -60,10 +60,10 @@ class MetaController extends Controller
         $validator = Validator::make($request->all(), [
             'patch_num' => 'required|alpha_num|max:16',
             'produce_date' => 'required|date',
-            'variety' => 'required|max:4',
+            'variety' => 'required|max:40',
             'variety_img' => 'required|url',
             'age' => 'required|max:4',
-            'food' => 'required|max:5',
+            'food' => 'required|max:50',
             'food_img' => 'required|url',
             'water' => 'required|max:5',
             'water_img' => 'required|url',

app/Models/Meta.php

@@ -16,4 +16,10 @@ class Meta extends Model
     protected $table = 'meta';
     protected $guarded = [];
 
+
+    public function serializeNum()
+    {
+        return $this->hasOne('App\Models\Serialize', 'meta_id', 'id');
+    }
+
 }

app/Repositories/MetaRepository.php

@@ -28,7 +28,7 @@ class MetaRepository {
         if(isset($request['patch_num']) && $request['patch_num']){
             $where[] = ['patch_num','like',"%".$request['patch_num']];
         }
-        return $this->meta->where($where)->orderBy('id', 'desc')->paginate($perPage);
+        return $this->meta->with('serializeNum')->where($where)->orderBy('id', 'desc')->paginate($perPage);
     }
     //详情
     public function view($request){

app/Transformers/MetaTransformer.php

@@ -22,6 +22,7 @@ class MetaTransformer extends TransformerAbstract
 
         return [
             "patch_num" => $meta['patch_num'],
+            'serialize' => $meta->serializeNum->serialize??'',
             "produce_date" => Carbon::parse($meta['produce_date'])->format('Y-m-d'),
             "variety" => $meta['variety'],
             "variety_img" => $meta['variety_img'],