完全脱离webbuilder依赖

hsweb-web-bean/pom.xml

@@ -21,8 +21,8 @@
             <artifactId>hsweb-easy-orm</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.webbuilder</groupId>
-            <artifactId>wb-utils</artifactId>
+            <groupId>org.hsweb</groupId>
+            <artifactId>hsweb-commons</artifactId>
         </dependency>
     </dependencies>
 </project>

hsweb-web-bean/src/main/java/org/hsweb/web/bean/common/SqlParam.java

@@ -1,12 +1,9 @@
 package org.hsweb.web.bean.common;
 
 import com.alibaba.fastjson.JSON;
-import org.hsweb.ezorm.param.Term;
-import org.hsweb.ezorm.param.TermType;
-import org.webbuilder.utils.common.MapUtils;
-import org.webbuilder.utils.common.StringUtils;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by zhouhao on 16-4-19.

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/GenericPo.java

@@ -1,7 +1,7 @@
 package org.hsweb.web.bean.po;
 
 
-import org.webbuilder.utils.common.MD5;
+import org.hsweb.commons.MD5;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/history/History.java

@@ -1,7 +1,7 @@
 package org.hsweb.web.bean.po.history;
 
+import org.hsweb.commons.MD5;
 import org.hsweb.web.bean.po.GenericPo;
-import org.webbuilder.utils.common.MD5;
 
 import java.util.Date;
 import java.util.UUID;

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/resource/Resources.java

@@ -1,7 +1,7 @@
 package org.hsweb.web.bean.po.resource;
 
+import org.hsweb.commons.file.FileUtils;
 import org.hsweb.web.bean.po.GenericPo;
