diff --git a/tamguo-oms/pom.xml b/tamguo-oms/pom.xml index f99ae39..46e09ef 100644 --- a/tamguo-oms/pom.xml +++ b/tamguo-oms/pom.xml @@ -23,8 +23,8 @@ spring-boot-starter-web - org.springframework.boot - spring-boot-starter-thymeleaf + org.springframework.boot + spring-boot-starter-thymeleaf org.springframework.boot @@ -76,11 +76,6 @@ shiro-ehcache 1.2.5 - - com.github.theborakompanioni - thymeleaf-extras-shiro - 1.2.1 - cn.songxinqiang com.baidu.ueditor @@ -138,6 +133,11 @@ commons-email 1.5 + + com.github.theborakompanioni + thymeleaf-extras-shiro + 1.2.1 + diff --git a/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java b/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java index ed4ccd8..04713b4 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java +++ b/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java @@ -1,7 +1,6 @@ package com.tamguo.common; import java.util.Properties; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -28,13 +27,14 @@ public class WebConfig implements WebMvcConfigurer { // properties.setProperty("kaptcha.border.color", "105,179,90"); properties.setProperty("kaptcha.border", "no"); properties.setProperty("kaptcha.image.width", "125"); - properties.setProperty("kaptcha.image.height", "38"); - properties.setProperty("kaptcha.session.key", "code"); + properties.setProperty("kaptcha.image.height", "40"); + properties.setProperty("kaptcha.session.key", "code"); + properties.setProperty("kaptcha.textproducer.char.space", "4"); properties.setProperty("kaptcha.textproducer.char.length", "4"); properties.setProperty("kaptcha.textproducer.font.names", "宋体,楷体,微软雅黑"); Config config=new Config(properties); defaultKaptcha.setConfig(config); return defaultKaptcha; } - + } diff --git a/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java b/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java index ef36894..a2a563f 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java +++ b/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java @@ -59,8 +59,8 @@ public class ShiroConfiguration { public ShiroFilterFactoryBean getShiroFilterFactoryBean() { ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean(); shiroFilterFactoryBean.setSecurityManager(getDefaultWebSecurityManager()); - shiroFilterFactoryBean.setLoginUrl("/login"); - shiroFilterFactoryBean.setSuccessUrl("/index"); + shiroFilterFactoryBean.setLoginUrl("/sysLogin"); + shiroFilterFactoryBean.setSuccessUrl("/sysIndex"); filterChainDefinitionMap.put("/jquery/**", "anon"); filterChainDefinitionMap.put("/adminlte/**", "anon"); filterChainDefinitionMap.put("/bootstrap/**", "anon"); @@ -79,7 +79,8 @@ public class ShiroConfiguration { filterChainDefinitionMap.put("/modules/**", "anon"); filterChainDefinitionMap.put("/my97/**", "anon"); filterChainDefinitionMap.put("/select2/**", "anon"); - filterChainDefinitionMap.put("/login/**", "anon"); + filterChainDefinitionMap.put("/sysLogin/**", "anon"); + filterChainDefinitionMap.put("/sysIndex/**", "anon"); filterChainDefinitionMap.put("/validCode", "anon"); filterChainDefinitionMap.put("/**", "authc"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/IndexController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/IndexController.java new file mode 100644 index 0000000..18d8b97 --- /dev/null +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/IndexController.java @@ -0,0 +1,15 @@ +package com.tamguo.modules.sys.web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +@Controller +public class IndexController { + + @RequestMapping(path="sysIndex") + public String sysLogin(ModelAndView model) { + return "sysIndex.html"; + } + +} diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java index 9de8490..61c832a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; import com.google.code.kaptcha.Constants; import com.tamguo.common.utils.ExceptionSupport; @@ -23,9 +24,9 @@ import com.tamguo.common.utils.ShiroUtils; @Controller public class LoginController { - @RequestMapping(path="login") - public String helloWorld() { - return "login"; + @RequestMapping(path="sysLogin") + public String sysLogin(ModelAndView model) { + return "sysLogin.html"; } @ResponseBody diff --git a/tamguo-oms/src/main/resources/static/modules/msg/topMenuMsg.js b/tamguo-oms/src/main/resources/static/modules/msg/topMenuMsg.js new file mode 100644 index 0000000..65d4d74 --- /dev/null +++ b/tamguo-oms/src/main/resources/static/modules/msg/topMenuMsg.js @@ -0,0 +1,5 @@ +/*! + * 消息推送实现 + * @author ThinkGem + */ +$(function(){unreadMsg()});function unreadMsg(){$.get(ctx+"/msg/unreadMsg?__notUpdateSession=true&__t="+new Date().getTime(),function(d){var b=$("#msgList").empty();var a=d.count||0,c=d.list||[];for(i=0;ib)){var g=js.template("msgTipTpl",e[i]);js.showMessage(g,e[i].msgContentEntity.title,"info",1000*60)}if(e[i].id&&e[i].id!=""){a.prepend(js.template("msgListTpl",e[i]))}doFlashTitle()}if(e.length>b){var f={msgContentEntity:{title:a.attr("data-mergeMsgTitle"),content:js.text(a.attr("data-mergeMsgContent"),e.length)},sendDate:"",sendUserName:"",id:""};var g=js.template("msgTipTpl",f);js.showMessage(g,null,"info",1000*60)}var c=parseInt($("#msgNum").text());if(!isNaN(c)){c+=e.length||0}else{c=a.find("li").length}$("#msgNum, #msgNum2").text(c);$(".timeago").timeago()})}function readMsg(c,d,e){var a=$(c).data("href");if(e==""){a=ctx+"/msg/list"}var b=js.addTabPage($(c),d,a,true,false);if(b){$("#"+b+"-frame").on("load",function(){setTimeout(unreadMsg,1000)})}}var isWindowFocus=true;if("onfocusin" in document){document.onfocusin=function(){isWindowFocus=true};document.onfocusout=function(){isWindowFocus=false}}else{window.onfocus=function(){isWindowFocus=true};window.onblur=function(){isWindowFocus=false}}var flashStep=0;var flashTitleRun=false;var normalTitle=document.title;var flashTitle=function(){if(isWindowFocus){document.title=normalTitle;flashTitleRun=false;return}flashTitleRun=true;flashStep++;if(flashStep==3){flashStep=1}if(flashStep==1){document.title="【✉】"+normalTitle}if(flashStep==2){document.title="【　】"+normalTitle}setTimeout("flashTitle()",500)};function doFlashTitle(){if(!flashTitleRun){flashTitle()}}; \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.css b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.css new file mode 100644 index 0000000..9715b24 --- /dev/null +++ b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.css @@ -0,0 +1 @@ +.fixed .main-header{position:relative;max-height:none}.fixed .content-wrapper,.fixed .right-side{padding-top:0}.fixed .main-header .navbar,.fixed .right-side{margin-left:0}.fixed .main-sidebar{top:auto;padding-top:0;position:relative;height:0}.main-header .logo small{font-size:17px}.main-header .navbar .dropdow-menu{border-top:0}.main-header .navbar .dropdown-menu li a{color:#555;padding:5px 15px 5px 25px}.main-header .navbar .dropdown-menu li a:hover{background:#e1e3e9;color:#555}.main-header .navbar .dropdown-menu li.divider{background-color:#ddd}.navbar-nav>.user-menu>.dropdown-menu{width:auto}.navbar-nav>.messages-menu i.img-circle{margin:auto 10px auto auto;display:block;width:33px;height:33px;padding:9px;font-weight:bold}.navbar-nav>.messages-menu>.dropdown-menu>li.header{border-radius:0;background-color:#f9f9f9}.user-panel>.image>img{width:45px;height:45px;background:#fff}.sidebar-collapse .user-panel>.image>img{width:27px;height:27px}.user-panel>.info{padding-left:11px}.sidebar-menu>li a{overflow:hidden;text-overflow:ellipsis}.sidebar-menu>li>a{padding:12px 15px 12px 12px;font-size:15px}.sidebar-menu>li>.treeview-menu{margin:0}.sidebar-menu>.treeview>.treeview-menu{padding-left:0}.sidebar-menu .treeview-menu>li>a{padding:7px 5px 8px 20px}.main-sidebar,.left-side{width:200px}.main-header .navbar,.content-wrapper,.right-side,.main-footer{margin-left:200px}@media(max-width:767px){.main-header .logo{width:100%}.main-header .navbar,.content-wrapper,.right-side,.main-footer{margin-left:0}.sidebar-open .content-wrapper,.sidebar-open .main-footer{-webkit-transform:translate(200px,0);-ms-transform:translate(200px,0);-o-transform:translate(200px,0);transform:translate(200px,0)}}.main-header .logo{width:auto;min-width:200px}@media(min-width:768px){.sidebar-mini.sidebar-collapse .main-header .logo{width:auto}.sidebar-mini.sidebar-collapse .main-header .navbar{margin-left:0}} \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js new file mode 100644 index 0000000..d7c355d --- /dev/null +++ b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js @@ -0,0 +1,7 @@ +/*! + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * + * @author ThinkGem + * @version 2017-4-18 + */ +if(self.frameElement&&self.frameElement.tagName=="IFRAME"){top.location.reload()}+function(d){var b="lte.pushmenu";var e={collapseScreenSize:767,expandOnHover:false,expandTransitionDelay:50};var a={collapsed:".sidebar-collapse",open:".sidebar-open",mainSidebar:".main-sidebar",contentWrapper:".content-wrapper",searchInput:".sidebar-form .form-control",button:'[data-toggle="push-menu"]',mini:".sidebar-mini",expanded:".sidebar-expanded-on-hover",layoutFixed:".fixed"};var h={collapsed:"sidebar-collapse",open:"sidebar-open",mini:"sidebar-mini",expanded:"sidebar-expanded-on-hover",expandFeature:"sidebar-mini-expand-feature",layoutFixed:"fixed"};var i={expanded:"expanded.pushMenu",collapsed:"collapsed.pushMenu"};var g=function(j){this.options=j;this.init()};g.prototype.init=function(){if(this.options.expandOnHover||(d("body").is(a.mini+a.layoutFixed))){this.expandOnHover();d("body").addClass(h.expandFeature)}d(a.contentWrapper).click(function(){if(d(window).width()<=this.options.collapseScreenSize&&d("body").hasClass(h.open)){this.close()}}.bind(this));d(a.searchInput).click(function(j){j.stopPropagation()})};g.prototype.toggle=function(){var k=d(window).width();var j=!d("body").hasClass(h.collapsed);if(k<=this.options.collapseScreenSize){j=d("body").hasClass(h.open)}if(!j){this.open()}else{this.close()}window.setTimeout(function(){d(window).resize()},100)};g.prototype.open=function(){var j=d(window).width();if(j>this.options.collapseScreenSize){d("body").removeClass(h.collapsed).trigger(d.Event(i.expanded))}else{d("body").addClass(h.open).trigger(d.Event(i.expanded))}};g.prototype.close=function(){var j=d(window).width();if(j>this.options.collapseScreenSize){d("body").addClass(h.collapsed).trigger(d.Event(i.collapsed))}else{d("body").removeClass(h.open+" "+h.collapsed).trigger(d.Event(i.collapsed))}};g.prototype.expandOnHover=function(){d(a.mainSidebar).hover(function(){if(d("body").is(a.mini+a.collapsed)&&d(window).width()>this.options.collapseScreenSize){this.expand()}}.bind(this),function(){if(d("body").is(a.expanded)){this.collapse()}}.bind(this))};g.prototype.expand=function(){setTimeout(function(){d("body").removeClass(h.collapsed).addClass(h.expanded)},this.options.expandTransitionDelay)};g.prototype.collapse=function(){setTimeout(function(){d("body").removeClass(h.expanded).addClass(h.collapsed)},this.options.expandTransitionDelay)};function f(j){return this.each(function(){var m=d(this);var l=m.data(b);if(!l){var k=d.extend({},e,m.data(),typeof j=="object"&&j);m.data(b,(l=new g(k)))}if(j=="toggle"){l.toggle()}})}var c=d.fn.pushMenu;d.fn.pushMenu=f;d.fn.pushMenu.Constructor=g;d.fn.pushMenu.noConflict=function(){d.fn.pushMenu=c;return this};d(document).on("click",a.button,function(j){j.preventDefault();f.call(d(this),"toggle")});d(function(){f.call(d(a.button));d(a.button).css({cursor:"pointer"})})}(jQuery)+function(e){var b="lte.tree";var f={animationSpeed:50,accordion:true,followLink:true,trigger:".treeview a"};var a={tree:".tree",treeview:".treeview",treeviewMenu:".treeview-menu",open:".menu-open, .active",li:"li",data:'[data-widget="tree"]',active:".active"};var h={open:"menu-open",tree:"tree"};var i={collapsed:"collapsed.tree",expanded:"expanded.tree"};var d=function(k,j){this.element=k;this.options=j;e(this.element).addClass(h.tree);e(a.treeview+a.active,this.element).addClass(h.open);this._setUpListeners()};d.prototype.toggle=function(n,m){var l=n.next(a.treeviewMenu);var j=n.parent();var k=j.hasClass(h.open);if(!j.is(a.treeview)){return}if(!this.options.followLink||n.attr("href")=="#"){m.preventDefault()}if(k){this.collapse(l,j)}else{this.expand(l,j)}if(l.children().length===0){e(".active",this.element).removeClass("treeview-item active");j.parents(".treeview:not(.active)").addClass("menu-open active");j.addClass("treeview-item active")}};d.prototype.expand=function(k,l){var n=e.Event(i.expanded);if(this.options.accordion){var j=l.siblings(a.open);var m=j.children(a.treeviewMenu);this.collapse(m,j)}l.addClass(h.open);k.slideDown(this.options.animationSpeed,function(){e(this.element).trigger(n)}.bind(this))};d.prototype.collapse=function(k,j){var l=e.Event(i.collapsed);k.find(a.open).removeClass(h.open);j.removeClass(h.open);k.slideUp(this.options.animationSpeed,function(){k.find(a.open+" > "+a.treeview).slideUp();e(this.element).trigger(l)}.bind(this))};d.prototype._setUpListeners=function(){var j=this;e(this.element).on("click",this.options.trigger,function(k){j.toggle(e(this),k)})};function g(j){return this.each(function(){var m=e(this);var l=m.data(b);if(!l){var k=e.extend({},f,m.data(),typeof j=="object"&&j);m.data(b,new d(m,k))}})}var c=e.fn.tree;e.fn.tree=g;e.fn.tree.Constructor=d;e.fn.tree.noConflict=function(){e.fn.tree=c;return this};e(function(){e(a.data).each(function(){g.call(e(this))})})}(jQuery);$(function(){js.initTabPage("tabpanel",{height:function(){var f=$(window).height(),d=$(".main-header:visible").outerHeight(),e=$(".main-footer:visible").outerHeight(),c=f-d-e;return c<300?300:c}});$(window).resize();var a=$("#desktopTabPage");if(a.size()>0){js.addTabPage(null,' '+a.data("title"),a.data("url"),false,false)}var b=$("#modifyPasswordTip");if(b.size()>0&&b.data("message")!=""){js.confirm(b.data("message"),function(){$("#modifyPassword").click()})}window.isMenuClickFlag=false;$(document).on("click","a.addTabPage",function(c){window.isMenuClickFlag=true});$(window).bind("hashchange",function(f){if(!window.isMenuClickFlag){var d=window.location.hash.replace("#","");if(d&&d!=""&&d!=window.location.pathname){var c=$('a.addTabPage[data-href="'+d+'"]:eq(0)');if(c&&c.length>0){c.click()}else{js.addTabPage(null,js.text("tabpanel.newTabPage"),d)}}else{$(".sidebar-menu > li:eq(0):not(.active) > a:eq(0)").click()}}window.isMenuClickFlag=false}).trigger("hashchange");$("#fullScreen").click(function(){if($(this).data("isOpen")=="true"){$(this).data("isOpen","false");if(document.exitFullscreen){document.exitFullscreen()}else{if(document.msExitFullscreen){document.msExitFullscreen()}else{if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else{if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}}}}}else{$(this).data("isOpen","true");var c=document.documentElement;if(c.requestFullscreen){c.requestFullscreen()}else{if(c.msRequestFullscreen){c.msRequestFullscreen()}else{if(c.mozRequestFullScreen){c.mozRequestFullScreen()}else{if(c.webkitRequestFullScreen){c.webkitRequestFullScreen()}}}}}return false});$("#switchSkin").click(function(){js.layer.open({type:2,shadeClose:true,title:$(this).attr("title"),area:["500px","390px"],content:ctx+"/switchSkin/select",success:function(c,d){if($(js.layer.window).width()<500||$(js.layer.window).height()<390){js.layer.full(d)}},})})});+function(h){var g="lte.layout";var c={slimscroll:true,resetHeight:true};var b={wrapper:".wrapper",contentWrapper:".content-wrapper",layoutBoxed:".layout-boxed",mainFooter:".main-footer:visible",mainHeader:".main-header:visible",sidebar:".sidebar",controlSidebar:".control-sidebar",fixed:".fixed",sidebarMenu:".sidebar-menu",logo:".main-header .logo"};var f={fixed:"fixed",holdTransition:"hold-transition"};var e=function(i){this.options=i;this.bindedResize=false;this.activate()};e.prototype.activate=function(){this.fix();this.fixSidebar();h("body").removeClass(f.holdTransition);if(!this.bindedResize){h(window).resize(function(){this.fix();this.fixSidebar();h(b.logo+", "+b.sidebar).one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",function(){this.fix();this.fixSidebar()}.bind(this))}.bind(this));this.bindedResize=true}};e.prototype.fix=function(){};e.prototype.fixSidebar=function(){if(!h("body").hasClass(f.fixed)){if(typeof h.fn.slimScroll!=="undefined"){h(b.sidebar).slimScroll({destroy:true}).height("auto")}return}if(this.options.slimscroll){if(typeof h.fn.slimScroll!=="undefined"){h(b.sidebar).slimScroll({destroy:true}).height("auto");h(b.sidebar).slimScroll({height:(h(b.contentWrapper).height())+"px",color:"#aaa",size:"3px"})}}};function d(i){return this.each(function(){var l=h(this);var k=l.data(g);if(!k){var j=h.extend({},c,l.data(),typeof i==="object"&&i);l.data(g,(k=new e(j)))}if(typeof i==="string"){if(typeof k[i]==="undefined"){throw new Error("No method named "+i)}k[i]()}})}var a=h.fn.layout;h.fn.layout=d;h.fn.layout.Constuctor=e;h.fn.layout.noConflict=function(){h.fn.layout=a;return this};h(function(){d.call(h("body"))})}(jQuery); \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js b/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js index f66f3d8..7ce96b2 100644 --- a/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js +++ b/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js @@ -12,11 +12,6 @@ $("#loginForm").validate({ var d = $("#username").val() , a = $("#password").val() , b = $("#validCode").val(); - if (secretKey != "") { - $("#username").val(DesUtils.encode(d, secretKey)); - $("#password").val(DesUtils.encode(a, secretKey)); - $("#validCode").val(DesUtils.encode(b, secretKey)) - } js.ajaxSubmitForm($(c), function(f, e, g) { if (f.isValidCodeLogin == true) { $("#isValidCodeLogin").show(); diff --git a/tamguo-oms/src/main/resources/static/modules/sys/userInfo.css b/tamguo-oms/src/main/resources/static/modules/sys/userInfo.css new file mode 100644 index 0000000..dd860c8 --- /dev/null +++ b/tamguo-oms/src/main/resources/static/modules/sys/userInfo.css @@ -0,0 +1 @@ +.profile-user-img{width:150px;height:150px}#inputFormPwd .form-group{margin-top:5px}#inputFormPwd .strength .button_strength{padding-top:40px} \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/login.html b/tamguo-oms/src/main/resources/templates/login.html deleted file mode 100644 index a21bac5..0000000 --- a/tamguo-oms/src/main/resources/templates/login.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - -登录 - Tamguo V1.0 - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/sysIndex.html b/tamguo-oms/src/main/resources/templates/sysIndex.html new file mode 100644 index 0000000..2a1dab4 --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/sysIndex.html @@ -0,0 +1,45 @@ + +JeeSite Demo + + + + + + + + + + + + + +
+ + + + +
+ <% include('sysIndex/topMenu.html'){} %> +
+ + + + + + + + + + + +
+
+ + + \ No newline at end of file diff --git a/tamguo-oms/src/main/resources/templates/sysLogin.html b/tamguo-oms/src/main/resources/templates/sysLogin.html new file mode 100644 index 0000000..5824f90 --- /dev/null +++ b/tamguo-oms/src/main/resources/templates/sysLogin.html @@ -0,0 +1,137 @@ + + + + + + + + + + + + +登录 - Tamguo OMS + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + \ No newline at end of file