From 08ce854f4185ce34cdd88959e6ea8ed13ffe8f8d Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Wed, 26 Oct 2022 11:00:49 +0800
Subject: [PATCH] * Call the loadTarget function to load the model object of a
 module.

---
 framework/base/model.class.php | 47 ++--------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/framework/base/model.class.php b/framework/base/model.class.php
index f370fd5248..d03f32e385 100644
--- a/framework/base/model.class.php
+++ b/framework/base/model.class.php
@@ -201,55 +201,12 @@ class baseModel
      *
      * @param  string $moduleName 模块名，如果为空，使用当前模块。The module name, if empty, use current module's name.
      * @param  string $appName    应用名，如果为空，使用当前应用。The app name, if empty, use current app's name.
-     * @param  string $type       对象的类型，可选值 model、zen、tao，默认为 model。The type of the object, optional values model, zen, tao, the default is model.
      * @access public
      * @return object|bool  the model object or false if model file not exists.
      */
-    public function loadModel($moduleName, $appName = '', $type = 'model')
+    public function loadModel($moduleName, $appName = '')
     {
-        if(empty($moduleName)) $moduleName = $this->moduleName;
-        if(empty($appName)) $appName = $this->appName;
-
-        $objectName = $type == 'model' ? $moduleName : $moduleName . ucfirst($type);
-
-        global $loadedModels;
-        if(isset($loadedModels[$type][$appName][$moduleName]))
-        {
-            $this->{$objectName} = $loadedModels[$type][$appName][$moduleName];
-            return $this->{$objectName};
-        }
-
-        $modelFile = $this->app->setModelFile($moduleName, $appName, $type);
-
-        /**
-         * 如果没有model文件，返回。
-         * If no model file, return.
-         */
-        if(!helper::import($modelFile)) return false;
-
-        /**
-         * 如果没有扩展文件，model类名是$moduleName + $type，如果有扩展，还需要增加ext前缀。
-         * If no extension file, model class name is $moduleName + $type, else with 'ext' as the prefix.
-         */
-        $modelClass = class_exists('ext' . $appName . $moduleName. $type) ? 'ext' . $appName . $moduleName . $type : $appName . $moduleName . $type;
-        if(!class_exists($modelClass))
-        {
-            $modelClass = class_exists('ext' . $moduleName. $type) ? 'ext' . $moduleName . $type : $moduleName . $type;
-            if(!class_exists($modelClass)) $this->app->triggerError(" The $type $modelClass not found", __FILE__, __LINE__, $exit = true);
-        }
-
-        /**
-         * 因为tao继承model，构造函数里会调用loadModel方法，赋默认值值防止递归调用。
-         */
-        if($type == 'tao') $loadedModels[$type][$appName][$moduleName] = false;
-
-        /**
-         * 初始化model对象，在model对象中可以通过$this->$objectName来引用。
-         * Init the model object thus you can try $this->$objectName to access it.
-         */
-        $this->{$objectName} = new $modelClass($appName);
-        $loadedModels[$type][$appName][$moduleName] = $this->{$objectName};
-        return $this->{$objectName};
+        return $this->app->loadTarget($moduleName, $appName);
     }
 
     /**