v1.0.2

.gitignore

@@ -26,6 +26,7 @@ target/
 /nbdist/
 /.nb-gradle/
 build/
+bin/
 !**/src/main/**/build/
 !**/src/test/**/build/
 

build.sh

@@ -2,20 +2,29 @@
 
 echo "开始构建..."
 
+cd front
+
+npm run build:prod
+echo "复制dist文件内容到gen/src/main/resources/public"
+rm -rf ../gen/src/main/resources/public/*
+cp -r dist/* ../gen/src/main/resources/public
+
+cd ..
+
 mvn clean package
 
-echo "复制文件到build目录"
+echo "复制文件到bin目录"
 
-build_dir="build"
+dist_mkdir="bin"
 
-if [ ! -d "$build_dir" ]; then
-  mkdir $build_dir
+if [ ! -d "$dist_mkdir" ]; then
+  mkdir $dist_mkdir
 fi
 
 rm -rf build/*
 
-cp -r gen/target/*.jar build
-cp -r script/* build
-cp -r db/gen.db build/gen.db
+cp -r gen/target/*.jar $dist_mkdir
+cp -r script/* $dist_mkdir
+cp -r db/gen.db $dist_mkdir/gen.db
 
 echo "构建完毕"

changelog.md

@@ -8,4 +8,8 @@
 
 ## 1.0.1
 
-- 新增复制代码功能
+- 新增复制代码功能
+
+## 1.0.2
+
+- 优化交互

front/README.md

@@ -12,5 +12,11 @@
 
 ## 打包放入到服务端步骤
 
-- 执行`npm run build:prod`进行打包，结果在dest下
-- 把dest中的所有文件，放到`gen/src/main/resources/public`下
+- 自动构建
+
+执行`build.sh`
+
+- 手动构建
+
+  - 执行`npm run build:prod`进行打包，结果在dist下
+  - 把dist中的所有文件，放到`gen/src/main/resources/public`下

front/src/views/generate/index.vue

@@ -1,11 +1,10 @@
 <template>
-  <div class="app-container">
-    <el-form ref="genForm" :model="clientParam" size="mini" label-width="200px" style="width: 900px;">
+  <div class="app-container code-gen">
+    <el-form ref="genForm" class="gen-form" :model="clientParam" size="mini" label-width="150px">
       <el-form-item label="选择数据源" prop="datasourceConfigId" :rules="{required: true, message: '请选择数据源'}">
         <el-select
           v-model="clientParam.datasourceConfigId"
           placeholder="选择数据源"
-          style="width: 500px"
           @change="onDataSourceChange"
         >
           <el-option
@@ -23,13 +22,18 @@
         </el-select>
         <el-button type="text" @click="onDataSourceAdd">新建数据源</el-button>
       </el-form-item>
-      <el-form-item v-show="showTable" required label="选择表">
+      <el-form-item v-show="showTable" label="包名（package）">
+        <el-input v-model="clientParam.packageName" placeholder="可选，如：com.gitee.xxx" show-word-limit maxlength="100" />
+      </el-form-item>
+    </el-form>
+    <el-row v-show="showTable" :gutter="20">
+      <el-col :span="12">
+        <h4>选择表</h4>
         <el-table
           :data="tableListData"
           border
           :cell-style="cellStyleSmall()"
           :header-cell-style="headCellStyleSmall()"
-          height="350px"
           @selection-change="onTableListSelect"
         >
           <el-table-column
@@ -39,13 +43,10 @@
             prop="tableName"
             label="表名"
           />
-          <el-table-column
-            prop="comment"
-            label="备注"
-          />
         </el-table>
-      </el-form-item>
-      <el-form-item v-show="showTable" required label="选择模板">
+      </el-col>
+      <el-col :span="12">
+        <h4>选择模板</h4>
         <el-table
           :data="templateListData"
           border
@@ -61,14 +62,9 @@
             label="模板名称"
           />
         </el-table>
-      </el-form-item>
-      <el-form-item v-show="showTable" label="包名（package）">
-        <el-input v-model="clientParam.packageName" placeholder="可选，如：com.gitee.xxx" show-word-limit maxlength="100" />
-      </el-form-item>
-      <el-form-item v-show="showTable">
-        <el-button type="primary" @click="onGenerate">生成代码</el-button>
-      </el-form-item>
-    </el-form>
+        <el-button v-show="showTable" type="primary" @click="onGenerate">生成代码</el-button>
+      </el-col>
+    </el-row>
 
     <el-dialog
       :title="datasourceTitle"
@@ -119,7 +115,19 @@
 
   </div>
 </template>
-
+<style lang="scss">
+  .code-gen {
+    margin: 0 auto;
+    width: 70%;
+      .el-input { width: 450px;}
+      .el-row h4 {
+        text-align: center;
+      }
+      .el-row .el-button {
+        margin-top: 20px;
+      }
+  }
+</style>
 <script>
 export default {
   data() {

gen/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.gitee.codegen</groupId>
     <artifactId>gen</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <description>一款代码生成器</description>
 
     <properties>

gen/src/main/resources/public/static/css/chunk-5fb3a2ba.a44bb87d.css

@@ -0,0 +1 @@
+.code-gen{margin:0 auto;width:70%}.code-gen .el-input{width:450px}.code-gen .el-row h4{text-align:center}.code-gen .el-row .el-button{margin-top:20px}

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.giee.codegen</groupId>
     <artifactId>code-gen</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

readme.md

@@ -38,7 +38,7 @@ Mac/Linux系统可直接执行`build.sh`进行构建，构建结果在build文
 
 ## 效果图
 
-![代码生成](https://images.gitee.com/uploads/images/2020/0723/200150_fd1f1a7a_332975.png "SpringBoot3.png")
+![代码生成](https://images.gitee.com/uploads/images/2020/0724/180853_df66e76d_332975.png "gen7.png")
 
 ![生成结果](https://images.gitee.com/uploads/images/2020/0724/090952_4dc5fec9_332975.png "gen4.png")
 

script/shutdown.sh

@@ -1,5 +1,5 @@
-echo "Stopping gen-1.0.1-SNAPSHOT.jar"
-pid=`ps -ef | grep gen-1.0.1-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.2-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.2-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid

script/startup.sh

@@ -1,9 +1,9 @@
-echo "Stopping gen-1.0.1-SNAPSHOT.jar"
-pid=`ps -ef | grep gen-1.0.1-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.2-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.2-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid
    kill -9 $pid
 fi
-nohup java -jar -Xms128m -Xmx128m gen-1.0.1-SNAPSHOT.jar &
+nohup java -jar -Xms128m -Xmx128m gen-1.0.2-SNAPSHOT.jar &