Skip to content

T
TokenVaultManagement
Commit eca43a0b authored by nickchen's avatar nickchen 🎨
Browse files
Options

v2.32

parent d1fbe9d1
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 121 deletions
Merchant Token Vault Management/backstage/Controllers/KeyController.cs
View file @ eca43a0b
...@@ -136,68 +136,22 @@ namespace backstage.Controllers ...@@ -136,68 +136,22 @@ namespace backstage.Controllers
#endregion #endregion
#region name重複檢查 #region name重複檢查
var url = _config["IP"] + "/security/key/list"; result = await CheckNameRepeat(key_name);
var httpMethod = HttpMethod.Post; if (!result.IsSuccess)
var parameters = new Dictionary<string, string>
{ {
};
var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
if (apiResult.IsSuccess)
{
try
{
var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
if (response.r == 0)
{
var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
var keyNameRepeat = keylist.Where(x => x.name == key_name).FirstOrDefault();
if (keyNameRepeat != null)
{
result.IsSuccess = false;
switch (_currentLanguage)
{
case "en":
msg = "key name already exists.";
break;
case "zh":
msg = "鑰匙名稱已存在";
break;
default:
msg = "鑰匙名稱已存在";
break;
}
result.Message = msg;
return result;
}
}
else
{
result.IsSuccess = false;
result.Message = "error.";
return result; return result;
} }
}
catch (Exception e)
{
result.IsSuccess = false;
result.Message = "error.";
return result;
}
}
else
{
result.IsSuccess = false;
result.Message = "error.";
return result;
}
#endregion #endregion
// step1 create key // step1 create key
url = _config["IP"] + "/security/key/generate"; var url = _config["IP"] + "/security/key/generate";
httpMethod = HttpMethod.Post; var httpMethod = HttpMethod.Post;
var parameters = new Dictionary<string, string>
{
};
if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key1)) if (!string.IsNullOrEmpty(key1) && !string.IsNullOrEmpty(key1))
{ {
...@@ -206,7 +160,7 @@ namespace backstage.Controllers ...@@ -206,7 +160,7 @@ namespace backstage.Controllers
{ "QRData","["+key1+","+key2+"]"} { "QRData","["+key1+","+key2+"]"}
}; };
} }
apiResult = await _callApi.CallAPI(url, parameters, httpMethod); var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
if (apiResult.IsSuccess) if (apiResult.IsSuccess)
{ {
try try
...@@ -430,127 +384,147 @@ namespace backstage.Controllers ...@@ -430,127 +384,147 @@ namespace backstage.Controllers
string msg; string msg;
#region name重複檢查 #region name重複檢查
var url = _config["IP"] + "/security/key/list"; result = await CheckNameRepeat(name, keyId);
var httpMethod = HttpMethod.Post; if (!result.IsSuccess)
var parameters = new Dictionary<string, string>
{ {
return result;
}
#endregion
#region key/list
var url = _config["IP"] + "/security/key";
var httpMethod = HttpMethod.Put;
var parameters = new Dictionary<string, string>
{
{ "id",keyId.ToString()},
{ "name",name},
{ "active",active.ToString()},
}; };
var apiResult = await _callApi.CallAPI(url, parameters, httpMethod); var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
if (apiResult.IsSuccess) if (apiResult.IsSuccess)
{ {
try try
{ {
var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString()); var Response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
if (response.r == 0) if (Response.r == 0)
{
var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
var keyNameRepeat = keylist.Where(x => x.name == name).FirstOrDefault();
if (keyNameRepeat != null)
{ {
result.IsSuccess = false;
switch (_currentLanguage) switch (_currentLanguage)
{ {
case "en": case "en":
msg = "key name already exists."; msg = "Edit key success.";
break; break;
case "zh": case "zh":
msg = "鑰匙名稱已存在"; msg = "編輯鑰匙成功";
break; break;
default: default:
msg = "鑰匙名稱已存在"; msg = "編輯鑰匙成功";
break; break;
} }
result.IsSuccess = true;
result.Message = msg; result.Message = msg;
return result; return result;
} }
}
else else
{ {
result.IsSuccess = false; result.IsSuccess = false;
result.Message = "error."; result.Message = Response.m.ToString();
return result; return result;
} }
} }
catch (Exception e) catch (Exception e)
{ {
result.IsSuccess = false; result.IsSuccess = false;
result.Message = "error."; result.Message = e.Message + e.InnerException?.Message;
return result; return result;
} }
} }
else
{
result.IsSuccess = false; result.IsSuccess = false;
result.Message = "error."; result.Message = apiResult.Message;
return result; return result;
#endregion
} }
#endregion
#region key/list /// <summary>
url = _config["IP"] + "/security/key"; /// 檢查name重複
httpMethod = HttpMethod.Put; /// </summary>
parameters = new Dictionary<string, string> /// <param name="name"></param>
/// <param name="id">預設值:0，檢查時跳過自己</param>
/// <returns></returns>
public async Task<ResultModel> CheckNameRepeat(string name, int id = 0)
{ {
{ "id",keyId.ToString()}, var result = new ResultModel();
{ "name",name}, result.IsSuccess = true;
{ "active",active.ToString()}, var msg = "";
};
apiResult = await _callApi.CallAPI(url, parameters, httpMethod); var url = _config["IP"] + "/security/key/list";
var httpMethod = HttpMethod.Post;
var parameters = new Dictionary<string, string>
{
};
var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
if (apiResult.IsSuccess) if (apiResult.IsSuccess)
{ {
try try
{ {
var Response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString()); var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
if (Response.r == 0) if (response.r == 0)
{ {
var keylist = JsonConvert.DeserializeObject<List<Key>>(response.d.ToString());
var keyNameRepeat = keylist.Where(x => x.name == name).FirstOrDefault();
if (keyNameRepeat != null && keyNameRepeat.id != id)
{
result.IsSuccess = false;
switch (_currentLanguage) switch (_currentLanguage)
{ {
case "en": case "en":
msg = "Edit key success."; msg = "key name already exists.";
break; break;
case "zh": case "zh":
msg = "編輯鑰匙成功"; msg = "鑰匙名稱已存在";
break; break;
default: default:
msg = "編輯鑰匙成功"; msg = "鑰匙名稱已存在";
break; break;
} }
result.IsSuccess = true;
result.Message = msg; result.Message = msg;
return result; return result;
} }
}
else else
{ {
result.IsSuccess = false; result.IsSuccess = false;
result.Message = Response.m.ToString(); result.Message = "error.";
return result; return result;
} }
} }
catch (Exception e) catch (Exception e)
{ {
result.IsSuccess = false; result.IsSuccess = false;
result.Message = e.Message + e.InnerException?.Message; result.Message = "error.";
return result; return result;
} }
} }
else
{
result.IsSuccess = false; result.IsSuccess = false;
result.Message = apiResult.Message; result.Message = "error.";
return result; return result;
#endregion
} }
return result;
}
} }
} }
\ No newline at end of file
Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs
View file @ eca43a0b
...@@ -25,7 +25,6 @@ using System.Dynamic; ...@@ -25,7 +25,6 @@ using System.Dynamic;
using TokenVault_management.Models; using TokenVault_management.Models;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Localization;
using DocumentFormat.OpenXml.Wordprocessing;
namespace backstage.Controllers namespace backstage.Controllers
{ {
......
Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml
View file @ eca43a0b
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<!-- partial:./partials/_sidebar.html --> <!-- partial:./partials/_sidebar.html -->
<nav class="sidebar sidebar-offcanvas" id="sidebar"> <nav class="sidebar sidebar-offcanvas" id="sidebar">
<div class="versionNo"> <div class="versionNo">
@Localizer["version"]: v2.31 @Localizer["version"]: v2.32
</div> </div>
<ul class="nav "> <ul class="nav ">
<li class="nav-item"> <li class="nav-item">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment