diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 06bc668..9273806 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,64 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/lib.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code-generater.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ControllerTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/DAOTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/EntityTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/HtmlTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/JsTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/POTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ServiceImplTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ServiceTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/Temp.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/createTableTemplate.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ControllerModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/EnvironmentModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ServiceModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ViewModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/createTable/ColumnModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/createTable/TableModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/BaseModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/DaoModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/FunctionModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/ColumnModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/PoModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/TableModel.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/Constants.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateCS.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateController.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateService.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateVCSDP.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateView.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/Utils.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/util/TempVelocity.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/Constants.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateDao.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateDaoPO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateEntity.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GeneratePO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/MainGenerateEntity.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/TableColumn.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/Tools.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/tools/StringUtil.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$1.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$2.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$3.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$4.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$5.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/UiUtils.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/default.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/erp.default.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/evaluate.default.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/print.default.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/code-generater/schedule.default.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/local.db.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/code-generater.iml" beforeDir="false" afterPath="$PROJECT_DIR$/code-generater.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" afterDir="false" />
     </list>
@@ -71,37 +17,50 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DefaultGradleProjectSettings">
-    <option name="testRunner" value="GRADLE" />
-    <option name="delegatedBuild" value="true" />
+    <option name="isMigrated" value="true" />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="code-generater" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="111" column="51" lean-forward="true" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
+            <state relative-caret-position="524">
+              <caret line="99" column="65" lean-forward="true" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
               <folding>
-                <element signature="e#2981#2989#0" expanded="true" />
+                <element signature="e#947#948#0" expanded="true" />
+                <element signature="e#967#968#0" expanded="true" />
+                <element signature="e#2529#2537#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+            <state relative-caret-position="352">
+              <caret line="20" column="39" lean-forward="true" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-17">
-              <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
+            <state relative-caret-position="299">
+              <caret line="45" column="78" selection-start-line="45" selection-start-column="78" selection-end-line="45" selection-end-column="78" />
               <folding>
                 <element signature="e#407#408#0" expanded="true" />
                 <element signature="e#461#462#0" expanded="true" />
@@ -111,9 +70,50 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/erp.default.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-14">
+              <caret line="17" column="38" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/local.db.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="220">
+              <caret line="10" column="35" lean-forward="true" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/print.default.properties">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="189">
+              <caret line="1663" column="14" selection-start-line="1663" selection-start-column="14" selection-end-line="1663" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-17">
+            <state relative-caret-position="616">
               <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
             </state>
           </provider>
@@ -124,9 +124,12 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>Tools.getPath()</find>
+      <find>frame.</find>
+      <find>Tools.getPath</find>
     </findStrings>
     <replaceStrings>
       <replace>UiUtils.getProjectRoot()</replace>
+      <replace>this.</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -135,81 +138,79 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" />
-        <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java" />
+        <option value="$PROJECT_DIR$/src/com/taover/ui/Temp.form" />
+        <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" />
+        <option value="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" />
+        <option value="$PROJECT_DIR$/src/local.db.properties" />
+        <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" />
       </list>
     </option>
   </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand />
+      <select />
+    </treeState>
+  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="260" />
     <option name="y" value="20" />
     <option name="width" value="1400" />
     <option name="height" value="1000" />
   </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="production" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-              <item name="production" type="462c0819:PsiDirectoryNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="code-generater" type="58d84e3e:PackageViewProjectNode" />
+              <item name="code-generater" type="616d4139:PackageViewModuleNode" />
             </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
             <path>
               <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
               <item name="code-generater" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="taover" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="code-generater" type="b2602c69:ProjectViewProjectNode" />
               <item name="code-generater" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="taover" type="462c0819:PsiDirectoryNode" />
-              <item name="ui" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\workproject\code-generater\src" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -223,7 +224,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Application.RunEntityGenWindow">
     <configuration name="EntityGenWindow" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.taover.ui.EntityGenWindow" />
       <module name="code-generater" />
@@ -237,14 +238,28 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="RunEntityGenWindow" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.taover.ui.RunEntityGenWindow" />
+      <module name="code-generater" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.taover.ui.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.RunEntityGenWindow" />
         <item itemvalue="Application.EntityGenWindow" />
       </list>
     </recent_temporary>
   </component>
   <component name="SvnConfiguration">
