rename package

slife-activiti/src/main/java/com/slife/controller/ModelController.java

@@ -5,7 +5,7 @@ import com.slife.base.vo.DataTable;
 import com.slife.enums.HttpCodeEnum;
 import com.slife.exception.SlifeException;
 import com.slife.service.ModelService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import com.slife.form.ModelForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

slife-activiti/src/main/java/com/slife/controller/ProcessController.java

@@ -5,7 +5,7 @@ import com.slife.base.vo.DataTable;
 import com.slife.enums.HttpCodeEnum;
 import com.slife.exception.SlifeException;
 import com.slife.service.ProcessService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import com.slife.dto.ProcessDefDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

slife-activiti/src/main/java/com/slife/controller/TaskController.java

@@ -4,7 +4,7 @@ import com.slife.base.entity.ReturnDTO;
 import com.slife.base.vo.DataTable;
 import com.slife.form.StartTaskForm;
 import com.slife.service.TaskService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

slife-activiti/src/main/java/com/slife/dto/Variable.java

@@ -1,7 +1,7 @@
 package com.slife.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.slife.util.StringUtils;
+import com.slife.utils.StringUtils;
 import com.slife.utils.DateConverter;
 import com.slife.utils.PropertyType;
 import org.apache.commons.beanutils.ConvertUtils;

slife-activiti/src/main/java/com/slife/editor/controller/EditorController.java

@@ -1,11 +1,8 @@
 package com.slife.editor.controller;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.slife.base.entity.ReturnDTO;
 import com.slife.editor.service.EditorService;
 import com.slife.enums.HttpCodeEnum;
 import com.slife.exception.SlifeException;
-import com.slife.util.ReturnDTOUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

slife-activiti/src/main/java/com/slife/ext/IdGenerator.java

@@ -1,6 +1,6 @@
 package com.slife.ext;
 
-import com.slife.util.SnowflakeIdGenerator;
+import com.slife.utils.SnowflakeIdGenerator;
 
 /**
  * @Author felixu

slife-activiti/src/main/java/com/slife/ext/UserEntityManager.java

@@ -1,6 +1,6 @@
 package com.slife.ext;
 
-import com.slife.util.ApplicationContextRegister;
+import com.slife.utils.ApplicationContextRegister;
 import com.slife.utils.ExtUtils;
 import org.activiti.engine.IdentityService;
 import org.activiti.engine.identity.Group;

slife-activiti/src/main/java/com/slife/service/TaskService.java

@@ -4,7 +4,7 @@ import com.slife.base.vo.DataTable;
 import com.slife.constants.ActivitiConstants;
 import com.slife.dto.TaskDTO;
 import com.slife.shiro.SlifeSysUser;
-import com.slife.util.StringUtils;
+import com.slife.utils.StringUtils;
 import com.slife.utils.ExtUtils;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;

slife-activiti/src/main/java/com/slife/utils/ExtUtils.java

@@ -7,8 +7,6 @@ import com.slife.enums.HttpCodeEnum;
 import com.slife.exception.SlifeException;
 import com.slife.dto.ProcessDefDTO;
 import com.slife.service.ISysUserService;
-import com.slife.util.ApplicationContextRegister;
-import com.slife.util.StringUtils;
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntity;
 import org.activiti.engine.repository.Deployment;

slife-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.js

@@ -645,7 +645,7 @@ jQuery.extend({
 				}
 			}
 
-		// A special, fast, case for the most util use of each
+		// A special, fast, case for the most utils use of each
 		} else {
 			if ( isObj ) {
 				for ( name in object ) {
@@ -2323,7 +2323,7 @@ jQuery.fn.extend({
 				ret = elem.value;
 
 				return typeof ret === "string" ?
-					// handle most util string cases
+					// handle most utils string cases
 					ret.replace(rreturn, "") :
 					// handle cases where value is null/undef or number
 					ret == null ? "" : ret;
@@ -7087,7 +7087,7 @@ jQuery.fn.extend({
 	}
 });
 
-// Attach a bunch of functions for handling util AJAX events
+// Attach a bunch of functions for handling utils AJAX events
 jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
 	jQuery.fn[ o ] = function( f ){
 		return this.on( o, f );

slife-activiti/src/main/resources/static/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js

@@ -814,7 +814,7 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
  *
  * *NOTE*: this is not an injectable instance, just a globally available function.
  *
- * Method for serializing util angular objects (scope, elements, etc..) into strings, useful for
+ * Method for serializing utils angular objects (scope, elements, etc..) into strings, useful for
  * debugging.
  *
  * This method is also available on window, where it can be used to display objects on debug
@@ -1013,7 +1013,7 @@ angular.mock.dump = function(object) {
        beforeEach(inject(function($injector) {
          // Set up the mock http service responses
          $httpBackend = $injector.get('$httpBackend');
-         // backend definition util for all tests
+         // backend definition utils for all tests
          $httpBackend.when('GET', '/auth.py').respond({userId: 'userX'}, {'A-Token': 'xxx'});
 
          // Get hold of a scope (i.e. the root scope)

slife-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js

@@ -308,7 +308,7 @@ if (!Array.isArray) {
 // V8 are regular expression literals permitted as
 // reduce parameters, so it is desirable in the
 // general case for the shim to match the more
-// strict and util behavior of rejecting regular
+// strict and utils behavior of rejecting regular
 // expressions.
 
 // ES5 15.4.4.18

slife-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js

@@ -1201,7 +1201,7 @@ jasmine.Matchers.prototype.toNotBe = function(expected) {
 };
 
 /**
- * toEqual: compares the actual to the expected using util sense equality. Handles Objects, Arrays, etc.
+ * toEqual: compares the actual to the expected using utils sense equality. Handles Objects, Arrays, etc.
  *
  * @param expected
  */

