Explorar o código

删除无用文件

zhouhao %!s(int64=8) %!d(string=hai) anos
pai
achega
b4fe9790a2
Modificáronse 14 ficheiros con 85 adicións e 715 borrados
  1. 7 5
      hsweb-web-service/hsweb-web-service-simple/pom.xml
  2. 0 1
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java
  3. 1 2
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/SpringApplication.java
  4. 0 92
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java
  5. 0 51
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java
  6. 0 111
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java
  7. 0 75
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/lock/LockTest.java
  8. 0 71
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/quartz/QuartzJobServiceImplTest.java
  9. 0 10
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java
  10. 0 38
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java
  11. 76 0
      hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java
  12. 1 8
      hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml
  13. 0 251
      hsweb-web-service/hsweb-web-service-simple/src/test/resources/h2.sql
  14. BIN=BIN
      hsweb-web-service/hsweb-web-service-simple/src/test/resources/test.xlsx

+ 7 - 5
hsweb-web-service/hsweb-web-service-simple/pom.xml

@@ -13,14 +13,16 @@
     <dependencies>
 
         <!--test-->
-        <dependency>
-            <groupId>org.hsweb</groupId>
-            <artifactId>hsweb-web-datasource</artifactId>
-            <scope>test</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.hsweb</groupId>-->
+            <!--<artifactId>hsweb-web-datasource</artifactId>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
+        <!---->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

+ 0 - 1
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/AbstractTestCase.java

@@ -10,5 +10,4 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = SpringApplication.class)
 public abstract class AbstractTestCase {
-
 }

+ 1 - 2
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/SpringApplication.java

@@ -1,6 +1,5 @@
 package org.hsweb.web.service.impl;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -13,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAutoConfiguration
 @ComponentScan(basePackages = {"org.hsweb.web"})
 @EnableTransactionManagement(proxyTargetClass = true)
-@MapperScan("org.hsweb.web.dao")
+//@MapperScan("org.hsweb.web.dao")
 public class SpringApplication {
 
 }

+ 0 - 92
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/DatasourceTests.java

