develop

app/Admin/Controller/IndexController.php

@@ -5,28 +5,13 @@ namespace App\Admin\Controller;
 
 
 use Illuminate\Routing\Controller;
-use ModStart\Admin\Layout\AdminPage;
-use ModStart\Admin\Widget\DashboardItemA;
-use ModStart\Admin\Widget\SecurityTooltipBox;
-use ModStart\Core\Dao\ModelUtil;
-use ModStart\Core\Util\ColorUtil;
-use ModStart\Layout\Row;
-use Module\AdminManager\Widget\ServerInfoWidget;
-use Module\Cms\Widget\CmsInfoWidget;
-use Module\Vendor\Admin\Config\AdminWidgetDashboard;
+use Module\Cms\Traits\AdminDashboardTrait;
 
 class IndexController extends Controller
 {
-    public function index(AdminPage $page)
+    use AdminDashboardTrait;
+    public function index()
     {
-        $page->pageTitle(L('Dashboard'))
-            ->row(new SecurityTooltipBox())
-            ->append(new Row(function (Row $row) {
-                AdminWidgetDashboard::callIcon($row);
-            }));
-        AdminWidgetDashboard::call($page);
-        $page->append(new CmsInfoWidget());
-        $page->append(new ServerInfoWidget());
-        return $page;
+        return $this->dashboard();
     }
 }

module/Cms/View/pc/cms/post/show.blade.php

@@ -106,11 +106,13 @@
 
     </div>
 
+    @if(0)
     <div class="ub-container margin-top" style="max-width:35rem;">
         <div>
             @include('module::MemberComment.View.pc.public.comment',['biz'=>'post','bizId'=>$post['id']])
         </div>
     </div>
+    @endif
 
 @endsection
 

module/Member/Docs/release/1.2.0.md

@@ -6,3 +6,4 @@
 - 增加我的积分功能
 - 启用我的钱包提现功能
 - 增加VIP功能
+- 修复用户头像为PNG图片背景黑色问题

module/Member/View/pc/memberProfile/avatar.blade.php

@@ -32,7 +32,7 @@
                 $cropper.cropper('zoom', 0.1);
             });
             $('#avatarSave').on('click', function () {
-                var image = $cropper.cropper('getCroppedCanvas').toDataURL('image/jpeg');
+                var image = $cropper.cropper('getCroppedCanvas').toDataURL('image/png');
                 window.api.dialog.loadingOn();
                 $.post('?', {type: 'cropper', avatar: image}, function (res) {
                     window.api.dialog.loadingOff();

module/Member/config.json

@@ -4,7 +4,7 @@
   "require": [
     "Vendor"
   ],
-  "version": "1.2.0",
+  "version": "1.1.0",
   "author": "官方",
   "description": "提供基础的用户管理服务",
   "providers": [

module/Vendor/Docs/release/1.1.0.md

@@ -2,4 +2,5 @@ ModStart基础包
 
 ---
 
-- 增加通用验证抽象包
+- 增加通用验证Provider
+- 增加随机图片生成器Provider

module/Vendor/Provider/RandomImage/AbstractRandomImageProvider.php

+<?php
+
+
+namespace Module\Vendor\Provider\RandomImage;
+
+
+abstract class AbstractRandomImageProvider
+{
+    abstract public function get($param = []);
+}

module/Vendor/Provider/RandomImage/DefaultRandomImageProvider.php

+<?php
+
+
+namespace Module\Vendor\Provider\RandomImage;
+
+
+use ModStart\Core\Assets\AssetsUtil;
+
+class DefaultRandomImageProvider extends AbstractRandomImageProvider
+{
+    public function get($param = [])
+    {
+        return [
+            'url' => AssetsUtil::fix('asset/image/none.png'),
+            'width' => 400,
+            'height' => 400,
+        ];
+    }
+}

module/Vendor/Provider/RandomImage/RandomImageProvider.php

+<?php
+
+
+namespace Module\Vendor\Provider\RandomImage;
+
+
+class RandomImageProvider
+{
+    
+    public static function get()
+    {
+        static $instance = null;
+        if (null === $instance) {
+            $driver = config('RandomImageProvider');
+            if (empty($driver)) {
+                $driver = DefaultRandomImageProvider::class;
+            }
+            $instance = app($driver);
+        }
+        return $instance;
+    }
+
+    public static function getImage($biz = '', $param = [])
+    {
+        return self::get()->get(array_merge(['biz' => $biz], $param));
+    }
+}

vendor/modstart/modstart/resources/asset/src/mod/webpack.js

@@ -17,6 +17,8 @@ module.exports = function (dirname) {
     const WebpackBuildNotifierPlugin = require('webpack-build-notifier');
     const CleanObsoleteChunks = require('webpack-clean-obsolete-chunks');
     const WebpackShellPlugin = require('webpack-shell-plugin');
+    const WebpackDynamicPublicPathPlugin = require("webpack-dynamic-public-path");
+
     const glob = require("glob");
     const UglifyJS = require("uglify-js");
     // const files = glob.readDirSync('*.js', {});
@@ -50,13 +52,16 @@ module.exports = function (dirname) {
         output: {
             path: path.resolve(config.dist),
             filename: '[name].js',
-            publicPath: config.cdn + '/',
+            publicPath: 'publicPathPlaceholder',
             chunkFilename: 'entry-chunk-[id]-[hash:8].js',
         },
         performance: {
             hints: false
         },
         plugins: [
+            new WebpackDynamicPublicPathPlugin({
+                externalPublicPath: "window.__msCDN+'" + config.cdn.substring(1) + "/'"
+            }),
             new WebpackShellPlugin({
                 onBuildStart: [
                     files.length > 0 ? 'rm -rv ' + files.join(' ') : 'pwd',
@@ -221,7 +226,7 @@ module.exports = function (dirname) {
                 output: {
                     path: path.resolve(config.distAsset),
                     filename: '[name].js',
-                    publicPath: config.cdn + '/',
+                    publicPath: 'publicPathPlaceholder',
                     chunkFilename: 'entry-chunk-[id]-[hash:8].js',
                 },
             }))

vendor/modstart/modstart/resources/asset/src/svue/lib/date-util.js

 let date = require('date-and-time')
+if (date.default) {
+    date = date.default
+}
 if (!date.format) {
     date = date.format
 }

vendor/modstart/modstart/src/ModStart.php

@@ -10,7 +10,7 @@ use ModStart\Support\Manager\WidgetManager;
 
 class ModStart
 {
-    public static $version = '1.0.0';
+    public static $version = '1.1.0';
 
     public static $script = [];
     public static $style = [];

vendor/modstart/modstart/views/admin/frame.blade.php

@@ -12,6 +12,12 @@
         window.__msAdminRoot = "{{modstart_admin_url(null)}}";
         window.__selectorDialogServer = "{{modstart_admin_url('data/file_manager')}}";
     </script>
+    {!! \ModStart\Core\Hook\ModStartHook::fireInView('AdminPageHeadAppend',$this); !!}
+@endsection
+
+@section('bodyAppend')
+    @parent
+    {!! \ModStart\Core\Hook\ModStartHook::fireInView('AdminPageBodyAppend',$this); !!}
 @endsection
 
 @section('body')

vendor/modstart/modstart/views/admin/login.blade.php

@@ -33,4 +33,5 @@
             </form>
         </div>
     </div>
-@endsection
\ No newline at end of file
+
+@endsection