优化字段命名

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

@@ -87,8 +87,8 @@ public class Term {
 
     public void setField(String field) {
         if(field==null)return;
-        setTermType(TermType.fromString(field));
         if (field.contains("$")) {
+            setTermType(TermType.fromString(field));
             field = field.split("[\\$]")[0];
         }
         this.field = field;

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

@@ -17,10 +17,14 @@ public class GenericPo<PK> implements Serializable {
     /**
      * 主键
      */
-    private PK uId;
+    private PK id;
 
-    public PK getUId() {
-        return uId;
+    public PK getId() {
+        return id;
+    }
+
+    public void setId(PK id) {
+        this.id = id;
     }
 
     private Map<String, Object> customAttr = new LinkedHashMap<>();
@@ -36,8 +40,8 @@ public class GenericPo<PK> implements Serializable {
 
     @Override
     public int hashCode() {
-        if (getUId() == null) return 0;
-        return getUId().hashCode();
+        if (getId() == null) return 0;
+        return getId().hashCode();
     }
 
     @Override
@@ -46,9 +50,6 @@ public class GenericPo<PK> implements Serializable {
         return this.hashCode() == obj.hashCode();
     }
 
-    public void setUId(PK uId) {
-        this.uId = uId;
-    }
 
     /**
      * 创建一个主键

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/classified/Classified.java

@@ -12,13 +12,13 @@ public class Classified extends GenericPo<String>{
         //分类类型
         private String type;
         //父级分类
-        private String p_id;
+        private String parentId;
         //显示图标
         private String icon;
         //其他配置
         private String config;
         //排序
-        private int sort_index;
+        private int sortIndex;
 
         /**
         * 获取 分类名称
@@ -72,18 +72,17 @@ public class Classified extends GenericPo<String>{
         * 获取 父级分类
         * @return java.lang.String 父级分类
         */
-        public String getP_id(){
-            if(this.p_id==null)
-            return "";
-        return this.p_id;
+        public String getParentId() {
+                return parentId;
         }
 
         /**
         * 设置 父级分类
         */
-        public void setP_id(String p_id){
-        this.p_id=p_id;
+        public void setParentId(String parentId) {
+                this.parentId = parentId;
         }
+
         /**
         * 获取 显示图标
         * @return java.lang.String 显示图标
@@ -120,14 +119,14 @@ public class Classified extends GenericPo<String>{
         * 获取 排序
         * @return int 排序
         */
-        public int getSort_index(){
-        return this.sort_index;
+        public int getSortIndex() {
+                return sortIndex;
         }
 
         /**
         * 设置 排序
         */
-        public void setSort_index(int sort_index){
-        this.sort_index=sort_index;
+        public void setSortIndex(int sortIndex) {
+                this.sortIndex = sortIndex;
         }
-    }
+}

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

@@ -126,7 +126,7 @@ public class History extends GenericPo<String> {
 
     public static History newInstance(String type) {
         History history = new History(type);
-        history.setUId(MD5.encode(UUID.randomUUID().toString().concat(String.valueOf(Math.random()))));
+        history.setId(MD5.encode(UUID.randomUUID().toString().concat(String.valueOf(Math.random()))));
         history.setCreateDate(new Date());
         history.setCreatorId("Sys");
         return history;

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/module/Module.java

@@ -2,10 +2,12 @@ package org.hsweb.web.bean.po.module;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import org.apache.commons.beanutils.BeanUtils;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hsweb.web.bean.po.GenericPo;
 
 import javax.validation.constraints.NotNull;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 
@@ -28,7 +30,7 @@ public class Module extends GenericPo<String> implements Comparable<Module> {
     private String icon;
 
     //父级模块主键
-    private String pId = "-1";
+    private String parentId = "-1";
 
     //备注
     private String remark;
@@ -37,13 +39,11 @@ public class Module extends GenericPo<String> implements Comparable<Module> {
     private int status = 1;
 
     //模块操作选项
-    private String mOption;
+    private String optional;
 
     //排序
     private long sortIndex;
 
-    private String oldId;
-
     /**
      * 获取 模块名称
      *
@@ -103,17 +103,17 @@ public class Module extends GenericPo<String> implements Comparable<Module> {
      *
      * @return String 父级模块主键
      */
-    public String getPId() {
-        if (this.pId == null)
+    public String getParentId() {
+        if (this.parentId == null)
             return "1";
-        return this.pId;
+        return this.parentId;
     }
 
     /**
      * 设置 父级模块主键
      */
-    public void setPId(String pId) {
-        this.pId = pId;
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
     }
 
     /**
@@ -163,13 +163,14 @@ public class Module extends GenericPo<String> implements Comparable<Module> {
      *
      * @return String 模块操作选项
      */
-    public String getMOption() {
-        return this.mOption;
+    public String getOptional() {
+        return this.optional;
     }
 
-    public Map<String, Object> getMOptionMap() {
+    public Map<String, Object> getOptionalMap() {
         try {
-            List<Map<String, Object>> opt = JSON.parseObject(getMOption(),new TypeReference<LinkedList<Map<String, Object>>>(){});
+            List<Map<String, Object>> opt = JSON.parseObject(getOptional(), new TypeReference<LinkedList<Map<String, Object>>>() {
+            });
             if (opt == null) return new HashMap<>();
             Map<String, Object> all = new LinkedHashMap<>();
             for (Map<String, Object> map : opt) {
@@ -181,26 +182,17 @@ public class Module extends GenericPo<String> implements Comparable<Module> {
         }
     }
 
+    public void setOptional(String optional) {
+        this.optional = optional;
+    }
+
     /**
      * 设置 模块操作选项
      */
-    public void setMOption(String mOption) {
-        this.mOption = mOption;
-    }
 
     @Override
     public int compareTo(Module o) {
         return getSortIndex() > o.getSortIndex() ? 1 : 1;
     }
 
-    public String getOldId() {
-        if (oldId == null)
-            oldId = getUId();
-        return oldId;
-    }
-
-    public void setOldId(String oldId) {
-        this.oldId = oldId;
-    }
-
 }

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

@@ -74,7 +74,7 @@ public class User extends GenericPo<String> {
 
     public Module getModule(String mId) {
         for (Module module : getModules()) {
-            if (module.getUId().equals(mId)) return module;
+            if (module.getId().equals(mId)) return module;
         }
         return null;
     }
@@ -94,14 +94,14 @@ public class User extends GenericPo<String> {
     public Set<Module> getModulesByPid(String pid) {
         Set<Module> modules = getModules()
                 .stream()
-                .filter(module -> pid.equals(module.getPId()))
+                .filter(module -> pid.equals(module.getParentId()))
                 .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
         return modules;
     }
 
     public Set<Module> getModulesByPid(String pid, String level) {
         Set<Module> modules = getModules().stream()
-                .filter(module -> module.getPId().equals(pid) && hasAccessModuleAction(module.getUId(), level))
+                .filter(module -> module.getParentId().equals(pid) && hasAccessModuleAction(module.getId(), level))
                 .collect(Collectors.toCollection(() -> new LinkedHashSet<>()));
         return modules;
     }
@@ -117,7 +117,7 @@ public class User extends GenericPo<String> {
     public boolean hasAccessModule(String mId) {
         if (roleInfo == null) initRoleInfo();
         for (Module module : roleInfo.keySet()) {
-            if (module.getUId().equals(mId)) return true;
+            if (module.getId().equals(mId)) return true;
         }
         return false;
     }

hsweb-web-bean/src/main/resources/system/install/sql/h2/install.sql

@@ -105,10 +105,10 @@ CREATE TABLE "S_MODULES" (
   "NAME"       VARCHAR2(256)  NOT NULL,
   "URI"        VARCHAR2(1024) NULL,
   "ICON"       VARCHAR2(256)  NULL,
-  "P_ID"       VARCHAR2(256)  NOT NULL,
+  "PARENT_ID"       VARCHAR2(256)  NOT NULL,
   "REMARK"     VARCHAR2(512)  NULL,
   "STATUS"     NUMBER(4)      NULL,
-  "M_OPTION"   CLOB           NOT NULL,
+  "OPTIONAL"   CLOB           NOT NULL,
   "SORT_INDEX" NUMBER(32)     NOT NULL
 );
 COMMENT ON TABLE "S_MODULES" IS '系统模块';
@@ -116,10 +116,10 @@ COMMENT ON COLUMN "S_MODULES"."U_ID" IS 'UID';
 COMMENT ON COLUMN "S_MODULES"."NAME" IS '模块名称';
 COMMENT ON COLUMN "S_MODULES"."URI" IS 'URI';
 COMMENT ON COLUMN "S_MODULES"."ICON" IS '图标';
-COMMENT ON COLUMN "S_MODULES"."P_ID" IS '上级菜单';
+COMMENT ON COLUMN "S_MODULES"."PARENT_ID" IS '上级菜单';
 COMMENT ON COLUMN "S_MODULES"."REMARK" IS '备注';
 COMMENT ON COLUMN "S_MODULES"."STATUS" IS '状态';
-COMMENT ON COLUMN "S_MODULES"."M_OPTION" IS '可选权限';
+COMMENT ON COLUMN "S_MODULES"."OPTIONAL" IS '可选权限';
 COMMENT ON COLUMN "S_MODULES"."SORT_INDEX" IS '排序';
 
 CREATE TABLE "S_MODULE_META" (
@@ -221,13 +221,13 @@ CREATE TABLE "S_ROLE_MODULES" (
   "U_ID"      VARCHAR2(256) NOT NULL,
   "MODULE_ID" VARCHAR2(256) NOT NULL,
   "ROLE_ID"   VARCHAR2(256) NOT NULL,
-  "O_LEVEL"   CLOB          NULL
+  "ACTIONS"   CLOB          NULL
 );
 COMMENT ON TABLE "S_ROLE_MODULES" IS '角色模块绑定表';
 COMMENT ON COLUMN "S_ROLE_MODULES"."U_ID" IS 'UID';
 COMMENT ON COLUMN "S_ROLE_MODULES"."MODULE_ID" IS '模块ID';
 COMMENT ON COLUMN "S_ROLE_MODULES"."ROLE_ID" IS '角色ID';
-COMMENT ON COLUMN "S_ROLE_MODULES"."O_LEVEL" IS '可操作权限';
+COMMENT ON COLUMN "S_ROLE_MODULES"."ACTIONS" IS '可操作权限';
 
 -- ----------------------------
 -- Table structure for S_SCRIPT

hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql

@@ -50,13 +50,13 @@ CREATE TABLE `s_modules` (
   COMMENT 'uri',
   `icon`       VARCHAR(256)  NULL
   COMMENT '图标',
-  `p_id`       VARCHAR(256)  NOT NULL
+  `parent_id`       VARCHAR(256)  NOT NULL
   COMMENT '上级菜单',
   `remark`     VARCHAR(512)  NULL
   COMMENT '备注',
   `status`     INT(4)        NULL
   COMMENT '状态',
-  `m_option`   TEXT          NOT NULL
+  `optional`   TEXT          NOT NULL
   COMMENT '可选权限',
   `sort_index` INT(32)       NOT NULL
   COMMENT '排序'
@@ -163,7 +163,7 @@ CREATE TABLE `s_role_modules` (
   COMMENT '模块id',
   `role_id`   VARCHAR(256) NOT NULL
   COMMENT '角色id',
-  `o_level`   TEXT         NULL
+  `actions`   TEXT         NULL
   COMMENT '可操作权限'
 );
 ALTER TABLE `s_role_modules` COMMENT '角色模块绑定表';

hsweb-web-bean/src/main/resources/system/install/sql/oracle/install.sql

@@ -105,10 +105,10 @@ CREATE TABLE ${jdbc.username}."S_MODULES" (
 "NAME" VARCHAR2(256)  NOT NULL,
 "URI" VARCHAR2(1024) NULL,
 "ICON" VARCHAR2(256)  NULL,
-"P_ID" VARCHAR2(256)  NOT NULL,
+"PARENT_ID" VARCHAR2(256)  NOT NULL,
 "REMARK" VARCHAR2(512)  NULL,
 "STATUS" NUMBER(4)      NULL,
-"M_OPTION" CLOB NOT NULL,
+"OPTIONAL" CLOB NOT NULL,
 "SORT_INDEX" NUMBER(32)     NOT NULL
 );
 COMMENT ON TABLE ${jdbc.username}."S_MODULES" IS '系统模块';
@@ -116,10 +116,10 @@ COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."U_ID" IS 'UID';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."NAME" IS '模块名称';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."URI" IS 'URI';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."ICON" IS '图标';
-COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."P_ID" IS '上级菜单';
+COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."PARENT_ID" IS '上级菜单';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."REMARK" IS '备注';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."STATUS" IS '状态';
-COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."M_OPTION" IS '可选权限';
+COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."OPTIONAL" IS '可选权限';
 COMMENT ON COLUMN ${jdbc.username}."S_MODULES"."SORT_INDEX" IS '排序';
 
 CREATE TABLE ${jdbc.username}."S_CLASSIFIED" (
@@ -222,13 +222,13 @@ CREATE TABLE ${jdbc.username}."S_ROLE_MODULES" (
 "U_ID" VARCHAR2(256) NOT NULL,
 "MODULE_ID" VARCHAR2(256) NOT NULL,
 "ROLE_ID" VARCHAR2(256) NOT NULL,
-"O_LEVEL" CLOB NULL
+"ACTIONS" CLOB NULL
 );
 COMMENT ON TABLE ${jdbc.username}."S_ROLE_MODULES" IS '角色模块绑定表';
 COMMENT ON COLUMN ${jdbc.username}."S_ROLE_MODULES"."U_ID" IS 'UID';
 COMMENT ON COLUMN ${jdbc.username}."S_ROLE_MODULES"."MODULE_ID" IS '模块ID';
 COMMENT ON COLUMN ${jdbc.username}."S_ROLE_MODULES"."ROLE_ID" IS '角色ID';
-COMMENT ON COLUMN ${jdbc.username}."S_ROLE_MODULES"."O_LEVEL" IS '可操作权限';
+COMMENT ON COLUMN ${jdbc.username}."S_ROLE_MODULES"."ACTIONS" IS '可操作权限';
 
 -- ----------------------------
 -- Table structure for S_SCRIPT

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

@@ -55,7 +55,7 @@ public class AopAccessLoggerResolverConfiguration extends AopAccessLoggerResolve
             loggerInfo.setResponseTime(responseTime);
             loggerInfo.setResponseContent(fastJsonHttpMessageConverter.converter(result));
             if (user != null)
-                loggerInfo.setUserId(user.getUId());
+                loggerInfo.setUserId(user.getId());
             if (result instanceof ResponseMessage)
                 loggerInfo.setResponseCode(String.valueOf(((ResponseMessage) result).getCode()));
             if (accessLoggerPersisting != null) {

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

@@ -151,7 +151,7 @@ public abstract class GenericController<PO, PK> {
         PO old = getService().selectByPk(id);
         if (old == null) throw new NotFoundException("data is not found!");
         if (object instanceof GenericPo) {
-            ((GenericPo) object).setUId(id);
+            ((GenericPo) object).setId(id);
         }
         int number = getService().update(object);
         return ResponseMessage.ok(number);

hsweb-web-controller/src/main/java/org/hsweb/web/controller/classified/ClassifiedController.java

@@ -2,6 +2,7 @@ package org.hsweb.web.controller.classified;
 
 import org.hsweb.web.bean.po.classified.Classified;
 import org.hsweb.web.controller.GenericController;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.service.classified.ClassifiedService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
 */
 @RestController
 @RequestMapping(value = "/classified")
+@Authorize(module = "classified")
 public class ClassifiedController extends GenericController<Classified,String> {
 
     //默认服务类

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

@@ -30,7 +30,7 @@ public class UserModuleController {
     @RequestMapping
     public ResponseMessage userModule() throws Exception {
         String[] includes = {
-                "name", "uId", "pId", "icon", "uri", "mOption"
+                "name", "id", "parentId", "icon", "uri", "optional"
         };
         User user = WebUtil.getLoginUser();
         List<Module> modules;
@@ -40,7 +40,7 @@ public class UserModuleController {
             modules = moduleService.select(queryParam);
             modules = modules.stream()
                     .filter(module -> {
-                        Object obj = module.getMOptionMap().get("M");
+                        Object obj = module.getOptionalMap().get("M");
                         if (obj instanceof Map)
                             return StringUtils.isTrue(((Map) obj).get("checked"));
                         return false;
@@ -48,13 +48,13 @@ public class UserModuleController {
                     .collect(Collectors.toCollection(() -> new LinkedList<>()));
         } else {
             modules = user.getModules().stream()
-                    .filter(module -> user.hasAccessModuleAction(module.getUId(), "M"))
+                    .filter(module -> user.hasAccessModuleAction(module.getId(), "M"))
                     .collect(Collectors.toCollection(() -> new LinkedList<>()));
         }
 
         return ResponseMessage.ok(modules)
                 .include(Module.class, includes)
-                .exclude(Module.class, "m_option")
+                .exclude(Module.class, "optional")
                 .onlyData();
     }
 }

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

@@ -35,7 +35,7 @@ public class AopAccessLoggerResolver {
                 describe.append("-");
             describe.append(methodAnnotation.value());
         }
-        logInfo.setUId(MD5.encode(String.valueOf(System.nanoTime())));
+        logInfo.setId(MD5.encode(String.valueOf(System.nanoTime())));
         logInfo.setModuleDesc(describe.toString());//方法描述
         logInfo.setClassName(target.getName());//当前访问映射到的类名
         logInfo.setClientIp(WebUtil.getIpAddr(request));//ip地址

hsweb-web-dao-impl-mybatis/README.md

@@ -36,7 +36,7 @@
                         ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                         ,'email':#{'jdbcType':'VARCHAR','javaType':'string'}
                         ,'phone':#{'jdbcType':'VARCHAR','javaType':'string'}
-                        ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                        ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                         ,'create_date':#{'jdbcType':'TIMESTAMP','javaType':'date'}
                         ,'update_date':#{'jdbcType':'TIMESTAMP','javaType':'date'}
                         }"/>

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

@@ -28,57 +28,57 @@ public class DefaultSqlParamBuilder {
     private static DefaultSqlParamBuilder instance = new DefaultSqlParamBuilder();
 
     public DefaultSqlParamBuilder() {
-        mapperMap.put(TermType.eq, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " = ", "#{", paramKey, "}").toString()
+        mapperMap.put(TermType.eq, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " = ", "#{", paramKey, "}").toString()
         );
-        mapperMap.put(TermType.not, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " != ", "#{", paramKey, "}").toString()
+        mapperMap.put(TermType.not, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " != ", "#{", paramKey, "}").toString()
         );
-        mapperMap.put(TermType.like, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " like ", "#{", paramKey, "}").toString()
+        mapperMap.put(TermType.like, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " like ", "#{", paramKey, "}").toString()
         );
-        mapperMap.put(TermType.notlike, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " not like ", "#{", paramKey, "}").toString()
+        mapperMap.put(TermType.notlike, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " not like ", "#{", paramKey, "}").toString()
         );
-        mapperMap.put(TermType.notnull, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " is not null").toString()
+        mapperMap.put(TermType.notnull, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " is not null").toString()
         );
-        mapperMap.put(TermType.isnull, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " is null").toString()
+        mapperMap.put(TermType.isnull, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " is null").toString()
         );
-        mapperMap.put(TermType.empty, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " =''").toString()
+        mapperMap.put(TermType.empty, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " =''").toString()
         );
-        mapperMap.put(TermType.notempty, (paramKey, field, jdbcType) ->
-                        new SqlAppender().add(field.getField(), " !=''").toString()
+        mapperMap.put(TermType.notempty, (paramKey, tableName, field, jdbcType) ->
+                        new SqlAppender().add(tableName, ".", field.getField(), " !=''").toString()
         );
-        mapperMap.put(TermType.btw, (paramKey, field, jdbcType) ->
+        mapperMap.put(TermType.btw, (paramKey, tableName, field, jdbcType) ->
         {
             SqlAppender sqlAppender = new SqlAppender();
             List<Object> objects = param2list(field.getValue());
             if (objects.size() == 1)
                 objects.add(objects.get(0));
             field.setValue(objects);
-            sqlAppender.addSpc(field.getField(), "between")
+            sqlAppender.add(tableName, ".", field.getField()," ").addSpc("between")
                     .add(" #{", paramKey, "[0]}")
                     .add(" and ", "#{", paramKey, "[1]}");
             return sqlAppender.toString();
         });
 
-        mapperMap.put(TermType.notbtw, (paramKey, field, jdbcType) ->
+        mapperMap.put(TermType.notbtw, (paramKey, tableName, field, jdbcType) ->
         {
             SqlAppender sqlAppender = new SqlAppender();
             List<Object> objects = param2list(field.getValue());
             if (objects.size() == 1)
                 objects.add(objects.get(0));
             field.setValue(objects);
-            sqlAppender.addSpc(field.getField(), "not between")
+            sqlAppender.add(tableName, ".", field.getField()," ").addSpc("not between")
                     .add(" #{", paramKey, "[0]}")
                     .add(" and ", "#{", paramKey, "[1]}");
             return sqlAppender.toString();
         });
 
-        mapperMap.put(TermType.gt, (paramKey, field, jdbcType) -> {
+        mapperMap.put(TermType.gt, (paramKey, tableName, field, jdbcType) -> {
             SqlAppender sqlAppender = new SqlAppender();
             if (Arrays.<JDBCType>asList(JDBCType.DATE, JDBCType.TIME, JDBCType.TIMESTAMP).contains(jdbcType)) {
                 if (!(field.getValue() instanceof Date)) {
@@ -87,11 +87,11 @@ public class DefaultSqlParamBuilder {
                     if (date != null) field.setValue(date);
                 }
             }
-            sqlAppender.add(field.getField(), " >= #{", paramKey, "}");
+            sqlAppender.add(tableName, ".", field.getField(), " >= #{", paramKey, "}");
             return sqlAppender.toString();
         });
 
-        mapperMap.put(TermType.lt, (paramKey, field, jdbcType) -> {
+        mapperMap.put(TermType.lt, (paramKey, tableName, field, jdbcType) -> {
             SqlAppender sqlAppender = new SqlAppender();
             if (Arrays.<JDBCType>asList(JDBCType.DATE, JDBCType.TIME, JDBCType.TIMESTAMP).contains(jdbcType)) {
                 if (!(field.getValue() instanceof Date)) {
@@ -100,15 +100,15 @@ public class DefaultSqlParamBuilder {
                     if (date != null) field.setValue(date);
                 }
             }
-            sqlAppender.add(field.getField(), " <= #{", paramKey, "}");
+            sqlAppender.add(tableName, ".",field.getField(), " <= #{", paramKey, "}");
             return sqlAppender.toString();
         });
 
-        mapperMap.put(TermType.in, (paramKey, field, jdbcType) -> {
+        mapperMap.put(TermType.in, (paramKey, tableName, field, jdbcType) -> {
             List<Object> values = param2list(field.getValue());
             field.setValue(values);
             SqlAppender appender = new SqlAppender();
-            appender.addSpc(field.getField(), "in(");
+            appender.add(tableName, ".").addSpc(field.getField(), "in(");
             for (int i = 0; i < values.size(); i++) {
                 appender.add("#{", paramKey, "[", i, "]}", ",");
             }
@@ -117,11 +117,11 @@ public class DefaultSqlParamBuilder {
             return appender.toString();
         });
 
-        mapperMap.put(TermType.notin, (paramKey, field, jdbcType) -> {
+        mapperMap.put(TermType.notin, (paramKey, tableName, field, jdbcType) -> {
             List<Object> values = param2list(field.getValue());
             field.setValue(values);
             SqlAppender appender = new SqlAppender();
-            appender.addSpc(field.getField(), "not in(");
+            appender.add(tableName, ".").addSpc(field.getField(), "not in(");
             for (int i = 0; i < values.size(); i++) {
                 appender.add("#{", paramKey, "[", i, "]}", ",");
             }
@@ -140,15 +140,15 @@ public class DefaultSqlParamBuilder {
         return mapperMap.get(type);
     }
 
-    public String buildWhere(Map<String, Object> fieldConfig, List<Term> terms) {
+    public String buildWhere(Map<String, Object> fieldConfig, String tableName, List<Term> terms) {
         SqlAppender sqlAppender = new SqlAppender();
-        buildWhere(fieldConfig, "", terms, sqlAppender);
+        buildWhere(fieldConfig, "", tableName, terms, sqlAppender);
         if (sqlAppender.size() > 0) sqlAppender.removeFirst();
         return sqlAppender.toString();
     }
 
-    public String buildSelectFields(Map<String, Object> fieldConfig, SqlParam param) {
-        if(param==null)return "*";
+    public String buildSelectFields(Map<String, Object> fieldConfig, String tableName, SqlParam param) {
+        if (param == null) return "*";
         Set<String> includes = param.getIncludes(),
                 excludes = param.getExcludes();
         boolean includesIsEmpty = includes.isEmpty(),
@@ -160,7 +160,7 @@ public class DefaultSqlParamBuilder {
         propertyMapper.forEach((k, v) -> {
             if (!appender.isEmpty())
                 appender.add(",");
-            appender.add(k, " as ").addEdSpc(getQuoteStart(), k, getQuoteEnd());
+            appender.add(tableName, ".", k, " as ").addEdSpc(getQuoteStart(), k, getQuoteEnd());
         });
         if (appender.isEmpty()) return "*";
         return appender.toString();
@@ -175,7 +175,19 @@ public class DefaultSqlParamBuilder {
                 if (obj != null) {
                     if (!appender.isEmpty())
                         appender.add(",");
-                    appender.add(k, "=", "#{data.", v, "}");
+                    Map<String, Object> config = ((Map) fieldConfig.get(k));
+                    appender.add(k, "=", "#{data.", v);
+                    if (config != null) {
+                        Object jdbcType = config.get("jdbcType"),
+                                javaType = config.get("javaType");
+                        if (jdbcType != null) {
+                            appender.add(",jdbcType=", jdbcType);
+                        }
+                        if (javaType != null) {
+                            appender.add(",javaType=", javaType);
+                        }
+                    }
+                    appender.add("}");
                 }
             } catch (Exception e) {
             }
@@ -226,9 +238,16 @@ public class DefaultSqlParamBuilder {
                 propertyMapper.put(k, fieldName);
                 return;
             }
-            if (includes.contains(fieldName) || includes.contains(k)) {
+            if (excludes.contains(fieldName) || excludes.contains(k)) {
+                return;
+            }
+            if (includesIsEmpty) {
+                propertyMapper.put(k, fieldName);
+            } else if (includes.contains(fieldName) || includes.contains(k)) {
                 propertyMapper.put(k, fieldName);
             }
+
+
         });
         return propertyMapper;
     }
@@ -259,7 +278,7 @@ public class DefaultSqlParamBuilder {
         return name;
     }
 
-    public void buildWhere(Map<String, Object> fieldConfig, String prefix, List<Term> terms, SqlAppender appender) {
+    public void buildWhere(Map<String, Object> fieldConfig, String prefix, String tableName, List<Term> terms, SqlAppender appender) {
         if (terms == null || terms.isEmpty()) return;
         int index = 0;
         String prefixTmp = StringUtils.concat(prefix, StringUtils.isNullOrEmpty(prefix) ? "" : ".");
@@ -284,7 +303,7 @@ public class DefaultSqlParamBuilder {
             if (!term.getTerms().isEmpty()) {
                 //构建嵌套的条件
                 SqlAppender nest = new SqlAppender();
-                buildWhere(fieldConfig, prefix, term.getTerms(), nest);
+                buildWhere(fieldConfig, prefix, tableName, term.getTerms(), nest);
                 //如果嵌套结果为空
                 if (nest.isEmpty()) {
                     appender.removeLast();//删除最后一个（and 或者 or）
@@ -296,12 +315,12 @@ public class DefaultSqlParamBuilder {
                 }
                 appender.add("(");
                 if (!nullTerm)
-                    appender.add(mapperMap.get(term.getTermType()).fieldMapper(prefix + ".value", term, jdbcType));
+                    appender.add(mapperMap.get(term.getTermType()).fieldMapper(prefix + ".value", tableName, term, jdbcType));
                 appender.addAll(nest);
                 appender.add(")");
             } else {
                 if (!nullTerm)
-                    appender.add(mapperMap.get(term.getTermType()).fieldMapper("" + prefix + ".value", term, jdbcType));
+                    appender.add(mapperMap.get(term.getTermType()).fieldMapper("" + prefix + ".value", tableName, term, jdbcType));
             }
         }
     }
@@ -350,12 +369,7 @@ public class DefaultSqlParamBuilder {
         return new ArrayList<>();
     }
 
-    public void test(Object data){
-
-        System.out.println(data);
-    }
-
     public interface KeyWordMapper {
-        String fieldMapper(String paramKey, Term term, JDBCType jdbcType);
+        String fieldMapper(String paramKey, String tableName, Term term, JDBCType jdbcType);
     }
 }

hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/handler/JsonArrayHandler.java

@@ -1,8 +1,10 @@
 package org.hsweb.web.mybatis.handler;
 
 import com.alibaba.fastjson.JSON;
+import org.apache.ibatis.type.Alias;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedTypes;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -14,6 +16,8 @@ import java.util.List;
 /**
  * Created by zhouhao on 16-5-14.
  */
+@Alias("jsonArrayHandler")
+@MappedTypes({List.class})
 public class JsonArrayHandler extends BaseTypeHandler<List<Object>> {
 
     @Override

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml

@@ -3,95 +3,32 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="BasicMapper">
-    <sql id="buildWhereV2">
-        ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildWhere($fieldsInfo,#this['_parameter'].terms)}
-    </sql>
-    <sql id="buildSelectFieldV2">
-        ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildSelectFields($fieldsInfo,#this['_parameter'])}
-    </sql>
     <!--通用查询条件-->
     <sql id="buildWhere">
-        <include refid="BasicMapper.buildWhereV2"/>
+        ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildWhere($fieldsInfo,$tableName,#this['_parameter'].terms)}
     </sql>
     <!--生成查询字段-->
     <sql id="buildSelectField">
-        <include refid="BasicMapper.buildSelectFieldV2"/>
+        ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildSelectFields($fieldsInfo,#this['_parameter'])}
     </sql>
 
     <!--生成修改字段-->
     <sql id="buildUpdateField">
-        <set>
-            <choose>
-                <!--指定要修改的字段-->
-                <when test="includes!=null and includes.size()>0">
-                    <foreach item="item" index="index" collection="includes" open="" separator="," close="">
-                        <if test="item in $fields">
-                            ${item}=#{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </when>
-                <!--指定不修改的字段-->
-                <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                    <foreach item="item" index="index" collection="$fields" open=" " separator="," close="">
-                        <if test="!(item in excludes)">
-                            ${item}= #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </when>
-                <!--修改所有-->
-                <otherwise>
-                    <foreach item="item" index="index" collection="$fields" open=" " separator="," close="">
-                        <if test="data[item] != null">
-                            ${item}=#{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </otherwise>
-            </choose>
-        </set>
+       <set>
+           ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildUpdateFields($fieldsInfo,#this['_parameter'])}
+       </set>
     </sql>
 
     <!--生成插入字段-->
     <sql id="buildInsertField">
-        <choose>
-            <when test="includes!=null and includes.size()>0">
-                <foreach item="item" index="index" collection="includes" open="(" separator="," close=")">
-                    <if test="item in $fields">${item}</if>
-                </foreach>
-            </when>
-            <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    <if test="!(item in excludes)">${item}</if>
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">${item}</foreach>
-            </otherwise>
-        </choose>
+        <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">${item}</foreach>
     </sql>
 
     <!--生成插入值-->
     <sql id="buildInsertValues">
-        <choose>
-            <when test="includes!=null and includes.size()>0">
-                <foreach item="item" index="index" collection="includes" open="(" separator="," close=")">
-                    <if test="item in $fields">
-                        #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                    </if>
-                </foreach>
-            </when>
-            <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    <if test="!(item in excludes)">
-                        #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                    </if>
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                </foreach>
-            </otherwise>
-        </choose>
+        <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
+            #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']},javaType=${$fieldsInfo[item]['javaType']}}
+        </foreach>
     </sql>
 
     <!--生成排序字段-->
@@ -105,8 +42,7 @@
         <include refid="BasicMapper.buildSelectField"/>
         from ${$tableName}
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
         </where>
         <include refid="BasicMapper.buildSortField"/>
     </sql>
@@ -124,10 +60,9 @@
         update ${$tableName}
         <include refid="BasicMapper.buildUpdateField"/>
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
             <if test="terms.size()==0">
-                u_id=#{data.uId}
+                u_id=#{data.id}
             </if>
         </where>
     </sql>
@@ -136,8 +71,7 @@
     <sql id="buildTotalSql">
         select count(0) as "total" from ${$tableName}
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
         </where>
     </sql>
 </mapper>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/classified/ClassifiedMapper.xml

@@ -5,11 +5,11 @@
 
 <mapper namespace="org.hsweb.web.dao.classified.ClassifiedMapper">
     <resultMap id="ClassifiedResultMap" type="org.hsweb.web.bean.po.classified.Classified">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
             <result property="name" column="name" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="type" column="type" javaType="java.lang.String" jdbcType="VARCHAR"/>
-            <result property="pId" column="p_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
+            <result property="parentId" column="parent_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="icon" column="icon" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="config" column="config" javaType="java.lang.String" jdbcType="CLOB"/>
             <result property="sortIndex" column="sort_index" javaType="int" jdbcType="INTEGER"/>
@@ -19,11 +19,11 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'uId':#{'column':'uId','jdbcType':'VARCHAR','javaType':'String'}
+                    'id':#{'column':'id','jdbcType':'VARCHAR','javaType':'String'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'String'}
-                    ,'p_id':#{'property':'pId','jdbcType':'VARCHAR','javaType':'String'}
+                    ,'parent_id':#{'property':'parentId','jdbcType':'VARCHAR','javaType':'String'}
                     ,'icon':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'config':#{'jdbcType':'CLOB','javaType':'String'}
                     ,'sort_index':#{'jdbcType':'INTEGER','javaType':'int'}
@@ -37,7 +37,7 @@
         <bind name="$tableName" value="'s_classified'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="u_id">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="u_id">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/config/ConfigMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.config.ConfigMapper">
     <resultMap id="ConfigResultMap" type="Config">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="content" column="content" javaType="String" jdbcType="VARCHAR"/>
         <result property="createDate" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'content':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
@@ -31,7 +31,7 @@
         <bind name="$tableName" value="'s_config'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.form.FormMapper">
     <resultMap id="FormResultMap" type="Form">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="html" column="html" javaType="String" jdbcType="VARCHAR"/>
         <result property="meta" column="meta" javaType="String" jdbcType="VARCHAR"/>
@@ -23,15 +23,15 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'html':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'meta':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'config':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'version':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'revision':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'release':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'version':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'revision':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'release':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'using':#{'jdbcType':'INTEGER','javaType':'boolean'}
                     ,'create_date':#{'property':'createDate','jdbcType':'VARCHAR','javaType':'date'}
                     ,'update_date':#{'property':'updateDate','jdbcType':'VARCHAR','javaType':'date'}
@@ -45,7 +45,7 @@
         <bind name="$tableName" value="'s_form'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>
@@ -66,7 +66,7 @@
     </select>
 
     <select id="selectUsing" parameterType="string" resultMap="FormResultMap">
-        select * from s_form WHERE `using`=1 and `name`=#{name}
+        select * from s_form WHERE using=1 and name=#{name}
     </select>
 
     <select id="selectLatestList" parameterType="org.hsweb.web.bean.common.QueryParam" resultMap="FormResultMap">

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/history/HistoryMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.history.HistoryMapper">
     <resultMap id="HistoryResultMap" type="History">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR"/>
         <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
         <result property="primaryKeyName" column="primary_key_name" javaType="String" jdbcType="VARCHAR"/>
@@ -20,14 +20,14 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'describe':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'primary_key_name':#{'property':'primaryKeyName','jdbcType':'VARCHAR','javaType':'string'}
                     ,'primary_key_value':#{'property':'primaryKeyValue','jdbcType':'VARCHAR','javaType':'string'}
                     ,'change_before':#{'property':'changeBefore','jdbcType':'VARCHAR','javaType':'string'}
                     ,'change_after':#{'property':'changeAfter','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'boolean'}
+                    ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'create_date':#{'property':'createDate','jdbcType':'VARCHAR','javaType':'date'}
                     }"/>
 
@@ -39,7 +39,7 @@
         <bind name="$tableName" value="'s_history'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMapper.xml

@@ -5,14 +5,14 @@
 
 <mapper namespace="org.hsweb.web.dao.module.ModuleMapper">
     <resultMap id="ModuleResultMap" type="Module">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="uri" column="uri" javaType="String" jdbcType="VARCHAR"/>
         <result property="icon" column="icon" javaType="String" jdbcType="VARCHAR"/>
-        <result property="pId" column="p_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="parent_id" column="p_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="status" column="status" javaType="int" jdbcType="INTEGER"/>
-        <result property="mOption" column="m_option" javaType="String" jdbcType="VARCHAR"/>
+        <result property="optional" column="optional" javaType="String" jdbcType="VARCHAR"/>
         <result property="sortIndex" column="sort_index" javaType="long" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -20,15 +20,15 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'uri':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'icon':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'p_id':#{'property':'pId','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'parent_id':#{'property':'parentId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'m_option':#{'property':'mOption','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'sort_index':#{'property':'sortIndex','jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'optional':#{'property':'optional','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'sort_index':#{'property':'sortIndex','jdbcType':'INTEGER','javaType':'long'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
     </sql>
@@ -37,7 +37,7 @@
         <bind name="$tableName" value="'s_modules'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/module/ModuleMetaMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.hsweb.web.dao.module.ModuleMetaMapper">
+    <resultMap id="ModuleMetaResultMap" type="ModuleMeta">
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <result property="key" column="key" javaType="String" jdbcType="VARCHAR"/>
+        <result property="moduleId" column="module_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="meta" column="meta" javaType="String" jdbcType="CLOB"/>
+        <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
+        <result property="status" column="status" javaType="int" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <!--字段信息绑定-->
+    <sql id="fieldConfig">
+        <bind name="$fieldsInfo"
+              value="#{
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'key':#{'jdbcType':'VARCHAR','javaType':'string'}
+                    ,'module_id':#{'property':'moduleId','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'meta':#{'jdbcType':'CLOB','javaType':'string'}
+                    ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
+                    }"/>
+        <bind name="$fields" value="$fieldsInfo.keySet()"/>
+    </sql>
+    <!--表名-->
+    <sql id="tableName">
+        <bind name="$tableName" value="'s_module_meta'"/>
+    </sql>
+
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.u_id" keyColumn="U_ID">
+        <include refid="fieldConfig"/>
+        <include refid="tableName"/>
+        <include refid="BasicMapper.buildInsertSql"/>
+    </insert>
+
+    <delete id="delete" parameterType="org.hsweb.web.bean.common.DeleteParam">
+        delete from s_module_meta where u_id=#{term.primaryKey}
+    </delete>
+
+    <update id="update" parameterType="org.hsweb.web.bean.common.UpdateParam">
+        <include refid="fieldConfig"/>
+        <include refid="tableName"/>
+        <include refid="BasicMapper.buildUpdateSql"/>
+    </update>
+
+    <select id="selectByPk" parameterType="string" resultMap="ModuleMetaResultMap">
+        select * from s_module_meta WHERE u_id=#{u_id}
+    </select>
+
+    <select id="select" parameterType="org.hsweb.web.bean.common.QueryParam" resultMap="ModuleMetaResultMap">
+        <include refid="fieldConfig"/>
+        <include refid="tableName"/>
+        <include refid="BasicMapper.buildSelectSql"/>
+    </select>
+
+    <select id="total" parameterType="org.hsweb.web.bean.common.QueryParam" resultType="int">
+        <include refid="fieldConfig"/>
+        <include refid="tableName"/>
+        <include refid="BasicMapper.buildTotalSql"/>
+    </select>
+</mapper>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/resource/ResourcesMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.resource.ResourcesMapper">
     <resultMap id="ResourcesResultMap" type="Resources" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR" />
         <result property="path" column="path" javaType="String" jdbcType="VARCHAR" />
         <result property="creatorId" column="creator_id" javaType="String" jdbcType="VARCHAR" />
@@ -19,13 +19,13 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'path':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'md5':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
@@ -35,7 +35,7 @@
         <bind name="$tableName" value="'s_resources'"/>
     </sql>
 
-    <insert id="insert" parameterType="Resources" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="u_id">
+    <insert id="insert" parameterType="Resources" useGeneratedKeys="true" keyProperty="data.id" keyColumn="u_id">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleMapper.xml

@@ -4,7 +4,7 @@
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.hsweb.web.dao.role.RoleMapper">
     <resultMap id="RoleResultMap" type="Role">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR"/>
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
@@ -29,7 +29,7 @@
         <bind name="$tableName" value="'s_role'"/>
     </sql>
 
-    <insert id="insert" parameterType="Role" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="Role" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/RoleModuleMapper.xml

@@ -5,10 +5,10 @@
 
 <mapper namespace="org.hsweb.web.dao.role.RoleModuleMapper">
     <resultMap id="RoleModuleResultMap" type="RoleModule" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="moduleId" column="module_id" javaType="String" jdbcType="VARCHAR" />
         <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR" />
-        <result property="actions" column="o_level" javaType="String" jdbcType="VARCHAR"
+        <result property="actions" column="actions" javaType="String" jdbcType="VARCHAR"
                 typeHandler="org.hsweb.web.mybatis.handler.JsonArrayHandler" />
         <collection property="module" column="module_id" ofType="Module" select="org.hsweb.web.dao.module.ModuleMapper.selectByPk"/>
     </resultMap>
@@ -17,10 +17,10 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'module_id':#{'property':'moduleId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'actions':#{'jdbcType':'VARCHAR','javaType':'list'}
+                    ,'actions':#{'jdbcType':'CLOB','javaType':'java.util.List'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
     </sql>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/role/UserRoleMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.role.UserRoleMapper">
     <resultMap id="UserRoleResultMap" type="UserRole">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR"/>
         <collection property="role" column="role_id" jdbcType="VARCHAR" ofType="Role"
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'user_id':#{'property':'userId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
                     }"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/script/DynamicScriptMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.script.DynamicScriptMapper">
     <resultMap id="DynamicScriptResultMap" type="DynamicScript" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR" />
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR" />
         <result property="content" column="content" javaType="String" jdbcType="VARCHAR" />
@@ -18,7 +18,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'content':#{'jdbcType':'VARCHAR','javaType':'string'}

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/user/UserMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.user.UserMapper">
     <resultMap id="UserResultMap" type="User">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="username" column="username" javaType="String" jdbcType="VARCHAR"/>
         <result property="password" column="password" javaType="String" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
@@ -21,13 +21,13 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'username':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'password':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'email':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'phone':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     ,'update_date':#{'property':'updateDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     }"/>
@@ -38,7 +38,7 @@
         <bind name="$tableName" value="'s_user'"/>
     </sql>
 
-    <insert id="insert" parameterType="User" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="User" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>
@@ -49,7 +49,7 @@
     </delete>
 
     <update id="updatePassword" parameterType="User">
-        update s_user set password=#{password,jdbcType=VARCHAR} where u_id = #{uId}
+        update s_user set password=#{password,jdbcType=VARCHAR} where u_id = #{id}
     </update>
 
     <update id="update" parameterType="org.hsweb.web.bean.common.UpdateParam">

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/basic/BasicMapper.xml

@@ -3,95 +3,32 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="BasicMapper">
-    <sql id="buildWhereV2">
-        ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().buildWhere($fieldsInfo,#this['_parameter'].terms)}
-    </sql>
-    <sql id="buildSelectFieldV2">
-        ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().buildSelectFields($fieldsInfo,#this['_parameter'])}
-    </sql>
     <!--通用查询条件-->
     <sql id="buildWhere">
-        <include refid="BasicMapper.buildWhereV2"/>
+        ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().buildWhere($fieldsInfo,$tableName,#this['_parameter'].terms)}
     </sql>
     <!--生成查询字段-->
     <sql id="buildSelectField">
-        <include refid="BasicMapper.buildSelectFieldV2"/>
+        ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().buildSelectFields($fieldsInfo,$tableName,#this['_parameter'])}
     </sql>
 
     <!--生成修改字段-->
     <sql id="buildUpdateField">
         <set>
-            <choose>
-                <!--指定要修改的字段-->
-                <when test="includes!=null and includes.size()>0">
-                    <foreach item="item" index="index" collection="includes" open="" separator="," close="">
-                        <if test="item in $fields">
-                            ${item}=#{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </when>
-                <!--指定不修改的字段-->
-                <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                    <foreach item="item" index="index" collection="$fields" open=" " separator="," close="">
-                        <if test="!(item in excludes)">
-                            ${item}= #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </when>
-                <!--修改所有-->
-                <otherwise>
-                    <foreach item="item" index="index" collection="$fields" open=" " separator="," close="">
-                        <if test="data[item] != null">
-                            ${item}=#{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                        </if>
-                    </foreach>
-                </otherwise>
-            </choose>
+        ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildUpdateFields($fieldsInfo,#this['_parameter'])}
         </set>
     </sql>
 
     <!--生成插入字段-->
     <sql id="buildInsertField">
-        <choose>
-            <when test="includes!=null and includes.size()>0">
-                <foreach item="item" index="index" collection="includes" open="(" separator="," close=")">
-                    <if test="item in $fields">${item}</if>
-                </foreach>
-            </when>
-            <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    <if test="!(item in excludes)">${item}</if>
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">${item}</foreach>
-            </otherwise>
-        </choose>
+        <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">${item}</foreach>
     </sql>
 
     <!--生成插入值-->
     <sql id="buildInsertValues">
-        <choose>
-            <when test="includes!=null and includes.size()>0">
-                <foreach item="item" index="index" collection="includes" open="(" separator="," close=")">
-                    <if test="item in $fields">
-                        #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                    </if>
-                </foreach>
-            </when>
-            <when test="(includes==null or includes.size()==0) and excludes!=null and excludes.size()>0">
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    <if test="!(item in excludes)">
-                        #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                    </if>
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
-                    #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']}}
-                </foreach>
-            </otherwise>
-        </choose>
+        <foreach item="item" index="index" collection="$fields" open="(" separator="," close=")">
+            #{data.${$fieldsInfo[item].property==null?item:$fieldsInfo[item].property},jdbcType=${$fieldsInfo[item]['jdbcType']},javaType=${$fieldsInfo[item]['javaType']}}
+        </foreach>
     </sql>
 
     <!--生成排序字段-->
@@ -105,8 +42,7 @@
         <include refid="BasicMapper.buildSelectField"/>
         from ${$tableName}
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
         </where>
         <include refid="BasicMapper.buildSortField"/>
     </sql>
@@ -124,10 +60,9 @@
         update ${$tableName}
         <include refid="BasicMapper.buildUpdateField"/>
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
             <if test="terms.size()==0">
-                u_id=#{data.uId}
+                u_id=#{data.id}
             </if>
         </where>
     </sql>
@@ -136,8 +71,7 @@
     <sql id="buildTotalSql">
         select count(0) as "total" from ${$tableName}
         <where>
-            <include refid="BasicMapper.buildWhereV2"/>
-            <!--<include refid="BasicMapper.buildWhere"/>-->
+            <include refid="BasicMapper.buildWhere"/>
         </where>
     </sql>
 </mapper>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/classified/ClassifiedMapper.xml

@@ -5,11 +5,11 @@
 
 <mapper namespace="org.hsweb.web.dao.classified.ClassifiedMapper">
     <resultMap id="ClassifiedResultMap" type="org.hsweb.web.bean.po.classified.Classified">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
             <result property="name" column="name" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="type" column="type" javaType="java.lang.String" jdbcType="VARCHAR"/>
-            <result property="pId" column="p_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
+            <result property="parentId" column="parent_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="icon" column="icon" javaType="java.lang.String" jdbcType="VARCHAR"/>
             <result property="config" column="config" javaType="java.lang.String" jdbcType="CLOB"/>
             <result property="sortIndex" column="sort_index" javaType="int" jdbcType="INTEGER"/>
@@ -19,11 +19,11 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'uId':#{'column':'uId','jdbcType':'VARCHAR','javaType':'String'}
+                    'id':#{'column':'id','jdbcType':'VARCHAR','javaType':'String'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'String'}
-                    ,'p_id':#{'property':'pId','jdbcType':'VARCHAR','javaType':'String'}
+                    ,'parent_id':#{'property':'parentId','jdbcType':'VARCHAR','javaType':'String'}
                     ,'icon':#{'jdbcType':'VARCHAR','javaType':'String'}
                     ,'config':#{'jdbcType':'CLOB','javaType':'String'}
                     ,'sort_index':#{'jdbcType':'INTEGER','javaType':'int'}
@@ -37,7 +37,7 @@
         <bind name="$tableName" value="'s_classified'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="u_id">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="u_id">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/config/ConfigMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.config.ConfigMapper">
     <resultMap id="ConfigResultMap" type="Config">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="content" column="content" javaType="String" jdbcType="VARCHAR"/>
         <result property="createDate" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'content':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
@@ -31,7 +31,7 @@
         <bind name="$tableName" value="'s_config'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.form.FormMapper">
     <resultMap id="FormResultMap" type="Form">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="html" column="html" javaType="String" jdbcType="VARCHAR"/>
         <result property="meta" column="meta" javaType="String" jdbcType="VARCHAR"/>
@@ -23,15 +23,15 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'html':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'meta':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'config':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'version':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'revision':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'release':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'version':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'revision':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'release':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'using':#{'jdbcType':'INTEGER','javaType':'boolean'}
                     ,'create_date':#{'property':'createDate','jdbcType':'VARCHAR','javaType':'date'}
                     ,'update_date':#{'property':'updateDate','jdbcType':'VARCHAR','javaType':'date'}
@@ -45,7 +45,7 @@
         <bind name="$tableName" value="'s_form'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/history/HistoryMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.history.HistoryMapper">
     <resultMap id="HistoryResultMap" type="History">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR"/>
         <result property="describe" column="describe" javaType="String" jdbcType="VARCHAR"/>
         <result property="primaryKeyName" column="primary_key_name" javaType="String" jdbcType="VARCHAR"/>
@@ -20,14 +20,14 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'describe':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'primary_key_name':#{'property':'primaryKeyName','jdbcType':'VARCHAR','javaType':'string'}
                     ,'primary_key_value':#{'property':'primaryKeyValue','jdbcType':'VARCHAR','javaType':'string'}
                     ,'change_before':#{'property':'changeBefore','jdbcType':'VARCHAR','javaType':'string'}
                     ,'change_after':#{'property':'changeAfter','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'boolean'}
+                    ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'create_date':#{'property':'createDate','jdbcType':'VARCHAR','javaType':'date'}
                     }"/>
 
@@ -39,7 +39,7 @@
         <bind name="$tableName" value="'s_history'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>
@@ -62,7 +62,6 @@
     <select id="select" parameterType="org.hsweb.web.bean.common.QueryParam" resultMap="HistoryResultMap">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
-        ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().test(#this)}
         <include refid="BasicMapper.buildSelectSql"/>
     </select>
 

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMapper.xml

@@ -5,14 +5,14 @@
 
 <mapper namespace="org.hsweb.web.dao.module.ModuleMapper">
     <resultMap id="ModuleResultMap" type="Module">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="uri" column="uri" javaType="String" jdbcType="VARCHAR"/>
         <result property="icon" column="icon" javaType="String" jdbcType="VARCHAR"/>
-        <result property="pId" column="p_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="parent_id" column="p_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="status" column="status" javaType="int" jdbcType="INTEGER"/>
-        <result property="mOption" column="m_option" javaType="String" jdbcType="VARCHAR"/>
+        <result property="optional" column="optional" javaType="String" jdbcType="VARCHAR"/>
         <result property="sortIndex" column="sort_index" javaType="long" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -20,15 +20,15 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'uri':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'icon':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'p_id':#{'property':'pId','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'parent_id':#{'property':'parentId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
-                    ,'m_option':#{'property':'mOption','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'sort_index':#{'property':'sortIndex','jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
+                    ,'optional':#{'property':'optional','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'sort_index':#{'property':'sortIndex','jdbcType':'INTEGER','javaType':'long'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
     </sql>
@@ -37,7 +37,7 @@
         <bind name="$tableName" value="'s_modules'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="org.hsweb.web.bean.common.InsertParam" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/module/ModuleMetaMapper.xml

@@ -5,10 +5,10 @@
 
 <mapper namespace="org.hsweb.web.dao.module.ModuleMetaMapper">
     <resultMap id="ModuleMetaResultMap" type="ModuleMeta">
-        <id property="u_id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="key" column="key" javaType="String" jdbcType="VARCHAR"/>
-        <result property="module_id" column="module_id" javaType="String" jdbcType="VARCHAR"/>
-        <result property="role_id" column="role_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="moduleId" column="module_id" javaType="String" jdbcType="VARCHAR"/>
+        <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="meta" column="meta" javaType="String" jdbcType="CLOB"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="status" column="status" javaType="int" jdbcType="INTEGER"/>
@@ -18,13 +18,13 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'key':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'module_id':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'role_id':#{'jdbcType':'VARCHAR','javaType':'string'}
+                    ,'module_id':#{'property':'moduleId','jdbcType':'VARCHAR','javaType':'string'}
+                    ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'meta':#{'jdbcType':'CLOB','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
     </sql>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/resource/ResourcesMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.resource.ResourcesMapper">
     <resultMap id="ResourcesResultMap" type="Resources" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR" />
         <result property="path" column="path" javaType="String" jdbcType="VARCHAR" />
         <result property="creatorId" column="creator_id" javaType="String" jdbcType="VARCHAR" />
@@ -19,13 +19,13 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'path':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'creator_id':#{'property':'creatorId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'md5':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
@@ -35,7 +35,7 @@
         <bind name="$tableName" value="'s_resources'"/>
     </sql>
 
-    <insert id="insert" parameterType="Resources" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="u_id">
+    <insert id="insert" parameterType="Resources" useGeneratedKeys="true" keyProperty="data.id" keyColumn="u_id">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleMapper.xml

@@ -4,7 +4,7 @@
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.hsweb.web.dao.role.RoleMapper">
     <resultMap id="RoleResultMap" type="Role">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR"/>
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
@@ -29,7 +29,7 @@
         <bind name="$tableName" value="'s_role'"/>
     </sql>
 
-    <insert id="insert" parameterType="Role" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="Role" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/RoleModuleMapper.xml

@@ -5,10 +5,10 @@
 
 <mapper namespace="org.hsweb.web.dao.role.RoleModuleMapper">
     <resultMap id="RoleModuleResultMap" type="RoleModule" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="moduleId" column="module_id" javaType="String" jdbcType="VARCHAR" />
         <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR" />
-        <result property="actions" column="o_level" javaType="String" jdbcType="VARCHAR"
+        <result property="actions" column="actions" javaType="String" jdbcType="VARCHAR"
                 typeHandler="org.hsweb.web.mybatis.handler.JsonArrayHandler" />
         <collection property="module" column="module_id" ofType="Module" select="org.hsweb.web.dao.module.ModuleMapper.selectByPk"/>
     </resultMap>
@@ -17,10 +17,10 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'module_id':#{'property':'moduleId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
-                    ,'actions':#{'jdbcType':'VARCHAR','javaType':'list'}
+                    ,'actions':#{'jdbcType':'CLOB','javaType':'java.util.List'}
                     }"/>
         <bind name="$fields" value="$fieldsInfo.keySet()"/>
     </sql>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/role/UserRoleMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.role.UserRoleMapper">
     <resultMap id="UserRoleResultMap" type="UserRole">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="roleId" column="role_id" javaType="String" jdbcType="VARCHAR"/>
         <collection property="role" column="role_id" jdbcType="VARCHAR" ofType="Role"
@@ -16,7 +16,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'user_id':#{'property':'userId','jdbcType':'VARCHAR','javaType':'string'}
                     ,'role_id':#{'property':'roleId','jdbcType':'VARCHAR','javaType':'string'}
                     }"/>

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/script/DynamicScriptMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.script.DynamicScriptMapper">
     <resultMap id="DynamicScriptResultMap" type="DynamicScript" >
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR" />
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR" />
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR" />
         <result property="type" column="type" javaType="String" jdbcType="VARCHAR" />
         <result property="content" column="content" javaType="String" jdbcType="VARCHAR" />
@@ -18,7 +18,7 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'type':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'content':#{'jdbcType':'VARCHAR','javaType':'string'}

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/user/UserMapper.xml

@@ -5,7 +5,7 @@
 
 <mapper namespace="org.hsweb.web.dao.user.UserMapper">
     <resultMap id="UserResultMap" type="User">
-        <id property="uId" column="u_id" javaType="string" jdbcType="VARCHAR"/>
+        <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="username" column="username" javaType="String" jdbcType="VARCHAR"/>
         <result property="password" column="password" javaType="String" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
@@ -21,13 +21,13 @@
     <sql id="fieldConfig">
         <bind name="$fieldsInfo"
               value="#{
-                    'u_id':#{'property':'uId','jdbcType':'VARCHAR','javaType':'string'}
+                    'u_id':#{'property':'id','jdbcType':'VARCHAR','javaType':'string'}
                     ,'username':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'password':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'name':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'email':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'phone':#{'jdbcType':'VARCHAR','javaType':'string'}
-                    ,'status':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'status':#{'jdbcType':'INTEGER','javaType':'int'}
                     ,'create_date':#{'property':'createDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     ,'update_date':#{'property':'updateDate','jdbcType':'TIMESTAMP','javaType':'date'}
                     }"/>
@@ -38,7 +38,7 @@
         <bind name="$tableName" value="'s_user'"/>
     </sql>
 
-    <insert id="insert" parameterType="User" useGeneratedKeys="true" keyProperty="data.uId" keyColumn="U_ID">
+    <insert id="insert" parameterType="User" useGeneratedKeys="true" keyProperty="data.id" keyColumn="U_ID">
         <include refid="fieldConfig"/>
         <include refid="tableName"/>
         <include refid="BasicMapper.buildInsertSql"/>
@@ -49,7 +49,7 @@
     </delete>
 
     <update id="updatePassword" parameterType="User">
-        update s_user set password=#{password,jdbcType=VARCHAR} where u_id = #{uId}
+        update s_user set password=#{password,jdbcType=VARCHAR} where u_id = #{id}
     </update>
 
     <update id="update" parameterType="org.hsweb.web.bean.common.UpdateParam">

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

@@ -46,9 +46,9 @@ public abstract class AbstractServiceImpl<Po, PK> implements GenericService<Po,
     public PK insert(Po data) throws Exception {
         PK primaryKey = null;
         if (data instanceof GenericPo) {
-            if (((GenericPo) data).getUId() == null)
-                ((GenericPo) data).setUId(RandomUtil.randomChar());
-            primaryKey = (PK) ((GenericPo) data).getUId();
+            if (((GenericPo) data).getId() == null)
+                ((GenericPo) data).setId(RandomUtil.randomChar());
+            primaryKey = (PK) ((GenericPo) data).getId();
         }
         tryValidPo(data);
         getMapper().insert(new InsertParam<>(data));

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

@@ -169,7 +169,7 @@ public class ConfigServiceImpl extends AbstractServiceImpl<Config, String> imple
 
     @Override
     public String insert(Config data) throws Exception {
-        Config old = this.selectByPk(data.getUId());
+        Config old = this.selectByPk(data.getId());
         Assert.isNull(old, "配置已存在，请勿重复添加!");
         return super.insert(data);
     }

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

@@ -27,7 +27,7 @@ public class DefaultFormParser implements FormParser {
         String meta = form.getMeta();
         TableMetaData metaData = new TableMetaData();
         metaData.setName(form.getName());
-        metaData.setLocation(form.getUId());
+        metaData.setLocation(form.getId());
         metaData.setComment(form.getRemark());
         JSONObject object = JSON.parseObject(meta);
         object.forEach((id, field) -> {

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

@@ -1,6 +1,8 @@
 package org.hsweb.web.service.impl.form;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.hsweb.concurrent.lock.annotation.LockName;
 import org.hsweb.concurrent.lock.annotation.ReadLock;
 import org.hsweb.concurrent.lock.annotation.WriteLock;
@@ -60,12 +62,12 @@ public class DynamicFormServiceImpl implements DynamicFormService {
             default:
                 dataType = "varchar(32)";
         }
-        FieldMetaData UID = new FieldMetaData("u_id", String.class, dataType);
-        UID.setPrimaryKey(true);
-        UID.setNotNull(true);
-        UID.setComment("主键");
+        FieldMetaData id = new FieldMetaData("u_id", String.class, dataType);
+        id.setPrimaryKey(true);
+        id.setNotNull(true);
+        id.setComment("主键");
         metaData.attr("primaryKey", "u_id");
-        metaData.addField(UID);
+        metaData.addField(id);
 
     }
 

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

@@ -62,7 +62,7 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
     public String createNewVersion(String oldVersionId) throws Exception {
         Form old = this.selectByPk(oldVersionId);
         Assert.notNull(old, "表单不存在!");
-        old.setUId(RandomUtil.randomChar());
+        old.setId(RandomUtil.randomChar());
         old.setVersion(old.getVersion() + 1);
         old.setCreateDate(new Date());
         old.setUpdateDate(null);
@@ -70,7 +70,7 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
         old.setRelease(0);
         old.setUsing(false);
         getMapper().insert(new InsertParam<>(old));
-        return old.getUId();
+        return old.getId();
     }
 
     @Override
@@ -79,16 +79,16 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
         Assert.isTrue(old.isEmpty(), "表单 [" + data.getName() + "] 已存在!");
         data.setCreateDate(new Date());
         data.setVersion(1);
-        if (StringUtils.isNullOrEmpty(data.getUId()))
-            data.setUId(RandomUtil.randomChar());
+        if (StringUtils.isNullOrEmpty(data.getId()))
+            data.setId(RandomUtil.randomChar());
         super.insert(data);
-        return data.getUId();
+        return data.getId();
     }
 
     @Override
-    @CacheEvict(value = {CACHE_KEY}, key = "'form.'+#data.uId")
+    @CacheEvict(value = {CACHE_KEY}, key = "'form.'+#data.id")
     public int update(Form data) throws Exception {
-        Form old = this.selectByPk(data.getUId());
+        Form old = this.selectByPk(data.getId());
         Assert.notNull(old, "表单不存在!");
         data.setUpdateDate(new Date());
         data.setRevision(old.getRevision() + 1);
@@ -147,17 +147,17 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
         //先卸载正在使用的表单
         Form using = getMapper().selectUsing(old.getName());
         if (using != null) {
-            this.unDeploy(using.getUId());
+            this.unDeploy(using.getId());
         }
         //开始发布
         old.setUsing(true);
         dynamicFormService.deploy(old);
         old.setRelease(old.getRevision());//发布修订版本
-        getMapper().update(new UpdateParam<>(old).includes("using", "release").where("uId", old.getUId()));
+        getMapper().update(new UpdateParam<>(old).includes("using", "release").where("id", old.getId()));
         //加入发布历史记录
         History history = History.newInstance("form.deploy." + old.getName());
-        history.setPrimaryKeyName("uId");
-        history.setPrimaryKeyValue(old.getUId());
+        history.setPrimaryKeyName("id");
+        history.setPrimaryKeyValue(old.getId());
         history.setChangeBefore("{}");
         history.setChangeAfter(JSON.toJSONString(old));
         historyService.insert(history);
@@ -171,7 +171,7 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
         dynamicFormService.unDeploy(old);
         old.setUsing(false);
         UpdateParam param = new UpdateParam<>(old);
-        param.includes("using").where("uId", old.getUId());
+        param.includes("using").where("id", old.getId());
         getMapper().update(param);
     }
 

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/module/ModuleServiceImpl.java

@@ -27,27 +27,6 @@ public class ModuleServiceImpl extends AbstractServiceImpl<Module, String> imple
         return this.moduleMapper;
     }
 
-    @Override
-    public int update(List<Module> datas) throws Exception {
-        int size = 0;
-        for (Module module : datas) {
-            tryValidPo(module);
-            boolean doUpdate = (this.selectByPk(module.getOldId()) != null);
-            if (!module.getUId().equals(module.getOldId())) {
-                if (doUpdate && this.selectByPk(module.getUId()) != null) {
-                    throw new BusinessException(String.format("标识:%s已存在", module.getUId()));
-                }
-            }
-            if (doUpdate) {
-                size += this.update(module);
-            } else {
-                this.insert(module);
-                size++;
-            }
-        }
-        return size;
-    }
-
     @Override
     public List<Module> selectByPid(String pid) throws Exception {
         return this.select(new QueryParam().where("p_id", pid));

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

@@ -101,7 +101,7 @@ public class FileServiceImpl implements FileService {
         try {
             User user = WebUtil.getLoginUser();
             if (user != null) {
-                resources.setCreatorId(user.getUId());
+                resources.setCreatorId(user.getId());
             } else {
                 resources.setCreatorId("1");
             }

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

@@ -55,17 +55,17 @@ public class ResourcesServiceImpl extends AbstractServiceImpl<Resources, String>
     @Override
     @Transactional(rollbackFor = Throwable.class)
     public String insert(Resources data) throws Exception {
-        data.setUId(this.newUid(6));//6位随机id
+        data.setId(this.newid(6));//6位随机id
         return super.insert(data);
     }
 
-    public String newUid(int len) throws Exception {
-        String uid = RandomUtil.randomChar(len);
+    public String newid(int len) throws Exception {
+        String id = RandomUtil.randomChar(len);
         for (int i = 0; i < 10; i++) {
-            if (this.selectByPk(uid) == null) {
-                return uid;
+            if (this.selectByPk(id) == null) {
+                return id;
             }
         }  //如果10次存在重复则位数+1
-        return newUid(len + 1);
+        return newid(len + 1);
     }
 }

hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/role/RoleServiceImpl.java

@@ -43,8 +43,8 @@ public class RoleServiceImpl extends AbstractServiceImpl<Role, String> implement
         if (roleModule != null && roleModule.size() > 0) {
             //保存角色模块关联
             for (RoleModule module : roleModule) {
-                module.setUId(RandomUtil.randomChar(6));
-                module.setRoleId(data.getUId());
+                module.setId(RandomUtil.randomChar(6));
+                module.setRoleId(data.getId());
                 roleModuleMapper.insert(new InsertParam<>(module));
             }
         }
@@ -57,11 +57,11 @@ public class RoleServiceImpl extends AbstractServiceImpl<Role, String> implement
         List<RoleModule> roleModule = data.getModules();
         if (roleModule != null && roleModule.size() > 0) {
             //先删除所有roleModule
-            roleModuleMapper.deleteByRoleId(data.getUId());
+            roleModuleMapper.deleteByRoleId(data.getId());
             //保存角色模块关联
             for (RoleModule module : roleModule) {
-                module.setUId(RandomUtil.randomChar(6));
-                module.setRoleId(data.getUId());
+                module.setId(RandomUtil.randomChar(6));
+                module.setRoleId(data.getId());
                 roleModuleMapper.insert(new InsertParam<>(module));
             }
         }

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

@@ -39,7 +39,7 @@ public class DynamicScriptServiceImpl extends AbstractServiceImpl<DynamicScript,
     }
 
     @Override
-    @CacheEvict(value = CACHE_KEY, key = "'script.'+#data.uId")
+    @CacheEvict(value = CACHE_KEY, key = "'script.'+#data.id")
     public int update(DynamicScript data) throws Exception {
         int i = super.update(data);
         return i;
@@ -64,7 +64,7 @@ public class DynamicScriptServiceImpl extends AbstractServiceImpl<DynamicScript,
         DynamicScriptEngine engine = DynamicScriptEngineFactory.getEngine(script.getType());
         try {
             if(engine==null)throw new BusinessException("不支持的脚本语言:"+script.getType());
-            engine.compile(script.getUId(), script.getContent());
+            engine.compile(script.getId(), script.getContent());
         } catch (Exception e) {
             logger.error("compile error!", e);
         }
@@ -75,7 +75,7 @@ public class DynamicScriptServiceImpl extends AbstractServiceImpl<DynamicScript,
         for (DynamicScript script : list) {
             DynamicScriptEngine engine = DynamicScriptEngineFactory.getEngine(script.getType());
             if(engine==null)throw new BusinessException("不支持的脚本语言:"+script.getType());
-            engine.compile(script.getUId(), script.getContent());
+            engine.compile(script.getId(), script.getContent());
         }
     }
 

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

@@ -51,18 +51,18 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
     public String insert(User data) throws Exception {
         tryValidPo(data);
         Assert.isNull(selectByUserName(data.getUsername()), "用户已存在!");
-        data.setUId(RandomUtil.randomChar(6));
+        data.setId(RandomUtil.randomChar(6));
         data.setCreateDate(new Date());
         data.setUpdateDate(new Date());
         data.setPassword(MD5.encode(data.getPassword()));
         data.setStatus(1);
         userMapper.insert(new InsertParam<>(data));
-        String id = data.getUId();
+        String id = data.getId();
         //添加角色关联
         if (data.getUserRoles().size() != 0) {
             for (UserRole userRole : data.getUserRoles()) {
-                userRole.setUId(RandomUtil.randomChar());
-                userRole.setUserId(data.getUId());
+                userRole.setId(RandomUtil.randomChar());
+                userRole.setUserId(data.getId());
                 userRoleMapper.insert(new InsertParam<>(userRole));
             }
         }
@@ -73,7 +73,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
     public int update(User data) throws Exception {
         tryValidPo(data);
         User old = this.selectByUserName(data.getUsername());
-        if (old != null && !old.getUId().equals(data.getUId())) {
+        if (old != null && !old.getId().equals(data.getId())) {
             throw new BusinessException("用户名已存在!");
         }
         data.setUpdateDate(new Date());
@@ -84,10 +84,10 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
         int i = userMapper.update(new UpdateParam<>(data).excludes("status","password","createDate"));
         if (data.getUserRoles().size() != 0) {
             //删除所有
-            userRoleMapper.deleteByUserId(data.getUId());
+            userRoleMapper.deleteByUserId(data.getId());
             for (UserRole userRole : data.getUserRoles()) {
-                userRole.setUId(RandomUtil.randomChar());
-                userRole.setUserId(data.getUId());
+                userRole.setId(RandomUtil.randomChar());
+                userRole.setUserId(data.getId());
                 userRoleMapper.insert(new InsertParam<>(userRole));
             }
         }
@@ -97,18 +97,18 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
     @Override
     public void initAdminUser(User user) throws Exception {
         QueryParam queryParam = new QueryParam();
-        queryParam.orderBy("sort_index");
+        queryParam.orderBy("sortIndex");
         List<Module> modules = moduleService.select(queryParam);
         Map<Module, Set<String>> roleInfo = new LinkedHashMap<>();
         for (Module module : modules) {
-            roleInfo.put(module, new LinkedHashSet<>(module.getMOptionMap().keySet()));
+            roleInfo.put(module, new LinkedHashSet<>(module.getOptionalMap().keySet()));
         }
         user.setRoleInfo(roleInfo);
     }
 
     @Override
     public void initGuestUser(User user) throws Exception {
-        List<UserRole> userRoles = userRoleMapper.select(new QueryParam().where("role_id", "guest"));
+        List<UserRole> userRoles = userRoleMapper.select(new QueryParam().where("roleId", "guest"));
         user.setUserRoles(userRoles);
         user.initRoleInfo();
     }
@@ -118,7 +118,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
         User user = selectByPk(id);
         if (user == null) throw new NotFoundException("用户不存在!");
         user.setStatus(1);
-        getMapper().update(new UpdateParam<>(user).includes("status").where("uId", id));
+        getMapper().update(new UpdateParam<>(user).includes("status").where("id", id));
     }
 
     @Override
@@ -126,7 +126,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
         User user = selectByPk(id);
         if (user == null) throw new NotFoundException("用户不存在!");
         user.setStatus(-1);
-        getMapper().update(new UpdateParam<>(user).includes("status").where("uId", id));
+        getMapper().update(new UpdateParam<>(user).includes("status").where("id", id));
     }
 
     @Override

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

@@ -90,13 +90,13 @@ public class FormServiceImplTest extends AbstractTestCase {
         form.setCreateDate(new Date());
         form.setHtml("<input fieldId='id1'/><input fieldId='id2'/>");
         form.setMeta(meta[0]);
-        form.setUId(RandomUtil.randomChar());
+        form.setId(RandomUtil.randomChar());
         formService.insert(form);
     }
 
     @Test
     public void testDeploy() throws Exception {
-        formService.deploy(form.getUId());
+        formService.deploy(form.getId());
         dataBase.getTable("test_form").createInsert()
                 .insert(new InsertParam().value("u_id", "test").value("name", "张三"));
         dataBase.getTable("test_form").createUpdate().update(new UpdateParam().set("u_id", "test2").where("u_id", "test"));
@@ -107,12 +107,14 @@ public class FormServiceImplTest extends AbstractTestCase {
         Assert.assertEquals("张三", data.get("name"));
         Assert.assertEquals("test2", data.get("u_id"));
         formService.createDeployHtml(form.getName());
-        formService.deploy(form.getUId());
+        formService.deploy(form.getId());
         formService.createDeployHtml(form.getName());
 
         form.setMeta(meta[1]);
         formService.update(form);
-        formService.deploy(form.getUId());
+        formService.deploy(form.getId());
+
+        formService.selectLatestList(new org.hsweb.web.bean.common.QueryParam());
     }
 
 

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

@@ -1,25 +1,28 @@
 package org.hsweb.web.service.impl.system;
 
+import com.alibaba.fastjson.JSON;
 import org.hsweb.web.bean.common.InsertParam;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.common.Term;
 import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.bean.po.module.Module;
+import org.hsweb.web.bean.po.role.RoleModule;
 import org.hsweb.web.bean.po.user.User;
+import org.hsweb.web.dao.role.RoleMapper;
+import org.hsweb.web.dao.role.RoleModuleMapper;
 import org.hsweb.web.dao.user.UserMapper;
 import org.hsweb.web.service.impl.AbstractTestCase;
 import org.hsweb.web.service.module.ModuleMetaService;
 import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.service.system.DataBaseManagerService;
 import org.junit.Test;
+import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import org.webbuilder.sql.support.common.CommonSql;
 import org.webbuilder.sql.support.executor.HashMapWrapper;
 import org.webbuilder.sql.support.executor.SqlExecutor;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by zhouhao on 16-4-21.
@@ -37,6 +40,9 @@ public class DataBaseManagerServiceImplTest extends AbstractTestCase {
     @Resource
     private UserMapper userMapper;
 
+    @Resource
+    private RoleModuleMapper roleModuleMapper;
+
     @Test
     public void test() throws Exception {
         QueryParam queryParam = new QueryParam();
@@ -52,15 +58,20 @@ public class DataBaseManagerServiceImplTest extends AbstractTestCase {
         queryParam.orderBy("status").asc();
         userMapper.select(queryParam);
         User user = userMapper.selectByPk("admin");
-        user.setUId("aaaa");
+        user.setId("aaaa");
         userMapper.insert(new InsertParam<>(user));
         userMapper.update(new UpdateParam<>(user).includes("username"));
     }
 
     @Test
     public void testGetFieldList() throws Exception {
-        moduleMetaService.selectByKeyAndRoleId("test", "userRole");
-
+        RoleModule roleModule = new RoleModule();
+        roleModule.setId("aaa");
+        roleModule.setActions(Arrays.asList("A","B"));
+        roleModule.setModuleId("aaa");
+        roleModuleMapper.insert(new InsertParam<>(roleModule));
+        roleModuleMapper.update(new UpdateParam<>(roleModule).includes("actions"));
+        System.out.println(JSON.toJSONString(roleModuleMapper.select(new QueryParam())));;
     }
 
     @Test

hsweb-web-service-impl-common/src/test/resources/application.yml

@@ -30,3 +30,4 @@ mybatis:
     type-aliases-package: org.hsweb.web.bean.po
     mapper-locations: classpath*:org/hsweb/web/dao/impl/mybatis/mapper/oracle/**/*.xml
     config: classpath:mybatis-config.xml
+    typeHandlersPackage: org.hsweb.web.mybatis.handler

hsweb-web-service-impl-common/src/test/resources/mybatis-config.xml

@@ -50,5 +50,4 @@
         <setting name="aggressiveLazyLoading" value="false"/>
         <setting name="proxyFactory" value="CGLIB"/>
     </settings>
-
 </configuration>