diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/CacheManager.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/CacheManager.java index 6d44d4e..f2c59b6 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/CacheManager.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/CacheManager.java @@ -76,7 +76,9 @@ public class CacheManager { return 0;//getPluginIndex(o1) - getPluginIndex(o2); }); for (AbstractCache cache : listCache) { - cache.init(); + if (cache.isNotInited()) { + cache.init(); + } } //按表加载并初始化 for (ModelTable table : ModelTableCache.getInstance().getAll()) { diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java index 6ea2a22..7aab294 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java @@ -13,16 +13,20 @@ import java.io.Serializable; */ public class DefaultEntity extends BaseBean implements Serializable, Cloneable { //表名 - private String _def_table_name; + private final static String tableNameKey = "_def_table_name"; public DefaultEntity() {} public DefaultEntity(String _def_table_name) { - this._def_table_name = _def_table_name; + this.put(tableNameKey,_def_table_name); } public ModelTable getModelTable() { - return ModelTableCache.getInstance().getByName(_def_table_name); + return ModelTableCache.getInstance().getByName(getTableName()); + } + + public String getTableName() { + return getStr(tableNameKey); } //根据实体定义,设默认值 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelDatabase.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelDatabase.java index fd0ca36..8a1ef57 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelDatabase.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelDatabase.java @@ -13,7 +13,7 @@ public class ModelDatabase extends DefaultEntity { public final static String ENTITY_NAME = "ASP_MODEL_DATABASE"; public ModelDatabase() { - super(); + super(ENTITY_NAME); } public long getId() {