-import org.webbuilder.utils.file.FileUtils;
 
 /**
  * 资源

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/script/DynamicScript.java

@@ -1,9 +1,7 @@
 package org.hsweb.web.bean.po.script;
 
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.NotEmpty;
 import org.hsweb.web.bean.po.GenericPo;
-import org.webbuilder.utils.common.StringUtils;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/user/User.java

@@ -2,13 +2,13 @@ package org.hsweb.web.bean.po.user;
 
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
+import org.hsweb.commons.MapUtils;
+import org.hsweb.commons.StringUtils;
 import org.hsweb.web.bean.po.GenericPo;
-import org.hsweb.web.bean.po.role.Role;
 import org.hsweb.web.bean.po.module.Module;
+import org.hsweb.web.bean.po.role.Role;
 import org.hsweb.web.bean.po.role.RoleModule;
 import org.hsweb.web.bean.po.role.UserRole;
-import org.webbuilder.utils.common.MapUtils;
-import org.webbuilder.utils.common.StringUtils;
 
 import javax.validation.constraints.NotNull;
 import java.util.*;

hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/support/AnnotationLockAopAdvice.java

@@ -11,9 +11,9 @@ import org.hsweb.web.core.authorize.ExpressionScopeBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
-import org.webbuilder.utils.script.engine.ExecuteResult;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.expands.script.engine.ExecuteResult;
 
 import java.util.HashMap;
 import java.util.Map;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/AopAccessLoggerResolverConfiguration.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 import java.util.List;
 

hsweb-web-controller/src/main/java/org/hsweb/web/controller/ExceptionHandlerConfiguration.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
-import org.webbuilder.utils.common.ClassUtils;
+import org.hsweb.commons.ClassUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/GenericController.java

@@ -13,7 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-import org.webbuilder.utils.common.ClassUtils;
+import org.hsweb.commons.ClassUtils;
 
 import java.util.ArrayList;
 import java.util.List;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/file/FileController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 import org.hsweb.web.service.config.ConfigService;
 import org.hsweb.web.service.resource.FileService;
 import org.hsweb.web.service.resource.ResourcesService;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/DynamicFormController.java

@@ -1,6 +1,5 @@
 package org.hsweb.web.controller.form;
 
-import org.hsweb.web.bean.common.InsertMapParam;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.common.UpdateMapParam;
 import org.hsweb.web.bean.po.form.Form;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/login/AuthorizeController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.webbuilder.utils.common.MD5;
+import org.hsweb.commons.MD5;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/login/UserModuleController.java

@@ -9,7 +9,7 @@ import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.LinkedList;

hsweb-web-core/pom.xml

@@ -39,7 +39,10 @@
             <groupId>org.hsweb</groupId>
             <artifactId>hsweb-easy-orm</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.hsweb</groupId>
+            <artifactId>hsweb-expands-script</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hsweb-web-core/src/main/java/org/hsweb/web/core/Install.java

@@ -1,5 +1,6 @@
 package org.hsweb.web.core;
 
+import org.hsweb.commons.file.FileUtils;
 import org.hsweb.ezorm.executor.SqlExecutor;
 import org.hsweb.ezorm.render.SqlAppender;
 import org.hsweb.ezorm.render.support.simple.SimpleSQL;
@@ -13,7 +14,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
-import org.webbuilder.utils.file.FileUtils;
 
 import javax.annotation.PostConstruct;
 import java.io.BufferedReader;

hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AopAuthorizeValidator.java

@@ -9,8 +9,8 @@ import org.hsweb.web.core.exception.AuthorizeException;
 import org.hsweb.web.core.session.HttpSessionManager;
 import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.webbuilder.utils.common.ClassUtils;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.ClassUtils;
+import org.hsweb.commons.StringUtils;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidator.java

@@ -6,9 +6,9 @@ import org.hsweb.web.core.authorize.ExpressionScopeBean;
 import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.webbuilder.utils.common.StringUtils;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.commons.StringUtils;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import java.util.*;
 

hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java

@@ -4,9 +4,9 @@ import org.hsweb.web.core.authorize.AuthorizeValidatorConfig;
 import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.core.exception.AuthorizeException;
 import org.hsweb.web.core.exception.AuthorizeForbiddenException;
-import org.webbuilder.utils.common.StringUtils;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.commons.StringUtils;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

hsweb-web-core/src/main/java/org/hsweb/web/core/jsonp/AopJsonpSupport.java

@@ -7,7 +7,7 @@ import org.hsweb.web.core.utils.ThreadLocalUtils;
 import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 /**
  * Created by zhouhao on 16-5-26.

hsweb-web-core/src/main/java/org/hsweb/web/core/logger/AopAccessLoggerResolver.java

@@ -6,8 +6,8 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.hsweb.web.bean.po.logger.LoggerInfo;
 import org.hsweb.web.core.logger.annotation.AccessLogger;
 import org.hsweb.web.core.utils.WebUtil;
-import org.webbuilder.utils.common.ClassUtils;
-import org.webbuilder.utils.common.MD5;
+import org.hsweb.commons.ClassUtils;
+import org.hsweb.commons.MD5;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;

hsweb-web-core/src/main/java/org/hsweb/web/core/message/FastJsonHttpMessageConverter.java

@@ -11,7 +11,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

hsweb-web-core/src/main/java/org/hsweb/web/core/message/ResponseMessage.java

@@ -1,7 +1,7 @@
 package org.hsweb.web.core.message;
 
 import com.alibaba.fastjson.JSON;
-import org.webbuilder.utils.common.DateTimeUtils;
+import org.hsweb.commons.DateTimeUtils;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;

hsweb-web-dao-impl-mybatis/pom.xml

@@ -41,12 +41,5 @@
             <artifactId>cglib-nodep</artifactId>
             <version>${cglib.version}</version>
         </dependency>
-
-        <!-- DruidDataSource -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
     </dependencies>
 </project>

hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java

@@ -4,6 +4,8 @@ import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtilsBean;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
+import org.hsweb.commons.DateTimeUtils;
+import org.hsweb.commons.StringUtils;
 import org.hsweb.ezorm.meta.FieldMetaData;
 import org.hsweb.ezorm.param.Term;
 import org.hsweb.ezorm.render.Dialect;
@@ -12,8 +14,6 @@ import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.mybatis.utils.ResultMapsUtils;
 import org.hsweb.web.mybatis.utils.SqlAppender;
-import org.webbuilder.utils.common.DateTimeUtils;
-import org.webbuilder.utils.common.StringUtils;
 
 import java.sql.JDBCType;
 import java.sql.SQLException;
@@ -362,31 +362,6 @@ public class DefaultSqlParamBuilder {
         return value;
     }
 
-    protected List<Object> param2list(Object value) {
-        if (value == null) return new ArrayList<>();
-        if (!(value instanceof Iterable)) {
-            if (value instanceof String) {
-                String[] arr = ((String) value).split("[, ;]");
-                Object[] objArr = new Object[arr.length];
-                for (int i = 0; i < arr.length; i++) {
-                    String str = arr[i];
-                    Object val = str;
-                    if (StringUtils.isInt(str))
-                        val = StringUtils.toInt(str);
-                    else if (StringUtils.isDouble(str))
-                        val = StringUtils.toDouble(str);
-                    objArr[i] = val;
-                }
-                return Arrays.asList(objArr);
-            } else if (value.getClass().isArray()) {
-                return Arrays.asList(((Object[]) value));
-            } else {
-                return Arrays.asList(value);
-            }
-        }
-        return new ArrayList<>();
-    }
-
     public interface KeyWordMapper {
         String fieldMapper(String paramKey, String tableName, Term term, JDBCType jdbcType);
     }

hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/MysqlPagerHelper.java

@@ -3,7 +3,7 @@ package org.hsweb.web.mybatis.plgins.pager.dialect;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.mybatis.plgins.pager.PagerHelper;
 import org.springframework.stereotype.Component;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 /**
  * Created by zhouhao on 16-4-13.

hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/plgins/pager/dialect/OraclePagerHelper.java

@@ -3,7 +3,7 @@ package org.hsweb.web.mybatis.plgins.pager.dialect;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.mybatis.plgins.pager.PagerHelper;
 import org.springframework.stereotype.Component;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 /**
  * Created by zhouhao on 16-4-13.

hsweb-web-service-impl-common/pom.xml

@@ -43,8 +43,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.webbuilder</groupId>
-            <artifactId>wb-office</artifactId>
+            <groupId>org.hsweb</groupId>
+            <artifactId>hsweb-expands-office</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.8.3</version>
         </dependency>
 
         <dependency>

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/config/ConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package org.hsweb.web.service.impl.config;
 
+import org.hsweb.commons.StringUtils;
 import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.bean.po.config.Config;
 import org.hsweb.web.core.authorize.ExpressionScopeBean;
@@ -10,13 +11,11 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import org.webbuilder.utils.common.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * 系统配置服务类

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DefaultFormParser.java

@@ -3,6 +3,7 @@ package org.hsweb.web.service.impl.form;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.beanutils.BeanUtils;
 import org.hsweb.ezorm.meta.FieldMetaData;
 import org.hsweb.ezorm.meta.TableMetaData;
 import org.hsweb.ezorm.meta.converter.ClobValueConverter;
@@ -17,10 +18,9 @@ import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ReflectionUtils;
-import org.webbuilder.utils.common.BeanUtils;
-import org.webbuilder.utils.common.StringUtils;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.commons.StringUtils;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import java.lang.reflect.Field;
 import java.sql.JDBCType;
@@ -162,7 +162,7 @@ public class DefaultFormParser implements FormParser {
                 if (ftmp != null) {
                     try {
                         if ("javaType".equals(key)) value = mapperJavaType(value.toString());
-                        BeanUtils.attr(fieldMeta, key, value);
+                        BeanUtils.setProperty(fieldMeta, key, value);
                     } catch (Exception e) {
                     }
                 } else {

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/DynamicFormServiceImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import org.hsweb.concurrent.lock.annotation.LockName;
 import org.hsweb.concurrent.lock.annotation.ReadLock;
 import org.hsweb.concurrent.lock.annotation.WriteLock;
+import org.hsweb.expands.office.excel.ExcelIO;
+import org.hsweb.expands.office.excel.config.Header;
 import org.hsweb.ezorm.meta.FieldMetaData;
 import org.hsweb.ezorm.meta.TableMetaData;
 import org.hsweb.ezorm.meta.expand.OptionConverter;
@@ -30,9 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.webbuilder.office.excel.ExcelIO;
-import org.webbuilder.office.excel.config.Header;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
@@ -407,4 +407,5 @@ public class DynamicFormServiceImpl implements DynamicFormService, ExpressionSco
         result.put("errorMessage", errorMessage);
         return result;
     }
+
 }

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/FormServiceImpl.java

@@ -20,7 +20,7 @@ import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
-import org.webbuilder.utils.common.StringUtils;
+import org.hsweb.commons.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidator.java

@@ -7,8 +7,8 @@ import org.hsweb.ezorm.meta.expand.Validator;
 import org.hsweb.web.bean.valid.ValidResults;
 import org.hsweb.web.core.exception.BusinessException;
 import org.springframework.util.ReflectionUtils;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import javax.validation.ConstraintViolation;
 import java.lang.reflect.Field;

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/form/validator/GroovyDycBeanValidatorFactory.java

@@ -7,9 +7,9 @@ import org.hsweb.ezorm.meta.expand.ValidatorFactory;
 import org.hsweb.web.core.exception.BusinessException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.webbuilder.utils.common.StringUtils;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.commons.StringUtils;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import java.util.HashMap;
 import java.util.Map;

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/resource/FileServiceImpl.java

@@ -14,8 +14,8 @@ import org.hsweb.web.service.resource.ResourcesService;
 import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.webbuilder.utils.common.DateTimeUtils;
-import org.webbuilder.utils.common.MD5;
+import org.hsweb.commons.DateTimeUtils;
+import org.hsweb.commons.MD5;
 
 import javax.annotation.Resource;
 import java.io.*;

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/script/DynamicScriptServiceImpl.java

@@ -8,8 +8,8 @@ import org.hsweb.web.service.script.DynamicScriptService;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.webbuilder.utils.script.engine.DynamicScriptEngine;
-import org.webbuilder.utils.script.engine.DynamicScriptEngineFactory;
+import org.hsweb.expands.script.engine.DynamicScriptEngine;
+import org.hsweb.expands.script.engine.DynamicScriptEngineFactory;
 
 import javax.annotation.Resource;
 import java.util.List;

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java

@@ -16,7 +16,7 @@ import org.hsweb.web.service.user.UserService;
 import org.hsweb.web.core.utils.RandomUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import org.webbuilder.utils.common.MD5;
+import org.hsweb.commons.MD5;
 
 import javax.annotation.Resource;
 import java.util.*;

hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java

@@ -1,5 +1,6 @@
 package org.hsweb.web.service.impl.form;
 
+import org.hsweb.commons.file.FileUtils;
 import org.hsweb.ezorm.executor.SqlExecutor;
 import org.hsweb.ezorm.run.Database;
 import org.hsweb.ezorm.run.Table;
@@ -15,7 +16,6 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.transaction.annotation.Transactional;
-import org.webbuilder.utils.file.FileUtils;
 
 import javax.annotation.Resource;
 import java.util.Date;

hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java

@@ -42,25 +42,13 @@ public class DataBaseManagerServiceImplTest extends AbstractTestCase {
 
     @Test
     public void test() throws Exception {
-        QueryParam queryParam = new QueryParam();
-        queryParam.select("username", "password")
-                .where("createDate$GT", "2015-12-10");
+        QueryParam queryParam = QueryParam.build()
+         .select("username", "password")
+                .where("createDate$GT", "2015-12-10")
+        .orderBy("u_id ;delete * from user;").asc();
 
         userMapper.select(queryParam);
-        userMapper.delete(new DeleteParam().where("id", "1"));
-        User user = userMapper.selectByPk("admin");
-        user.setId("aaaa");
-        List<User> users = new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            User user2 = new User();
-            user2.setUsername("aaaa");
-            user2.setPassword("aaaa");
-            user2.setCreateDate(new Date());
-            user2.setId("bbb" + i);
-            users.add(user2);
-        }
-        userMapper.insert((InsertParam) new InsertParam<>(users));
-        // userMapper.update(new UpdateParam<>(user).includes("username"));
+
     }
 
     @Test

hsweb-web-websocket/src/test/java/org/hsweb/web/socket/WebSocketClientTest.java

@@ -6,10 +6,6 @@ import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.client.WebSocketClient;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
-import org.webbuilder.utils.storage.counter.Counter;
-import org.webbuilder.utils.storage.counter.support.local.LocalCounter;
-
-import java.io.IOException;
 
 /**
  * 使用java模拟websocket客户端

hsweb-web-workflow/pom.xml

@@ -43,10 +43,6 @@
             <!--<groupId>org.activiti</groupId>-->
             <!--<artifactId>activiti-modeler</artifactId>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>org.webbuilder</groupId>
-            <artifactId>wb-utils</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>

pom.xml

@@ -41,7 +41,8 @@
         <aspectj.version>1.6.12</aspectj.version>
         <hibernate.validator.version>5.1.1.Final</hibernate.validator.version>
         <hsweb.ezorm.version>1.0-SNAPSHOT</hsweb.ezorm.version>
-        <webbuilder.version>1.0-SNAPSHOT</webbuilder.version>
+        <hsweb.commons.version>1.0-SNAPSHOT</hsweb.commons.version>
+        <hsweb.expands.version>1.0-SNAPSHOT</hsweb.expands.version>
     </properties>
 
     <build>
@@ -113,65 +114,24 @@
         <dependencies>
             <dependency>
                 <groupId>org.hsweb</groupId>
-                <artifactId>hsweb-easy-orm</artifactId>
-                <version>${hsweb.ezorm.version}</version>
+                <artifactId>hsweb-commons</artifactId>
+                <version>${hsweb.commons.version}</version>
             </dependency>
-
-            <!--<dependency>-->
-                <!--<groupId>org.webbuilder</groupId>-->
-                <!--<artifactId>wb-sql-util</artifactId>-->
-                <!--<version>${webbuilder.version}</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.slf4j</groupId>-->
-                        <!--<artifactId>slf4j-api</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.slf4j</groupId>-->
-                        <!--<artifactId>slf4j-log4j12</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>ch.qos.logback</groupId>-->
-                        <!--<artifactId>logback-classic</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
-            <!--</dependency>-->
-
             <dependency>
-                <groupId>org.webbuilder</groupId>
-                <artifactId>wb-utils</artifactId>
-                <version>${webbuilder.version}</version>
+                <groupId>org.hsweb</groupId>
+                <artifactId>hsweb-expands-script</artifactId>
+                <version>${hsweb.expands.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.webbuilder</groupId>
-                <artifactId>wb-office</artifactId>
-                <version>${webbuilder.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>ch.qos.logback</groupId>
-                        <artifactId>logback-classic</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.hsweb</groupId>
+                <artifactId>hsweb-expands-office</artifactId>
+                <version>${hsweb.expands.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hsweb</groupId>
+                <artifactId>hsweb-easy-orm</artifactId>
+                <version>${hsweb.ezorm.version}</version>
             </dependency>
-            <!--<dependency>-->
-            <!--<groupId>com.vaadin</groupId>-->
-            <!--<artifactId>vaadin-bom</artifactId>-->
-            <!--<version>7.6.4</version>-->
-            <!--<type>pom</type>-->
-            <!--<scope>import</scope>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.hsweb</groupId>
                 <artifactId>hsweb-web-concurrent-cache</artifactId>