7

.roo/rules-code/rules.md

@@ -1,6 +1,5 @@
 # 引导
 - 这不是一个标准 Laravel 项目,不要用 Laravel 的思维进行开发
-- apply_diff失败，阅读文件后重试
 - Validation不是Validator,有本质区别,阅读 ucore/Validation/README.md 了解
 
 # 开发流程

UCore/DcatAdmin/Metrics/User/NewUsers.php

@@ -2,7 +2,7 @@
 
 namespace UCore\DcatAdmin\Metrics\User;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Carbon\Carbon;
 use Dcat\Admin\Widgets\Metrics\Line;
 use UCore\Helper\Cache;

UCore/DcatAdmin/Traits/UserID.php

@@ -5,7 +5,7 @@ namespace UCore\DcatAdmin\Traits;
 
 use App\Module\System\AdminLazyRenderable\UserInfo;
 use App\Module\System\AdminLazyRenderable\UserTable;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 trait UserID
 {

UCore/Validator/InviteCode.php

@@ -2,7 +2,7 @@
 
 namespace UCore\Validator;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use UCore\Validator;
 
 class InviteCode extends Validator

app/Module/App/Mnemon.php

@@ -5,7 +5,7 @@ namespace App\Module\App;
 use App\Module\Ulogic\Enum\WALLET_ADDRESS_TYPE;
 use App\Module\Ulogic\Model\WalletAddress;
 use App\Module\Ulogic\Services\UserRelationService;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use UCore\Exception\ValidateException;

app/Module/App/SessionApp.php

@@ -48,7 +48,7 @@ class SessionApp extends TokenSession
      * @return User
      * @throws LogicException
      */
-    static public function setLogin(\App\Module\User\Model\User $user, $token = false, $role = '')
+    static public function setLogin(\App\Module\User\Models\User $user, $token = false, $role = '')
     {
         // todo 不清楚作用
 //        \App\Module\User\User::infoinfo($user->id, true);
@@ -106,7 +106,7 @@ class SessionApp extends TokenSession
      * @param User $user
      * @return int
      */
-    static public function getRole(\App\Module\User\Model\User $user): RULE
+    static public function getRole(\App\Module\User\Models\User $user): RULE
     {
         return RULE::ROLE_USER;
     }

app/Module/Dev/Admin/Actions/SessionLoginForm.php

@@ -3,7 +3,7 @@
 
 namespace App\Module\Dev\Admin\Actions;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Dcat\Admin\Traits\LazyWidget;
 use Dcat\Admin\Contracts\LazyRenderable;
 use Illuminate\Support\Facades\Hash;

app/Module/File/Model/FileFile.php

@@ -19,7 +19,7 @@ use UCore\ModelCore;
  * @property   \Carbon\Carbon  $deleted_at
  * field end
  */
-class FileFile extends \App\Models\ModelCore
+class FileFile extends \UCore\ModelCore
 {
 // attrlist start
   public static $attrlist = array (

app/Module/File/Model/FileImg.php

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * field end
  *
  */
-class FileImg extends \App\Models\ModelCore
+class FileImg extends \UCore\ModelCore
 {
 
     use SoftDeletes;

app/Module/Fund/Models/FundCirculationModel.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Fund\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 
 
 class FundCirculationModel extends ModelCore

app/Module/Fund/Models/FundLogModel.php

@@ -49,7 +49,7 @@ class FundLogModel extends ModelCore
 
     public function user()
     {
-        return $this->hasOne(\App\Module\User\Model\User::class, 'user_id', 'user_id');
+        return $this->hasOne(\App\Module\User\Models\User::class, 'user_id', 'user_id');
     }
 
 

app/Module/Fund/Models/FundModel.php

@@ -3,7 +3,7 @@
 namespace App\Module\Fund\Models;
 
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 use UCore\ModelCore;
 

app/Module/Fund/Models/FundTransferModel.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\Fund\Models;
 
-use App\Models\ModelCore;
-use App\Module\User\Model\User;
+use UCore\ModelCore;
+use App\Module\User\Models\User;
 
 
 class FundTransferModel extends ModelCore

app/Module/OAuth/Controllers/UserController.php

@@ -33,7 +33,7 @@ class UserController extends Controller
         }
 
         // 获取用户信息
-        $user = \App\Module\User\Model\User::find($accessToken->user_id);
+        $user = \App\Module\User\Models\User::find($accessToken->user_id);
         if (!$user) {
             return response()->json([
                 'error' => 'invalid_token',

app/Module/OAuth/Services/AuthService.php

@@ -3,7 +3,7 @@
 namespace App\Module\OAuth\Services;
 
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 

app/Module/Sms/Models/SmsCode.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Sms\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 

app/Module/Sms/Models/SmsConfig.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Sms\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use UCore\Model;
 
 /**

app/Module/System/AdminLazyRenderable/UserTable.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\System\AdminLazyRenderable;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Dcat\Admin\Grid;
 use UCore\DcatAdmin\FilterHelper;
 use UCore\DcatAdmin\GridHelper;

app/Module/System/Models/AdminActionlog.php

@@ -3,7 +3,7 @@
 namespace App\Module\System\Models;
 
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**

app/Module/System/Models/AdminGridView.php

@@ -3,7 +3,7 @@
 namespace App\Module\System\Models;
 
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use App\Module\System\Enums\VIEW_TYPE;
 
 

app/Module/System/Models/AdminUser.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\System\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 
 /**
  * 管理员

app/Module/System/Models/ContinuousTimes.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\System\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 
 /**
  * 连续次数判定

app/Module/Ulogic/Models/Internal.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\Model;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use App\Module\Ulogic\Enum\INTERNAL_TYPE;
 use App\Module\User\User;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Module/Ulogic/Models/UserDaytime.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 
 
 /**

app/Module/Ulogic/Models/UserPunish.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use App\Module\Ulogic\Enum\PUNISH_TYPE;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
@@ -37,7 +37,7 @@ class UserPunish extends ModelCore
 
     public function user(): HasOne
     {
-        return $this->hasOne(\App\Module\User\Model\User::class, 'user_id', 'user_id');
+        return $this->hasOne(\App\Module\User\Models\User::class, 'user_id', 'user_id');
     }
 
 }

app/Module/Ulogic/Models/UserTime.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 
 
 /**

app/Module/Ulogic/Services/UserRelationService.php

@@ -3,7 +3,7 @@
 namespace App\Module\Ulogic\Services;
 
 use App\Module\Ulogic\Model\UserRelation;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 class UserRelationService
 {

app/Module/Ulogic/Unit.php

@@ -16,7 +16,7 @@ class Unit
      * @param User $user
      * @return Unit\User
      */
-    static public function userModel2User(\App\Module\User\Model\User $user):\App\Module\Ulogic\Unit\User
+    static public function userModel2User(\App\Module\User\Models\User $user):\App\Module\Ulogic\Unit\User
     {
         $unit = new \App\Module\Ulogic\Unit\User($user->id);
 

app/Module/User/Action.php

@@ -6,7 +6,7 @@ use App\Module\App\SessionApp;
 use App\Module\User\Enums\ActionStatus;
 use App\Module\User\Enums\ActionType;
 use App\Module\User\Enums\Status2;
-use App\Module\User\Model\UserAction;
+use App\Module\User\Models\UserAction;
 use App\Module\User\Unit\UserPublic;
 use Dcore\Db\Arr;
 use Dcore\Db\Helper;

app/Module/User/Google2Fa.php

@@ -4,7 +4,7 @@ namespace App\Module\User;
 
 use App\Module\Sys\Config;
 use App\Module\Sys\Key;
-use App\Module\User\Model\UserInfo;
+use App\Module\User\Models\UserInfo;
 
 class Google2Fa
 {

app/Module/User/Model/Events/UserId.php → app/Module/User/Models/Events/UserId.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
 abstract class UserId implements UserIdInterface
 {

app/Module/User/Model/Events/UserIdInterface.php → app/Module/User/Models/Events/UserIdInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
 interface UserIdInterface
 {

app/Module/User/Model/Events/UserInfoSaved.php → app/Module/User/Models/Events/UserInfoSaved.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\UserInfo;
+use App\Module\User\Models\UserInfo;
 
 class UserInfoSaved extends UserId
 {

app/Module/User/Model/Events/UserInfoUpdate.php → app/Module/User/Models/Events/UserInfoUpdate.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\UserInfo;
+use App\Module\User\Models\UserInfo;
 
 class UserInfoUpdate extends UserId
 {

app/Module/User/Model/Events/UserPhoneSaved.php → app/Module/User/Models/Events/UserPhoneSaved.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\UserInfo;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserInfo;
+use App\Module\User\Models\UserPhone;
 
 class UserPhoneSaved extends UserId
 {

app/Module/User/Model/Events/UserPhoneUpdate.php → app/Module/User/Models/Events/UserPhoneUpdate.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\UserInfo;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserInfo;
+use App\Module\User\Models\UserPhone;
 
 class UserPhoneUpdate extends UserId
 {

app/Module/User/Model/Events/UserSaved.php → app/Module/User/Models/Events/UserSaved.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\User;
-use App\Module\User\Model\UserInfo;
+use App\Module\User\Models\User;
+use App\Module\User\Models\UserInfo;
 
 class UserSaved extends UserId
 {

app/Module/User/Model/Events/UserSecretPasswordSaved.php → app/Module/User/Models/Events/UserSecretPasswordSaved.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Module\User\Model\Events;
+namespace App\Module\User\Models\Events;
 
-use App\Module\User\Model\User;
-use App\Module\User\Model\UserSecretPassword;
+use App\Module\User\Models\User;
+use App\Module\User\Models\UserSecretPassword;
 
 class UserSecretPasswordSaved extends UserId
 {

app/Module/User/Model/User.php → app/Module/User/Models/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Module\User\Model;
+namespace App\Module\User\Models;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;

app/Module/User/Model/UserAction.php → app/Module/User/Models/UserAction.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\User\Model;
+namespace App\Module\User\Models;
 
-use App\Models\ModelCore;
+use UCore\ModelCore;
 use App\Module\User\Enums\ActionStatus;
 use App\Module\User\Enums\ActionType;
 
@@ -10,8 +10,8 @@ use App\Module\User\Enums\ActionType;
  *
  * 用户操作记录
  *
- * field start 
- * @property   int  $id  
+ * field start
+ * @property   int  $id
  * @property   int  $admin_id  做出操作的管理员ID
  * @property   int  $user_id  用户ID
  * @property   string  $type  类型
@@ -19,9 +19,9 @@ use App\Module\User\Enums\ActionType;
  * @property   int  $exp_time  有效期
  * @property   int  $re_id  关联操作-ID
  * @property   string  $re_type  关联操作-类型
- * @property   \Carbon\Carbon  $created_at  
- * @property   \Carbon\Carbon  $updated_at  
- * @property   \Carbon\Carbon  $deleted_at  
+ * @property   \Carbon\Carbon  $created_at
+ * @property   \Carbon\Carbon  $updated_at
+ * @property   \Carbon\Carbon  $deleted_at
  * @property   int  $status  状态
  * field end
  */

app/Module/User/Model/UserInfo.php → app/Module/User/Models/UserInfo.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Module\User\Model;
+namespace App\Module\User\Models;
 
 use App\Module\Merchant\Model\Merchant;
 use App\Module\User\Enums\PhoneStatus;
 use App\Module\User\Enums\Status;
 use App\Module\User\Enums\Status2;
-use App\Module\User\Model\Events\UserInfoSaved;
-use App\Module\User\Model\Events\UserInfoUpdate;
+use App\Module\User\Models\Events\UserInfoSaved;
+use App\Module\User\Models\Events\UserInfoUpdate;
 use UCore\ModelCore;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -31,7 +31,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * Class UserInfo
  * @property UserPhone $user_phone
  */
-class UserInfo extends \App\Models\ModelCore
+class UserInfo extends \UCore\ModelCore
 {
 
     use SoftDeletes;

app/Module/User/Model/UserPhone.php → app/Module/User/Models/UserPhone.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Module\User\Model;
+namespace App\Module\User\Models;
 
 use App\Module\Merchant\Model\Merchant;
 use App\Module\User\Enums\PhoneStatus;
 use App\Module\User\Enums\Status;
 use App\Module\User\Enums\Status2;
-use App\Module\User\Model\Events\UserPhoneSaved;
-use App\Module\User\Model\Events\UserSaved;
+use App\Module\User\Models\Events\UserPhoneSaved;
+use App\Module\User\Models\Events\UserSaved;
 use App\Module\VOrder\Enums\Type;
 use UCore\ModelCore;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -28,7 +28,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property   \Carbon\Carbon  $deleted_at
  * field end
  */
-class UserPhone extends \App\Models\ModelCore
+class UserPhone extends \UCore\ModelCore
 {
 
     use SoftDeletes;

app/Module/User/Model/UserSecretPassword.php → app/Module/User/Models/UserSecretPassword.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Module\User\Model;
+namespace App\Module\User\Models;
 
 use App\Module\User\Enums\SecertPasswordStatus;
-use App\Module\User\Model\Events\UserPhoneSaved;
-use App\Module\User\Model\Events\UserSecretPasswordSaved;
+use App\Module\User\Models\Events\UserPhoneSaved;
+use App\Module\User\Models\Events\UserSecretPasswordSaved;
 use UCore\ModelCore;
 
 /**

app/Module/User/Phone.php

@@ -4,7 +4,7 @@ namespace App\Module\User;
 
 use App\Module\User\Enums\PhoneStatus;
 use App\Module\User\Enums\PhoneType;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 
 class Phone
 {

app/Module/User/Repository/UserAction.php

@@ -13,6 +13,6 @@ use App\Admin\Core\Repositories\EloquentRepository;
 class UserAction extends EloquentRepository
 {
 
-    protected $eloquentClass = \App\Module\User\Model\UserAction::class;
+    protected $eloquentClass = \App\Module\User\Models\UserAction::class;
 
 }

app/Module/User/Repository/UserInfo.php

@@ -12,6 +12,6 @@ use App\Admin\Core\Repositories\EloquentRepository;
 class UserInfo extends EloquentRepository
 {
 
-    protected $eloquentClass = \App\Module\User\Model\UserInfo::class;
+    protected $eloquentClass = \App\Module\User\Models\UserInfo::class;
 
 }

app/Module/User/SecurityPassword.php

@@ -4,7 +4,7 @@ namespace App\Module\User;
 
 
 use App\Module\User\Enums\SecertPasswordStatus;
-use App\Module\User\Model\UserSecretPassword;
+use App\Module\User\Models\UserSecretPassword;
 use Carbon\Carbon;
 
 class SecurityPassword

app/Module/User/Services/UserService.php

@@ -6,7 +6,7 @@ use App\Module\App\Mnemon;
 use App\Module\App\SessionApp;
 use App\Module\Ulogic\Model\UserBans;
 use App\Module\Ulogic\Model\UserWord;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 

app/Module/User/User.php

@@ -23,7 +23,7 @@ class User
      */
     static public function create($username, $password)
     {
-        $user           = new \App\Module\User\Model\User();
+        $user           = new \App\Module\User\Models\User();
         $user->username = $username;
         $user->password = Hash::make($password);
         $user->status2 = Status2::Normal;
@@ -44,9 +44,10 @@ class User
 
     /**
      * 使用手机号码注册
+     *
      * @param $phone
      * @param $password
-     * @return Model\User|string|true
+     * @return Models\User|string|true
      * @throws LogicException
      */
     static public function createPhone($phone, $password)
@@ -74,7 +75,7 @@ class User
      */
     static public function resetPassword($id, $password)
     {
-        $user = \App\Module\User\Model\User::query()->find($id);
+        $user = \App\Module\User\Models\User::query()->find($id);
         if (!$user) {
             return 'user-notfind';
         }
@@ -99,7 +100,7 @@ class User
      */
     static public function lisss($page, $limit, $where)
     {
-        $q    = \App\Module\User\Model\User::query()->with([
+        $q    = \App\Module\User\Models\User::query()->with([
                                                                'fund', 'merchant', 'info'
                                                            ]);
         $wArr = new Arr($where, $q);
@@ -115,7 +116,7 @@ class User
 
     /**
      * @param $id
-     * @return Model\User|null
+     * @return Models\User|null
      */
     static public function info($id, $create = false)
     {
@@ -128,7 +129,7 @@ class User
      *
      * @param $id
      * @param $create
-     * @return Model\UserInfo|null
+     * @return Models\UserInfo|null
      */
     static public function infoinfo($id, $create = false)
     {
@@ -163,9 +164,9 @@ class User
         $res = self::pinfoCaches($ids2);
         if ($ids2) {
             /**
-             * @var \App\Module\User\Model\UserInfo[] $users
+             * @var \App\Module\User\Models\UserInfo[] $users
              */
-            $users = \App\Module\User\Model\UserInfo::query()->whereIn('user_id', $ids2)->with([
+            $users = \App\Module\User\Models\UserInfo::query()->whereIn('user_id', $ids2)->with([
                                                                                                    'merchant'
                                                                                                ])->get();
 

app/Module/User/UserOInfo.php

@@ -3,7 +3,7 @@
 namespace App\Module\User;
 
 use App\Module\User\Enums\Status2;
-use App\Module\User\Model\UserInfo;
+use App\Module\User\Models\UserInfo;
 use App\Module\User\Unit\UserPublic;
 use Dcore\Db\Arr;
 use Dcore\Exception\LogicException;
@@ -24,9 +24,9 @@ class UserOInfo
 
         if($cache === null){
             /**
-             * @var \App\Module\User\Model\UserInfo[] $users
+             * @var \App\Module\User\Models\UserInfo[] $users
              */
-            $user = \App\Module\User\Model\UserInfo::query()->where('user_id', $id)->with([
+            $user = \App\Module\User\Models\UserInfo::query()->where('user_id', $id)->with([
                                                                                                    'merchant',
                                                                                                    'user_phone'
                                                                                                ])->first();
@@ -90,9 +90,9 @@ class UserOInfo
         $res = self::infoCaches($ids2);
         if ($ids2) {
             /**
-             * @var \App\Module\User\Model\UserInfo[] $users
+             * @var \App\Module\User\Models\UserInfo[] $users
              */
-            $users = \App\Module\User\Model\UserInfo::query()->whereIn('user_id', $ids2)->with([
+            $users = \App\Module\User\Models\UserInfo::query()->whereIn('user_id', $ids2)->with([
                                                                                                    'merchant',
                                                                                                    'user_phone'
                                                                                                ])->get();

app/Module/User/Validation/Login.php

@@ -3,7 +3,7 @@
 namespace App\Module\User\Validation;
 
 use App\Module\Ulogic\Validator\Model2Unit;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use UCore\ValidationCore;
 
 use App\Module\User\Validator\CanLogin;

app/Module/User/Validation/Login4Phone.php

@@ -7,7 +7,7 @@ use App\Module\Common\Validator\Phone;
 use App\Module\Sms\Validator\PhoneCode;
 use App\Module\Sys\ContinuousTimes;
 use App\Module\Ulogic\Validator\Model2Unit;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use App\Module\User\Validator\AutoRegPhone;
 use App\Module\User\Validator\CanLogin;
 use App\Module\User\Validator\LoginJizhi;

app/Module/User/Validation/PhoneResetSPassword.php

@@ -7,7 +7,7 @@ use App\Module\App\Validator\UserBindValidator;
 use App\Module\Common\Validator\Number;
 use App\Module\Sms\Validator\PhoneCode;
 use App\Module\Ulogic\Validator\Model2Unit;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use App\Module\User\Validator\SPassword;
 use UCore\ValidationCore;
 

app/Module/User/Validator/AuthPassword.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\UserSecretPassword;
+use App\Module\User\Models\UserSecretPassword;
 use UCore\Validator;
 
 

app/Module/User/Validator/AuthPasswordApp.php

@@ -3,7 +3,7 @@
 namespace App\Module\User\Validator;
 
 use App\Module\App\SessionApp;
-use App\Module\User\Model\UserSecretPassword;
+use App\Module\User\Models\UserSecretPassword;
 use UCore\Validator;
 
 

app/Module/User/Validator/AutoRegPhone.php

@@ -4,7 +4,7 @@ namespace App\Module\User\Validator;
 
 use App\Module\Outside\Api;
 use App\Module\User\Enums\PhoneStatus;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use App\Module\User\User;
 use UCore\Validator;
 

app/Module/User/Validator/IsAuthPassword.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\UserSecretPassword;
+use App\Module\User\Models\UserSecretPassword;
 use UCore\Validator;
 
 

app/Module/User/Validator/Phone.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use UCore\Validator;
 use App\Models\Hp\User;
 

app/Module/User/Validator/PhoneAndCheck.php

@@ -4,7 +4,7 @@ namespace App\Module\User\Validator;
 
 use App\Module\Outside\Api;
 use App\Module\User\Enums\PhoneStatus;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use App\Module\User\User;
 use UCore\Validator;
 

app/Module/User/Validator/PhoneN.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use DCore\Validator;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 
 /**

app/Module/User/Validator/PhoneU.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use DCore\Validator;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 
 /**

app/Module/User/Validator/PhoneUser.php

@@ -4,9 +4,9 @@ namespace App\Module\User\Validator;
 
 use App\Module\App\H;
 use App\Module\App\SessionApp;
-use App\Module\User\Model\UserPhone;
+use App\Module\User\Models\UserPhone;
 use DCore\Validator;
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 
 
 /**

app/Module/User/Validator/UserEmail.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use UCore\Validator;
 
 

app/Module/User/Validator/Username.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use UCore\Validator;
 
 

app/Module/User/Validator/UsernameNt.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Model\User;
+use App\Module\User\Models\User;
 use UCore\Validator;
 
 

noai.md

@@ -5,6 +5,7 @@
 
 项目需要与三个区块链进行互通，我需要创建一个区块链模块，能够与bnb,usdt,uraus进行一些区块链操作，你梳理下都能进行那些区块链操作
 
+App\Models\ModelCore 不存在了，使用\UCore\ModelCore
 
 netresearch/jsonmapper
 
@@ -24,3 +25,7 @@ netresearch/jsonmapper
 
 @/app/ProtoLogic/Blockchain/MinerHandler.php  现在是假数据，进行开发，在服务层模拟数据。
 
+2025/4/22 上午11:00:06 (Asia/Shanghai, UTC+8:00)
+2025/4/22 上午11:01:21 (Asia/Shanghai, UTC+8:00)
+
+枚举类名 全大写下划线命名，文件名同类名，case名 全大写下划线命名，case值不变