From d136d88d1db00d411da0f087b57a44188e982dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 22 Oct 2021 19:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 12 ++- .../Yi.Framework.ApiMicroservice/YIDB.db | Bin 69632 -> 69632 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-shm | Bin 32768 -> 0 bytes .../Yi.Framework.ApiMicroservice/YIDB.db-wal | Bin 206032 -> 0 bytes .../Yi.Framework.Common/Helper/HttpHelper.cs | 76 ++++++++++++++++ .../Yi.Framework.Service/UserService.cs | 6 +- Yi.Vue/src/util/getMould.js | 45 ++++++++++ Yi.Vue/src/views/AdmRole.vue | 85 ++++++++++++++++++ Yi.Vue/src/views/userInfo.vue | 1 + 9 files changed, 216 insertions(+), 9 deletions(-) delete mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm delete mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal create mode 100644 Yi.Framework/Yi.Framework.Common/Helper/HttpHelper.cs create mode 100644 Yi.Vue/src/util/getMould.js 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 121fef4e353bb97df4b8e0da109bd55de4714ce5..42d8c6cf64c091bd1673dc026bf8cdf7eb8280c2 100644 GIT binary patch delta 1129 zcmZWoTWAzX6s_v1nx39X*Xfzb%xt2@K;jb;r#tb%$}R}IpW=d$4}VmmAF_ss=EDz- z`k_DK13DUALE{Rt!unumHL_?%P=jyrfvk$gU|wQ;L=^Gy;jN0GkZ$^%zPIkZb?e?+ z8#~0t4sqhi0v?3D3o0EvV-igaO@;VxjrbwUCCf~SwJcxLGT8Q4-+$W&PHr7KzAFef zFJ3l{F_z0r8nfuC5hhhT!;osnL3I`53Q2FX+7MVS%cLiil`%ds#+Z)j2X#%$R@AI) zZv1`V$lm^=JL~J}XV%rHhKhUoPH%hGwzpciEJr?!arV`xZj4h3>)CW2Irq(Kj8T30 z%vrPNq?SmRrOC90@tMwpkq~qmz(F72dbChGv4D3USJ4M z@fi1U7dKUJIDS=yr3MN=t~#U=BEoneBb+P0Fx;Bu<=xCik>L~h^rDD|G=21j~h6J zZakuoUW)$*HrRqwG*N-s)aP7&^v*4qAF8nmMw(iI4%hu z+BkafKi=XNuHZb*q7#GoNHsZuBlr{h&_-t8o2=Ov)?mh9sljyE^{Td7@1k=RMwike73UfaLAM^y$JCnJ z1@HA4%*AUKwG!IQf^5y z2}h8NGJYD3J<1g;#Jc8IA$O+QseRk_Fv#zw4b&jQWBFaQ-r|=B`HrT*s|)y~!dzc2>g*fwhPwS|;b>N_nG`lE0)H4agP-_}Dk_*X5oKCN5LQmxdsIV0 zO0rngN~shlSCUCdt`uJ>B1&jJOPRtVn+q!;6Iwf{GXI$2|AF@?V+?h?<{li(e;$Wy zlFUu%<;?npSk1KH3}*B=+fuplwIY=yZQ#qLm5NKtCem8Fm=hW$$rIP`ocle&L)^hF zluU59a|lbL!4CWuN$tnNJw;AJ>NYcr&N!H5f}+GH+{G)5V;U2HWSgdqz z#CMkDr(zA>e?OX&B(=(cyw{9*I!%bR%MBo ztgy_Rd4&7;$_~{`u+{>?@|U(vSQ07~TWtK+hJ!tQ%AQuuet%&R6Oq3-jt&Eg-D`}! sOUKS7m21u^9+oJ^#B`RO;O&^-EO2Ppmit-g1$~wrxkZXnt0Sk?KP$|gG5`Po 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 1e3a6416964e06b68d8032b22dd7da33393d5e92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeI*%S~HB6b9fQ2#**@9O4A?3It+99ymY&kx~Uq)`(JAQ2{F`ffkYmk^;geUBK8f z=*kNuFR{NPojXsBX1)T>ZT{O&HyR};lKN3;-;`{hUtIqBF?W4?eD(MDpVq<2&HtaL zw`cRsA@`S~deJH0yGrz@ADh|I>*mXnwUYJz_+fsq9o$zPSNnr!R@bWir}hoAR<11w z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PF|=z(gi9Q)-RQm0F{< z%x9t08ePuE?B)9yt9UvA0t7}|U@D8Hx^*MXtmQ+t)5_<3%fVbXoTltjTd`&0azx)XT W1PBlyK!5-N0t5&UAV6ST1nvP^ATGE7 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 390fa52fbeee5fa6efef17f99aa35b812781ffc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206032 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 o8-rKuq)uT5PY=3|00IagfB*srAb 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 @@