diff --git a/app/Console/Commands/Inventory.php b/app/Console/Commands/Inventory.php index 59ad9f9..348c9d5 100644 --- a/app/Console/Commands/Inventory.php +++ b/app/Console/Commands/Inventory.php @@ -70,7 +70,7 @@ class Inventory extends Command $log->message = '成功'; DB::commit(); } catch (\Exception $exception) { - $log->message = '失败'; + $log->message = '失败' . $exception->getMessage(); DB::rollBack(); } $log->save(); diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php index e6f3245..a6fdc4a 100644 --- a/app/Http/Controllers/Shop/ShopsController.php +++ b/app/Http/Controllers/Shop/ShopsController.php @@ -19,7 +19,7 @@ class ShopsController extends Controller $shops = Shop::query()->paginate(); foreach ($shops as $shop) { $shop->authUrl = ''; - if ('妙选' !== $shop->plat_id && '未授权' === $shop->status) { + if ('妙选' !== $shop->plat_id && ('未授权' === $shop->status || '重新授权' === $shop->status)) { $shop->authUrl = BusinessFactory::init()->make($shop->plat_id)->getAuthUrl($shop->id, $shop->getOriginal('plat_id')); } } diff --git a/app/Http/Controllers/User/UsersController.php b/app/Http/Controllers/User/UsersController.php index 5a378d7..32c8546 100644 --- a/app/Http/Controllers/User/UsersController.php +++ b/app/Http/Controllers/User/UsersController.php @@ -6,7 +6,6 @@ use App\Http\Controllers\Controller; use App\Models\Log as LogModel; use App\Models\User; use Illuminate\Http\Request; -use Faker\Generator as Faker; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use App\Http\Resources\UsersResource; @@ -30,7 +29,7 @@ class UsersController extends Controller return UsersResource::collection($users); } - public function store(Request $request, Faker $faker) + public function store(Request $request) { $validator = Validator::make($request->all(), [ 'name' => 'required|string|max:191|unique:users,name', @@ -45,7 +44,6 @@ class UsersController extends Controller } $user = new User(); $user->name = $request->name; - $user->email = \request('email', $faker->unique()->safeEmail); $user->password = $request->password; $user->api_token = Str::random(60); $user->save(); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index cf52c70..350f44e 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -38,7 +38,7 @@ class Kernel extends HttpKernel ], 'api' => [ - 'throttle:60,1', +// 'throttle:60,1', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; diff --git a/app/Models/Goods.php b/app/Models/Goods.php index 7919336..1493ecc 100644 --- a/app/Models/Goods.php +++ b/app/Models/Goods.php @@ -23,6 +23,15 @@ class Goods extends Model 'goods_code', ]; + public function getImgUrlAttribute($value) + { + if (false !== strpos($value, 'ju8hn6/erp/shop')) { + $value = config('filesystems.disks.aliyun.url') . $value; + } + + return $value; + } + /** * 多规格 */ diff --git a/artisan b/artisan old mode 100755 new mode 100644 diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 4e3b45a..c26b9f5 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -17,7 +17,7 @@ class CreateUsersTable extends Migration Schema::create('users', function (Blueprint $table) { $table->bigIncrements('id'); $table->string('name'); - $table->string('email')->unique(); + $table->string('email')->nullable()->unique(); $table->timestamp('email_verified_at')->nullable(); $table->string('password'); $table->string('api_token', 80)->unique()->nullable(false); diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php index 44c75aa..fe2f9f9 100644 --- a/resources/lang/zh-CN/permission.php +++ b/resources/lang/zh-CN/permission.php @@ -225,6 +225,11 @@ return [ 'name' => '列表', 'parent_id' => 9, ], + 'upload.file' => [ + 'id' => 11, + 'name' => '文件上传', + 'parent_id' => 7, + ], // 系统日志 'SYSTEM_LOG' => [ 'id' => 10, diff --git a/resources/templates/goods_skus_import.xlsx b/resources/templates/goods_skus_import.xlsx old mode 100755 new mode 100644