diff --git a/boot-service/pom.xml b/boot-service/pom.xml index 5e074a8..9b10f76 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -43,7 +43,7 @@ mysql-connector-java runtime - + org.springframework.boot spring-boot-starter-data-jpa @@ -53,12 +53,12 @@ - + org.mybatis.spring.boot mybatis-spring-boot-starter 1.3.0 - + com.github.pagehelper pagehelper-spring-boot-starter 1.1.2 diff --git a/boot-service/src/main/java/com/xwbing/datasource/MybatisDataSourceConfig.java b/boot-service/src/main/java/com/xwbing/datasource/MybatisDataSourceConfig.java index f7f4c58..198cc87 100644 --- a/boot-service/src/main/java/com/xwbing/datasource/MybatisDataSourceConfig.java +++ b/boot-service/src/main/java/com/xwbing/datasource/MybatisDataSourceConfig.java @@ -26,8 +26,8 @@ import javax.sql.DataSource; @PropertySource("classpath:druid.properties") public class MybatisDataSourceConfig { @Primary - @Bean(name = "mybatisDatasource") @ConfigurationProperties("db1") + @Bean(name = "mybatisDatasource") public DataSource dataSource() { return DruidDataSourceBuilder.create().build(); } @@ -38,7 +38,7 @@ public class MybatisDataSourceConfig { sqlSessionFactoryBean.setDataSource(dataSource()); sqlSessionFactoryBean.setTypeAliasesPackage("com.xwbing.domain.entity"); PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - sqlSessionFactoryBean.setMapperLocations(resolver.getResources("classpath:mapper/*.xml")); + sqlSessionFactoryBean.setMapperLocations(resolver.getResources("classpath:mapper/**/*.xml")); return sqlSessionFactoryBean.getObject(); } diff --git a/boot-service/src/main/resources/mapper/sys/sysAuthority.xml b/boot-service/src/main/resources/mapper/sys/sysAuthority.xml deleted file mode 100644 index e69de29..0000000 diff --git a/boot-service/src/main/resources/mapper/sys/sysRole.xml b/boot-service/src/main/resources/mapper/sys/sysRole.xml deleted file mode 100644 index e69de29..0000000 diff --git a/boot-service/src/main/resources/mapper/sys/sysRoleAuthority.xml b/boot-service/src/main/resources/mapper/sys/sysRoleAuthority.xml deleted file mode 100644 index e69de29..0000000 diff --git a/boot-service/src/main/resources/mapper/sys/sysUserLoginInOut.xml b/boot-service/src/main/resources/mapper/sys/sysUserLoginInOut.xml deleted file mode 100644 index e69de29..0000000 diff --git a/boot-service/src/main/resources/mapper/sys/sysUserRole.xml b/boot-service/src/main/resources/mapper/sys/sysUserRole.xml deleted file mode 100644 index e69de29..0000000 diff --git a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java index 0456d21..4420202 100644 --- a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java @@ -53,10 +53,10 @@ public class TestControl { private SysUserMapper sysUserMapper; @Transactional @PostMapping("save") - public void save(@RequestBody SysUser sysUser) { - int save = sysUserMapper.save(sysUser); - sysUserMapper.save(sysUser); - System.out.println("shiwi"); + public JSONObject save(@RequestBody SysUser sysUser) { + List findall = sysUserMapper.findall(); + findall.forEach(sysUser1 -> sysUser1.setCreate("aaa")); + return JsonResult.toJSONObj(findall,""); } @GetMapping("send") public void sendM(@RequestParam String[] msg) { diff --git a/boot-web/src/test/java/com/xwbing/ApplicationTest.java b/boot-web/src/test/java/com/xwbing/ApplicationTest.java new file mode 100644 index 0000000..6ba4d98 --- /dev/null +++ b/boot-web/src/test/java/com/xwbing/ApplicationTest.java @@ -0,0 +1,16 @@ +package com.xwbing; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ApplicationTest { + + @Test + public void contextLoads() { + } + +}