1

app/Http/Controllers/Admin/Album/ManufacturerController.php

@@ -9,6 +9,7 @@
 namespace App\Http\Controllers\Admin\Album;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\AlbumManufacturerModel;
+use App\Models\AlbumUserModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Album\Criteria\MultiWhere;

app/Http/Controllers/Api/V1/AlbumController.php

@@ -200,12 +200,16 @@ class AlbumController extends Controller
                 'code' => 'required',
                 'agent_id' => 'required',
                 'nickName' => 'required',
+                'iv' => 'required',
+                'encryptData' => 'required',
                 'avatar' => 'required',
                 'store_id' => 'required'
             ],[
                 'code.required' => 'code不能为空!',
                 'agent_id.required' => 'agent_id不能为空!',
                 'nickName.required' => '昵称不能为空!',
+                'iv.required' => '昵称不能为空!',
+                'encryptData.required' => '昵称不能为空!',
                 'avatar.required' => '头像不能为空!',
                 'store_id.required' => '站点ID不能为空!'
             ]
@@ -233,9 +237,9 @@ class AlbumController extends Controller
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '获取用户OpenId失败!', $validator->messages());
         }
 
-        $session_key = $res['session_key'];
-
-
+        $session = $res['session_key'];
+        $decryptedData = $app->encryptor->decryptData($session, $datas['iv'], $datas['encryptData']);
+        dd($decryptedData);die;
             $check = AlbumUserModel::where('wechat_open_id',$res['openid'])->first();
             if(!$check){
                 $add['username'] = preg_replace('/[\xf0-\xf7].{3}/', '', $datas['nickName']);

database/migrations/2019_01_25_171744_add_unionid_to_user.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUnionidToUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_user', function (Blueprint $table) {
+            //
+            $table->string('unionid',100)->nullable()->default(null)->comment('unionid');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_user', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2019_01_28_161043_add_column_switch_to_manufacturer.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnSwitchToManufacturer extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+            $table->unsignedInteger('getPhone')->default(0)->comment('是否强制获取手机号');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+        });
+    }
+}