modstart upgrade

Author: modstart

app/Constant/AppConstant.php

@@ -6,5 +6,5 @@ class AppConstant
 {
     const APP = 'cms';
     const APP_NAME = 'ModStartCMS';
-    const VERSION = '8.8.0';
+    const VERSION = '8.9.0';
 }

module/Banner/Asset/style/banner.css

@@ -135,7 +135,8 @@ public function setting(AdminConfigBuilder $builder)
             $builder->number('Member_PasswordLengthMin', '密码最小长度')
                 ->defaultValue(0)
                 ->help('0表示不限制，推荐为8位以上');
-
+            $builder->switch('Member_LoginInfoEncrypt', '登录信息加密')
+                ->help('开启后，登录信息请求时将会加密传输');
         });
         if (ModuleManager::getModuleConfig('Member', 'dataStatisticEnable', false)) {
             $builder->layoutPanel('存储上传', function ($builder) {

module/Member/Admin/Controller/ConfigController.php

@@ -14,6 +14,7 @@
 use ModStart\Core\Util\CurlUtil;
 use ModStart\Core\Util\EventUtil;
 use ModStart\Core\Util\RandomUtil;
+use ModStart\Core\Util\SecureUtil;
 use ModStart\Core\Util\StrUtil;
 use ModStart\Misc\Captcha\CaptchaFacade;
 use ModStart\Module\ModuleBaseController;
@@ -712,8 +713,8 @@ public function login()
     {
         $input = InputPackage::buildFromInput();
 
-        $username = $input->getTrimString('username');
-        $password = $input->getTrimString('password');
+        $username = $input->getTrimStringWithAutoDecrypt('username');
+        $password = $input->getTrimStringWithAutoDecrypt('password');
         if (empty($username)) {
             return Response::generate(-1, '请输入用户');
         }

module/Member/Api/Controller/AuthController.php

@@ -2,6 +2,7 @@
 
 - 新增：VIP 优惠券功能集成，支持折扣券
 - 新增：可完全自定义上传功能定制的特性 UploadScript Hook
+- 新增：用户登录传输用户密码加密
 - 优化：VIP 开通页面交互形式优化
 
 ---

module/Member/Docs/release.md

@@ -11,14 +11,19 @@
         </div>
         <div class="ub-form flat">
             <form action="{{modstart_web_url('login')}}" method="post" data-ajax-form>
+                @if(modstart_config('Member_LoginInfoEncrypt',false))
+                    <input type="hidden" data-encrypt-data name="ek" value="{{\ModStart\Core\Util\RandomUtil::string(8)}}" />
+                @endif
                 <div class="line">
                     <div class="field">
-                        <input type="text" class="form-lg" name="username" placeholder="输入用户" />
+                        <input type="text" class="form-lg" name="username" placeholder="输入用户"
+                               @if(modstart_config('Member_LoginInfoEncrypt',false)) data-encrypt-field="username" @endif/>
                     </div>
                 </div>
                 <div class="line">
                     <div class="field">
-                        <input type="password" class="form-lg" name="password" placeholder="输入密码" />
+                        <input type="password" class="form-lg" name="password" placeholder="输入密码"
+                               @if(modstart_config('Member_LoginInfoEncrypt',false)) data-encrypt-field="password" @endif/>
                     </div>
                 </div>
                 @if(modstart_config('loginCaptchaEnable',false))

module/Member/View/pc/inc/loginPanel.blade.php

@@ -32,14 +32,19 @@
                 </div>
                 <div class="ub-form flat">
                     <form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" method="post" data-ajax-form>
+                        @if(modstart_config('Member_LoginInfoEncrypt',false))
+                            <input type="hidden" data-encrypt-data name="ek" value="{{\ModStart\Core\Util\RandomUtil::string(8)}}" />
+                        @endif
                         <div class="line">
                             <div class="field">
-                                <input type="text" class="form-lg" name="username" placeholder="输入用户" />
+                                <input type="text" class="form-lg" name="username" placeholder="输入用户"
+                                       @if(modstart_config('Member_LoginInfoEncrypt',false)) data-encrypt-field="username" @endif />
                             </div>
                         </div>
                         <div class="line">
                             <div class="field">
-                                <input type="password" class="form-lg" name="password" placeholder="输入密码" />
+                                <input type="password" class="form-lg" name="password" placeholder="输入密码"
+                                       @if(modstart_config('Member_LoginInfoEncrypt',false)) data-encrypt-field="password" @endif />
                             </div>
                         </div>
                         @if(modstart_config('loginCaptchaEnable',false))

module/Member/View/pc/loginDialog.blade.php

@@ -2,6 +2,7 @@
 
 - 新增：EntryProcessor 功能逻辑
 - 优化：图片可视化设计增加图片占位符显示
+- 优化：图片可视化设计库尺寸缩放问题优化
 
 ---
 

module/Vendor/Docs/release.md

@@ -58,6 +58,14 @@ public static function textLineCount($text)
         return count($pcs);
     }
 
+    public static function configSaveCheck($imageConfig)
+    {
+        BizException::throwsIfEmpty('imageConfig 为空', $imageConfig);
+        BizException::throwsIfEmpty('宽度为空', $imageConfig['width']);
+        BizException::throwsIfEmpty('高度为空', $imageConfig['height']);
+        BizException::throwsIf('背景图和背景色同时为空', empty($imageConfig['backgroundImage']) && empty($imageConfig['backgroundColor']));
+    }
+
     public static function render($imageConfig, $variables = [])
     {
         BizException::throwsIfEmpty('imageConfig 为空', $imageConfig);
@@ -163,12 +171,12 @@ public static function render($imageConfig, $variables = [])
                 case 'image':
                     $itemImagePath = FileUtil::savePathToLocalTemp($item['data']['image']);
                     $itemImage = Image::make($itemImagePath);
-                    if (!empty($item['data']['opacity']) && $item['data']['opacity'] < 100 && $item['data']['opacity'] > 0) {
-                        $itemImage->opacity($item['data']['opacity']);
-                    }
                     if (isset($item['data']['width']) && isset($item['data']['height'])) {
                         $itemImage->resize($item['data']['width'], $item['data']['height']);
                     }
+                    if (!empty($item['data']['opacity']) && $item['data']['opacity'] < 100 && $item['data']['opacity'] > 0) {
+                        $itemImage->opacity($item['data']['opacity']);
+                    }
                     $image->insert($itemImage, 'top-left', $item['x'], $item['y']);
                     break;
                 case 'qrcode':