-    <configuration />
+    <configuration>C:\Users\root\AppData\Roaming\Subversion</configuration>
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -253,51 +268,70 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1557914467884</updated>
-      <workItem from="1557914479970" duration="1392000" />
+      <workItem from="1557914479970" duration="3550000" />
+      <workItem from="1557989274327" duration="323000" />
+      <workItem from="1557989640809" duration="476000" />
+      <workItem from="1557990143187" duration="4364000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1392000" />
+    <option name="totallyTimeSpent" value="8713000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="UI Designer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.25799572" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Messages" weight="0.329718" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.329718" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.329718" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3991323" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Maven" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Database" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Maven" order="6" weight="0.32995737" />
+      <window_info anchor="right" id="Capture Analysis" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java</url>
+          <line>434</line>
+          <properties />
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/code-generater.iml">
       <provider selected="true" editor-type-id="text-editor">
@@ -306,38 +340,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-17">
-          <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
+        <state relative-caret-position="132">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java">
+    <entry file="file://$APPLICATION_CONFIG_DIR$/extensions/com.intellij.database/schema/Generate POJOs.groovy">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-17">
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
+        <state relative-caret-position="-1016">
+          <caret line="8" column="29" lean-forward="true" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
           <folding>
-            <element signature="e#407#408#0" expanded="true" />
-            <element signature="e#461#462#0" expanded="true" />
+            <element signature="e#0#43#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="616">
+          <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindowE.jfd">
+      <provider selected="true" editor-type-id="JFormDesigner">
+        <state paletteWidth="0" propertiesWidth="0" structureHeight="0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.jfd">
+      <provider selected="true" editor-type-id="JFormDesigner">
+        <state paletteWidth="0" propertiesWidth="0" structureHeight="0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-902">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/awt/event/ActionListener.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="49" column="16" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.jfd">
+      <provider selected="true" editor-type-id="JFormDesigner">
+        <state paletteWidth="0" propertiesWidth="0" structureHeight="0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/Temp.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.jfd">
+      <provider selected="true" editor-type-id="JFormDesigner">
+        <state paletteWidth="0" propertiesWidth="0" structureHeight="0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1316">
+          <caret line="11" column="18" lean-forward="true" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/default.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="5" column="10" selection-start-line="5" selection-end-line="5" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="1663" column="14" selection-start-line="1663" selection-start-column="14" selection-end-line="1663" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/print.default.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/local.db.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="10" column="35" lean-forward="true" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/erp.default.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-14">
+          <caret line="17" column="38" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="20" column="39" lean-forward="true" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="111" column="51" lean-forward="true" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
+        <state relative-caret-position="524">
+          <caret line="99" column="65" lean-forward="true" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
           <folding>
-            <element signature="e#2981#2989#0" expanded="true" />
+            <element signature="e#947#948#0" expanded="true" />
+            <element signature="e#967#968#0" expanded="true" />
+            <element signature="e#2529#2537#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+        <state relative-caret-position="299">
+          <caret line="45" column="78" selection-start-line="45" selection-start-column="78" selection-end-line="45" selection-end-column="78" />
+          <folding>
+            <element signature="e#407#408#0" expanded="true" />
+            <element signature="e#461#462#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/code-generater.iml b/code-generater.iml
index fb8e866..6b7e7e4 100644
--- a/code-generater.iml
+++ b/code-generater.iml
@@ -8,5 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="MigLayout" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/com/taover/db/GenerateEntity.java b/src/com/taover/db/GenerateEntity.java
index 8fc9c2f..18eec27 100644
--- a/src/com/taover/db/GenerateEntity.java
+++ b/src/com/taover/db/GenerateEntity.java
@@ -11,6 +11,7 @@ import com.taover.base.template.model.po.ColumnModel;
 import com.taover.base.template.model.po.PoModel;
 import com.taover.base.template.model.po.TableModel;
 
