新增：框架稳定性持续迭代，修复部分已知问题

Author: modstart

app/Constant/AppConstant.php

@@ -6,5 +6,5 @@ class AppConstant
 {
     const APP = 'cms9';
     const APP_NAME = 'ModStartCMS9';
-    const VERSION = '8.3.0';
+    const VERSION = '8.4.0';
 }

module/AdminManager/Util/ModuleUtil.php

@@ -4,6 +4,7 @@
 namespace Module\AdminManager\Util;
 
 
+use ModStart\Core\Util\MetaUtil;
 use ModStart\ModStart;
 use ModStart\Module\ModuleManager;
 
@@ -12,6 +13,7 @@ class ModuleUtil
     public static function modules()
     {
         $modules = [];
+        $modules[] = "APP:" . MetaUtil::get('APP') . ':' . MetaUtil::get('VERSION');
         $modules[] = "ModStart:" . ModStart::$version;
         foreach (ModuleManager::listAllEnabledModules() as $m => $_) {
             $info = ModuleManager::getModuleBasic($m);

module/AdminManager/View/widget/serverInfo.blade.php

@@ -86,7 +86,7 @@
         </div>
         <script type="text/javascript">
             // 请勿删除，用于获取最新的安全通告（比如框架、模块有重大缺陷的应急通知等）
-            $('body').append('<script src="https://modstart.com/api/modstart/notice?modules={{urlencode($modules)}}"><' + '/script>');
+            $('body').append('<script src="https://modstart.com/api/modstart/notice?modules={{urlencode($modules)}}&t={{date('YmdH')}}"><' + '/script>');
             $(function(){
                 var $serverTime = $('[data-server-time]');
                 var timeDiff = {{time()*1000}} - (new Date()).getTime()

module/AdminManager/Widget/ServerInfoWidget.php

@@ -2,6 +2,7 @@
 
 namespace Module\AdminManager\Widget;
 
+use App\Constant\AppConstant;
 use Illuminate\Support\Str;
 use ModStart\Core\Util\SerializeUtil;
 use ModStart\Widget\AbstractWidget;

module/Member/Admin/Controller/MemberController.php

@@ -143,7 +143,7 @@ protected function crud(AdminCRUDBuilder $builder)
                 $vipEnable = ModuleManager::getModuleConfig('Member', 'vipEnable', false);
                 if ($vipEnable) {
                     $builder->radio('vipId', 'VIP')->options(MemberVipUtil::mapTitle())->required();
-                    $builder->date('vipExpire', 'VIP过期');
+                    $builder->datetime('vipExpire', 'VIP过期');
                 }
                 $builder->display('registerIp', '注册IP');
                 $builder->display('created_at', '注册时间');
@@ -252,7 +252,7 @@ public function add(AdminDialogPage $page)
             }
             if (ModuleManager::getModuleConfig('Member', 'vipEnable', false)) {
                 $form->radio('vipId', 'VIP')->options(MemberVipUtil::mapTitle())->required();
-                $form->date('vipExpire', 'VIP过期');
+                $form->datetime('vipExpire', 'VIP过期');
             }
         });
         $form->showSubmit(false)->showReset(false);
@@ -271,7 +271,7 @@ public function add(AdminDialogPage $page)
             $ret = MemberUtil::register($username, $phone, $email, $data['password']);
             BizException::throwsIfResponseError($ret);
             if (!empty($profile)) {
-                if (isset($profile['vipExpire']) && TimeUtil::isDateEmpty($profile['vipExpire'])) {
+                if (isset($profile['vipExpire']) && TimeUtil::isDatetimeEmpty($profile['vipExpire'])) {
                     $profile['vipExpire'] = null;
                 }
                 MemberUtil::update($ret['data']['id'], $profile);
@@ -317,7 +317,7 @@ public function edit(AdminDialogPage $page)
             }
             if (ModuleManager::getModuleConfig('Member', 'vipEnable', false)) {
                 $form->radio('vipId', 'VIP')->options(MemberVipUtil::mapTitle())->required();
-                $form->date('vipExpire', 'VIP过期')->help('VIP过期留空表示永久');
+                $form->datetime('vipExpire', 'VIP过期')->help('VIP过期留空表示永久');
             }
         });
         $form->item($memberUser)->fillFields();