@@ -1,92 +0,0 @@
-/*
- * Copyright 2015-2016 http://hsweb.me
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.hsweb.web.service.impl.datasource;
-
-import org.hsweb.ezorm.executor.SqlExecutor;
-import org.hsweb.web.bean.common.QueryParam;
-import org.hsweb.web.bean.po.datasource.DataSource;
-import org.hsweb.web.core.Install;
-import org.hsweb.web.core.datasource.DynamicDataSource;
-import org.hsweb.web.service.datasource.DataSourceService;
-import org.hsweb.web.service.form.FormService;
-import org.hsweb.web.service.impl.AbstractTestCase;
-import org.hsweb.web.service.user.UserService;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.sql.SQLException;
-import java.util.Date;
-
-public class DatasourceTests extends AbstractTestCase {
-    @Resource
-    private DataSourceService dataSourceService;
-
-    @Resource
-    SqlExecutor sqlExecutor;
-
-    @Resource
-    private TestService testService;
-
-    @Resource
-    private UserService userService;
-    @Resource
-    Install install;
-
-    @Resource
-    private FormService formService;
-
-    @PostConstruct
-    public void init() {
-        testService.setSqlExecutor(sqlExecutor);
-    }
-
-    @Before
-    public void setup() throws Exception {
-        dataSourceService.delete("test");
-        //创建一个新的数据源配置,放入到数据库中
-        DataSource dataSource = new DataSource();
-        dataSource.setId("test");
-        dataSource.setName("test");
-        dataSource.setDriver("org.h2.Driver");
-        dataSource.setUsername("sa");
-        dataSource.setPassword("");
-        dataSource.setCreateDate(new Date());
-        dataSource.setUrl("jdbc:h2:file:./data/h2db2;DB_CLOSE_ON_EXIT=FALSE");
-
-        dataSourceService.insert(dataSource);
-
-        //使用刚刚创建的数据源
-        DynamicDataSource.use("test");
-        install.install();//自动创建系统所需的数据库表
-
-        //使用默认数据源进行查询
-        DynamicDataSource.useDefault();
-        userService.select(QueryParam.build());
-        //使用test数据源进行查询
-        DynamicDataSource.use("test");
-        userService.select(QueryParam.build());
-    }
-
-    @Test
-    public void testGetFieldList() throws Exception {
-        formService.select(QueryParam.build());
-        System.out.println(1);
-    }
-
-}

+ 0 - 51
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/datasource/TestService.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2015-2016 http://hsweb.me
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.hsweb.web.service.impl.datasource;
-
-import org.hsweb.ezorm.executor.SqlExecutor;
-import org.hsweb.ezorm.meta.expand.SimpleMapWrapper;
-import org.hsweb.ezorm.render.support.simple.SimpleSQL;
-import org.hsweb.web.core.datasource.DynamicDataSource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.sql.SQLException;
-
-@Service
-public class TestService {
-
-    private SqlExecutor sqlExecutor;
-
-    public void setSqlExecutor(SqlExecutor sqlExecutor) {
-        this.sqlExecutor = sqlExecutor;
-    }
-
-    @Transactional
-    public void test() throws Exception {
-        sqlExecutor.exec(new SimpleSQL("drop table if exists s_test"));
-        sqlExecutor.exec(new SimpleSQL("create table s_test(name varchar(32))"));
-        System.out.println(sqlExecutor.list(new SimpleSQL("select * from s_test"), new SimpleMapWrapper()));
-        System.out.println(sqlExecutor.insert(new SimpleSQL("insert into s_test values ('默认数据源')")));
-        DynamicDataSource.use("test");
-        Thread.sleep(30000);
-        sqlExecutor.exec(new SimpleSQL("drop table if exists s_test"));
-        sqlExecutor.exec(new SimpleSQL("create table s_test(name varchar(32))"));
-        System.out.println(sqlExecutor.list(new SimpleSQL("select * from s_test"), new SimpleMapWrapper()));
-        System.out.println(sqlExecutor.insert(new SimpleSQL("insert into s_test values ('测试1')")));
-        DynamicDataSource.useDefault();
-    }
-}

+ 0 - 111
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/form/FormServiceImplTest.java

@@ -1,111 +0,0 @@
-package org.hsweb.web.service.impl.form;
-
-import org.hsweb.ezorm.executor.SqlExecutor;
-import org.hsweb.ezorm.run.Database;
-import org.hsweb.ezorm.run.Table;
-import org.hsweb.web.bean.po.form.Form;
-import org.hsweb.web.core.authorize.ExpressionScopeBean;
-import org.hsweb.web.core.utils.RandomUtil;
-import org.hsweb.web.service.form.DynamicFormService;
-import org.hsweb.web.service.form.FormService;
-import org.hsweb.web.service.impl.AbstractTestCase;
-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 javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by zhouhao on 16-4-20.
- */
-@Transactional
-@Rollback
-public class FormServiceImplTest extends AbstractTestCase {
-
-    @Resource
-    protected FormService formService;
-    @Resource
-    private DynamicFormService dynamicFormService;
-    @Resource
-    protected Database dataBase;
-
-    @Resource
-    protected SqlExecutor sqlExecutor;
-
-    @Autowired(required = false)
-    private Map<String, ExpressionScopeBean> expressionScopeBeanMap;
-
-    protected Form form;
-
-    private String[] meta = {
-            "{" +
-                    "\"id1\":[" +
-                    "{\"key\":\"name\",\"value\":\"u_id\",\"describe\":\"名称\"}," +
-                    "{\"key\":\"comment\",\"value\":\"ID\",\"describe\":\"ID\"}," +
-                    "{\"key\":\"javaType\",\"value\":\"string\",\"describe\":\"java类型\"}," +
-                    "{\"key\":\"dataType\",\"value\":\"varchar(32)\",\"describe\":\"数据库类型\"}" +
-                    "]" +
-                    ",\"id2\":[" +
-                    "{\"key\":\"name\",\"value\":\"name\",\"describe\":\"名称\"}," +
-                    "{\"key\":\"comment\",\"value\":\"姓名\",\"describe\":\"姓名\"}," +
-                    "{\"key\":\"javaType\",\"value\":\"string\",\"describe\":\"java类型\"}," +
-                    "{\"key\":\"validator-list\",\"value\":\"[{\\\"validator\\\":\\\"NotNull\\\"}]\",,\"describe\":\"java类型\"}," +
-                    "{\"key\":\"dataType\",\"value\":\"varchar(32)\",\"describe\":\"数据库类型\"}" +
-                    "]" +
-                    "}",
-            "{" +
-                    "\"id1\":[" +
-                    "{\"key\":\"name\",\"value\":\"u_id\",\"describe\":\"名称\"}," +
-                    "{\"key\":\"comment\",\"value\":\"ID\",\"describe\":\"ID\"}," +
-                    "{\"key\":\"javaType\",\"value\":\"string\",\"describe\":\"java类型\"}," +
-                    "{\"key\":\"dataType\",\"value\":\"varchar(32)\",\"describe\":\"数据库类型\"}" +
-                    "]" +
-                    ",\"id2\":[" +
-                    "{\"key\":\"name\",\"value\":\"name\",\"describe\":\"名称\"}," +
-                    "{\"key\":\"comment\",\"value\":\"姓名\",\"describe\":\"字段描述\"}," +
-                    "{\"key\":\"javaType\",\"value\":\"string\",\"describe\":\"java类型\"}," +
-                    "{\"key\":\"dataType\",\"value\":\"varchar(32)\",\"describe\":\"数据库类型\"}" +
-                    "]" +
-                    ",\"id3\":[" +
-                    "{\"key\":\"name\",\"value\":\"sex\",\"describe\":\"名称\"}," +
-                    "{\"key\":\"comment\",\"value\":\"性别\",\"describe\":\"性别\"}," +
-                    "{\"key\":\"javaType\",\"value\":\"string\",\"describe\":\"java类型\"}," +
-                    "{\"key\":\"dataType\",\"value\":\"varchar(32)\",\"describe\":\"数据库类型\"}" +
-                    "]" +
-                    "}"
-    };
-
-    @Before
-    public void setup() throws Exception {
-        form = new Form();
-        form.setName("test_form");
-        form.setCreateDate(new Date());
-        form.setHtml("<input fieldId='id1'/><input fieldId='id2'/>");
-        form.setMeta(meta[0]);
-        form.setId(RandomUtil.randomChar());
-        formService.insert(form);
-    }
-
-    @Test
-    public void testDeploy() throws Exception {
-        formService.deploy(form.getId());
-        dataBase.getTable("test_form").createInsert().value(new HashMap<String, Object>() {{
-            put("u_id", "test");
-            put("name", "张三2");
-        }}).exec();
-
-        Table<Map<String, Object>> table = dataBase.getTable("test_form");
-        table.createUpdate().set("name", "张三").where("u_id", "test").exec();
-
-        Map<String, Object> data = table.createQuery().where("name$LIKE", "张三").single();
-        Assert.assertEquals("张三", data.get("name"));
-    }
-
-
-}

