SVN r984
SVN-Revision: r984
This commit is contained in:
@@ -128,7 +128,10 @@ namespace Lskj.Util
|
||||
/// Mrp标记
|
||||
/// </summary>
|
||||
private static readonly string _rightLineStatus = "{RightLineStatus}";
|
||||
|
||||
/// <summary>
|
||||
/// Mac地址
|
||||
/// </summary>
|
||||
private static readonly string _macAddressy = "{loginMac}";
|
||||
|
||||
/// <summary>
|
||||
/// 参数替换父级字符前缀
|
||||
@@ -233,7 +236,8 @@ namespace Lskj.Util
|
||||
.Replace(_userCode_key, ERPInfo.Instance.LoginAccount + "", true)
|
||||
.Replace(_accountBook, ERPInfo.Instance.AccountBook + "", true)
|
||||
.Replace(_loginUserLinkPhone_key, ERPInfo.Instance.UserLinkPhone + "", true)
|
||||
.Replace(_mrpTag_key, ERPInfo.Instance.MrpTag + "", true);
|
||||
.Replace(_mrpTag_key, ERPInfo.Instance.MrpTag + "", true)
|
||||
.Replace(_macAddressy, ERPInfo.Instance.MacAddress + "", true); ;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
@@ -250,6 +254,8 @@ namespace Lskj.Util
|
||||
{
|
||||
try
|
||||
{
|
||||
if(defaultValue.StartsWith("--不替换")) return defaultValue;
|
||||
|
||||
if (defaultValue.Contains("#"))
|
||||
{
|
||||
defaultValue=defaultValue.Replace("'#'", "%^&*");
|
||||
@@ -689,7 +695,7 @@ namespace Lskj.Util
|
||||
var fields = GetParamFields(defaultValue);
|
||||
foreach (string item in fields)
|
||||
{
|
||||
if (item.Equals(paramStr))
|
||||
if (item.Equals(paramStr,StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
defaultValue = defaultValue.Replace(item, value);
|
||||
}
|
||||
@@ -784,4 +790,4 @@ namespace Lskj.Util
|
||||
/// <param name="iPersonnelCustomerId">客户标识</param>
|
||||
/// <param name="iPersonnelPrivateKey">私钥</param>
|
||||
/// <returns>System.String.</returns>
|
||||
public static string ReplaceIPersonnel(string defaultValue, string iPersonnelAllowInformation
|
||||
public static string ReplaceIPersonnel(string defaultValue, string iPersonnelAllowInformation, stri
|
||||
Reference in New Issue
Block a user