From 0ecadf2d4500e018ef59c5d7c0eb3b23856580f0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 27 四月 2026 15:11:11 +0800
Subject: [PATCH] 调整 token自动刷新接口，解决token 无法自动刷新的问题
---
WebAPI/Controllers/WebAPIController.cs | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ab61d72..9e1452f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -340,6 +340,7 @@
/// <returns></returns>
[Route("Web/GetUser")]
[HttpGet]
+ [AllowAnonymous]
public object GetUser(string UserName, string PassWord, string HOrgName)
{
try
@@ -384,11 +385,23 @@
}
}
+ if (!oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐧诲綍寮傚父锛乀oken 鐢熸垚寮傚父锛屾棤娉曡幏鍙栧叕鍙镐俊鎭紒";
+ }
+
+ string tokenStr = Utility.JWTHelper.GenerateToken(ds.Tables[0].Rows[0]["Czybm"].ToString(), ds.Tables[0].Rows[0]["Czymc"].ToString());
+
+
objjson.code = "0";
objjson.count = 1;
objjson.Message = "[0000-1-073]鐧诲綍鎴愬姛锛�";
objjson.data = ds.Tables[0];
- return objjson;
+ JObject jobjJsonResult = JObject.FromObject(objjson);
+ jobjJsonResult["token"] = tokenStr;
+ return jobjJsonResult;
}
catch (Exception e)
@@ -396,7 +409,7 @@
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "[0000-1-074]鐧诲綍寮傚父锛�" + e.Message;
+ objjson.Message = "[0000-1-074]鐧诲綍寮傚父锛�" + e;
objjson.data = null;
return objjson; ;
}
@@ -2619,6 +2632,7 @@
/// <returns></returns>
[Route("Web/GetDataBases")]
[HttpGet]
+ [AllowAnonymous]
public object GetDataBases()
{
try
@@ -18965,6 +18979,7 @@
/// <returns></returns>
[Route("Web/GetOrganizations")]
[HttpGet]
+ [AllowAnonymous]
public object GetOrganizations()
{
try
@@ -18997,6 +19012,7 @@
/// <returns></returns>
[Route("Web/BaseInfo")]
[HttpGet]
+ [AllowAnonymous]
public object GetBaseInfo()
{
try
@@ -20457,7 +20473,7 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.Message = "鑾峰彇澶辫触" + ex.Message.ToString();
objjson.data = null;
return objjson;
}
@@ -20952,7 +20968,18 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触,鏄庣粏鏌ユ棤鏁版嵁";
+ if(Type == "DJ")
+ {
+ objjson.Message = "鑾峰彇澶辫触,妯″叿鏃犵粦瀹氱殑鐐规瑙勭▼";
+ }
+ else if (Type == "BY")
+ {
+ objjson.Message = "鑾峰彇澶辫触,妯″叿鏃犵粦瀹氱殑淇濆吇瑙勭▼";
+ }
+ else
+ {
+ objjson.Message = "鑾峰彇澶辫触,鏄庣粏鏌ユ棤鏁版嵁";
+ }
objjson.data = null;
return objjson;
}
@@ -21153,12 +21180,12 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
- if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
- {
- //涓嶆槸绠＄悊鍛�
- sWhere += " and 鍒跺崟浜� = '" + user + "'";
- }
+ //ds = oCN.RunProcReturn("select ManagerFlag from gy_czygl where czymc='" + user.Trim() + "'", "gy_czygl");
+ //if (!(bool)ds.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠＄悊鍛�
+ //{
+ // //涓嶆槸绠＄悊鍛�
+ // sWhere += " and 鍒跺崟浜� = '" + user + "'";
+ //}
string sql = string.Format(@"select * from " + HView + " where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc, hmainid desc");
@@ -22836,6 +22863,7 @@
/// <returns></returns>
[Route("Web/GetModuleName")]
[HttpGet]
+ [AllowAnonymous]
public object GetModuleName(string HModuleType)
{
try
@@ -23439,6 +23467,7 @@
#region 鐢ㄤ簬杩炴帴鐨勫仴搴峰害妫�楠岋紝鍙鑳借闂�氳繖涓帴鍙ｏ紝鍒欒〃鏄庤繛鎺ュ彲鐢�
[Route("Health")]
[HttpGet]
+ [AllowAnonymous]
public IHttpActionResult CheckHealth()
{
// 杩斿洖 200 鐘舵�佺爜 纭鍋ュ悍鐘舵��
@@ -23905,11 +23934,15 @@
foreach (var param in rawParams)
{
bool isMatched = false;
- // 閬嶅巻鎵�鏈夊伐鑹哄垎绫伙紝鍒ゆ柇鍙傛暟鍚嶆槸鍚﹀寘鍚鍒嗙被鍚嶇О
+ // 閬嶅巻鎵�鏈夊伐鑹哄垎绫伙紝鍒ゆ柇鍙傛暟鍚嶆槸浠ヨ鍒嗙被鍚嶇О寮�澶�
foreach (string category in categoryNames)
{
- if (param.TechParamName.Contains(category))
+ if (param.TechParamName.StartsWith(category))
{
+ if(param.TechParamName.Length != category.Length)
+ {
+ param.TechParamName = param.TechParamName.Substring(category.Length);
+ }
groupedParams[category].Add(param);
isMatched = true;
break; // 鍖归厤鍒扮涓�涓垎绫诲悗鍋滄锛堥伩鍏嶉噸澶嶅尮閰嶏級
@@ -23971,5 +24004,81 @@
}
}
#endregion
+
+ /// <summary>
+ /// APP鐧诲綍鏉冮檺楠岃瘉鎺ュ彛
+ /// </summary>
+ [Route("Auth/CheckAppLoginAuth")]
+ [HttpPost]
+ public object CheckAppLoginAuth()
+ {
+ try
+ {
+ // 鑾峰彇璇锋眰鍙傛暟
+ string orgID = HttpContext.Current.Request.Form["orgID"] ?? "";
+ string orgName = HttpContext.Current.Request.Form["orgName"] ?? "";
+ string serverUrl = HttpContext.Current.Request.Form["serverUrl"] ?? "";
+ string phoneType = HttpContext.Current.Request.Form["phoneType"] ?? "";
+ string userAccount = HttpContext.Current.Request.Form["userAccount"] ?? "";
+ string other = HttpContext.Current.Request.Form["other"] ?? "";
+ // 鍙傛暟楠岃瘉
+ if (string.IsNullOrEmpty(userAccount))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璐﹀彿涓嶈兘涓虹┖!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrEmpty(orgID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "缁勭粐ID涓嶈兘涓虹┖!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙傛暟瀹夊叏澶勭悊锛堥槻姝㈡敞鍏ワ級
+ orgID = orgID.Replace("'", "''");
+ orgName = orgName.Replace("'", "''");
+ serverUrl = serverUrl.Replace("'", "''");
+ phoneType = phoneType.Replace("'", "''");
+ userAccount = userAccount.Replace("'", "''");
+
+ // 鎵ц鍥哄畾瀛樺偍杩囩▼
+ string sql = $"EXEC SP_CheckAppLoginAuth '{orgID}', '{orgName}', '{serverUrl}', '{phoneType}','{userAccount}','{other}'";
+ ds = oCN.RunProcReturn(sql, "SP_CheckAppLoginAuth");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ int result = Convert.ToInt32(ds.Tables[0].Rows[0]["Result"]);
+ string message = ds.Tables[0].Rows[0]["Message"].ToString();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = message;
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "楠岃瘉鎺ュ彛杩斿洖寮傚父!";
+ objJsonResult.data = null;
+ }
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
}
--
Gitblit v1.9.1