+ 0 - 75
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/lock/LockTest.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2015-2016 http://hsweb.me
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.hsweb.web.service.impl.lock;
-
-import org.hsweb.concurrent.lock.LockFactory;
-import org.hsweb.web.service.impl.AbstractTestCase;
-import org.junit.Test;
-
-import javax.annotation.Resource;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-
-public class LockTest extends AbstractTestCase {
-
-    @Resource
-    private LockFactory lockFactory;
-
-    @Test
-    public void testLock() throws InterruptedException {
-        Lock lock = lockFactory.createLock("test_lock");
-        new Thread(() -> {
-            try {
-                System.out.println("锁");
-                lock.lock();
-                Thread.sleep(5000);
-            } catch (InterruptedException e) {
-            }
-            System.out.println("解锁");
-            lock.unlock();
-        }).start();
-        Thread.sleep(200);
-        System.out.println("锁2");
-        lock.lock();
-        System.out.println("解锁2");
-        lock.unlock();
-        Thread.sleep(10000);
-    }
-
-    @Test
-    public void testRWLock() throws InterruptedException {
-        ReadWriteLock readWriteLock = lockFactory.createReadWriteLock("test");
-        new Thread(() -> {
-            try {
-                System.out.println("读锁");
-                readWriteLock.readLock().lock();
-                Thread.sleep(5000);
-            } catch (InterruptedException e) {
-            }
-            System.out.println("解读锁");
-            readWriteLock.readLock().unlock();
-        }).start();
-        Thread.sleep(100);
-        System.out.println("写锁");
-        readWriteLock.writeLock().tryLock(20, TimeUnit.SECONDS);
-        Thread.sleep(100);
-        System.out.println("解写锁");
-        readWriteLock.writeLock().unlock();
-        Thread.sleep(10000);
-    }
-}

