diff --git a/src/main/java/com/dsideal/Sso/Model/BaseModel.java b/src/main/java/com/dsideal/Sso/Model/BaseModel.java index 411b36b..e1c0a42 100644 --- a/src/main/java/com/dsideal/Sso/Model/BaseModel.java +++ b/src/main/java/com/dsideal/Sso/Model/BaseModel.java @@ -10,7 +10,15 @@ import java.util.Map; public class BaseModel { - + /** + * 功能:获取当前安装地区 + * + * @return + */ + public String getInstallArea() { + String sql = "select COALESCE(global_value,'') as global_value from t_base_global where global_code = 'install_area'"; + return Db.findFirst(sql).getStr("global_value"); + } /** * 功能:根据全局变量的KEY获取VALUE * @@ -18,16 +26,13 @@ public class BaseModel { * @return */ public String getGlobalValueByKey(String key) { - String redisKey = "global_" + key; - if (RedisKit.Exists(redisKey)) return RedisKit.Get(redisKey); - String result = ""; - String sql = "select * from t_base_global where global_code=?"; - List list = Db.find(sql, key); - if (!list.isEmpty()) { - result = list.getFirst().getStr("global_value"); + String install_area = getInstallArea(); + if (key.equals("install_area")) {//如果是获取安装地区 + return install_area; } - RedisKit.Set(redisKey, result); - return result; + //获取当前安装地区,然后组装出查询条件 + String sql = "select global_value from t_base_global where install_area=? and global_code=?"; + return Db.findFirst(sql, install_area, key).getStr("global_value"); } public Record getLoginInfoByUserName(String username) { @@ -58,7 +63,7 @@ public class BaseModel { * @return */ public boolean checkUrlExist(String redirect_url) { - String sql = "select * from t_sso_system where redirect_url=?"; + String sql = "select * from t_datashare_system where redirect_url=?"; List list = Db.find(sql, redirect_url); return !list.isEmpty(); }