Merge branch 'upgrade mybatis'

oldratlee · oldratlee · commit c41df731103f · 2022-07-31T12:36:31.000+08:00
diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
         <cola.components.version>4.3.0-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.2</spring-boot.version>
-        <mybatis-starter.version>1.3.1</mybatis-starter.version>
+        <mybatis-starter.version>2.2.2</mybatis-starter.version>
     </properties>
 
     <modules>
diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/src/main/java/Application.java b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/src/main/java/Application.java
@@ -14,7 +14,6 @@
  * @author Frank Zhang
  */
 @SpringBootApplication
-@MapperScan("${package}.repository")
 public class Application {
 
     public static void main(String[] args) {
diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
         <cola.components.version>4.3.0-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.2</spring-boot.version>
-        <mybatis-starter.version>1.3.1</mybatis-starter.version>
+        <mybatis-starter.version>2.2.2</mybatis-starter.version>
     </properties>
 
     <modules>
diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/start/src/main/java/Application.java b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/start/src/main/java/Application.java
@@ -12,8 +12,7 @@
  *
  * @author Frank Zhang
  */
-@SpringBootApplication(scanBasePackages = {"${package}","com.alibaba.cola"})
-@MapperScan("${package}.repository")
+@SpringBootApplication(scanBasePackages = {"${package}", "com.alibaba.cola"})
 public class Application {
 
     public static void main(String[] args) {
diff --git a/cola-samples/craftsman/pom.xml b/cola-samples/craftsman/pom.xml
@@ -18,7 +18,7 @@
         <cola.components.version>4.3.0-SNAPSHOT</cola.components.version>
 
         <spring-boot.version>2.7.2</spring-boot.version>
-        <mybatis-starter.version>1.3.1</mybatis-starter.version>
+        <mybatis-starter.version>2.2.2</mybatis-starter.version>
     </properties>
 
     <modules>

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @author Frank Zhang`
`14`	`14`	`*/`
`15`		`-@SpringBootApplication(scanBasePackages = {"${package}","com.alibaba.cola"})`
`16`		`-@MapperScan("${package}.repository")`
	`15`	`+@SpringBootApplication(scanBasePackages = {"${package}", "com.alibaba.cola"})`
`17`	`16`	`public class Application {`
`18`	`17`
`19`	`18`	`public static void main(String[] args) {`