+ 0 - 71
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/quartz/QuartzJobServiceImplTest.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2015-2016 http://hsweb.me
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.hsweb.web.service.impl.quartz;
-
-import org.hsweb.web.bean.po.quartz.QuartzJob;
-import org.hsweb.web.bean.po.user.User;
-import org.hsweb.web.core.utils.WebUtil;
-import org.hsweb.web.service.impl.AbstractTestCase;
-import org.hsweb.web.service.quartz.QuartzJobService;
-import org.hsweb.web.service.user.UserService;
-import org.junit.Test;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * @author zhouhao
- */
-public class QuartzJobServiceImplTest extends AbstractTestCase {
-
-    @Resource
-    private QuartzJobService quartzJobService;
-
-    @Resource
-    private UserService userService;
-
-    static final String jobId = "test";
-
-    @Test
-    public void testJob() throws InterruptedException {
-        User user = new User();
-        user.setName("admin");
-        user.setUsername("admin");
-        user.setPassword("admin");
-        userService.insert(user);
-        quartzJobService.delete(jobId);
-        QuartzJob job = new QuartzJob();
-        job.setId(jobId);
-        job.setName("测试任务");
-        job.setCron("0/2 * * * * ?");
-        job.setLanguage("groovy");
-        job.setScript("println('任务执行中...'+(org.hsweb.web.core.utils.WebUtil.getLoginUser())); return 'aaaaa';");
-        quartzJobService.insert(job);
-        Thread.sleep(20 * 1000);
-//        job.setCron("0/5 * * * * ?");
-//        job.setScript("println('任务执行中22222...');return 'aaaaa';");
-//        quartzJobService.update(job);
-        Thread.sleep(10 * 1000);
-        quartzJobService.disable(job.getId());
-        Thread.sleep(10 * 1000);
-        quartzJobService.enable(job.getId());
-        Thread.sleep(30 * 1000);
-        quartzJobService.delete(jobId);
-        Thread.sleep(5 * 1000);
-    }
-
-}

+ 0 - 10
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/system/DataBaseManagerServiceImplTest.java

@@ -1,10 +0,0 @@
-package org.hsweb.web.service.impl.system;
-
-import org.hsweb.web.service.impl.AbstractTestCase;
-
-/**
- * Created by zhouhao on 16-4-21.
- */
-public class DataBaseManagerServiceImplTest extends AbstractTestCase {
-
-}

+ 0 - 38
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/template/TemplateServiceImplTest.java

