From 292807e0a23a146934bae37b11a2f8b765e338d1 Mon Sep 17 00:00:00 2001 From: tamguo Date: Fri, 20 Jul 2018 14:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tamguo/{common => config}/WebConfig.java | 2 +- .../dao/MyMetaObjectHandler.java | 2 +- .../dao/MybatisPlusConfig.java | 2 +- .../{common => config}/dao/SuperEntity.java | 2 +- .../{common => config}/dao/SuperMapper.java | 2 +- .../redis/SessionConfig.java | 2 +- .../redis/SessionInitializer.java | 2 +- .../shiro/ShiroConfiguration.java | 2 +- .../{common => config}/shiro/UserRealm.java | 2 +- .../tamguo/modules/sys/dao/SysMenuMapper.java | 2 +- .../tamguo/modules/sys/dao/SysRoleMapper.java | 2 +- .../tamguo/modules/sys/dao/SysUserMapper.java | 2 +- .../modules/sys/model/SysMenuEntity.java | 2 +- .../modules/sys/model/SysRoleEntity.java | 2 +- .../modules/sys/model/SysUserEntity.java | 3 +- .../modules/sys/service/ISysUserService.java | 2 +- .../sys/service/impl/SysUserServiceImpl.java | 8 +- .../sys}/utils/AbstractRunningLogHandler.java | 2 +- .../sys}/utils/CException.java | 2 +- .../sys}/utils/DateUtil.java | 2 +- .../sys}/utils/DateUtils.java | 2 +- .../sys}/utils/ExceptionSupport.java | 2 +- .../{common => modules/sys}/utils/IdGen.java | 2 +- .../sys}/utils/Log4jHandler.java | 2 +- .../sys}/utils/LogDebug.java | 2 +- .../sys}/utils/LogHandler.java | 2 +- .../sys}/utils/ObjectUtil.java | 2 +- .../sys}/utils/RequestHelper.java | 2 +- .../{common => modules/sys}/utils/Result.java | 2 +- .../sys}/utils/SerializeTranscoder.java | 2 +- .../sys}/utils/Setting.java | 2 +- .../sys}/utils/ShaEncrypt.java | 2 +- .../sys}/utils/ShiroUtils.java | 2 +- .../{common => modules/sys}/utils/Status.java | 2 +- .../sys}/utils/TamguoConstant.java | 2 +- .../sys}/utils/Uploader.java | 2 +- .../sys}/utils/UploaderMessage.java | 2 +- .../sys}/utils/XMLConfiguration.java | 2 +- .../modules/sys/web/LoginController.java | 6 +- .../modules/sys/web/ValidCodeController.java | 2 +- .../src/main/resources/application.properties | 2 +- .../resources/static/modules/sys/sysIndex.js | 449 ++++++++++- .../main/resources/templates/sysIndex.html | 753 +++++++++++------- 43 files changed, 938 insertions(+), 357 deletions(-) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/WebConfig.java (96%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/dao/MyMetaObjectHandler.java (95%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/dao/MybatisPlusConfig.java (99%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/dao/SuperEntity.java (94%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/dao/SuperMapper.java (88%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/redis/SessionConfig.java (93%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/redis/SessionInitializer.java (86%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/shiro/ShiroConfiguration.java (97%) rename tamguo-oms/src/main/java/com/tamguo/{common => config}/shiro/UserRealm.java (95%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/AbstractRunningLogHandler.java (95%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/CException.java (85%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/DateUtil.java (96%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/DateUtils.java (95%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/ExceptionSupport.java (92%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/IdGen.java (98%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/Log4jHandler.java (91%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/LogDebug.java (85%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/LogHandler.java (90%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/ObjectUtil.java (97%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/RequestHelper.java (97%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/Result.java (94%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/SerializeTranscoder.java (89%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/Setting.java (88%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/ShaEncrypt.java (93%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/ShiroUtils.java (92%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/Status.java (54%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/TamguoConstant.java (95%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/Uploader.java (96%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/UploaderMessage.java (96%) rename tamguo-oms/src/main/java/com/tamguo/{common => modules/sys}/utils/XMLConfiguration.java (96%) diff --git a/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java b/tamguo-oms/src/main/java/com/tamguo/config/WebConfig.java similarity index 96% rename from tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java rename to tamguo-oms/src/main/java/com/tamguo/config/WebConfig.java index 199ce75..73b06a2 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/WebConfig.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.tamguo.common; +package com.tamguo.config; import java.util.Properties; import org.springframework.beans.factory.annotation.Value; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/dao/MyMetaObjectHandler.java b/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/common/dao/MyMetaObjectHandler.java rename to tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java index 4bc56e1..6f83dc4 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/dao/MyMetaObjectHandler.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/dao/MyMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.tamguo.common.dao; +package com.tamguo.config.dao; import com.baomidou.mybatisplus.mapper.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/dao/MybatisPlusConfig.java b/tamguo-oms/src/main/java/com/tamguo/config/dao/MybatisPlusConfig.java similarity index 99% rename from tamguo-oms/src/main/java/com/tamguo/common/dao/MybatisPlusConfig.java rename to tamguo-oms/src/main/java/com/tamguo/config/dao/MybatisPlusConfig.java index 966c016..47d0386 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/dao/MybatisPlusConfig.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/dao/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.tamguo.common.dao; +package com.tamguo.config.dao; import java.util.ArrayList; import java.util.List; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/dao/SuperEntity.java b/tamguo-oms/src/main/java/com/tamguo/config/dao/SuperEntity.java similarity index 94% rename from tamguo-oms/src/main/java/com/tamguo/common/dao/SuperEntity.java rename to tamguo-oms/src/main/java/com/tamguo/config/dao/SuperEntity.java index cd71fba..8906d69 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/dao/SuperEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/dao/SuperEntity.java @@ -1,4 +1,4 @@ -package com.tamguo.common.dao; +package com.tamguo.config.dao; import java.io.Serializable; import com.baomidou.mybatisplus.activerecord.Model; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/dao/SuperMapper.java b/tamguo-oms/src/main/java/com/tamguo/config/dao/SuperMapper.java similarity index 88% rename from tamguo-oms/src/main/java/com/tamguo/common/dao/SuperMapper.java rename to tamguo-oms/src/main/java/com/tamguo/config/dao/SuperMapper.java index 002529f..6b8b4cf 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/dao/SuperMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/dao/SuperMapper.java @@ -1,4 +1,4 @@ -package com.tamguo.common.dao; +package com.tamguo.config.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/redis/SessionConfig.java b/tamguo-oms/src/main/java/com/tamguo/config/redis/SessionConfig.java similarity index 93% rename from tamguo-oms/src/main/java/com/tamguo/common/redis/SessionConfig.java rename to tamguo-oms/src/main/java/com/tamguo/config/redis/SessionConfig.java index e17e527..c2376a1 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/redis/SessionConfig.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/redis/SessionConfig.java @@ -1,4 +1,4 @@ -package com.tamguo.common.redis; +package com.tamguo.config.redis; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/redis/SessionInitializer.java b/tamguo-oms/src/main/java/com/tamguo/config/redis/SessionInitializer.java similarity index 86% rename from tamguo-oms/src/main/java/com/tamguo/common/redis/SessionInitializer.java rename to tamguo-oms/src/main/java/com/tamguo/config/redis/SessionInitializer.java index be08e70..3477712 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/redis/SessionInitializer.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/redis/SessionInitializer.java @@ -1,4 +1,4 @@ -package com.tamguo.common.redis; +package com.tamguo.config.redis; import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java b/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java similarity index 97% rename from tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java rename to tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java index c0b44dd..d5d5622 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/shiro/ShiroConfiguration.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java @@ -1,4 +1,4 @@ -package com.tamguo.common.shiro; +package com.tamguo.config.shiro; import java.util.LinkedHashMap; import java.util.Map; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/shiro/UserRealm.java b/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/common/shiro/UserRealm.java rename to tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java index ad4c6a0..6b2bb1a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/shiro/UserRealm.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/shiro/UserRealm.java @@ -1,4 +1,4 @@ -package com.tamguo.common.shiro; +package com.tamguo.config.shiro; import java.util.ArrayList; import java.util.Arrays; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java index 058bcd7..7f0e8ce 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysMenuMapper.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.tamguo.common.dao.SuperMapper; +import com.tamguo.config.dao.SuperMapper; import com.tamguo.modules.sys.model.SysMenuEntity; public interface SysMenuMapper extends SuperMapper{ diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java index ccd7f43..37cf39f 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java @@ -2,7 +2,7 @@ package com.tamguo.modules.sys.dao; import java.util.List; import com.baomidou.mybatisplus.plugins.pagination.Pagination; -import com.tamguo.common.dao.SuperMapper; +import com.tamguo.config.dao.SuperMapper; import com.tamguo.modules.sys.model.SysRoleEntity; public interface SysRoleMapper extends SuperMapper{ diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java index f414a94..71030bd 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserMapper.java @@ -4,7 +4,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.plugins.Page; -import com.tamguo.common.dao.SuperMapper; +import com.tamguo.config.dao.SuperMapper; import com.tamguo.modules.sys.model.SysUserEntity; public interface SysUserMapper extends SuperMapper{ diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java index 055d2eb..07e8596 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java @@ -5,7 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.common.dao.SuperEntity; +import com.tamguo.config.dao.SuperEntity; /** * The persistent class for the reaps_sys_menu database table. diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java index 283615a..a53b793 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java @@ -5,7 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.common.dao.SuperEntity; +import com.tamguo.config.dao.SuperEntity; /** diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 12932e6..c25e836 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -2,12 +2,11 @@ package com.tamguo.modules.sys.model; import java.io.Serializable; import java.util.List; - import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; -import com.tamguo.common.dao.SuperEntity; +import com.tamguo.config.dao.SuperEntity; import com.tamguo.modules.sys.model.enums.SysUserStatusEnum; diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java index 61f05a4..7bfc47b 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java @@ -1,8 +1,8 @@ package com.tamguo.modules.sys.service; import com.baomidou.mybatisplus.plugins.Page; -import com.tamguo.common.utils.Result; import com.tamguo.modules.sys.model.SysUserEntity; +import com.tamguo.modules.sys.utils.Result; public interface ISysUserService { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java index c3c95ea..e9260f4 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java @@ -9,13 +9,13 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import com.baomidou.mybatisplus.plugins.Page; -import com.tamguo.common.utils.DateUtil; -import com.tamguo.common.utils.Result; -import com.tamguo.common.utils.ShaEncrypt; -import com.tamguo.common.utils.ShiroUtils; import com.tamguo.modules.sys.dao.SysUserMapper; import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.service.ISysUserService; +import com.tamguo.modules.sys.utils.DateUtil; +import com.tamguo.modules.sys.utils.Result; +import com.tamguo.modules.sys.utils.ShaEncrypt; +import com.tamguo.modules.sys.utils.ShiroUtils; @Service public class SysUserServiceImpl implements ISysUserService{ diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/AbstractRunningLogHandler.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/AbstractRunningLogHandler.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/AbstractRunningLogHandler.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/AbstractRunningLogHandler.java index f82fa18..cfda82b 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/AbstractRunningLogHandler.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/AbstractRunningLogHandler.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.InterruptedIOException; import java.lang.reflect.InvocationTargetException; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/CException.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/CException.java similarity index 85% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/CException.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/CException.java index 878d158..f06ed68 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/CException.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/CException.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public class CException extends RuntimeException { diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtil.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtil.java similarity index 96% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtil.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtil.java index b1c315b..6ecf88c 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtil.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtil.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.text.DateFormat; import java.text.ParseException; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtils.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtils.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtils.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtils.java index e89ff34..6f94a90 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/DateUtils.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/ExceptionSupport.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ExceptionSupport.java similarity index 92% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/ExceptionSupport.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ExceptionSupport.java index 829281d..b5763eb 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/ExceptionSupport.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ExceptionSupport.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; /** * 统一异常处理 日志处理 diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/IdGen.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/IdGen.java similarity index 98% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/IdGen.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/IdGen.java index f44b5e1..be66574 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/IdGen.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/IdGen.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public class IdGen { diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/Log4jHandler.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Log4jHandler.java similarity index 91% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/Log4jHandler.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Log4jHandler.java index 9c46b1b..9b5f6c5 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/Log4jHandler.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Log4jHandler.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/LogDebug.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogDebug.java similarity index 85% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/LogDebug.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogDebug.java index e517e92..05917b1 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/LogDebug.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogDebug.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public class LogDebug { diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/LogHandler.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogHandler.java similarity index 90% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/LogHandler.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogHandler.java index 5fe8d8e..a6c8dc8 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/LogHandler.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/LogHandler.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public interface LogHandler { diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/ObjectUtil.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ObjectUtil.java similarity index 97% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/ObjectUtil.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ObjectUtil.java index e81775c..e9d0d3b 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/ObjectUtil.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ObjectUtil.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/RequestHelper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/RequestHelper.java similarity index 97% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/RequestHelper.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/RequestHelper.java index 567947d..739342b 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/RequestHelper.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/RequestHelper.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.IOException; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/Result.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Result.java similarity index 94% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/Result.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Result.java index 278a412..af5a88e 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/Result.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Result.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.Serializable; import java.util.HashMap; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/SerializeTranscoder.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/SerializeTranscoder.java similarity index 89% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/SerializeTranscoder.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/SerializeTranscoder.java index 36b9f14..4a11f39 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/SerializeTranscoder.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/SerializeTranscoder.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.Closeable; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/Setting.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Setting.java similarity index 88% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/Setting.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Setting.java index e9753bb..e7e9987 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/Setting.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Setting.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/ShaEncrypt.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShaEncrypt.java similarity index 93% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/ShaEncrypt.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShaEncrypt.java index 171d979..517a270 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/ShaEncrypt.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShaEncrypt.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/ShiroUtils.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java similarity index 92% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/ShiroUtils.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java index a2e7287..3b14e88 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/ShiroUtils.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/ShiroUtils.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/Status.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Status.java similarity index 54% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/Status.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Status.java index 1bd741d..c731d24 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/Status.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Status.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public enum Status { SUCCESS , ERROR diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/TamguoConstant.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/TamguoConstant.java similarity index 95% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/TamguoConstant.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/TamguoConstant.java index 8cfe268..7056e5a 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/TamguoConstant.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/TamguoConstant.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; public class TamguoConstant { diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/Uploader.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Uploader.java similarity index 96% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/Uploader.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Uploader.java index 7100a73..3c559d3 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/Uploader.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/Uploader.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.*; import java.text.SimpleDateFormat; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/UploaderMessage.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/UploaderMessage.java similarity index 96% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/UploaderMessage.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/UploaderMessage.java index 7fa9071..3eeb74d 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/UploaderMessage.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/UploaderMessage.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.util.ArrayList; diff --git a/tamguo-oms/src/main/java/com/tamguo/common/utils/XMLConfiguration.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/XMLConfiguration.java similarity index 96% rename from tamguo-oms/src/main/java/com/tamguo/common/utils/XMLConfiguration.java rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/XMLConfiguration.java index 6737c2d..b7aab39 100644 --- a/tamguo-oms/src/main/java/com/tamguo/common/utils/XMLConfiguration.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/utils/XMLConfiguration.java @@ -1,4 +1,4 @@ -package com.tamguo.common.utils; +package com.tamguo.modules.sys.utils; import java.io.IOException; import java.io.InputStream; 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 61c832a..93728c2 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 @@ -17,9 +17,9 @@ 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; -import com.tamguo.common.utils.Result; -import com.tamguo.common.utils.ShiroUtils; +import com.tamguo.modules.sys.utils.ExceptionSupport; +import com.tamguo.modules.sys.utils.Result; +import com.tamguo.modules.sys.utils.ShiroUtils; @Controller public class LoginController { diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java index 1e23f5d..156d3c2 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/ValidCodeController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; -import com.tamguo.common.utils.ShiroUtils; +import com.tamguo.modules.sys.utils.ShiroUtils; @Controller public class ValidCodeController { diff --git a/tamguo-oms/src/main/resources/application.properties b/tamguo-oms/src/main/resources/application.properties index d825a35..d8832b7 100644 --- a/tamguo-oms/src/main/resources/application.properties +++ b/tamguo-oms/src/main/resources/application.properties @@ -33,7 +33,7 @@ mybatis-plus.global-config.key-generator=com.baomidou.mybatisplus.incrementer.H2 mybatis-plus.global-config.logic-delete-value=0 mybatis-plus.global-config.logic-not-delete-value=1 mybatis-plus.global-config.sql-injector=com.baomidou.mybatisplus.mapper.LogicSqlInjector -mybatis-plus.global-config.meta-object-handler=com.tamguo.common.dao.MyMetaObjectHandler +mybatis-plus.global-config.meta-object-handler=com.tamguo.config.dao.MyMetaObjectHandler mybatis-plus.global-config.sql-parser-cache=true mybatis-plus.configuration.map-underscore-to-camel-case=true mybatis-plus.configuration.cache-enabled=false diff --git a/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js index d7c355d..6b57889 100644 --- a/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js +++ b/tamguo-oms/src/main/resources/static/modules/sys/sysIndex.js @@ -4,4 +4,451 @@ * @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 +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("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); diff --git a/tamguo-oms/src/main/resources/templates/sysIndex.html b/tamguo-oms/src/main/resources/templates/sysIndex.html index f459384..213f884 100644 --- a/tamguo-oms/src/main/resources/templates/sysIndex.html +++ b/tamguo-oms/src/main/resources/templates/sysIndex.html @@ -1,8 +1,15 @@ - + + + + + + + + + + + + JeeSite Demo @@ -16,58 +23,67 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/> - -
- - - - -
-
- -
-
-
-
- - - - - - - - - - - -
-
- - - \ No newline at end of file + + + + + + + + + + + +
+
+ + + \ No newline at end of file