代码修复 userTid的类型错误和去掉webUtil获取Ip4的正则判断

yuzd · yuzd · commit 45f193ed872c · 2019-07-09T12:19:17.000+08:00
diff --git a/ant.mgr/Infrastructure/Infrastructure/Web/WebUtils.cs b/ant.mgr/Infrastructure/Infrastructure/Web/WebUtils.cs
@@ -118,11 +118,6 @@ private static string GetIP()
                 result = HttpContext.Current.Connection.RemoteIpAddress.ToString();
             }
 
-            if (string.IsNullOrEmpty(result) || !Regex.IsMatch(result, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"))
-            {
-                return "127.0.0.1";
-            }
-
             return result;
         }
 
diff --git a/ant.mgr/Repository/Repository/AdminRepository/AccountRespository.cs b/ant.mgr/Repository/Repository/AdminRepository/AccountRespository.cs
@@ -189,7 +189,7 @@ from role in this.Entitys.SystemRole.Where(r => r.Tid.Equals(u.RoleTid)).Default
         /// <returns></returns>
         public async Task<Tuple<bool, string>> UserAddRole(UserAddRoleVm info)
         {
-            if (info == null || info.RoleTid < 1 || !string.IsNullOrEmpty(info.UserTid))
+            if (info == null || info.RoleTid < 1 || info.UserTid<1)
             {
                 return new Tuple<bool, string>(false, Tip.BadRequest);
             }
diff --git a/ant.mgr/ViewModels/ViewModels/Admin/AccountVm.cs b/ant.mgr/ViewModels/ViewModels/Admin/AccountVm.cs
@@ -26,7 +26,7 @@ public class UserAddRoleVm
         /// <summary>
         /// 用户Tid
         /// </summary>
-        public string UserTid { get; set; }
+        public long UserTid { get; set; }
 
         /// <summary>
         /// 角色Tid

Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,6 @@ private static string GetIP()`
`118`	`118`	`result = HttpContext.Current.Connection.RemoteIpAddress.ToString();`
`119`	`119`	`}`
`120`	`120`
`121`		`- if (string.IsNullOrEmpty(result) \|\| !Regex.IsMatch(result, @"^((2[0-4]\d\|25[0-5]\|[01]?\d\d?)\.){3}(2[0-4]\d\|25[0-5]\|[01]?\d\d?)$"))`
`122`		`- {`
`123`		`- return "127.0.0.1";`
`124`		`- }`
`125`		`-`
`126`	`121`	`return result;`
`127`	`122`	`}`
`128`	`123`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ from role in this.Entitys.SystemRole.Where(r => r.Tid.Equals(u.RoleTid)).Default`
`189`	`189`	`/// <returns></returns>`
`190`	`190`	`public async Task<Tuple<bool, string>> UserAddRole(UserAddRoleVm info)`
`191`	`191`	`{`
`192`		`- if (info == null \|\| info.RoleTid < 1 \|\| !string.IsNullOrEmpty(info.UserTid))`
	`192`	`+ if (info == null \|\| info.RoleTid < 1 \|\| info.UserTid<1)`
`193`	`193`	`{`
`194`	`194`	`return new Tuple<bool, string>(false, Tip.BadRequest);`
`195`	`195`	`}`