@@ -1,38 +0,0 @@
-package org.hsweb.web.service.impl.template;
-
-import org.hsweb.web.bean.common.QueryParam;
-import org.hsweb.web.bean.po.template.Template;
-import org.hsweb.web.dao.template.TemplateMapper;
-import org.hsweb.web.service.template.TemplateService;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockSettings;
-import org.mockito.MockitoAnnotations;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Created by zhouhao on 16-5-23.
- */
-public class TemplateServiceImplTest {
-
-    @Mock
-    private TemplateService templateService;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        TemplateMapper templateMapper = mock(TemplateMapper.class);
-        System.out.println(templateMapper.select(QueryParam.build()));
-        System.out.println(templateMapper.insert(null));
-    }
-
-    @Test
-    public void test() {
-        System.out.println(templateService.insert(null));
-    }
-
-
-}

+ 76 - 0
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015-2016 http://hsweb.me
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hsweb.web.service.impl.user;
+
+import org.hsweb.web.bean.common.DeleteParam;
+import org.hsweb.web.bean.common.InsertParam;
+import org.hsweb.web.bean.common.UpdateParam;
+import org.hsweb.web.bean.po.user.User;
+import org.hsweb.web.dao.role.UserRoleMapper;
+import org.hsweb.web.dao.user.UserMapper;
+import org.hsweb.web.service.impl.AbstractTestCase;
+import org.hsweb.web.service.module.ModuleService;
+import org.hsweb.web.service.user.UserService;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.mockito.Mockito.when;
+
+/**
+ * @author zhouhao
+ */
+public class UserServiceImplTest {
+
+    @InjectMocks
+    UserService userService = new UserServiceImpl();
+    @Mock
+    UserMapper                 userMapper;
+    @Mock
+    ModuleService              moduleService;
+    @Mock
+    UserRoleMapper             userRoleMapper;
+    @Mock
+    javax.validation.Validator validator;
+
+    InsertParam<User> insertParam;
+
+    @Before
+    public void setup() {
+        User user = new User();
+        insertParam = new InsertParam<>(user);
+        user.setUsername("admin");
+        MockitoAnnotations.initMocks(this);
+        when(userMapper.insert(insertParam)).thenReturn(1);
+        when(userMapper.update(UpdateParam.build(new User()))).thenReturn(1);
+        when(userMapper.delete(DeleteParam.build().where("id", "test"))).thenReturn(1);
+    }
+
+    @Test
+    public void insert() throws Exception {
+        Assert.assertNotNull(userService.insert(new User()));
+    }
+
+    @Test
+    public void update() throws Exception {
+        Assert.assertEquals(userService.update(new User()), 1);
+    }
+
+}

+ 1 - 8
hsweb-web-service/hsweb-web-service-simple/src/test/resources/application.yml

@@ -1,8 +1,5 @@
 logging:
     config: classpath:logback.xml
-scheduler:
-    properties:
-        org.quartz.jobStore.isClustered: true
 spring:
     aop:
         auto: true
@@ -10,11 +7,7 @@ spring:
         host: 127.0.0.1
         port: 6379
 mybatis:
-    type: oracle
     config: classpath:mybatis-config.xml
-#    dynamic-datasource: on
 hsweb:
     dynamic-datasource:
-          url: jdbc:mysql://127.0.0.1:3306/hsweb?useUnicode=true&characterEncoding=utf-8&useSSL=false
-          username: root
-          password: 19920622
+          type: h2

+ 0 - 251
hsweb-web-service/hsweb-web-service-simple/src/test/resources/h2.sql