slife-activiti/src/main/resources/static/editor-app/libs/jquery_1.11.0/jquery.js

@@ -650,7 +650,7 @@ jQuery.extend({
 				}
 			}
 
-		// A special, fast, case for the most util use of each
+		// A special, fast, case for the most utils use of each
 		} else {
 			if ( isArray ) {
 				for ( ; i < length; i++ ) {
@@ -1772,7 +1772,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 
 		return i ?
-			// Do a sibling check if the nodes have a util ancestor
+			// Do a sibling check if the nodes have a utils ancestor
 			siblingCheck( ap[i], bp[i] ) :
 
 			// Otherwise nodes in our document sort first
@@ -4230,7 +4230,7 @@ jQuery.fn.extend({
 				ret = elem.value;
 
 				return typeof ret === "string" ?
-					// handle most util string cases
+					// handle most utils string cases
 					ret.replace(rreturn, "") :
 					// handle cases where value is null/undef or number
 					ret == null ? "" : ret;
@@ -7771,7 +7771,7 @@ jQuery.fn.load = function( url, params, callback ) {
 	return this;
 };
 
-// Attach a bunch of functions for handling util AJAX events
+// Attach a bunch of functions for handling utils AJAX events
 jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
 	jQuery.fn[ type ] = function( fn ){
 		return this.on( type, fn );

slife-activiti/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js

@@ -630,7 +630,7 @@
                   }
                   charCode = source.charCodeAt(Index);
                   begin = Index;
-                  // Optimize for the util case where a string is valid.
+                  // Optimize for the utils case where a string is valid.
                   while (charCode >= 32 && charCode != 92 && charCode != 34) {
                     charCode = source.charCodeAt(++Index);
                   }

slife-blog/src/main/java/com/slife/controller/BlogContentController.java

@@ -6,7 +6,7 @@ import com.slife.base.entity.ReturnDTO;
 import com.slife.base.vo.DataTable;
 import com.slife.entity.BlogContent;
 import com.slife.service.IBlogContentService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.List;
 
 /**

slife-common/src/main/java/com/slife/base/controller/BaseController.java

@@ -1,9 +1,9 @@
 package com.slife.base.controller;
 
 import com.slife.constant.Setting;
-import com.slife.util.DateUtils;
-import com.slife.util.ExcelUtils;
-import com.slife.util.FileUtils;
+import com.slife.utils.DateUtils;
+import com.slife.utils.ExcelUtils;
+import com.slife.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

slife-common/src/main/java/com/slife/base/service/impl/BaseService.java

@@ -10,7 +10,7 @@ import com.slife.base.service.IBaseService;
 import com.slife.base.vo.DataTable;
 import com.slife.base.vo.JsTree;
 import com.slife.constant.SearchParam;
-import com.slife.util.StringUtils;
+import com.slife.utils.StringUtils;
 import org.springframework.util.CollectionUtils;
 import java.util.Collections;
 import java.util.List;

slife-common/src/main/java/com/slife/exception/SlifeExceptionHandler.java

@@ -3,7 +3,7 @@ package com.slife.exception;
 
 import com.slife.base.entity.ReturnDTO;
 import com.slife.enums.HttpCodeEnum;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

slife-common/src/main/java/com/slife/filter/AuthFilter.java

@@ -5,7 +5,7 @@ import com.slife.enums.HttpCodeEnum;
 import com.slife.exception.SlifeException;
 import com.slife.rest.JwtProperties;
 import com.slife.rest.JwtTokenUtil;
-import com.slife.util.RenderUtils;
+import com.slife.utils.RenderUtils;
 import io.jsonwebtoken.JwtException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

slife-common/src/main/java/com/slife/utils/ApplicationContextRegister.java

@@ -1,11 +1,10 @@
-package com.slife.util;
+package com.slife.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**

slife-common/src/main/java/com/slife/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

slife-common/src/main/java/com/slife/utils/Digests.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2005-2012 springside.org.cn
  */
-package com.slife.util;
+package com.slife.utils;
 
 import org.apache.commons.lang3.Validate;
 

slife-common/src/main/java/com/slife/utils/Encodes.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2005-2012 springside.org.cn
  */
-package com.slife.util;
+package com.slife.utils;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Base64;

slife-common/src/main/java/com/slife/utils/ExcelUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;

slife-common/src/main/java/com/slife/utils/Exceptions.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2005-2012 springside.org.cn
  */
-package com.slife.util;
+package com.slife.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

slife-common/src/main/java/com/slife/utils/FileUtils.java

@@ -1,11 +1,10 @@
-package com.slife.util;
+package com.slife.utils;
 
 import net.coobird.thumbnailator.Thumbnails;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;

slife-common/src/main/java/com/slife/utils/IPUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

slife-common/src/main/java/com/slife/utils/PathUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;

slife-common/src/main/java/com/slife/utils/PinyinUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;

slife-common/src/main/java/com/slife/utils/RenderUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.slife.enums.HttpCodeEnum;

slife-common/src/main/java/com/slife/utils/ReturnDTOUtil.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 
 import com.slife.base.entity.ReturnDTO;

slife-common/src/main/java/com/slife/utils/ServletUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

slife-common/src/main/java/com/slife/utils/SnowflakeIdGenerator.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import java.util.Random;
 

slife-common/src/main/java/com/slife/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 

slife-common/src/main/java/com/slife/utils/page/PageUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util.page;
+package com.slife.utils.page;
 
 import java.util.ArrayList;
 import java.util.List;

slife-common/src/main/java/com/slife/utils/page/Paginable.java

@@ -1,4 +1,4 @@
-package com.slife.util.page;
+package com.slife.utils.page;
 
 public interface Paginable {
 

slife-common/src/main/java/com/slife/utils/page/Pagination.java

@@ -1,4 +1,4 @@
-package com.slife.util.page;
+package com.slife.utils.page;
 
 import java.util.List;
 

slife-common/src/main/java/com/slife/utils/page/SimplePage.java

@@ -1,4 +1,4 @@
-package com.slife.util.page;
+package com.slife.utils.page;
 
 import java.util.ArrayList;
 import java.util.List;

slife-common/src/test/java/com/slife/test/SubListTest.java

@@ -1,7 +1,7 @@
 package com.slife.test;
 
 import com.alibaba.fastjson.JSON;
-import com.slife.util.page.PageUtils;
+import com.slife.utils.page.PageUtils;
 import org.junit.Test;
 
 import java.util.ArrayList;

slife-log/src/main/java/com/slife/aspect/SLogAspect.java

@@ -2,8 +2,8 @@ package com.slife.aspect;
 
 
 
-import com.slife.util.IPUtils;
-import com.slife.util.ServletUtils;
+import com.slife.utils.IPUtils;
+import com.slife.utils.ServletUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

slife-log/src/main/java/com/slife/aspect/SaveLogTask.java

@@ -6,16 +6,11 @@ import com.slife.dao.SlifeLogDao;
 import com.slife.entity.SlifeLog;
 import com.slife.shiro.ShiroUser;
 import com.slife.shiro.SlifeSysUser;
-import com.slife.util.ApplicationContextRegister;
-import com.slife.util.IPUtils;
-import com.slife.util.ServletUtils;
+import com.slife.utils.ApplicationContextRegister;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.Date;
 
 /**
  *

slife-log/src/main/java/com/slife/controller/SlifeLogController.java

@@ -5,7 +5,7 @@ import com.slife.base.entity.ReturnDTO;
 import com.slife.base.vo.DataTable;
 import com.slife.entity.SlifeLog;
 import com.slife.service.ISlifeLogService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java

@@ -9,8 +9,8 @@ import com.slife.service.ISysUserService;
 import com.slife.service.impl.SysRoleService;
 import com.slife.service.impl.SysUserService;
 import com.slife.shiro.ShiroUser;
-import com.slife.util.ApplicationContextRegister;
-import com.slife.util.Encodes;
+import com.slife.utils.ApplicationContextRegister;
+import com.slife.utils.Encodes;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher;

slife-sys/src/main/java/com/slife/controller/FileController.java

@@ -2,8 +2,8 @@ package com.slife.controller;
 
 import com.slife.base.entity.ReturnDTO;
 import com.slife.constant.Setting;
-import com.slife.util.FileUtils;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.FileUtils;
+import com.slife.utils.ReturnDTOUtil;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

slife-sys/src/main/java/com/slife/controller/SysMenuController.java

@@ -7,8 +7,7 @@ import com.slife.entity.SysMenu;
 import com.slife.enums.SysMenuType;
 import com.slife.service.ISysMenuService;
 import com.slife.shiro.SlifeSysUser;
-import com.slife.util.ReturnDTOUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.slife.utils.ReturnDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

slife-sys/src/main/java/com/slife/controller/SysRoleController.java

@@ -8,9 +8,8 @@ import com.slife.base.vo.DataTable;
 import com.slife.entity.SysRole;
 import com.slife.service.ISysMenuService;
 import com.slife.service.ISysRoleService;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

slife-sys/src/main/java/com/slife/controller/SysTestController.java

@@ -3,7 +3,7 @@ package com.slife.controller;
 import com.slife.base.entity.ReturnDTO;
 import com.slife.cache.CacheUtils;
 import com.slife.entity.SysMenu;
-import com.slife.util.ReturnDTOUtil;
+import com.slife.utils.ReturnDTOUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

slife-sys/src/main/java/com/slife/controller/SysUserController.java

@@ -11,10 +11,10 @@ import com.slife.exception.SlifeException;
 import com.slife.service.ISysRoleService;
 import com.slife.service.ISysUserService;
 import com.slife.shiro.SlifeSysUser;
-import com.slife.util.FileUtils;
-import com.slife.util.PasswordUtils;
-import com.slife.util.ReturnDTOUtil;
-import com.slife.util.StringUtils;
+import com.slife.utils.FileUtils;
+import com.slife.utils.PasswordUtils;
+import com.slife.utils.ReturnDTOUtil;
+import com.slife.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

slife-sys/src/main/java/com/slife/service/impl/SysUserService.java

@@ -1,26 +1,15 @@
 package com.slife.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.QueryChainWrapper;
 import com.slife.base.service.impl.BaseService;
-import com.slife.base.vo.DataTable;
-import com.slife.constant.SearchParam;
 import com.slife.dao.SysUserDao;
 import com.slife.entity.SysUser;
 import com.slife.service.ISysRoleService;
 import com.slife.service.ISysUserService;
-import com.slife.util.PasswordUtils;
-import org.apache.poi.ss.formula.functions.T;
-import org.assertj.core.util.Strings;
+import com.slife.utils.PasswordUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Map;
 
 /**
  *

slife-sys/src/main/java/com/slife/utils/PasswordUtils.java

@@ -1,4 +1,4 @@
-package com.slife.util;
+package com.slife.utils;
 
 /**
  * Created by chen on 2017/9/1.

slife-sys/src/test/java/PasswordTest.java

@@ -1,5 +1,5 @@
-import com.slife.util.Digests;
-import com.slife.util.Encodes;
+import com.slife.utils.Digests;
+import com.slife.utils.Encodes;
 
 /**
  * Created by chen on 2017/7/27.

slife-web/src/main/java/com/slife/config/cache/SlifeRedisCache.java

@@ -7,11 +7,11 @@
 //import org.slf4j.LoggerFactory;
 //import org.springframework.data.redis.core.RedisTemplate;
 //
-//import java.util.ArrayList;
-//import java.util.Collection;
-//import java.util.List;
-//import java.util.Set;
-//import java.util.concurrent.TimeUnit;
+//import java.utils.ArrayList;
+//import java.utils.Collection;
+//import java.utils.List;
+//import java.utils.Set;
+//import java.utils.concurrent.TimeUnit;
 //
 ///**
 // * @author chen

slife-web/src/main/java/com/slife/config/mvc/MvcConfiguration.java

@@ -13,7 +13,7 @@
 //import org.springframework.http.converter.HttpMessageConverter;
 //import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 //import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-//import java.util.List;
+//import java.utils.List;
 //
 ///**
 // * Created by chen on 2017/7/17.

slife-web/src/main/resources/static/js/plugins/markdown/markdown.js

@@ -125,7 +125,7 @@ function mk_block_toSource() {
 
 // node
 function mk_block_inspect() {
-  var util = require('util');
+  var util = require('utils');
   return "Markdown.mk_block( " +
           util.inspect(this.toString()) +
           ", " +

slife-web/src/main/resources/static/js/plugins/webuploader/webuploader.custom.js

@@ -4640,7 +4640,7 @@
      * @fileOverview Image控件
      */
     define('runtime/html5/imagemeta',[
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Util ) {
 
         var api;
@@ -5080,7 +5080,7 @@
     define('runtime/html5/image',[
         'base',
         'runtime/html5/runtime',
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Base, Html5Runtime, Util ) {
 
         var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D';
@@ -6263,7 +6263,7 @@
      * @fileOverview Fix android canvas.toDataUrl bug.
      */
     define('runtime/html5/androidpatch',[
-        'runtime/html5/util',
+        'runtime/html5/utils',
         'runtime/html5/jpegencoder',
         'base'
     ], function( Util, encoder, Base ) {

slife-web/src/main/resources/static/js/plugins/webuploader/webuploader.fis.js

@@ -5039,7 +5039,7 @@ return (function( root, factory ) {
      * @fileOverview Image控件
      */
     define('runtime/html5/imagemeta',[
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Util ) {
 
         var api;
@@ -6229,7 +6229,7 @@ return (function( root, factory ) {
      * @fileOverview Fix android canvas.toDataUrl bug.
      */
     define('runtime/html5/androidpatch',[
-        'runtime/html5/util',
+        'runtime/html5/utils',
         'runtime/html5/jpegencoder',
         'base'
     ], function( Util, encoder, Base ) {
@@ -6281,7 +6281,7 @@ return (function( root, factory ) {
     define('runtime/html5/image',[
         'base',
         'runtime/html5/runtime',
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Base, Html5Runtime, Util ) {
 
         var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D';

slife-web/src/main/resources/static/js/plugins/webuploader/webuploader.html5only.js

@@ -4954,7 +4954,7 @@
      * @fileOverview Image控件
      */
     define('runtime/html5/imagemeta',[
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Util ) {
 
         var api;
@@ -5394,7 +5394,7 @@
     define('runtime/html5/image',[
         'base',
         'runtime/html5/runtime',
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Base, Html5Runtime, Util ) {
 
         var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D';

slife-web/src/main/resources/static/js/plugins/webuploader/webuploader.js

@@ -5064,7 +5064,7 @@
      * @fileOverview Image控件
      */
     define('runtime/html5/imagemeta',[
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Util ) {
 
         var api;
@@ -6254,7 +6254,7 @@
      * @fileOverview Fix android canvas.toDataUrl bug.
      */
     define('runtime/html5/androidpatch',[
-        'runtime/html5/util',
+        'runtime/html5/utils',
         'runtime/html5/jpegencoder',
         'base'
     ], function( Util, encoder, Base ) {
@@ -6306,7 +6306,7 @@
     define('runtime/html5/image',[
         'base',
         'runtime/html5/runtime',
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Base, Html5Runtime, Util ) {
 
         var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D';

slife-web/src/main/resources/static/js/plugins/webuploader/webuploader.nolog.js

@@ -5064,7 +5064,7 @@
      * @fileOverview Image控件
      */
     define('runtime/html5/imagemeta',[
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Util ) {
 
         var api;
@@ -6254,7 +6254,7 @@
      * @fileOverview Fix android canvas.toDataUrl bug.
      */
     define('runtime/html5/androidpatch',[
-        'runtime/html5/util',
+        'runtime/html5/utils',
         'runtime/html5/jpegencoder',
         'base'
     ], function( Util, encoder, Base ) {
@@ -6306,7 +6306,7 @@
     define('runtime/html5/image',[
         'base',
         'runtime/html5/runtime',
-        'runtime/html5/util'
+        'runtime/html5/utils'
     ], function( Base, Html5Runtime, Util ) {
 
         var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D';