修改依赖包名和类名

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

@@ -0,0 +1,15 @@
+package org.hsweb.web.service.impl;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created by zhouhao on 16-5-6.
+ */
+@Configuration
+@ComponentScan(
+        basePackages = {"org.hsweb.web.service.impl"}
+)
+public class ServiceAutoConfiguration {
+    
+}

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

@@ -23,7 +23,7 @@ import java.util.Map;
 /**
  * Created by zhouhao on 16-4-20.
  */
-public class CommonFormParser implements FormParser {
+public class DefaultFormParser implements FormParser {
 
     @Override
     public TableMetaData parse(Form form) {
@@ -61,18 +61,15 @@ public class CommonFormParser implements FormParser {
                     }
                     fieldMeta.attr(key, value);
                 }
-                validField(fieldMeta);
             });
-            metaData.addField(fieldMeta);
+            //name为空的时候 不保持此字段
+            if (!StringUtils.isNullOrEmpty(fieldMeta.getName())) {
+                metaData.addField(fieldMeta);
+            }
         });
         return metaData;
     }
 
-    public void validField(FieldMetaData field) {
-        Assert.notNull(field.getName(), "字段名称不能为空!");
-        Assert.notNull(field.getJavaType(), "java类型未找到!");
-    }
-
     protected static Map<String, Class> typeMapper = new HashMap() {{
         put("", String.class);
         put("null", String.class);

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

@@ -2,9 +2,8 @@ package org.hsweb.web.service.impl.form;
 
 import com.alibaba.fastjson.JSON;
 import org.hsweb.concurrent.lock.LockFactory;
-import org.hsweb.web.Install;
+import org.hsweb.web.core.Install;
 import org.hsweb.web.bean.common.*;
-import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.GenericPo;
 import org.hsweb.web.bean.po.form.Form;
 import org.hsweb.web.bean.po.history.History;
@@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.webbuilder.sql.*;
-import org.webbuilder.sql.param.query.*;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -24,7 +22,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * Created by zhouhao on 16-4-14.
@@ -38,7 +35,7 @@ public class DynamicFormServiceImpl implements DynamicFormService {
     protected Lock writeLock, readLock;
 
     @Autowired(required = false)
-    protected FormParser formParser = new CommonFormParser();
+    protected FormParser formParser = new DefaultFormParser();
 
     @Autowired
     protected DataBase dataBase;

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

@@ -1,7 +1,7 @@
 package org.hsweb.web.service.impl.form;
 
 import com.alibaba.fastjson.JSON;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.bean.po.form.Form;
@@ -11,7 +11,7 @@ import org.hsweb.web.service.form.DynamicFormService;
 import org.hsweb.web.service.form.FormService;
 import org.hsweb.web.service.history.HistoryService;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
-import org.hsweb.web.utils.RandomUtil;
+import org.hsweb.web.core.utils.RandomUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -35,7 +35,7 @@ public class FormServiceImpl extends AbstractServiceImpl<Form, String> implement
     private static final String CACHE_KEY = "form";
 
     @Autowired(required = false)
-    protected FormParser formParser = new CommonFormParser();
+    protected FormParser formParser = new DefaultFormParser();
 
     @Resource
     private FormMapper formMapper;

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

@@ -3,7 +3,7 @@ package org.hsweb.web.service.impl.module;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.module.Module;
 import org.hsweb.web.dao.module.ModuleMapper;
-import org.hsweb.web.exception.BusinessException;
+import org.hsweb.web.core.exception.BusinessException;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
 import org.hsweb.web.service.module.ModuleService;
 import org.springframework.stereotype.Service;

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

@@ -10,7 +10,7 @@ import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.service.config.ConfigService;
 import org.hsweb.web.service.resource.FileService;
 import org.hsweb.web.service.resource.ResourcesService;
-import org.hsweb.web.utils.WebUtil;
+import org.hsweb.web.core.utils.WebUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.webbuilder.utils.common.DateTimeUtils;

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

@@ -6,7 +6,7 @@ import org.hsweb.web.dao.resource.ResourcesMapper;
 import org.hsweb.web.service.config.ConfigService;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
 import org.hsweb.web.service.resource.ResourcesService;
-import org.hsweb.web.utils.RandomUtil;
+import org.hsweb.web.core.utils.RandomUtil;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -8,7 +8,7 @@ import org.hsweb.web.dao.role.RoleModuleMapper;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
 import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.service.role.RoleService;
-import org.hsweb.web.utils.RandomUtil;
+import org.hsweb.web.core.utils.RandomUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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

@@ -2,7 +2,7 @@ package org.hsweb.web.service.impl.script;
 
 import org.hsweb.web.bean.po.script.DynamicScript;
 import org.hsweb.web.dao.script.DynamicScriptMapper;
-import org.hsweb.web.exception.BusinessException;
+import org.hsweb.web.core.exception.BusinessException;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
 import org.hsweb.web.service.script.DynamicScriptService;
 import org.springframework.cache.annotation.CacheEvict;

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

@@ -6,13 +6,14 @@ import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.bean.po.module.Module;
 import org.hsweb.web.bean.po.role.UserRole;
 import org.hsweb.web.bean.po.user.User;
+import org.hsweb.web.core.exception.NotFoundException;
 import org.hsweb.web.dao.role.UserRoleMapper;
 import org.hsweb.web.dao.user.UserMapper;
-import org.hsweb.web.exception.BusinessException;
+import org.hsweb.web.core.exception.BusinessException;
 import org.hsweb.web.service.impl.AbstractServiceImpl;
 import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.service.user.UserService;
-import org.hsweb.web.utils.RandomUtil;
+import org.hsweb.web.core.utils.RandomUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.webbuilder.utils.common.MD5;
@@ -55,6 +56,7 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
         data.setCreate_date(new Date());
         data.setUpdate_date(new Date());
         data.setPassword(MD5.encode(data.getPassword()));
+        data.setStatus(1);
         userMapper.insert(new InsertParam<>(data));
         String id = data.getU_id();
         //添加角色关联
@@ -111,4 +113,25 @@ public class UserServiceImpl extends AbstractServiceImpl<User, String> implement
         user.setUserRoles(userRoles);
         user.initRoleInfo();
     }
+
+    @Override
+    public void enableUser(String id) throws Exception {
+        User user = selectByPk(id);
+        if (user == null) throw new NotFoundException("用户不存在!");
+        user.setStatus(1);
+        getMapper().update(new UpdateParam<>(user).includes("status").where("u_id", id));
+    }
+
+    @Override
+    public void disableUser(String id) throws Exception {
+        User user = selectByPk(id);
+        if (user == null) throw new NotFoundException("用户不存在!");
+        user.setStatus(-1);
+        getMapper().update(new UpdateParam<>(user).includes("status").where("u_id", id));
+    }
+
+    @Override
+    public int delete(String s) throws Exception {
+        throw new BusinessException("服务不支持", 500);
+    }
 }

hsweb-web-service-impl-common/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.hsweb.web.service.impl.ServiceAutoConfiguration

hsweb-web-service-impl-common/src/test/java/org/hsweb/web/service/impl/cache/CacheTest.java

@@ -0,0 +1,24 @@
+package org.hsweb.web.service.impl.cache;
+
+import org.hsweb.web.service.config.ConfigService;
+import org.hsweb.web.service.impl.AbstractTestCase;
+import org.junit.Test;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by zhouhao on 16-4-26.
+ */
+public class CacheTest extends AbstractTestCase {
+
+    @Resource
+    private ConfigService configService;
+
+    @Test
+    public void testCache() {
+        configService.get("test", "test", "11");
+        System.out.println(configService.get("test", "test", "11"));
+        System.out.println(configService.get("test", "test", "11"));
+        System.out.println(configService.get("test", "test", "11"));
+    }
+}

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

@@ -1,18 +1,19 @@
 package org.hsweb.web.service.impl.form;
 
+import org.hsweb.web.core.authorize.ExpressionScopeBean;
 import org.hsweb.web.bean.po.form.Form;
 import org.hsweb.web.service.form.FormService;
 import org.hsweb.web.service.impl.AbstractTestCase;
-import org.hsweb.web.utils.RandomUtil;
+import org.hsweb.web.core.utils.RandomUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.transaction.annotation.Transactional;
 import org.webbuilder.sql.DataBase;
 import org.webbuilder.sql.param.insert.InsertParam;
 import org.webbuilder.sql.param.query.QueryParam;
-import org.webbuilder.sql.support.common.CommonSql;
 import org.webbuilder.sql.support.executor.SqlExecutor;
 
 import javax.annotation.Resource;
@@ -35,6 +36,9 @@ public class FormServiceImplTest extends AbstractTestCase {
     @Resource
     protected SqlExecutor sqlExecutor;
 
+    @Autowired(required = false)
+    private Map<String, ExpressionScopeBean> expressionScopeBeanMap;
+
     protected Form form;
 
     private String[] meta = {
@@ -76,33 +80,6 @@ public class FormServiceImplTest extends AbstractTestCase {
 
     @Before
     public void setup() throws Exception {
-        sqlExecutor.exec(new CommonSql("drop table if exists s_form"));
-        sqlExecutor.exec(new CommonSql("create table s_form\n" +
-                "(\n" +
-                "  u_id        varchar(256) not null,\n" +
-                "  name        varchar(256) not null,\n" +
-                "  html        clob,\n" +
-                "  meta        clob,\n" +
-                "  config      clob,\n" +
-                "  version     number(32),\n" +
-                "  using       int,\n" +
-                "  create_date date not null,\n" +
-                "  update_date date,\n" +
-                "  remark      varchar2(200)\n" +
-                ")"));
-        sqlExecutor.exec(new CommonSql("drop table if exists s_history"));
-        sqlExecutor.exec(new CommonSql("create table s_history\n" +
-                "(\n" +
-                "  u_id              varchar2(32) not null,\n" +
-                "  type              varchar2(64) not null,\n" +
-                "  describe          varchar2(512),\n" +
-                "  primary_key_name  varchar2(32),\n" +
-                "  primary_key_value varchar2(64),\n" +
-                "  change_before     clob,\n" +
-                "  change_after      clob,\n" +
-                "  create_date       date not null,\n" +
-                "  creator_id        varchar2(32)\n" +
-                ")"));
         form = new Form();
         form.setName("test_form");
         form.setCreate_date(new Date());
@@ -121,9 +98,16 @@ public class FormServiceImplTest extends AbstractTestCase {
         Map<String, Object> data = dataBase.getTable("test_form")
                 .createQuery().single(new QueryParam().where("name$LIKE", "张三"));
         Assert.assertEquals("张三", data.get("name"));
+
+        System.out.println(formService.createDeployHtml(form.getName()));
+        formService.createDeployHtml(form.getName());
+        formService.deploy(form.getU_id());
+        formService.createDeployHtml(form.getName());
+
 //        form.setMeta(meta[1]);
 //        formService.update(form);
 //        formService.deploy(form.getU_id());
     }
 
+
 }

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

@@ -1,12 +1,19 @@
 package org.hsweb.web.service.impl.system;
 
+import org.hsweb.web.bean.common.QueryParam;
+import org.hsweb.web.bean.po.module.Module;
 import org.hsweb.web.service.impl.AbstractTestCase;
+import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.service.system.DataBaseManagerService;
 import org.junit.Test;
+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 static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by zhouhao on 16-4-21.
@@ -15,10 +22,15 @@ public class DataBaseManagerServiceImplTest extends AbstractTestCase {
 
     @Resource
     private DataBaseManagerService dataBaseManagerService;
+    @Resource
+    private SqlExecutor sqlExecutor;
+
+    @Resource
+    private ModuleService moduleService;
 
     @Test
     public void testGetTableNameList() throws Exception {
-
+        moduleService.select(new QueryParam().orderBy("sort_index").includes("aaa"));
     }
 
     @Test

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

@@ -1,6 +1,11 @@
 logging:
     config: classpath:logback.xml
 spring:
+    aop:
+        auto: true
+    redis:
+        host: 127.0.0.1
+        port: 6389
     datasource:
         name: core
         url: jdbc:h2:mem:hsweb