@@ -1,251 +0,0 @@
-CREATE TABLE QRTZ_CALENDARS (
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  CALENDAR_NAME VARCHAR(200) NOT NULL,
-  CALENDAR      IMAGE        NOT NULL
-);
-
-CREATE TABLE QRTZ_CRON_TRIGGERS (
-  SCHED_NAME      VARCHAR(120) NOT NULL,
-  TRIGGER_NAME    VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP   VARCHAR(200) NOT NULL,
-  CRON_EXPRESSION VARCHAR(120) NOT NULL,
-  TIME_ZONE_ID    VARCHAR(80)
-);
-
-CREATE TABLE QRTZ_FIRED_TRIGGERS (
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  ENTRY_ID          VARCHAR(95)  NOT NULL,
-  TRIGGER_NAME      VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP     VARCHAR(200) NOT NULL,
-  INSTANCE_NAME     VARCHAR(200) NOT NULL,
-  FIRED_TIME        BIGINT       NOT NULL,
-  SCHED_TIME        BIGINT       NOT NULL,
-  PRIORITY          INTEGER      NOT NULL,
-  STATE             VARCHAR(16)  NOT NULL,
-  JOB_NAME          VARCHAR(200) NULL,
-  JOB_GROUP         VARCHAR(200) NULL,
-  IS_NONCONCURRENT  BOOLEAN      NULL,
-  REQUESTS_RECOVERY BOOLEAN      NULL
-);
-
-CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL
-);
-
-CREATE TABLE QRTZ_SCHEDULER_STATE (
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  INSTANCE_NAME     VARCHAR(200) NOT NULL,
-  LAST_CHECKIN_TIME BIGINT       NOT NULL,
-  CHECKIN_INTERVAL  BIGINT       NOT NULL
-);
-
-CREATE TABLE QRTZ_LOCKS (
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  LOCK_NAME  VARCHAR(40)  NOT NULL
-);
-
-CREATE TABLE QRTZ_JOB_DETAILS (
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  JOB_NAME          VARCHAR(200) NOT NULL,
-  JOB_GROUP         VARCHAR(200) NOT NULL,
-  DESCRIPTION       VARCHAR(250) NULL,
-  JOB_CLASS_NAME    VARCHAR(250) NOT NULL,
-  IS_DURABLE        BOOLEAN      NOT NULL,
-  IS_NONCONCURRENT  BOOLEAN      NOT NULL,
-  IS_UPDATE_DATA    BOOLEAN      NOT NULL,
-  REQUESTS_RECOVERY BOOLEAN      NOT NULL,
-  JOB_DATA          IMAGE        NULL
-);
-
-CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
-  SCHED_NAME      VARCHAR(120) NOT NULL,
-  TRIGGER_NAME    VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP   VARCHAR(200) NOT NULL,
-  REPEAT_COUNT    BIGINT       NOT NULL,
-  REPEAT_INTERVAL BIGINT       NOT NULL,
-  TIMES_TRIGGERED BIGINT       NOT NULL
-);
-
-CREATE TABLE qrtz_simprop_triggers
-(
-  SCHED_NAME    VARCHAR(120)   NOT NULL,
-  TRIGGER_NAME  VARCHAR(200)   NOT NULL,
-  TRIGGER_GROUP VARCHAR(200)   NOT NULL,
-  STR_PROP_1    VARCHAR(512)   NULL,
-  STR_PROP_2    VARCHAR(512)   NULL,
-  STR_PROP_3    VARCHAR(512)   NULL,
-  INT_PROP_1    INTEGER        NULL,
-  INT_PROP_2    INTEGER        NULL,
-  LONG_PROP_1   BIGINT         NULL,
-  LONG_PROP_2   BIGINT         NULL,
-  DEC_PROP_1    NUMERIC(13, 4) NULL,
-  DEC_PROP_2    NUMERIC(13, 4) NULL,
-  BOOL_PROP_1   BOOLEAN        NULL,
-  BOOL_PROP_2   BOOLEAN        NULL,
-);
-
-CREATE TABLE QRTZ_BLOB_TRIGGERS (
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  TRIGGER_NAME  VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  BLOB_DATA     IMAGE        NULL
-);
-
-CREATE TABLE QRTZ_TRIGGERS (
-  SCHED_NAME     VARCHAR(120) NOT NULL,
-  TRIGGER_NAME   VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP  VARCHAR(200) NOT NULL,
-  JOB_NAME       VARCHAR(200) NOT NULL,
-  JOB_GROUP      VARCHAR(200) NOT NULL,
-  DESCRIPTION    VARCHAR(250) NULL,
-  NEXT_FIRE_TIME BIGINT       NULL,
-  PREV_FIRE_TIME BIGINT       NULL,
-  PRIORITY       INTEGER      NULL,
-  TRIGGER_STATE  VARCHAR(16)  NOT NULL,
-  TRIGGER_TYPE   VARCHAR(8)   NOT NULL,
-  START_TIME     BIGINT       NOT NULL,
-  END_TIME       BIGINT       NULL,
-  CALENDAR_NAME  VARCHAR(200) NULL,
-  MISFIRE_INSTR  SMALLINT     NULL,
-  JOB_DATA       IMAGE        NULL
-);
-
-ALTER TABLE QRTZ_CALENDARS
-  ADD
-  CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY
-    (
-      SCHED_NAME,
-      CALENDAR_NAME
-    );
-
-ALTER TABLE QRTZ_CRON_TRIGGERS
-  ADD
-  CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    );
-
-ALTER TABLE QRTZ_FIRED_TRIGGERS
-  ADD
-  CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY
-    (
-      SCHED_NAME,
-      ENTRY_ID
-    );
-
-ALTER TABLE QRTZ_PAUSED_TRIGGER_GRPS
-  ADD
-  CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY
-    (
-      SCHED_NAME,
-      TRIGGER_GROUP
-    );
-
-ALTER TABLE QRTZ_SCHEDULER_STATE
-  ADD
-  CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY
-    (
-      SCHED_NAME,
-      INSTANCE_NAME
-    );
-
-ALTER TABLE QRTZ_LOCKS
-  ADD
-  CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY
-    (
-      SCHED_NAME,
-      LOCK_NAME
-    );
-
-ALTER TABLE QRTZ_JOB_DETAILS
-  ADD
-  CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY
-    (
-      SCHED_NAME,
-      JOB_NAME,
-      JOB_GROUP
-    );
-
-ALTER TABLE QRTZ_SIMPLE_TRIGGERS
-  ADD
-  CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    );
-
-ALTER TABLE QRTZ_SIMPROP_TRIGGERS
-  ADD
-  CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    );
-
-ALTER TABLE QRTZ_TRIGGERS
-  ADD
-  CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    );
-
-ALTER TABLE QRTZ_CRON_TRIGGERS
-  ADD
-  CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    ) REFERENCES QRTZ_TRIGGERS (
-    SCHED_NAME,
-    TRIGGER_NAME,
-    TRIGGER_GROUP
-  ) ON DELETE CASCADE;
-
-
-ALTER TABLE QRTZ_SIMPLE_TRIGGERS
-  ADD
-  CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    ) REFERENCES QRTZ_TRIGGERS (
-    SCHED_NAME,
-    TRIGGER_NAME,
-    TRIGGER_GROUP
-  ) ON DELETE CASCADE;
-
-ALTER TABLE QRTZ_SIMPROP_TRIGGERS
-  ADD
-  CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS FOREIGN KEY
-    (
-      SCHED_NAME,
-      TRIGGER_NAME,
-      TRIGGER_GROUP
-    ) REFERENCES QRTZ_TRIGGERS (
-    SCHED_NAME,
-    TRIGGER_NAME,
-    TRIGGER_GROUP
-  ) ON DELETE CASCADE;
-
-
-ALTER TABLE QRTZ_TRIGGERS
-  ADD
-  CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS FOREIGN KEY
-    (
-      SCHED_NAME,
-      JOB_NAME,
-      JOB_GROUP
-    ) REFERENCES QRTZ_JOB_DETAILS (
-    SCHED_NAME,
-    JOB_NAME,
-    JOB_GROUP
-  );

BIN=BIN
hsweb-web-service/hsweb-web-service-simple/src/test/resources/test.xlsx