merge

boot-service/pom.xml

@@ -43,7 +43,7 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency><!-- mysql driver -->
+        <dependency> <!-- jpa -->
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <exclusions>
@@ -53,12 +53,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
+        <dependency> <!-- mybatis -->
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.0</version>
         </dependency>
-        <dependency>   <!-- 分页插件 -->
+        <dependency> <!-- 分页插件 -->
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.1.2</version>

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();
     }
 

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<SysUser> findall = sysUserMapper.findall();
+        findall.forEach(sysUser1 -> sysUser1.setCreate("aaa"));
+       return JsonResult.toJSONObj(findall,"");
     }
     @GetMapping("send")
     public void sendM(@RequestParam String[] msg) {

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() {
+	}
+
+}