@@ -338,7 +338,7 @@ public function edit(AdminDialogPage $page)
             ]);
             $ret = MemberUtil::updateBasicWithUniqueCheck($memberUser['id'], $basic);
             BizException::throwsIfResponseError($ret);
-            if (isset($profile['vipExpire']) && TimeUtil::isDateEmpty($profile['vipExpire'])) {
+            if (isset($profile['vipExpire']) && TimeUtil::isDatetimeEmpty($profile['vipExpire'])) {
                 $profile['vipExpire'] = null;
             }
             if ($memberUser['vipId'] != $profile['vipId']) {

module/Member/Api/Controller/AuthController.php

@@ -274,7 +274,7 @@ public function oauthBind($oauthType = null)
         }
         if (modstart_config('Member_OauthBindPhoneEnable')) {
             if (empty($phone)) {
-                return Response::generate(-1, '请输入手机');
+                return Response::generate(-1, '手机号为空或格式不正确');
             }
             $phoneVerifyCheck = Session::get('oauthBindPhoneVerify');
             if ($phoneVerify != $phoneVerifyCheck) {
@@ -381,7 +381,7 @@ public function oauthCallback($oauthType = null, $callback = null)
             $code = $input->getTrimString('auth_code');
         }
         if (empty($code)) {
-            return Response::generate(-1, '登录失败(code为空)', null, '/');
+            return Response::generate(-1, '登录失败(code为空)');
         }
         /** @var AbstractOauth $oauth */
         $oauth = MemberOauth::getOrFail($oauthType);
@@ -774,7 +774,7 @@ public function loginPhone()
         $phone = $input->getPhone('phone');
         $verify = $input->getTrimString('verify');
         if (empty($phone)) {
-            return Response::generate(-1, '手机为空或不正确');
+            return Response::generate(-1, '手机号为空或格式不正确');
         }
         if (empty($verify)) {
             return Response::generate(-1, '验证码不能为空');

module/Member/Auth/MemberUser.php

@@ -21,6 +21,17 @@ public static function user()
         return Session::get('_memberUser', null);
     }
 
+    public static function update($memberUser)
+    {
+        if (!empty($memberUser)) {
+            Session::put('_memberUser', $memberUser);
+            Session::put('memberUserId', $memberUser['id']);
+        } else {
+            Session::forget('_memberUser');
+            Session::forget('memberUserId');
+        }
+    }
+
     public static function isMine($memberUserId)
     {
         return self::id() > 0 && self::id() == $memberUserId;

module/Member/Docs/release.md

@@ -1,4 +1,10 @@
-## 4.2.0
+## 4.3.0
+
+- 新增：用户过期时间精确到时分秒，支持更精确的过期时间控制
+
+---
+
+## 4.2.0 VIP界面升级，用户积分流水记录，用户管理优化，等
 
 - 新增：用户VIP开通界面增加划线价
 - 新增：VIP开通界面增加最近开通用户列表和倒计时，促进用户开通率

module/Member/Migrate/2024_04_11_000001_member_vip_expire_datetime.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MemberVipExpireDatetime extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('member_user', function (Blueprint $table) {
+            $table->dateTime('vipExpire')->nullable()->comment('VIP过期时间')->change();
+        });
+
+        Schema::table('member_vip_order', function (Blueprint $table) {
+            $table->dateTime('expire')->nullable()->comment('VIP过期时间')->change();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

module/Member/Util/ApiUtil.php

@@ -56,6 +56,7 @@ public static function config()
         $data['Member_VipEnable'] = ModuleManager::getModuleConfig('Member', 'vipEnable', false);
 
         // 资产
+        $data['Member_CreditName'] = ModuleManager::getModuleConfig('Member', 'creditName', '积分');
         $data['Member_MoneyEnable'] = ModuleManager::getModuleConfig('Member', 'moneyEnable', false);
         $data['Member_MoneyChargeEnable'] = modstart_config('Member_MoneyChargeEnable', false);
         $data['Member_MoneyCashEnable'] = modstart_config('Member_MoneyCashEnable', false);