diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index 8c9a7c24..f7884dc7 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -112,7 +112,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers var uid= pwdDto.user.id; var user_data = await _userService.GetUserById(uid); string msg = "修改成功"; - if (pwdDto.newPassword != null) + if (! string.IsNullOrEmpty( pwdDto.newPassword)) { if (user_data.password == pwdDto.user.password) { @@ -124,9 +124,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers user_data.age = pwdDto.user.age; user_data.address = pwdDto.user.address; user_data.nick = pwdDto.user.nick; + + await _userService.UpdateAsync(user_data); user_data.password = null; - return Result.Success(msg).SetData(user_data); + return Result.Success(msg); } else { @@ -141,9 +143,11 @@ namespace Yi.Framework.ApiMicroservice.Controllers user_data.age = pwdDto.user.age; user_data.address = pwdDto.user.address; user_data.nick = pwdDto.user.nick; + await _userService.UpdateAsync(user_data); - user_data.password = null; - return Result.Success(msg).SetData(user_data); + + + return Result.Success(msg); } } } \ No newline at end of file diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index 121fef4e..42d8c6cf 100644 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db and b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db differ diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm deleted file mode 100644 index 1e3a6416..00000000 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm and /dev/null differ diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal deleted file mode 100644 index 390fa52f..00000000 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal and /dev/null differ diff --git a/Yi.Framework/Yi.Framework.Common/Helper/HttpHelper.cs b/Yi.Framework/Yi.Framework.Common/Helper/HttpHelper.cs new file mode 100644 index 00000000..96b7c4c0 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Common/Helper/HttpHelper.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace Yi.Framework.Common.Helper +{ + public static class HttpHelper + { + public static string HttpGet(string Url, string postDataStr="") + { + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url + (postDataStr == "" ? "" : "?") + postDataStr); + request.Method = "GET"; + request.ContentType = "text/html;charset=UTF-8"; + + HttpWebResponse response = (HttpWebResponse)request.GetResponse(); + Stream myResponseStream = response.GetResponseStream(); + StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8")); + string retString = myStreamReader.ReadToEnd(); + myStreamReader.Close(); + myResponseStream.Close(); + + return retString; + } + + public static bool HttpIOGet(string Url, string file, string postDataStr="") + { + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url + (postDataStr == "" ? "" : "?") + postDataStr); + request.Method = "GET"; + request.ContentType = "text/html;charset=UTF-8"; + + HttpWebResponse response = (HttpWebResponse)request.GetResponse(); + Stream myResponseStream = response.GetResponseStream(); + FileStream writer = new FileStream(file, FileMode.OpenOrCreate, FileAccess.Write); + byte[] buffer = new byte[1024]; + int c; + while ((c = myResponseStream.Read(buffer, 0, buffer.Length)) > 0) + { + writer.Write(buffer, 0, c); + } + writer.Close(); + myResponseStream.Close(); + + return true; + } + + public static string HttpPost(string Url, string postDataStr="") + { + CookieContainer cookie = new CookieContainer(); + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Url); + request.Method = "POST"; + request.ContentType = "application/x-www-form-urlencoded"; + request.ContentLength = Encoding.UTF8.GetByteCount(postDataStr); + request.CookieContainer = cookie; + Stream myRequestStream = request.GetRequestStream(); + StreamWriter myStreamWriter = new StreamWriter(myRequestStream, Encoding.GetEncoding("gb2312")); + myStreamWriter.Write(postDataStr); + myStreamWriter.Close(); + + HttpWebResponse response = (HttpWebResponse)request.GetResponse(); + + response.Cookies = cookie.GetCookies(response.ResponseUri); + Stream myResponseStream = response.GetResponseStream(); + StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8")); + string retString = myStreamReader.ReadToEnd(); + myStreamReader.Close(); + myResponseStream.Close(); + + return retString; + } + } +} diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs index 66b2b1b7..eed4a769 100644 --- a/Yi.Framework/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework/Yi.Framework.Service/UserService.cs @@ -124,9 +124,7 @@ namespace Yi.Framework.Service } public async Task GetUserInfoById(int user_id) { - var user_data=await _Db.Set().Include(u=>u.roles) - .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); - //user_data.password = null; + var user_data=await GetUserById(user_id); user_data.roles.ToList().ForEach(u => u.users = null); return user_data; } @@ -134,8 +132,6 @@ namespace Yi.Framework.Service { var user_data = await _Db.Set().Include(u => u.roles) .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync(); - - user_data.roles.ToList().ForEach(u => u.users = null); return user_data; } } diff --git a/Yi.Vue/src/util/getMould.js b/Yi.Vue/src/util/getMould.js new file mode 100644 index 00000000..2f9e05a8 --- /dev/null +++ b/Yi.Vue/src/util/getMould.js @@ -0,0 +1,45 @@ +function getUrl(menuList, menuStr) { + for (var i = 0; i < menuList.length; i++) { + if (menuList[i].menu_name == menuStr) { + console.log(handUrl(menuList[i])) + return 1; + } else { + if (menuList[i].children != undefined) { + getUrl(menuList[i].children, menuStr); + } + + } + } +} + + +function handUrl(menu) { + var axiosUrls = { + get: "123", + update: "123", + del: "123", + add: "123", + }; + const myMenu = menu.children; + myMenu.forEach(item => { + const myName = item.mould.mould_name; + const myUrl = item.mould.url; + + switch (myName) { + case 'get': + axiosUrls.get = myUrl; + break; + case 'update': + axiosUrls.update = myUrl; + break; + case 'del': + axiosUrls.del = myUrl; + break; + case 'add': + axiosUrls.add = myUrl; + break; + } + }); + return axiosUrls; +} +export default { getUrl } \ No newline at end of file diff --git a/Yi.Vue/src/views/AdmRole.vue b/Yi.Vue/src/views/AdmRole.vue index 5d01fc2d..61a79ed7 100644 --- a/Yi.Vue/src/views/AdmRole.vue +++ b/Yi.Vue/src/views/AdmRole.vue @@ -12,7 +12,92 @@