From 4a5e85c31b3d5344be36e7ef97ece4515d725538 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 13 Jan 2022 11:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E6=9F=A5?= =?UTF-8?q?=E6=88=BF=E8=B7=B3=E8=BD=AC=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +- .../manage/controller/LoginController.java | 25 +- .../main/resources/config/config.properties | 38 +-- .../src/main/resources/log4j.properties | 5 + .../src/main/webapp/WEB-INF/jspf/common.jspf | 1 + .../webapp/WEB-INF/views/loginDir/login.jsp | 40 ++- .../src/main/webapp/static/js/login.js | 56 ++-- power-admin/src/main/webapp/static/js/md5.js | 256 ++++++++++++++++++ 8 files changed, 355 insertions(+), 69 deletions(-) create mode 100644 power-admin/src/main/webapp/static/js/md5.js diff --git a/pom.xml b/pom.xml index 4830128..9ceaaa3 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,8 @@ 1.2 3.4.6 1.3.2 - 5.1.32 + 8.0.11 + 1.6.4 2.9.4 1.0.9 diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java index 0fb87a2..f7a6da9 100644 --- a/power-admin/src/main/java/com/manage/controller/LoginController.java +++ b/power-admin/src/main/java/com/manage/controller/LoginController.java @@ -30,6 +30,8 @@ import java.util.*; public class LoginController { @Value("${TOKEN_EXPIRE_TIME}") private long TOKEN_EXPIRE_TIME; + @Value("${sysFlag}") + private Integer sysFlag; @Autowired private Power_UserService powerUserService; @Autowired @@ -50,16 +52,20 @@ public class LoginController { @Value("${EMRMEDICALRECORD_PORT}") private String port; + @Value("${POWER_PORT}") + private String POWER_PORT; + @RequestMapping(value = "login",method = RequestMethod.GET) public String toLogin(Model model){ - Power_Login_Set loginSet = powerLoginSetMapper.selectByPrimaryKey(1); + Power_Login_Set loginSet = powerLoginSetMapper.selectByPrimaryKey(sysFlag); model.addAttribute("loginSet",loginSet); CacheManager.addExcCount("noExc"); return "loginDir/login"; } @RequestMapping(value = "login",method = RequestMethod.POST) - public void login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ + @ResponseBody + public Msg login(Power_User powerUser,HttpServletResponse response, HttpServletRequest request,Model model){ try { Power_UserVo user = powerUserService.findPowerUserByUserNameAndUserPwd(powerUser); //添加进操作日志 @@ -124,11 +130,17 @@ public class LoginController { ActionScopeUtils.setSessionAttribute("token",token,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); ActionScopeUtils.setSessionAttribute("CURRENT_USER",user,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))); //单点登录跳转 - String url=EMRMEDICALRECORD_URLHEAD+"/login?token="+token+"&userName="+user.getUserName()+"&flag=1"; - //request.getRequestDispatcher(result).forward(request, response); + String url = ""; + if(sysFlag == 2){ + url = EMRMEDICALRECORD_URLHEAD+"/login?token="+token+"&userName="+user.getUserName()+"&flag=1"; + }else{ + url = "http://"+ip+":"+POWER_PORT+"/power/gatewayPage"; + } + //request.getRequestDispatcher(url).forward(request, response); - response.sendRedirect(url); - // return "redirect:gatewayPage"; + //response.sendRedirect(url); + //return "redirect:gatewayPage"; + return Msg.success().add("url",url); }else{ //登录失败 Integer wrongNum = 1; @@ -152,6 +164,7 @@ public class LoginController { e.printStackTrace(); CacheManager.addExcCount("exc"); } + return null; } @RequestMapping("refuse") public String refuse(){ diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index 025b3bd..89e5cc9 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -9,12 +9,12 @@ TOKEN_EXPIRE_TIME = 7200 ##################################################\u670D\u52A1\u5668ip########################################################## #\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3 -SERVER_IP = localhost -SERVER_PORT = 8081 - -#SERVER_IP = 200.100.104.40 +#SERVER_IP = localhost #SERVER_PORT = 8081 +SERVER_IP = 10.100.23.1 +SERVER_PORT = 8081 + #power\u6743\u9650\u7CFB\u7EDFip POWER_IP = ${SERVER_IP} #\u6743\u9650\u7CFB\u7EDF\u7AEF\u53E3 @@ -23,11 +23,11 @@ POWER_PORT = ${SERVER_PORT} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip EMRMEDICALRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3 -EMRMEDICALRECORD_PORT = 8082 +EMRMEDICALRECORD_PORT = ${SERVER_PORT} #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip EMRRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3 -EMRRECORD_PORT = 8083 +EMRRECORD_PORT = ${SERVER_PORT} #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip EMRAPPLYCOPY_IP = ${SERVER_IP} @@ -70,29 +70,31 @@ log.days = 90 #\u5B9A\u4E49\u662F\u5426\u4E3A\u957F\u671F\u767B\u5F55\u7528\u6237\u6B21\u6570 login.times = 3 -#ɭSSO OIDC +#\u68EE\u4EBFSSO OIDC\u914D\u7F6E\u9879 -#OIDCṩclient_id +#\u7531OIDC\u670D\u52A1\u63D0\u4F9B\u7684client_id client_id=WZH -#OIDCṩclient_secret +#\u7531OIDC\u670D\u52A1\u63D0\u4F9B\u7684client_secret client_secret=ClientSecret -#OIDCĵַ +#OIDC\u670D\u52A1\u7684\u5730\u5740 oidc_address= http://10.100.12.12:37727 -#Ȩַ޷ʹ÷ -#ֹܣ +#\u9274\u6743\u670D\u52A1\u5730\u5740\uFF08\u5982\u679C\u65E0\u6CD5\u4F7F\u7528\u670D\u52A1 +#\u53D1\u73B0\u529F\u80FD\uFF09 authorization_endpoint=/connect/authorize -#ȡTokenӿڣ޷ʹ÷ -#ֹܣ +#\u83B7\u53D6Token\u63A5\u53E3\uFF08\u5982\u679C\u65E0\u6CD5\u4F7F\u7528\u670D +#\u52A1\u53D1\u73B0\u529F\u80FD\uFF09 token_endpoint=/connect/token -#ûϢӿڣ޷ʹ÷ -#ֹܣ +#\u7528\u6237\u4FE1\u606F\u63A5\u53E3\uFF08\u5982\u679C\u65E0\u6CD5\u4F7F\u7528\u670D\u52A1 +#\u53D1\u73B0\u529F\u80FD\uFF09 userinfo_endpoint=/connect/userinfo -#ʵַ -URL_ADDRESS=http://10.100.23.1:8080/power/ssoLogin/login +#\u8BBF\u95EE\u5730\u5740 +URL_ADDRESS=http://10.100.23.1:8081/power/ssoLogin/login +#\u5224\u65AD\u767B\u5F55\u9875\u663E\u793A\u7684\u662Fid 1:\u5F52\u6863\u7CFB\u7EDF\uFF1B2\uFF1A\u79FB\u52A8\u67E5\u623F\u7CFB\u7EDF +sysFlag=2 \ No newline at end of file diff --git a/power-admin/src/main/resources/log4j.properties b/power-admin/src/main/resources/log4j.properties index 7a0bdab..5f31c08 100644 --- a/power-admin/src/main/resources/log4j.properties +++ b/power-admin/src/main/resources/log4j.properties @@ -16,3 +16,8 @@ log4j.appender.errorMsg.Threshold = error log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n +#log4j.rootLogger=debug,myLog,errorMsg,CONSOLE +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern =%d %-5p [%c{5}] - %m%n + diff --git a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf index 6c7c14c..8313e55 100644 --- a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf +++ b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf @@ -35,6 +35,7 @@ + diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp index 4760acb..e2512a0 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp @@ -54,33 +54,31 @@
-
-
${loginSet.footContext}
- + diff --git a/power-admin/src/main/webapp/static/js/login.js b/power-admin/src/main/webapp/static/js/login.js index 8f60707..5856034 100644 --- a/power-admin/src/main/webapp/static/js/login.js +++ b/power-admin/src/main/webapp/static/js/login.js @@ -32,32 +32,42 @@ $(function(){ }); -$('body').keydown(function () { - if(event.keyCode == '13'){ - var userName = $("#userName").val(); - var userPwd = $("#userPwd").val(); - var rememberMeChecked = $("input[type='checkbox']").is(':checked'); - var rememberMe = ''; - if(rememberMeChecked){ - rememberMe = 'yes'; - } - if(userName == ''){ - toastr.warning("用户名不能为空!"); +function login(){ + var userName = $("#userName").val(); + var userPwd = $("#userPwd").val(); + userPwd = hex_hmac_md5(userPwd,userPwd); + var rememberMeChecked = $("input[type='checkbox']").is(':checked'); + var rememberMe = ''; + if(rememberMeChecked){ + rememberMe = 'yes'; + } + if(userName == ''){ + toastr.warning("用户名不能为空!"); + }else{ + if(userPwd == ''){ + toastr.warning("密码不能为空!"); }else{ - if(userPwd == ''){ - toastr.warning("密码不能为空!"); - }else{ - $.ajax({ - type : "POST", - url : path+"/login", - data: {userName:userName, userPwd:userPwd,rememberMe:rememberMe}, - success : function(data) { - //window.location.href = 'gatewayPage'; - }, - }) - } + $.ajax({ + type : "POST", + url : path+"/login", + data: {userName:userName, userPwd:userPwd,rememberMe:rememberMe}, + dataType:'json', + success : function(data) { + if(data.code == 100){ + window.location.href = data.extend.url; + }else{ + $("#msg").text(data.msg); + } + } + }) } } +} + +$('body').keydown(function () { + if(event.keyCode == '13'){ + login(); + } }) /** * 判断是iframe框架跳出iframe框架使用top链接 diff --git a/power-admin/src/main/webapp/static/js/md5.js b/power-admin/src/main/webapp/static/js/md5.js new file mode 100644 index 0000000..d0c6b4f --- /dev/null +++ b/power-admin/src/main/webapp/static/js/md5.js @@ -0,0 +1,256 @@ +/* + * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message + * Digest Algorithm, as defined in RFC 1321. + * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for more info. + */ + +/* + * Configurable variables. You may need to tweak these to be compatible with + * the server-side, but the defaults work in most cases. + */ +var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ +var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ +var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */ + +/* + * These are the functions you'll usually want to call + * They take string arguments and return either hex or base-64 encoded strings + */ +function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));} +function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));} +function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));} +function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); } +function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); } +function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); } + +/* + * Perform a simple self-test to see if the VM is working + */ +function md5_vm_test() +{ + return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72"; +} + +/* + * Calculate the MD5 of an array of little-endian words, and a bit length + */ +function core_md5(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << ((len) % 32); + x[(((len + 64) >>> 9) << 4) + 14] = len; + + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + + a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); + d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); + d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); + d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i+10], 17, -42063); + b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); + d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); + d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); + c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); + a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); + d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); + c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); + d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); + c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); + d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); + c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); + d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); + d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); + d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); + c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); + d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); + d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); + d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); + d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); + d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + } + return Array(a, b, c, d); + +} + +/* + * These functions implement the four basic operations the algorithm uses. + */ +function md5_cmn(q, a, b, x, s, t) +{ + return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b); +} +function md5_ff(a, b, c, d, x, s, t) +{ + return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); +} +function md5_gg(a, b, c, d, x, s, t) +{ + return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); +} +function md5_hh(a, b, c, d, x, s, t) +{ + return md5_cmn(b ^ c ^ d, a, b, x, s, t); +} +function md5_ii(a, b, c, d, x, s, t) +{ + return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); +} + +/* + * Calculate the HMAC-MD5, of a key and some data + */ +function core_hmac_md5(key, data) +{ + var bkey = str2binl(key); + if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz); + + var ipad = Array(16), opad = Array(16); + for(var i = 0; i < 16; i++) + { + ipad[i] = bkey[i] ^ 0x36363636; + opad[i] = bkey[i] ^ 0x5C5C5C5C; + } + + var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz); + return core_md5(opad.concat(hash), 512 + 128); +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function safe_add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left. + */ +function bit_rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + +/* + * Convert a string to an array of little-endian words + * If chrsz is ASCII, characters >255 have their hi-byte silently ignored. + */ +function str2binl(str) +{ + var bin = Array(); + var mask = (1 << chrsz) - 1; + for(var i = 0; i < str.length * chrsz; i += chrsz) + bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32); + return bin; +} + +/* + * Convert an array of little-endian words to a string + */ +function binl2str(bin) +{ + var str = ""; + var mask = (1 << chrsz) - 1; + for(var i = 0; i < bin.length * 32; i += chrsz) + str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask); + return str; +} + +/* + * Convert an array of little-endian words to a hex string. + */ +function binl2hex(binarray) +{ + var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i++) + { + str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) + + hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF); + } + return str; +} + +/* + * Convert an array of little-endian words to a base-64 string + */ +function binl2b64(binarray) +{ + var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i += 3) + { + var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16) + | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 ) + | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF); + for(var j = 0; j < 4; j++) + { + if(i * 8 + j * 6 > binarray.length * 32) str += b64pad; + else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); + } + } + return str; +} \ No newline at end of file