diff --git a/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl b/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl index 2fcc2d6..7cf8523 100644 --- a/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl +++ b/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl @@ -78,10 +78,14 @@ layui.use('table', function () { var table = layui.table; //方法级渲染 + var arr=[]; + if(${leaveDetail}){ + arr=${leaveDetail}; + } table.render({ id: 'leaveDetail', elem: '#leaveDetail' - , data: ${leaveDetail} + , data:arr , cols: [[ {field: 'taskId', title: '任务编码', width: '20%'} ,{field: 'opName', title: '审批人', width: '20%'} diff --git a/len-sys/src/main/java/com/len/controller/LoginController.java b/len-sys/src/main/java/com/len/controller/LoginController.java index b128b8b..d0468a2 100644 --- a/len-sys/src/main/java/com/len/controller/LoginController.java +++ b/len-sys/src/main/java/com/len/controller/LoginController.java @@ -10,6 +10,7 @@ import com.len.util.VerifyCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.ExcessiveAttemptsException; import org.apache.shiro.authc.IncorrectCredentialsException; @@ -39,6 +40,7 @@ public class LoginController { @Autowired SysUserService userService; private static final String CODE_ERROR = "code.error"; + private static final Long TWO_WEEK = 1000 * 60 * 60 * 24 * 14L; @GetMapping(value = "") public String login() { @@ -77,10 +79,10 @@ public class LoginController { @PostMapping("/login") public String login(SysUser user, Model model, String rememberMe, HttpServletRequest request) { String codeMsg = (String) request.getAttribute("shiroLoginFailure"); - /*if (CODE_ERROR.equals(codeMsg)) { + if (CODE_ERROR.equals(codeMsg)) { model.addAttribute("message", "验证码错误"); return "/login2"; - }*/ + } CustomUsernamePasswordToken token = new CustomUsernamePasswordToken(user.getUsername().trim(), user.getPassword(), LoginType.SYS); Subject subject = Principal.getSubject(); @@ -88,7 +90,13 @@ public class LoginController { try { subject.login(token); if (subject.isAuthenticated()) { - token.getUsername(); + String isRemember = request.getParameter("isRemember"); + if (!StringUtils.isEmpty(isRemember)) { + if ("true".equals(isRemember)) { + subject.getSession().setTimeout(TWO_WEEK); + } + } + return "redirect:/main"; } } catch (UnknownAccountException | IncorrectCredentialsException e) { diff --git a/len-sys/src/main/resources/ftl/login2.html b/len-sys/src/main/resources/ftl/login2.html index 14ac223..600d968 100644 --- a/len-sys/src/main/resources/ftl/login2.html +++ b/len-sys/src/main/resources/ftl/login2.html @@ -11,7 +11,6 @@ - @@ -55,6 +54,7 @@ +
@@ -66,11 +66,8 @@
- 忘记密码？ +
-
@@ -88,9 +85,16 @@ // 是否两周内自动登录 - /* $('.icon-nocheck, .login-tip').click(function () { + $('.icon-nocheck, .login-tip').click(function () { $('.icon-nocheck').toggleClass('icon-check'); - });*/ + var isRemember=$('#isRemember').val(); + if(isRemember==='false'){ + isRemember='true'; + }else{ + isRemember='false' + } + $('#isRemember').val(isRemember); + }); layui.use(['form','layer'], function(){ var form = layui.form; form.verify({ diff --git a/len-sys/src/main/resources/plugin/login/hawkEye.min.js b/len-sys/src/main/resources/plugin/login/hawkEye.min.js deleted file mode 100644 index ca8b68d..0000000 --- a/len-sys/src/main/resources/plugin/login/hawkEye.min.js +++ /dev/null @@ -1 +0,0 @@ -window.FAI_HAWK_EYE=!!window.FAI_HAWK_EYE?window.FAI_HAWK_EYE:{};window.FAI_HAWK_EYE.sdk_version=1.1;window.FAI_HAWK_EYE.FAI_HAWK_EYE_REPORT_URL=window.FAI_HAWK_EYE.jssdk_report_url;window.devicePixelRatio=window.devicePixelRatio||window.webkitDevicePixelRatio||window.mozDevicePixelRatio||1;(function(a,b){a._DEF={_MODULE:{_TYPE:{PV_MODULE:0,PERFORMANCE_MODULE:1,EXCEPTION_MODULE:2,CLICK_MODULE:3,EVENT_MODULE:4,BSS_MONITOR_MODULE:5,FAI_SPEED_TEST_MODULE:6},_KEY:{EXCEPTION_MODULE:"e_m",PERFORMANCE_MODULE:"pe_m",EVENT_MODULE:"b_m",PV_MODULE:"p_m",CLICK_MODULE:"c_m",BSS_MONITOR_MODULE:"bm_m",FAI_SPEED_TEST_MODULE:"fst_m"}},_COOKIE:{_AID_COOKIE:"",_BS_ADI_COOKIE:"",_BS_WID_COOKIE:"",_BS_ID_COOKIE:"",_CLI_ID_COOKIE:"_cliid"},_IDTYPE:{_DISTINC_ID:1,_SESSION_ID:2,_PV_ID:3,_CLICK_ID:4},_REPORT:{_BASIC:{_REPORT_TYPE:"b_rt",_PV_ID:"b_pi",_APP_ID:"b_a_i",_SDK_VERSION:"b_sv",_DISTINC_ID:"b_di",_CROSS_DOMAIN_CLI_ID:"b_cdci",_CLI_TIME:"b_ct",_AID:"b_ai",_BS_AID:"b_ba",_BS_WID:"b_bw",_BS_ID:"b_bi"},_URL:{_URL:"u_u",_REFER_URL:"u_ru"},_CLIENT:{_CLI_LANG:"c_l",_CLI_SCREEN_TYPE:"c_st",_CLI_DPR:"c_dpr"},_PERFORMANCE:{_DOMAIN_LOOKUP_TIME:"pe_dt",_TCP_TIME:"pe_tt",_REQUEST_TIME:"pe_rt",_BACK_END_TIME:"pe_rpt",_DOM_PARSE_TIME:"pe_dpt",_WRITER_SCREEN_TIME:"pe_wst",_FIRST_SCREEN_TIME:"pe_fst",_DOM_READY_TIME:"pe_drt",_FINISH_TIME:"pe_ft"},_EXCEPTION:{_EXCEPTION_TYPE:{_JS_EXCEPTION:0,_IMG_EXCEPTION:1,_AJAX_EXCEPTION:2},_TYPE:"e_t",_URL:"e_u",_MESSAGE:"e_m",_STATUS:"e_ss",_STACK:"e_sk",_LINE_NUM:"e_ln",_COL_NUM:"e_cn"},_EVENT:{_EVENT_ID:"ev_i",_EVENT_ID_SUB:"ev_i_s",_EVENT_CONTENT:"ev_c"},_CLICK:{_ID:"c_i",_PATH:"c_e_pa",_NAME:"c_e_n",_POSITION:"c_e_po",_TYPE:"c_t",_TO_URL:"c_t_u",_STEP_PV:"s_i_p"},_PV:{_REFER:"p_r",_TITLE:"p_t",_PV_ID:"p_pi"},_BSS:{_TIME:"bs_t",_MONITOR_ID:"bs_i"}}};a._DATA={};a._MODULES={};a._TOOL={};a._INTERFACE={}})(window.FAI_HAWK_EYE);(function(a,b){a._INTERFACE._install=function(){for(var c in a._MODULES){a._MODULES[c]._init()}};a._TOOL._extend=function(e,c){var d=function(){};d.prototype=c.prototype;e.prototype=new d();e.prototype.constructor=e;e.uber=c.prototype};a._TOOL._getElementPath=function(c){var d=[];do{d.push(a._TOOL._getElementName(c))}while((c.nodeName.toLowerCase()!="html")&&(c=c.parentNode));return d.join(" > ")};a._TOOL._getElementName=function(e){var d=e.className;var c=e.id;if(!!d||!!c){return e.nodeName.toLowerCase()+"["+(d?'class="'+d+'"':"")+(c?' id="'+c+'"':"")+"]"}else{return e.nodeName.toLowerCase()}};a._TOOL._getElementAttribute=function(d,c){var e=d.getAttribute(c);if(e==null||e==b){return""}else{return e}};a._TOOL._getLang=function(){var c=navigator.userLanguage||navigator.language;return c};a._TOOL._getScreenSize=function(){var e=window.screen.width,c=window.screen.height,f=window.devicePixelRatio;var g=parseInt(e*f);var d=parseInt(c*f);return g+"x"+d};a._TOOL._getDevicePixelRatio=function(){return window.devicePixelRatio};a._TOOL._getCookie=function(d){var c,e=new RegExp("(^| )"+d+"=([^;]*)(;|$)");if(c=document.cookie.match(e)){return unescape(c[2])}else{return null}};a._TOOL._getPageReferrer=function(){try{if(!!window.Fai&&!!window.Fai.top&&!!window.Fai.top.document){return window.Fai.top.document.referrer}else{return document.referrer}}catch(c){return document.referrer}};a._TOOL._sendReport=function(d,f){var g="";for(var e in f){g+=e+"="+encodeURIComponent(f[e])+"&"}d+="?"+g;var c=document.createElement("img");c.src=d;document.getElementsByTagName("head")[0].appendChild(c);c.parentNode.removeChild(c)};a._TOOL._getId=function(d){var g=(d).toString(16);if(g.length<2){for(var h=0;h<2-g.length;h++){g="0"+g}}var f=(((new Date().getTime())&4294967295)>>>0).toString(16);if(f.length<8){for(var h=0;h<8-f.length;h++){f="0"+f}}var c=16777215;var e=((Math.random()*c)&16777215).toString(16);if(e.length<6){for(var h=0;h<6-e.length;h++){e="0"+e}}return g+f+e};a._TOOL._getUrlDomain=function(c){var d=c.split("/")[2];if(d==b){d=""}return d}})(window.FAI_HAWK_EYE);(function(b){b.fai_he_pv_id=b._TOOL._getId(b._DEF._IDTYPE._PV_ID);b.fai_he_script_src="";if(document.currentScript&&document.currentScript.src){b.fai_he_script_src=document.currentScript.src}else{if(document.scripts){var a=document.scripts[document.scripts.length-1];if(a.src){b.fai_he_script_src=a.src}}}})(window.FAI_HAWK_EYE);(function(g){var c={};function a(){var l={};var o=g.fai_he_pv_id;var q=g.jssdk_appid;var k=g.sdk_version;var m=g._TOOL._getCookie(g._DEF._COOKIE._CLI_ID_COOKIE);var i=g.fai_aid;var p=g.fai_bs_aid;var j=g.fai_bs_wid;var n=g.fai_bs_id;l[g._DEF._REPORT._BASIC._PV_ID]=o;l[g._DEF._REPORT._BASIC._APP_ID]=q;l[g._DEF._REPORT._BASIC._SDK_VERSION]=k;l[g._DEF._REPORT._BASIC._CROSS_DOMAIN_CLI_ID]=m;l[g._DEF._REPORT._BASIC._AID]=i;l[g._DEF._REPORT._BASIC._BS_AID]=p;l[g._DEF._REPORT._BASIC._BS_WID]=j;l[g._DEF._REPORT._BASIC._BS_ID]=n;return l}function f(){var i={};var j=document.URL;var k=g._TOOL._getPageReferrer();i[g._DEF._REPORT._URL._URL]=j;i[g._DEF._REPORT._URL._REFER_URL]=k;return i}function e(){var l={};var k=g._TOOL._getLang();var i=g._TOOL._getScreenSize();var j=g._TOOL._getDevicePixelRatio();l[g._DEF._REPORT._CLIENT._CLI_LANG]=k;l[g._DEF._REPORT._CLIENT._CLI_SCREEN_TYPE]=i;l[g._DEF._REPORT._CLIENT._CLI_DPR]=j;return l}var d=a();var b=f();var h=e();g._DATA[g._DEF._REPORT._BASIC._PV_ID]=d[g._DEF._REPORT._BASIC._PV_ID];g._DATA[g._DEF._REPORT._BASIC._APP_ID]=d[g._DEF._REPORT._BASIC._APP_ID];g._DATA[g._DEF._REPORT._BASIC._SDK_VERSION]=d[g._DEF._REPORT._BASIC._SDK_VERSION];g._DATA[g._DEF._REPORT._BASIC._CROSS_DOMAIN_CLI_ID]=d[g._DEF._REPORT._BASIC._CROSS_DOMAIN_CLI_ID];g._DATA[g._DEF._REPORT._BASIC._AID]=d[g._DEF._REPORT._BASIC._AID];g._DATA[g._DEF._REPORT._BASIC._BS_AID]=d[g._DEF._REPORT._BASIC._BS_AID];g._DATA[g._DEF._REPORT._BASIC._BS_WID]=d[g._DEF._REPORT._BASIC._BS_WID];g._DATA[g._DEF._REPORT._BASIC._BS_ID]=d[g._DEF._REPORT._BASIC._BS_ID];g._DATA[g._DEF._REPORT._URL._URL]=b[g._DEF._REPORT._URL._URL];g._DATA[g._DEF._REPORT._URL._REFER_URL]=b[g._DEF._REPORT._URL._REFER_URL];g._DATA[g._DEF._REPORT._CLIENT._CLI_LANG]=h[g._DEF._REPORT._CLIENT._CLI_LANG];g._DATA[g._DEF._REPORT._CLIENT._CLI_SCREEN_TYPE]=h[g._DEF._REPORT._CLIENT._CLI_SCREEN_TYPE];g._DATA[g._DEF._REPORT._CLIENT._CLI_DPR]=h[g._DEF._REPORT._CLIENT._CLI_DPR]})(window.FAI_HAWK_EYE);(function(e,k,c){if(!Function.prototype.bind){Function.prototype.bind=function(l){if(typeof this!=="function"){throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable")}var p=Array.prototype.slice.call(arguments,1),o=this,m=function(){},n=function(){return o.apply(this instanceof m?this:l,p.concat(Array.prototype.slice.call(arguments)))};if(this.prototype){m.prototype=this.prototype}n.prototype=new m();return n}}function j(l,m){this._name=l;this._type=m}j.prototype.report=function(m,l){var o={};for(var n in k._DATA){o[n]=k._DATA[n]}for(var n in m){o[n]=m[n]}o[k._DEF._REPORT._BASIC._CLI_TIME]=new Date().getTime();o[k._DEF._REPORT._BASIC._REPORT_TYPE]=l;k._TOOL._sendReport(k.FAI_HAWK_EYE_REPORT_URL,o)};function g(l,m){this._name=l;this._type=m;this._init=function(){var o=this;if(e.addEventListener){e.addEventListener("error",function(q){var r={};if(q.target&&q.target.tagName&&(q.target.tagName.toLocaleLowerCase()=="img")){target_src_domain=k._TOOL._getUrlDomain(q.target.src);self_report_url=k.jssdk_report_url;if(self_report_url.indexOf(target_src_domain)==-1){r[k._DEF._REPORT._EXCEPTION._URL]=q.target.src;r[k._DEF._REPORT._EXCEPTION._STACK]="";r[k._DEF._REPORT._EXCEPTION._STATUS]=0;r[k._DEF._REPORT._EXCEPTION._LINE_NUM]=0;r[k._DEF._REPORT._EXCEPTION._COL_NUM]=0;r[k._DEF._REPORT._EXCEPTION._TYPE]=k._DEF._REPORT._EXCEPTION._EXCEPTION_TYPE._IMG_EXCEPTION;o.report(r,o._type)}}},true)}e.onerror=function(u,s,t,B,r){if(u==="Script error."){return}if(s==k.fai_he_script_src){}var y={};var v=s;var x=u;var z="";if(r&&r.stack){z=r.stack}var w=0;var q=t;var A=0;if(B){A=B}y[k._DEF._REPORT._EXCEPTION._URL]=v;y[k._DEF._REPORT._EXCEPTION._MESSAGE]=x;y[k._DEF._REPORT._EXCEPTION._STACK]=z;y[k._DEF._REPORT._EXCEPTION._STATUS]=w;y[k._DEF._REPORT._EXCEPTION._LINE_NUM]=q;y[k._DEF._REPORT._EXCEPTION._COL_NUM]=A;y[k._DEF._REPORT._EXCEPTION._TYPE]=k._DEF._REPORT._EXCEPTION._EXCEPTION_TYPE._JS_EXCEPTION;o.report(y,o._type)};if(e.XMLHttpRequest){var p=XMLHttpRequest.prototype.send;var n=XMLHttpRequest.prototype.open;XMLHttpRequest.prototype.open=function(s,r,q){n.apply(this,[s,r,q]);this.ajaxUrl=r};XMLHttpRequest.prototype.send=function(r){var s={};p.apply(this,[r]);if(this.onreadystatechange){this.newStateChange=q.bind(this)}else{this.onreadystatechange=q.bind(this)}function q(){if(this.readyState==4){if(!(this.status>=200&&this.status<300)){s[k._DEF._REPORT._EXCEPTION._URL]=this.ajaxUrl;s[k._DEF._REPORT._EXCEPTION._STACK]="";s[k._DEF._REPORT._EXCEPTION._STATUS]=this.status;s[k._DEF._REPORT._EXCEPTION._MESSAGE]=this.statusText;s[k._DEF._REPORT._EXCEPTION._LINE_NUM]=0;s[k._DEF._REPORT._EXCEPTION._COL_NUM]=0;s[k._DEF._REPORT._EXCEPTION._TYPE]=k._DEF._REPORT._EXCEPTION._EXCEPTION_TYPE._AJAX_EXCEPTION;o.report(s,o._type)}}}}}}}k._TOOL._extend(g,j);k._MODULES[k._DEF._MODULE._KEY.EXCEPTION_MODULE]=new g("异常监控模块",k._DEF._MODULE._TYPE.EXCEPTION_MODULE);function f(l,m){this._name=l;this._type=m;this._init=function(){var o=this;if(!!e.addEventListener){e.addEventListener("load",function(p){setTimeout(function(){var q=n();o.report(q,o._type)},100)},false)}else{if(!!e.attachEvent){e.attachEvent("onload",function(p){setTimeout(function(){var q=n();o.report(q,o._type)},100)})}}};function n(){var s={};if(!!e.performance&&!!e.performance.timing){var o,x,t,q,v,u,w,p,r=null;o=performance.timing;x=o.domainLookupEnd-o.domainLookupStart;t=o.connectEnd-o.connectStart;q=o.responseEnd-o.requestStart;response_time=o.responseStart-o.navigationStart;v=o.domComplete-o.domInteractive;u=o.domInteractive-o.navigationStart;w=o.domComplete-o.navigationStart;p=o.domContentLoadedEventEnd-o.navigationStart;r=o.loadEventEnd-o.navigationStart;s[k._DEF._REPORT._PERFORMANCE._DOMAIN_LOOKUP_TIME]=x;s[k._DEF._REPORT._PERFORMANCE._TCP_TIME]=t;s[k._DEF._REPORT._PERFORMANCE._REQUEST_TIME]=q;s[k._DEF._REPORT._PERFORMANCE._BACK_END_TIME]=response_time;s[k._DEF._REPORT._PERFORMANCE._DOM_PARSE_TIME]=v;s[k._DEF._REPORT._PERFORMANCE._WRITER_SCREEN_TIME]=u;s[k._DEF._REPORT._PERFORMANCE._FIRST_SCREEN_TIME]=w;s[k._DEF._REPORT._PERFORMANCE._DOM_READY_TIME]=p;s[k._DEF._REPORT._PERFORMANCE._FINISH_TIME]=r}return s}}k._TOOL._extend(f,j);k._MODULES[k._DEF._MODULE._KEY.PERFORMANCE_MODULE]=new f("性能监控模块",k._DEF._MODULE._TYPE.PERFORMANCE_MODULE);function a(l,m){this._name=l;this._type=m;this._datas=[];this._init=function(){var n=this;k.trackEvent=function(r,p,q){var o={};o[k._DEF._REPORT._EVENT._EVENT_ID]=r;o[k._DEF._REPORT._EVENT._EVENT_ID_SUB]=p;o[k._DEF._REPORT._EVENT._EVENT_CONTENT]=q;n.report(o,n._type)}}}k._TOOL._extend(a,j);k._MODULES[k._DEF._MODULE._KEY.EVENT_MODULE]=new a("行为监控模块",k._DEF._MODULE._TYPE.EVENT_MODULE);function h(l,m){this._name=l;this._type=m;this._init=function(){var n=this;var o=(!!k._TOOL._getCookie(k._DEF._COOKIE._CLI_ID_COOKIE))?0:1000;setTimeout(function(){var p={};p[k._DEF._REPORT._PV._REFER]=document.referrer;p[k._DEF._REPORT._PV._TITLE]=document.title;p[k._DEF._REPORT._PV._PV_ID]=k.fai_he_pv_id;n.report(p,n._type)},o)}}k._TOOL._extend(h,j);k._MODULES[k._DEF._MODULE._KEY.PV_MODULE]=new h("PV模块",k._DEF._MODULE._TYPE.PV_MODULE);function b(l,m){this._name=l;this._type=m;this._step_pv=0;this._init=function(){var o=this;if(e.addEventListener){var q=true;var p=null;e.addEventListener("click",function(r){q=true;p=setTimeout(function(){if(q){n(r)}},400)});e.addEventListener("dblclick",function(r){q=false;clearTimeout(p);n(r)})}else{if(e.attachEvent){var q=true;var p=null;document.attachEvent("onclick",function(r){q=true;var s={};s.src=r.srcElement;s.screenX=r.screenX;s.screenY=r.screenY;s.type=r.type;p=setTimeout(function(){if(q){n(s)}},400)});document.attachEvent("ondblclick",function(r){q=false;clearTimeout(p);n(r)})}}function n(v){var w={};o._step_pv++;var s=k._TOOL._getId(k._DEF._IDTYPE._CLICK_ID);var x="";var r="";var t="";if(v.target){x=k._TOOL._getElementPath(v.target);r=k._TOOL._getElementName(v.target);t=k._TOOL._getElementAttribute(v.target,"href")}else{if(v.srcElement){x=k._TOOL._getElementPath(v.srcElement);r=k._TOOL._getElementName(v.srcElement);t=k._TOOL._getElementAttribute(v.srcElement,"href")}}var u=v.screenX+","+v.screenY;var y=v.type;w[k._DEF._REPORT._CLICK._ID]=s;w[k._DEF._REPORT._CLICK._PATH]=x;w[k._DEF._REPORT._CLICK._NAME]=r;w[k._DEF._REPORT._CLICK._POSITION]=u;w[k._DEF._REPORT._CLICK._TYPE]=v.type;w[k._DEF._REPORT._CLICK._TO_URL]=t;w[k._DEF._REPORT._CLICK._STEP_PV]=o._step_pv;o.report(w,o._type)}}}k._TOOL._extend(b,j);function i(l,m){this._name=l;this._type=m;this._init=function(){var n=this;k.bssMonitor=function(o){var p={};p[k._DEF._REPORT._BSS._MONITOR_ID]=o;p[k._DEF._REPORT._URL._URL]=document.URL;p[k._DEF._REPORT._BASIC._REPORT_TYPE]=n._type;k._TOOL._sendReport(k.FAI_HAWK_EYE_REPORT_URL,p)}}}k._TOOL._extend(i,j);k._MODULES[k._DEF._MODULE._KEY.BSS_MONITOR_MODULE]=new i("业务上报模块",k._DEF._MODULE._TYPE.BSS_MONITOR_MODULE);function d(p,q){this._name=p;this._type=q;this.testSeed=1;this._init=function(){var v=this;var u=((k.jssdk_appid==3010)&&(Math.random(1)*10<=5));var t=((k.jssdk_appid==6001)&&(Math.random(1)*10<=2));var s=((k.jssdk_appid==5002)&&(Math.random(1)*10<=1));if(false){if(!!e.addEventListener){e.addEventListener("load",function(w){setTimeout(function(){r()},1000)},false)}}};function n(s){s.domain=k._TOOL._getUrlDomain(s.url);if(!!JSON){k.trackEvent(10000,0,JSON.stringify(s))}}function r(){list=l();for(var s=0;s