Merge branch 'release/v1.0.4' into develop

Author: Washmore

autocode.core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>autocode</artifactId>
         <groupId>tech.washmore</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.4-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>autocode.core</artifactId>

autocode.core/src/main/java/tech/washmore/autocode/core/generator/mysql/MysqlAbstractServiceClassGenerator.java

@@ -1,6 +1,7 @@
 package tech.washmore.autocode.core.generator.mysql;
 
 import tech.washmore.autocode.core.config.ConfigManager;
+import tech.washmore.autocode.core.generator.base.AutoCodeFileWriter;
 import tech.washmore.autocode.model.Constants;
 import tech.washmore.autocode.model.config.*;
 import tech.washmore.autocode.model.enums.DataFileMethod;
@@ -48,17 +49,6 @@ private void generateServiceExtends(TableModel tm) throws IOException {
         Doc doc = config.getDoc();
         Project project = config.getProject();
 
-        File dic = new File(project.getPath() + Constants.pathSplitor + project.getJavaRoot() + Constants.pathSplitor + service.getExtendsPackagePath());
-        if (!dic.exists()) {
-            dic.mkdirs();
-        }
-
-        File file = new File(dic, tm.getClsName() + service.getSuffix() + ".java");
-        if (file.exists()) {
-            return;
-        }
-        file.createNewFile();
-
         StringBuffer sb = new StringBuffer("");
         sb.append("package ").append(service.getExtendsPackageName()).append(";").append(System.lineSeparator()).append(System.lineSeparator());
         sb.append("import org.springframework.stereotype.Service;").append(System.lineSeparator());
@@ -78,11 +68,11 @@ private void generateServiceExtends(TableModel tm) throws IOException {
                 .append(System.lineSeparator());
         sb.append("}");
 
-        OutputStream ops = new FileOutputStream(file);
-        ops.write(sb.toString().getBytes());
-        ops.flush();
-        ops.close();
-        System.out.println("\t输出文件:" + file.getPath().replace(new File(config.getProject().getPath()).getPath(), ""));
+        AutoCodeFileWriter.writeStringToFile(
+                project.getPath() + Constants.pathSplitor + project.getJavaRoot()
+                        + Constants.pathSplitor + service.getExtendsPackagePath(),
+                tm.getClsName() + service.getSuffix() + ".java", sb.toString(), false
+        );
     }
 
     private void generateService(TableModel tm) throws IOException {
@@ -169,21 +159,12 @@ private void generateService(TableModel tm) throws IOException {
 
         insertDependencies(sb, tm);
 
-        File dic = new File(project.getPath() + Constants.pathSplitor + project.getJavaRoot() + Constants.pathSplitor + service.getBasePackagePath());
-        if (!dic.exists()) {
-            dic.mkdirs();
-        }
+        AutoCodeFileWriter.writeStringToFile(
+                project.getPath() + Constants.pathSplitor + project.getJavaRoot()
+                        + Constants.pathSplitor + service.getBasePackagePath(),
+                tm.getClsName() + service.getBaseSuffix() + ".java", sb.toString(), true
+        );
 
-        File file = new File(dic, tm.getClsName() + service.getBaseSuffix() + ".java");
-        if (file.exists()) {
-            file.delete();
-        }
-        file.createNewFile();
-        OutputStream ops = new FileOutputStream(file);
-        ops.write(sb.toString().getBytes());
-        ops.flush();
-        ops.close();
-        System.out.println("\t输出文件:" + file.getPath().replace(new File(config.getProject().getPath()).getPath(), ""));
     }
 
 

autocode.test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>autocode</artifactId>
         <groupId>tech.washmore</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.4-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,11 +18,6 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>tech.washmore</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-            <artifactId>autocode.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -74,7 +69,7 @@
         <plugins>
             <plugin>
                 <groupId>tech.washmore</groupId>
-                <version>0.0.1-SNAPSHOT</version>
+                <version>1.0.4-RELEASE</version>
                 <artifactId>maven-autocode-plugin</artifactId>
                 <configuration>
                     <configLocation>/Users/chenyuqing/IdeaProjects/AutoCode/autocode.test/config.json</configLocation>

maven-autocode-plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>autocode</artifactId>
         <groupId>tech.washmore</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.4-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-autocode-plugin</artifactId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>tech.washmore</groupId>
             <artifactId>autocode.core</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>1.0.4-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>

pom.xml

@@ -4,7 +4,7 @@
     <groupId>tech.washmore</groupId>
     <artifactId>autocode</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.4-RELEASE</version>
     <modules>
         <module>autocode.core</module>
         <module>autocode.test</module>
@@ -28,6 +28,11 @@
             <url>http://maven.washmore.tech/nexus/content/repositories/snapshots/</url>
             <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
+        <repository>
+            <id>deploymentRepo</id>
+            <name>washmore_release</name>
+            <url>http://maven.washmore.tech/nexus/content/repositories/releases/</url>
+        </repository>
     </distributionManagement>
     <pluginRepositories>
         <pluginRepository>