+import com.taover.ui.UiUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 
@@ -32,7 +33,7 @@ public class GenerateEntity {
 		cif.setToStringMethodBody(getPOToString(ColumnsInTable));
 		cif.setTablemodel(tm);
 		
-		File f = new File(Tools.getPath() + Constants.TEMPATE_PATH);
+		File f = new File(UiUtils.getProjectRoot() + Constants.TEMPATE_PATH);
 		Configuration cfg = new Configuration();
 		cfg.setDirectoryForTemplateLoading(f);
 		cfg.setDefaultEncoding("utf-8");
diff --git a/src/com/taover/ui/EntityGenWindow.java b/src/com/taover/ui/EntityGenWindow.java
index d85b550..a7e6761 100644
--- a/src/com/taover/ui/EntityGenWindow.java
+++ b/src/com/taover/ui/EntityGenWindow.java
@@ -1,7 +1,6 @@
 package com.taover.ui;
 
 import java.awt.BorderLayout;
-import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -24,51 +23,29 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 
-import com.taover.db.Tools;
+public class EntityGenWindow extends JFrame{
 
-public class EntityGenWindow {
-
-	private JFrame frame;
 	private JTextField tf_outputDir;
 	private JTextField tf_dbPackage;
+	private JTextField tf_dbName;
 	private JTextArea ta_tableList;
 	private Properties prop;
 	private boolean createAllTable;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					EntityGenWindow window = new EntityGenWindow();
-					window.frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Create the application.
-	 */
-	public EntityGenWindow() {
-		initialize();
+	public EntityGenWindow(){
+		initComponents();
 	}
 
 	/**
 	 * Initialize the contents of the frame.
 	 */
-	private void initialize() {
-		frame = new JFrame();
-		frame.setBounds(100, 100, 746, 464);
-		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+	private void initComponents() {
+		this.setBounds(100, 100, 746, 464);
+		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		
 		JPanel panel = new JPanel();
-		frame.getContentPane().add(panel, BorderLayout.CENTER);
-		frame.setTitle("生成实体文件");
+		this.getContentPane().add(panel, BorderLayout.CENTER);
+		this.setTitle("生成实体文件");
 		panel.setLayout(null);
 		
 		JLabel lblNewLabel = new JLabel("表名列表");
@@ -108,32 +85,39 @@ public class EntityGenWindow {
 		tf_dbPackage.setColumns(10);
 		tf_dbPackage.setBounds(139, 280, 413, 21);
 		panel.add(tf_dbPackage);
+
+		JLabel lblClass1 = new JLabel("数据库名称");
+		lblClass1.setBounds(40, 320, 89, 15);
+		panel.add(lblClass1);
+
+		tf_dbName = new JTextField();
+		tf_dbName.setColumns(10);
+		tf_dbName.setBounds(139, 320, 413, 21);
+		panel.add(tf_dbName);
 		
 		JButton btnNewButton = new JButton("生成文件");
-		btnNewButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				List<String> tableNameList = new ArrayList<String>();
-				String tableNameStr = ta_tableList.getText();
-				String[] tableNameSplitBack = tableNameStr.split("\n");
-				for(int i=0; i<tableNameSplitBack.length; ++i){
-					String tableNameBack = tableNameSplitBack[i];
-					String[] tableNameCommoArr = tableNameBack.split(",");
-					for(int j=0; j<tableNameCommoArr.length; ++j){
-						tableNameList.add(tableNameCommoArr[j]);
-					}
-				}
-				try {
-					JButton eBtn = (JButton)e.getSource();
-					eBtn.setEnabled(false);
-					UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tableNameList, createAllTable);					
-					JOptionPane.showMessageDialog(EntityGenWindow.this.frame, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE);
-					eBtn.setEnabled(true);
-				} catch (Exception e1) {
-					e1.printStackTrace();
+		btnNewButton.addActionListener(e -> {
+			List<String> tableNameList = new ArrayList<String>();
+			String tableNameStr = ta_tableList.getText();
+			String[] tableNameSplitBack = tableNameStr.split("\n");
+			for(int i=0; i<tableNameSplitBack.length; ++i){
+				String tableNameBack = tableNameSplitBack[i];
+				String[] tableNameCommoArr = tableNameBack.split(",");
+				for(int j=0; j<tableNameCommoArr.length; ++j){
+					tableNameList.add(tableNameCommoArr[j]);
 				}
 			}
+			try {
+				JButton eBtn = (JButton)e.getSource();
+				eBtn.setEnabled(false);
+				UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tf_dbName.getText(), tableNameList, createAllTable);
+				JOptionPane.showMessageDialog(EntityGenWindow.this, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE);
+				eBtn.setEnabled(true);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
 		});
-		btnNewButton.setBounds(319, 348, 113, 38);
+		btnNewButton.setBounds(319, 360, 113, 38);
 		panel.add(btnNewButton);
 		
 		JLabel label_2 = new JLabel("(逗号分隔或换行)");
@@ -143,16 +127,14 @@ public class EntityGenWindow {
 		panel.add(label_2);
 		
 		JButton button = new JButton("选择文件");
-		button.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				JFileChooser fileChooser = new JFileChooser();
-				fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-				fileChooser.setCurrentDirectory(new File(tf_outputDir.getText()));
-				int status = fileChooser.showOpenDialog(EntityGenWindow.this.frame);
-				if (status == JFileChooser.APPROVE_OPTION) {
-			      File selectedFile = fileChooser.getSelectedFile();
-			      tf_outputDir.setText(selectedFile.getPath());
-			    }
+		button.addActionListener(e -> {
+			JFileChooser fileChooser = new JFileChooser();
+			fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+			fileChooser.setCurrentDirectory(new File(tf_outputDir.getText()));
+			int status = fileChooser.showOpenDialog(EntityGenWindow.this);
+			if (status == JFileChooser.APPROVE_OPTION) {
+			  File selectedFile = fileChooser.getSelectedFile();
+			  tf_outputDir.setText(selectedFile.getPath());
 			}
 		});
 		button.setBounds(562, 239, 93, 23);
@@ -206,6 +188,7 @@ public class EntityGenWindow {
 				EntityGenWindow.this.prop = prop;
 				EntityGenWindow.this.tf_outputDir.setText(prop.getProperty("OutputPath"));
 				EntityGenWindow.this.tf_dbPackage.setText(prop.getProperty("packageName"));
+				EntityGenWindow.this.tf_dbName.setText(prop.getProperty("SchameName"));
 			}
 		});
 	}
diff --git a/src/com/taover/ui/RunEntityGenWindow.java b/src/com/taover/ui/RunEntityGenWindow.java
new file mode 100644
index 0000000..594b137
--- /dev/null
+++ b/src/com/taover/ui/RunEntityGenWindow.java
@@ -0,0 +1,27 @@
+/*
+ * Created by JFormDesigner on Thu May 16 15:05:27 CST 2019
+ */
+
+package com.taover.ui;
+
+import java.awt.*;
+import javax.swing.*;
+import net.miginfocom.swing.*;
+
+/**
+ * @author unknown
+ */
+public class RunEntityGenWindow {
+    public static void main(String args[]){
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                try {
+                    EntityGenWindow window = new EntityGenWindow();
+                    window.setVisible(true);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+}
diff --git a/src/com/taover/ui/UiUtils.java b/src/com/taover/ui/UiUtils.java
index 322cf04..0b0ba1f 100644
--- a/src/com/taover/ui/UiUtils.java
+++ b/src/com/taover/ui/UiUtils.java
@@ -33,18 +33,17 @@ public class UiUtils {
 		return conn;
 	}
 	
-	public static void generateEntity(Properties prop, String dbPackage, String outputPath, List<String> tableNameList, boolean createAllTable) throws Exception{
+	public static void generateEntity(Properties prop, String dbPackage, String outputPath, String schameName, List<String> tableNameList, boolean createAllTable) throws Exception{
 		String driver = prop.getProperty("driver");
 		String user = prop.getProperty("User");
 		String password = prop.getProperty("Password");
 		String url = prop.getProperty("URL");
-		String schameName = prop.getProperty("SchameName");
 		generateEntity(driver, user, password, url, dbPackage, outputPath, schameName, tableNameList, createAllTable);
 	}
 	
 	public static void generateEntity(String driver, String user, String password, String url, String dbPackage, String outputPath, String schameName, List<String> tableNameList, boolean createAllTable) throws Exception{
 		//取数据库连接
-		Connection conn = getConnection(driver, user, password, url);
+		Connection conn = getConnection(driver, user, password, url+schameName);
 		
 		//是否生成全部表实体
 		if (createAllTable) {
@@ -69,7 +68,7 @@ public class UiUtils {
 			String tableNameCurr = (String) tableNameList.get(i);			
 			
 			//取得表中所有列
-			Vector<TableColumn> columnsInTable = TableColumn.GetTableInfo(conn, null, tableNameCurr, "%", "mysql");
+			Vector<TableColumn> columnsInTable = TableColumn.GetTableInfo(conn, schameName, tableNameCurr, "%", "mysql");
 			if (columnsInTable == null || columnsInTable.size() == 0) {
 				System.out.println(tableNameCurr + " : 生成失败，得不到表中列明");
 				continue;
diff --git a/src/local.db.properties b/src/local.db.properties
new file mode 100644
index 0000000..32c4786
--- /dev/null
+++ b/src/local.db.properties
@@ -0,0 +1,16 @@
+#顶层po、dao文件生成总目录
+OutputPath=D:\\dblist\\
+#数据库名
+SchameName=songshuyun_stat
+#数据库库连接信息
+User=tylife
+Password=lexi365
+#数据库驱动类型
+driver=com.mysql.jdbc.Driver
+#数据库连接url
+URL=jdbc\:mysql\://127.0.0.1\:3306/
+#数据库类型
+dbtype=mysql
+#数据库顶层包名
+#packageName=com.taover.printer.db
+packageName=com.ssy.java.entity
--
libgit2 0.21.2