Commit 3d18464738aae2b532557cd9454310503458c33e
1 parent
729e3755
Exists in
master
1.优化
Showing
7 changed files
with
389 additions
and
210 deletions
Show diff stats
.idea/workspace.xml
| ... | ... | @@ -2,64 +2,10 @@ |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 4 | <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/.idea/libraries/lib.xml" afterDir="false" /> | |
| 6 | - <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> | |
| 7 | - <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" /> | |
| 8 | - <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> | |
| 9 | - <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | |
| 10 | - <change afterPath="$PROJECT_DIR$/code-generater.iml" afterDir="false" /> | |
| 11 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ControllerTemplate.ftl" afterDir="false" /> | |
| 12 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/DAOTemplate.ftl" afterDir="false" /> | |
| 13 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/EntityTemplate.ftl" afterDir="false" /> | |
| 14 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/HtmlTemplate.ftl" afterDir="false" /> | |
| 15 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/JsTemplate.ftl" afterDir="false" /> | |
| 16 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/POTemplate.ftl" afterDir="false" /> | |
| 17 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ServiceImplTemplate.ftl" afterDir="false" /> | |
| 18 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/ServiceTemplate.ftl" afterDir="false" /> | |
| 19 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/Temp.ftl" afterDir="false" /> | |
| 20 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/createTableTemplate.ftl" afterDir="false" /> | |
| 21 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ControllerModel.class" afterDir="false" /> | |
| 22 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/EnvironmentModel.class" afterDir="false" /> | |
| 23 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ServiceModel.class" afterDir="false" /> | |
| 24 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/bussiness/ViewModel.class" afterDir="false" /> | |
| 25 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/createTable/ColumnModel.class" afterDir="false" /> | |
| 26 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/createTable/TableModel.class" afterDir="false" /> | |
| 27 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/BaseModel.class" afterDir="false" /> | |
| 28 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/DaoModel.class" afterDir="false" /> | |
| 29 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/dao/FunctionModel.class" afterDir="false" /> | |
| 30 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/ColumnModel.class" afterDir="false" /> | |
| 31 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/PoModel.class" afterDir="false" /> | |
| 32 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/base/template/model/po/TableModel.class" afterDir="false" /> | |
| 33 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/Constants.class" afterDir="false" /> | |
| 34 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateCS.class" afterDir="false" /> | |
| 35 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateController.class" afterDir="false" /> | |
| 36 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateService.class" afterDir="false" /> | |
| 37 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateVCSDP.class" afterDir="false" /> | |
| 38 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/GenerateView.class" afterDir="false" /> | |
| 39 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/Utils.class" afterDir="false" /> | |
| 40 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/business/util/TempVelocity.class" afterDir="false" /> | |
| 41 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/Constants.class" afterDir="false" /> | |
| 42 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateDao.class" afterDir="false" /> | |
| 43 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateDaoPO.class" afterDir="false" /> | |
| 44 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GenerateEntity.class" afterDir="false" /> | |
| 45 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/GeneratePO.class" afterDir="false" /> | |
| 46 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/MainGenerateEntity.class" afterDir="false" /> | |
| 47 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/TableColumn.class" afterDir="false" /> | |
| 48 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/db/Tools.class" afterDir="false" /> | |
| 49 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/tools/StringUtil.class" afterDir="false" /> | |
| 50 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$1.class" afterDir="false" /> | |
| 51 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$2.class" afterDir="false" /> | |
| 52 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$3.class" afterDir="false" /> | |
| 53 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$4.class" afterDir="false" /> | |
| 54 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow$5.class" afterDir="false" /> | |
| 55 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/EntityGenWindow.class" afterDir="false" /> | |
| 56 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/com/taover/ui/UiUtils.class" afterDir="false" /> | |
| 57 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/default.properties" afterDir="false" /> | |
| 58 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/erp.default.properties" afterDir="false" /> | |
| 59 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/evaluate.default.properties" afterDir="false" /> | |
| 60 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/print.default.properties" afterDir="false" /> | |
| 61 | - <change afterPath="$PROJECT_DIR$/out/production/code-generater/schedule.default.properties" afterDir="false" /> | |
| 62 | - <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> | |
| 5 | + <change afterPath="$PROJECT_DIR$/src/local.db.properties" afterDir="false" /> | |
| 6 | + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | |
| 7 | + <change beforePath="$PROJECT_DIR$/code-generater.iml" beforeDir="false" afterPath="$PROJECT_DIR$/code-generater.iml" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" afterDir="false" /> | |
| 63 | 9 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" /> |
| 64 | 10 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" afterDir="false" /> |
| 65 | 11 | </list> |
| ... | ... | @@ -71,37 +17,50 @@ |
| 71 | 17 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 72 | 18 | </component> |
| 73 | 19 | <component name="DefaultGradleProjectSettings"> |
| 74 | - <option name="testRunner" value="GRADLE" /> | |
| 75 | - <option name="delegatedBuild" value="true" /> | |
| 20 | + <option name="isMigrated" value="true" /> | |
| 21 | + </component> | |
| 22 | + <component name="FavoritesManager"> | |
| 23 | + <favorites_list name="code-generater" /> | |
| 76 | 24 | </component> |
| 77 | 25 | <component name="FileEditorManager"> |
| 78 | - <leaf> | |
| 26 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 79 | 27 | <file pinned="false" current-in-tab="false"> |
| 80 | 28 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> |
| 81 | 29 | <provider selected="true" editor-type-id="text-editor"> |
| 82 | - <state relative-caret-position="255"> | |
| 83 | - <caret line="111" column="51" lean-forward="true" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" /> | |
| 30 | + <state relative-caret-position="524"> | |
| 31 | + <caret line="99" column="65" lean-forward="true" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" /> | |
| 84 | 32 | <folding> |
| 85 | - <element signature="e#2981#2989#0" expanded="true" /> | |
| 33 | + <element signature="e#947#948#0" expanded="true" /> | |
| 34 | + <element signature="e#967#968#0" expanded="true" /> | |
| 35 | + <element signature="e#2529#2537#0" expanded="true" /> | |
| 86 | 36 | </folding> |
| 87 | 37 | </state> |
| 88 | 38 | </provider> |
| 89 | 39 | </entry> |
| 90 | 40 | </file> |
| 91 | - <file pinned="false" current-in-tab="true"> | |
| 92 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 41 | + <file pinned="false" current-in-tab="false"> | |
| 42 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java"> | |
| 93 | 43 | <provider selected="true" editor-type-id="text-editor"> |
| 94 | - <state relative-caret-position="132"> | |
| 95 | - <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" /> | |
| 44 | + <state relative-caret-position="352"> | |
| 45 | + <caret line="20" column="39" lean-forward="true" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" /> | |
| 96 | 46 | </state> |
| 97 | 47 | </provider> |
| 98 | 48 | </entry> |
| 99 | 49 | </file> |
| 100 | 50 | <file pinned="false" current-in-tab="false"> |
| 51 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java"> | |
| 52 | + <provider selected="true" editor-type-id="text-editor"> | |
| 53 | + <state relative-caret-position="306"> | |
| 54 | + <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> | |
| 55 | + </state> | |
| 56 | + </provider> | |
| 57 | + </entry> | |
| 58 | + </file> | |
| 59 | + <file pinned="false" current-in-tab="true"> | |
| 101 | 60 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 102 | 61 | <provider selected="true" editor-type-id="text-editor"> |
| 103 | - <state relative-caret-position="-17"> | |
| 104 | - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" /> | |
| 62 | + <state relative-caret-position="299"> | |
| 63 | + <caret line="45" column="78" selection-start-line="45" selection-start-column="78" selection-end-line="45" selection-end-column="78" /> | |
| 105 | 64 | <folding> |
| 106 | 65 | <element signature="e#407#408#0" expanded="true" /> |
| 107 | 66 | <element signature="e#461#462#0" expanded="true" /> |
| ... | ... | @@ -111,9 +70,50 @@ |
| 111 | 70 | </entry> |
| 112 | 71 | </file> |
| 113 | 72 | <file pinned="false" current-in-tab="false"> |
| 73 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java"> | |
| 74 | + <provider selected="true" editor-type-id="text-editor"> | |
| 75 | + <state relative-caret-position="168"> | |
| 76 | + <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" /> | |
| 77 | + </state> | |
| 78 | + </provider> | |
| 79 | + </entry> | |
| 80 | + </file> | |
| 81 | + <file pinned="false" current-in-tab="false"> | |
| 82 | + <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | |
| 83 | + <provider selected="true" editor-type-id="text-editor"> | |
| 84 | + <state relative-caret-position="-14"> | |
| 85 | + <caret line="17" column="38" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="38" /> | |
| 86 | + </state> | |
| 87 | + </provider> | |
| 88 | + </entry> | |
| 89 | + </file> | |
| 90 | + <file pinned="false" current-in-tab="false"> | |
| 91 | + <entry file="file://$PROJECT_DIR$/src/local.db.properties"> | |
| 92 | + <provider selected="true" editor-type-id="text-editor"> | |
| 93 | + <state relative-caret-position="220"> | |
| 94 | + <caret line="10" column="35" lean-forward="true" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" /> | |
| 95 | + </state> | |
| 96 | + </provider> | |
| 97 | + </entry> | |
| 98 | + </file> | |
| 99 | + <file pinned="false" current-in-tab="false"> | |
| 100 | + <entry file="file://$PROJECT_DIR$/src/print.default.properties"> | |
| 101 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 102 | + </entry> | |
| 103 | + </file> | |
| 104 | + <file pinned="false" current-in-tab="false"> | |
| 105 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java"> | |
| 106 | + <provider selected="true" editor-type-id="text-editor"> | |
| 107 | + <state relative-caret-position="189"> | |
| 108 | + <caret line="1663" column="14" selection-start-line="1663" selection-start-column="14" selection-end-line="1663" selection-end-column="14" /> | |
| 109 | + </state> | |
| 110 | + </provider> | |
| 111 | + </entry> | |
| 112 | + </file> | |
| 113 | + <file pinned="false" current-in-tab="false"> | |
| 114 | 114 | <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java"> |
| 115 | 115 | <provider selected="true" editor-type-id="text-editor"> |
| 116 | - <state relative-caret-position="-17"> | |
| 116 | + <state relative-caret-position="616"> | |
| 117 | 117 | <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" /> |
| 118 | 118 | </state> |
| 119 | 119 | </provider> |
| ... | ... | @@ -124,9 +124,12 @@ |
| 124 | 124 | <component name="FindInProjectRecents"> |
| 125 | 125 | <findStrings> |
| 126 | 126 | <find>Tools.getPath()</find> |
| 127 | + <find>frame.</find> | |
| 128 | + <find>Tools.getPath</find> | |
| 127 | 129 | </findStrings> |
| 128 | 130 | <replaceStrings> |
| 129 | 131 | <replace>UiUtils.getProjectRoot()</replace> |
| 132 | + <replace>this.</replace> | |
| 130 | 133 | </replaceStrings> |
| 131 | 134 | </component> |
| 132 | 135 | <component name="Git.Settings"> |
| ... | ... | @@ -135,81 +138,79 @@ |
| 135 | 138 | <component name="IdeDocumentHistory"> |
| 136 | 139 | <option name="CHANGED_PATHS"> |
| 137 | 140 | <list> |
| 138 | - <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> | |
| 139 | - <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | |
| 140 | 141 | <option value="$PROJECT_DIR$/.gitignore" /> |
| 142 | + <option value="$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java" /> | |
| 143 | + <option value="$PROJECT_DIR$/src/com/taover/ui/Temp.form" /> | |
| 144 | + <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | |
| 145 | + <option value="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" /> | |
| 146 | + <option value="$PROJECT_DIR$/src/local.db.properties" /> | |
| 147 | + <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> | |
| 141 | 148 | </list> |
| 142 | 149 | </option> |
| 143 | 150 | </component> |
| 151 | + <component name="MavenProjectNavigator"> | |
| 152 | + <treeState> | |
| 153 | + <expand /> | |
| 154 | + <select /> | |
| 155 | + </treeState> | |
| 156 | + </component> | |
| 144 | 157 | <component name="ProjectFrameBounds" extendedState="6"> |
| 145 | 158 | <option name="x" value="260" /> |
| 146 | 159 | <option name="y" value="20" /> |
| 147 | 160 | <option name="width" value="1400" /> |
| 148 | 161 | <option name="height" value="1000" /> |
| 149 | 162 | </component> |
| 163 | + <component name="ProjectLevelVcsManager"> | |
| 164 | + <ConfirmationsSetting value="2" id="Add" /> | |
| 165 | + </component> | |
| 150 | 166 | <component name="ProjectView"> |
| 151 | 167 | <navigator proportions="" version="1"> |
| 152 | 168 | <foldersAlwaysOnTop value="true" /> |
| 153 | 169 | </navigator> |
| 154 | 170 | <panes> |
| 155 | - <pane id="ProjectPane"> | |
| 171 | + <pane id="PackagesPane"> | |
| 156 | 172 | <subPane> |
| 157 | 173 | <expand> |
| 158 | 174 | <path> |
| 159 | - <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | |
| 160 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 161 | - </path> | |
| 162 | - <path> | |
| 163 | - <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | |
| 164 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 165 | - <item name="out" type="462c0819:PsiDirectoryNode" /> | |
| 166 | - </path> | |
| 167 | - <path> | |
| 168 | - <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | |
| 169 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 170 | - <item name="out" type="462c0819:PsiDirectoryNode" /> | |
| 171 | - <item name="production" type="462c0819:PsiDirectoryNode" /> | |
| 172 | - </path> | |
| 173 | - <path> | |
| 174 | - <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | |
| 175 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 176 | - <item name="out" type="462c0819:PsiDirectoryNode" /> | |
| 177 | - <item name="production" type="462c0819:PsiDirectoryNode" /> | |
| 178 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 179 | - </path> | |
| 180 | - <path> | |
| 181 | - <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | |
| 182 | - <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | |
| 183 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 175 | + <item name="code-generater" type="58d84e3e:PackageViewProjectNode" /> | |
| 176 | + <item name="code-generater" type="616d4139:PackageViewModuleNode" /> | |
| 184 | 177 | </path> |
| 178 | + </expand> | |
| 179 | + <select /> | |
| 180 | + </subPane> | |
| 181 | + </pane> | |
| 182 | + <pane id="ProjectPane"> | |
| 183 | + <subPane> | |
| 184 | + <expand> | |
| 185 | 185 | <path> |
| 186 | 186 | <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> |
| 187 | 187 | <item name="code-generater" type="462c0819:PsiDirectoryNode" /> |
| 188 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 189 | - <item name="taover" type="462c0819:PsiDirectoryNode" /> | |
| 190 | 188 | </path> |
| 191 | 189 | <path> |
| 192 | 190 | <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> |
| 193 | 191 | <item name="code-generater" type="462c0819:PsiDirectoryNode" /> |
| 194 | 192 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 195 | - <item name="taover" type="462c0819:PsiDirectoryNode" /> | |
| 196 | - <item name="ui" type="462c0819:PsiDirectoryNode" /> | |
| 197 | 193 | </path> |
| 198 | 194 | </expand> |
| 199 | 195 | <select /> |
| 200 | 196 | </subPane> |
| 201 | 197 | </pane> |
| 202 | 198 | <pane id="Scope" /> |
| 203 | - <pane id="PackagesPane" /> | |
| 204 | 199 | </panes> |
| 205 | 200 | </component> |
| 206 | 201 | <component name="PropertiesComponent"> |
| 207 | 202 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 208 | 203 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 209 | 204 | <property name="aspect.path.notification.shown" value="true" /> |
| 205 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/src" /> | |
| 210 | 206 | <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> |
| 211 | 207 | <property name="nodejs_npm_path_reset_for_default_project" value="true" /> |
| 212 | - <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" /> | |
| 208 | + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> | |
| 209 | + </component> | |
| 210 | + <component name="RecentsManager"> | |
| 211 | + <key name="CopyFile.RECENT_KEYS"> | |
| 212 | + <recent name="D:\workproject\code-generater\src" /> | |
| 213 | + </key> | |
| 213 | 214 | </component> |
| 214 | 215 | <component name="RunDashboard"> |
| 215 | 216 | <option name="ruleStates"> |
| ... | ... | @@ -223,7 +224,7 @@ |
| 223 | 224 | </list> |
| 224 | 225 | </option> |
| 225 | 226 | </component> |
| 226 | - <component name="RunManager"> | |
| 227 | + <component name="RunManager" selected="Application.RunEntityGenWindow"> | |
| 227 | 228 | <configuration name="EntityGenWindow" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> |
| 228 | 229 | <option name="MAIN_CLASS_NAME" value="com.taover.ui.EntityGenWindow" /> |
| 229 | 230 | <module name="code-generater" /> |
| ... | ... | @@ -237,14 +238,28 @@ |
| 237 | 238 | <option name="Make" enabled="true" /> |
| 238 | 239 | </method> |
| 239 | 240 | </configuration> |
| 241 | + <configuration name="RunEntityGenWindow" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | |
| 242 | + <option name="MAIN_CLASS_NAME" value="com.taover.ui.RunEntityGenWindow" /> | |
| 243 | + <module name="code-generater" /> | |
| 244 | + <extension name="coverage"> | |
| 245 | + <pattern> | |
| 246 | + <option name="PATTERN" value="com.taover.ui.*" /> | |
| 247 | + <option name="ENABLED" value="true" /> | |
| 248 | + </pattern> | |
| 249 | + </extension> | |
| 250 | + <method v="2"> | |
| 251 | + <option name="Make" enabled="true" /> | |
| 252 | + </method> | |
| 253 | + </configuration> | |
| 240 | 254 | <recent_temporary> |
| 241 | 255 | <list> |
| 256 | + <item itemvalue="Application.RunEntityGenWindow" /> | |
| 242 | 257 | <item itemvalue="Application.EntityGenWindow" /> |
| 243 | 258 | </list> |
| 244 | 259 | </recent_temporary> |
| 245 | 260 | </component> |
| 246 | 261 | <component name="SvnConfiguration"> |
| 247 | - <configuration /> | |
| 262 | + <configuration>C:\Users\root\AppData\Roaming\Subversion</configuration> | |
| 248 | 263 | </component> |
| 249 | 264 | <component name="TaskManager"> |
| 250 | 265 | <task active="true" id="Default" summary="Default task"> |
| ... | ... | @@ -253,51 +268,70 @@ |
| 253 | 268 | <option name="number" value="Default" /> |
| 254 | 269 | <option name="presentableId" value="Default" /> |
| 255 | 270 | <updated>1557914467884</updated> |
| 256 | - <workItem from="1557914479970" duration="1392000" /> | |
| 271 | + <workItem from="1557914479970" duration="3550000" /> | |
| 272 | + <workItem from="1557989274327" duration="323000" /> | |
| 273 | + <workItem from="1557989640809" duration="476000" /> | |
| 274 | + <workItem from="1557990143187" duration="4364000" /> | |
| 257 | 275 | </task> |
| 258 | 276 | <servers /> |
| 259 | 277 | </component> |
| 260 | 278 | <component name="TimeTrackingManager"> |
| 261 | - <option name="totallyTimeSpent" value="1392000" /> | |
| 279 | + <option name="totallyTimeSpent" value="8713000" /> | |
| 262 | 280 | </component> |
| 263 | 281 | <component name="ToolWindowManager"> |
| 264 | 282 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
| 265 | 283 | <editor active="true" /> |
| 266 | 284 | <layout> |
| 267 | - <window_info id="Image Layers" /> | |
| 268 | - <window_info id="Designer" /> | |
| 269 | - <window_info id="UI Designer" /> | |
| 270 | - <window_info id="Capture Tool" /> | |
| 271 | - <window_info id="Favorites" side_tool="true" /> | |
| 272 | - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> | |
| 285 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.25799572" /> | |
| 273 | 286 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 274 | - <window_info anchor="bottom" id="Messages" weight="0.329718" /> | |
| 275 | - <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> | |
| 276 | - <window_info anchor="bottom" id="Database Changes" /> | |
| 277 | - <window_info anchor="bottom" id="Version Control" /> | |
| 278 | - <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.329718" /> | |
| 279 | - <window_info anchor="bottom" id="Event Log" side_tool="true" /> | |
| 287 | + <window_info id="Image Layers" order="2" /> | |
| 288 | + <window_info id="Designer" order="3" /> | |
| 289 | + <window_info id="UI Designer" order="4" /> | |
| 290 | + <window_info id="Capture Tool" order="5" /> | |
| 291 | + <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> | |
| 280 | 292 | <window_info anchor="bottom" id="Message" order="0" /> |
| 281 | 293 | <window_info anchor="bottom" id="Find" order="1" /> |
| 282 | - <window_info anchor="bottom" id="Run" order="2" weight="0.329718" /> | |
| 294 | + <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" /> | |
| 283 | 295 | <window_info anchor="bottom" id="Debug" order="3" weight="0.3991323" /> |
| 284 | 296 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 285 | 297 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 286 | 298 | <window_info anchor="bottom" id="TODO" order="6" /> |
| 287 | - <window_info anchor="right" id="Palette" /> | |
| 288 | - <window_info anchor="right" id="Theme Preview" /> | |
| 289 | - <window_info anchor="right" id="Maven" /> | |
| 290 | - <window_info anchor="right" id="Capture Analysis" /> | |
| 291 | - <window_info anchor="right" id="Palette	" /> | |
| 292 | - <window_info anchor="right" id="Database" /> | |
| 299 | + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
| 300 | + <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" /> | |
| 301 | + <window_info anchor="bottom" id="Database Changes" order="9" /> | |
| 302 | + <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" /> | |
| 303 | + <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> | |
| 304 | + <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> | |
| 293 | 305 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 294 | 306 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 295 | 307 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| 308 | + <window_info anchor="right" id="Palette" order="3" /> | |
| 309 | + <window_info anchor="right" id="Database" order="4" /> | |
| 310 | + <window_info anchor="right" id="Theme Preview" order="5" /> | |
| 311 | + <window_info anchor="right" id="Maven" order="6" weight="0.32995737" /> | |
| 312 | + <window_info anchor="right" id="Capture Analysis" order="7" /> | |
| 313 | + <window_info anchor="right" id="Palette	" order="8" /> | |
| 296 | 314 | </layout> |
| 297 | 315 | </component> |
| 298 | 316 | <component name="TypeScriptGeneratedFilesManager"> |
| 299 | 317 | <option name="version" value="1" /> |
| 300 | 318 | </component> |
| 319 | + <component name="XDebuggerManager"> | |
| 320 | + <breakpoint-manager> | |
| 321 | + <breakpoints> | |
| 322 | + <line-breakpoint enabled="true" type="java-line"> | |
| 323 | + <url>file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java</url> | |
| 324 | + <line>434</line> | |
| 325 | + <properties /> | |
| 326 | + <option name="timeStamp" value="4" /> | |
| 327 | + </line-breakpoint> | |
| 328 | + </breakpoints> | |
| 329 | + </breakpoint-manager> | |
| 330 | + </component> | |
| 331 | + <component name="antWorkspaceConfiguration"> | |
| 332 | + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | |
| 333 | + <option name="FILTER_TARGETS" value="false" /> | |
| 334 | + </component> | |
| 301 | 335 | <component name="editorHistoryManager"> |
| 302 | 336 | <entry file="file://$PROJECT_DIR$/code-generater.iml"> |
| 303 | 337 | <provider selected="true" editor-type-id="text-editor"> |
| ... | ... | @@ -306,38 +340,156 @@ |
| 306 | 340 | </state> |
| 307 | 341 | </provider> |
| 308 | 342 | </entry> |
| 309 | - <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java"> | |
| 343 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 310 | 344 | <provider selected="true" editor-type-id="text-editor"> |
| 311 | - <state relative-caret-position="-17"> | |
| 312 | - <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" /> | |
| 345 | + <state relative-caret-position="132"> | |
| 346 | + <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" /> | |
| 313 | 347 | </state> |
| 314 | 348 | </provider> |
| 315 | 349 | </entry> |
| 316 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | |
| 350 | + <entry file="file://$APPLICATION_CONFIG_DIR$/extensions/com.intellij.database/schema/Generate POJOs.groovy"> | |
| 317 | 351 | <provider selected="true" editor-type-id="text-editor"> |
| 318 | - <state relative-caret-position="-17"> | |
| 319 | - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" /> | |
| 352 | + <state relative-caret-position="-1016"> | |
| 353 | + <caret line="8" column="29" lean-forward="true" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" /> | |
| 320 | 354 | <folding> |
| 321 | - <element signature="e#407#408#0" expanded="true" /> | |
| 322 | - <element signature="e#461#462#0" expanded="true" /> | |
| 355 | + <element signature="e#0#43#0" expanded="true" /> | |
| 323 | 356 | </folding> |
| 324 | 357 | </state> |
| 325 | 358 | </provider> |
| 326 | 359 | </entry> |
| 360 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java"> | |
| 361 | + <provider selected="true" editor-type-id="text-editor"> | |
| 362 | + <state relative-caret-position="616"> | |
| 363 | + <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" /> | |
| 364 | + </state> | |
| 365 | + </provider> | |
| 366 | + </entry> | |
| 367 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindowE.jfd"> | |
| 368 | + <provider selected="true" editor-type-id="JFormDesigner"> | |
| 369 | + <state paletteWidth="0" propertiesWidth="0" structureHeight="0" /> | |
| 370 | + </provider> | |
| 371 | + </entry> | |
| 372 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.jfd"> | |
| 373 | + <provider selected="true" editor-type-id="JFormDesigner"> | |
| 374 | + <state paletteWidth="0" propertiesWidth="0" structureHeight="0" /> | |
| 375 | + </provider> | |
| 376 | + </entry> | |
| 377 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.java"> | |
| 378 | + <provider selected="true" editor-type-id="text-editor"> | |
| 379 | + <state relative-caret-position="-902"> | |
| 380 | + <caret line="18" column="31" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="31" /> | |
| 381 | + </state> | |
| 382 | + </provider> | |
| 383 | + </entry> | |
| 384 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/awt/event/ActionListener.java"> | |
| 385 | + <provider selected="true" editor-type-id="text-editor"> | |
| 386 | + <state relative-caret-position="572"> | |
| 387 | + <caret line="49" column="16" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="16" /> | |
| 388 | + </state> | |
| 389 | + </provider> | |
| 390 | + </entry> | |
| 391 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.java"> | |
| 392 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 393 | + </entry> | |
| 394 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.jfd"> | |
| 395 | + <provider selected="true" editor-type-id="JFormDesigner"> | |
| 396 | + <state paletteWidth="0" propertiesWidth="0" structureHeight="0" /> | |
| 397 | + </provider> | |
| 398 | + </entry> | |
| 399 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/Temp.form"> | |
| 400 | + <provider selected="true" editor-type-id="ui-designer" /> | |
| 401 | + </entry> | |
| 402 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.jfd"> | |
| 403 | + <provider selected="true" editor-type-id="JFormDesigner"> | |
| 404 | + <state paletteWidth="0" propertiesWidth="0" structureHeight="0" /> | |
| 405 | + </provider> | |
| 406 | + </entry> | |
| 407 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.java"> | |
| 408 | + <provider selected="true" editor-type-id="text-editor"> | |
| 409 | + <state relative-caret-position="-1316"> | |
| 410 | + <caret line="11" column="18" lean-forward="true" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" /> | |
| 411 | + </state> | |
| 412 | + </provider> | |
| 413 | + </entry> | |
| 414 | + <entry file="file://$PROJECT_DIR$/src/default.properties"> | |
| 415 | + <provider selected="true" editor-type-id="text-editor"> | |
| 416 | + <state relative-caret-position="110"> | |
| 417 | + <caret line="5" column="10" selection-start-line="5" selection-end-line="5" selection-end-column="10" /> | |
| 418 | + </state> | |
| 419 | + </provider> | |
| 420 | + </entry> | |
| 421 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java"> | |
| 422 | + <provider selected="true" editor-type-id="text-editor"> | |
| 423 | + <state relative-caret-position="306"> | |
| 424 | + <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> | |
| 425 | + </state> | |
| 426 | + </provider> | |
| 427 | + </entry> | |
| 428 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java"> | |
| 429 | + <provider selected="true" editor-type-id="text-editor"> | |
| 430 | + <state relative-caret-position="167"> | |
| 431 | + <caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" /> | |
| 432 | + </state> | |
| 433 | + </provider> | |
| 434 | + </entry> | |
| 435 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java"> | |
| 436 | + <provider selected="true" editor-type-id="text-editor"> | |
| 437 | + <state relative-caret-position="189"> | |
| 438 | + <caret line="1663" column="14" selection-start-line="1663" selection-start-column="14" selection-end-line="1663" selection-end-column="14" /> | |
| 439 | + </state> | |
| 440 | + </provider> | |
| 441 | + </entry> | |
| 442 | + <entry file="file://$PROJECT_DIR$/src/print.default.properties"> | |
| 443 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 444 | + </entry> | |
| 445 | + <entry file="file://$PROJECT_DIR$/src/local.db.properties"> | |
| 446 | + <provider selected="true" editor-type-id="text-editor"> | |
| 447 | + <state relative-caret-position="220"> | |
| 448 | + <caret line="10" column="35" lean-forward="true" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" /> | |
| 449 | + </state> | |
| 450 | + </provider> | |
| 451 | + </entry> | |
| 452 | + <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | |
| 453 | + <provider selected="true" editor-type-id="text-editor"> | |
| 454 | + <state relative-caret-position="-14"> | |
| 455 | + <caret line="17" column="38" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="38" /> | |
| 456 | + </state> | |
| 457 | + </provider> | |
| 458 | + </entry> | |
| 459 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java"> | |
| 460 | + <provider selected="true" editor-type-id="text-editor"> | |
| 461 | + <state relative-caret-position="352"> | |
| 462 | + <caret line="20" column="39" lean-forward="true" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" /> | |
| 463 | + </state> | |
| 464 | + </provider> | |
| 465 | + </entry> | |
| 466 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java"> | |
| 467 | + <provider selected="true" editor-type-id="text-editor"> | |
| 468 | + <state relative-caret-position="168"> | |
| 469 | + <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" /> | |
| 470 | + </state> | |
| 471 | + </provider> | |
| 472 | + </entry> | |
| 327 | 473 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> |
| 328 | 474 | <provider selected="true" editor-type-id="text-editor"> |
| 329 | - <state relative-caret-position="255"> | |
| 330 | - <caret line="111" column="51" lean-forward="true" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" /> | |
| 475 | + <state relative-caret-position="524"> | |
| 476 | + <caret line="99" column="65" lean-forward="true" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" /> | |
| 331 | 477 | <folding> |
| 332 | - <element signature="e#2981#2989#0" expanded="true" /> | |
| 478 | + <element signature="e#947#948#0" expanded="true" /> | |
| 479 | + <element signature="e#967#968#0" expanded="true" /> | |
| 480 | + <element signature="e#2529#2537#0" expanded="true" /> | |
| 333 | 481 | </folding> |
| 334 | 482 | </state> |
| 335 | 483 | </provider> |
| 336 | 484 | </entry> |
| 337 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 485 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | |
| 338 | 486 | <provider selected="true" editor-type-id="text-editor"> |
| 339 | - <state relative-caret-position="132"> | |
| 340 | - <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" /> | |
| 487 | + <state relative-caret-position="299"> | |
| 488 | + <caret line="45" column="78" selection-start-line="45" selection-start-column="78" selection-end-line="45" selection-end-column="78" /> | |
| 489 | + <folding> | |
| 490 | + <element signature="e#407#408#0" expanded="true" /> | |
| 491 | + <element signature="e#461#462#0" expanded="true" /> | |
| 492 | + </folding> | |
| 341 | 493 | </state> |
| 342 | 494 | </provider> |
| 343 | 495 | </entry> | ... | ... |
code-generater.iml
| ... | ... | @@ -8,5 +8,6 @@ |
| 8 | 8 | <orderEntry type="inheritedJdk" /> |
| 9 | 9 | <orderEntry type="sourceFolder" forTests="false" /> |
| 10 | 10 | <orderEntry type="library" name="lib" level="project" /> |
| 11 | + <orderEntry type="library" name="MigLayout" level="project" /> | |
| 11 | 12 | </component> |
| 12 | 13 | </module> |
| 13 | 14 | \ No newline at end of file | ... | ... |
src/com/taover/db/GenerateEntity.java
| ... | ... | @@ -11,6 +11,7 @@ import com.taover.base.template.model.po.ColumnModel; |
| 11 | 11 | import com.taover.base.template.model.po.PoModel; |
| 12 | 12 | import com.taover.base.template.model.po.TableModel; |
| 13 | 13 | |
| 14 | +import com.taover.ui.UiUtils; | |
| 14 | 15 | import freemarker.template.Configuration; |
| 15 | 16 | import freemarker.template.Template; |
| 16 | 17 | |
| ... | ... | @@ -32,7 +33,7 @@ public class GenerateEntity { |
| 32 | 33 | cif.setToStringMethodBody(getPOToString(ColumnsInTable)); |
| 33 | 34 | cif.setTablemodel(tm); |
| 34 | 35 | |
| 35 | - File f = new File(Tools.getPath() + Constants.TEMPATE_PATH); | |
| 36 | + File f = new File(UiUtils.getProjectRoot() + Constants.TEMPATE_PATH); | |
| 36 | 37 | Configuration cfg = new Configuration(); |
| 37 | 38 | cfg.setDirectoryForTemplateLoading(f); |
| 38 | 39 | cfg.setDefaultEncoding("utf-8"); | ... | ... |
src/com/taover/ui/EntityGenWindow.java
| 1 | 1 | package com.taover.ui; |
| 2 | 2 | |
| 3 | 3 | import java.awt.BorderLayout; |
| 4 | -import java.awt.EventQueue; | |
| 5 | 4 | import java.awt.event.ActionEvent; |
| 6 | 5 | import java.awt.event.ActionListener; |
| 7 | 6 | import java.io.File; |
| ... | ... | @@ -24,51 +23,29 @@ import javax.swing.JTextArea; |
| 24 | 23 | import javax.swing.JTextField; |
| 25 | 24 | import javax.swing.SwingConstants; |
| 26 | 25 | |
| 27 | -import com.taover.db.Tools; | |
| 26 | +public class EntityGenWindow extends JFrame{ | |
| 28 | 27 | |
| 29 | -public class EntityGenWindow { | |
| 30 | - | |
| 31 | - private JFrame frame; | |
| 32 | 28 | private JTextField tf_outputDir; |
| 33 | 29 | private JTextField tf_dbPackage; |
| 30 | + private JTextField tf_dbName; | |
| 34 | 31 | private JTextArea ta_tableList; |
| 35 | 32 | private Properties prop; |
| 36 | 33 | private boolean createAllTable; |
| 37 | 34 | |
| 38 | - /** | |
| 39 | - * Launch the application. | |
| 40 | - */ | |
| 41 | - public static void main(String[] args) { | |
| 42 | - EventQueue.invokeLater(new Runnable() { | |
| 43 | - public void run() { | |
| 44 | - try { | |
| 45 | - EntityGenWindow window = new EntityGenWindow(); | |
| 46 | - window.frame.setVisible(true); | |
| 47 | - } catch (Exception e) { | |
| 48 | - e.printStackTrace(); | |
| 49 | - } | |
| 50 | - } | |
| 51 | - }); | |
| 52 | - } | |
| 53 | - | |
| 54 | - /** | |
| 55 | - * Create the application. | |
| 56 | - */ | |
| 57 | - public EntityGenWindow() { | |
| 58 | - initialize(); | |
| 35 | + public EntityGenWindow(){ | |
| 36 | + initComponents(); | |
| 59 | 37 | } |
| 60 | 38 | |
| 61 | 39 | /** |
| 62 | 40 | * Initialize the contents of the frame. |
| 63 | 41 | */ |
| 64 | - private void initialize() { | |
| 65 | - frame = new JFrame(); | |
| 66 | - frame.setBounds(100, 100, 746, 464); | |
| 67 | - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); | |
| 42 | + private void initComponents() { | |
| 43 | + this.setBounds(100, 100, 746, 464); | |
| 44 | + this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); | |
| 68 | 45 | |
| 69 | 46 | JPanel panel = new JPanel(); |
| 70 | - frame.getContentPane().add(panel, BorderLayout.CENTER); | |
| 71 | - frame.setTitle("生成实体文件"); | |
| 47 | + this.getContentPane().add(panel, BorderLayout.CENTER); | |
| 48 | + this.setTitle("生成实体文件"); | |
| 72 | 49 | panel.setLayout(null); |
| 73 | 50 | |
| 74 | 51 | JLabel lblNewLabel = new JLabel("表名列表"); |
| ... | ... | @@ -108,32 +85,39 @@ public class EntityGenWindow { |
| 108 | 85 | tf_dbPackage.setColumns(10); |
| 109 | 86 | tf_dbPackage.setBounds(139, 280, 413, 21); |
| 110 | 87 | panel.add(tf_dbPackage); |
| 88 | + | |
| 89 | + JLabel lblClass1 = new JLabel("数据库名称"); | |
| 90 | + lblClass1.setBounds(40, 320, 89, 15); | |
| 91 | + panel.add(lblClass1); | |
| 92 | + | |
| 93 | + tf_dbName = new JTextField(); | |
| 94 | + tf_dbName.setColumns(10); | |
| 95 | + tf_dbName.setBounds(139, 320, 413, 21); | |
| 96 | + panel.add(tf_dbName); | |
| 111 | 97 | |
| 112 | 98 | JButton btnNewButton = new JButton("生成文件"); |
| 113 | - btnNewButton.addActionListener(new ActionListener() { | |
| 114 | - public void actionPerformed(ActionEvent e) { | |
| 115 | - List<String> tableNameList = new ArrayList<String>(); | |
| 116 | - String tableNameStr = ta_tableList.getText(); | |
| 117 | - String[] tableNameSplitBack = tableNameStr.split("\n"); | |
| 118 | - for(int i=0; i<tableNameSplitBack.length; ++i){ | |
| 119 | - String tableNameBack = tableNameSplitBack[i]; | |
| 120 | - String[] tableNameCommoArr = tableNameBack.split(","); | |
| 121 | - for(int j=0; j<tableNameCommoArr.length; ++j){ | |
| 122 | - tableNameList.add(tableNameCommoArr[j]); | |
| 123 | - } | |
| 124 | - } | |
| 125 | - try { | |
| 126 | - JButton eBtn = (JButton)e.getSource(); | |
| 127 | - eBtn.setEnabled(false); | |
| 128 | - UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tableNameList, createAllTable); | |
| 129 | - JOptionPane.showMessageDialog(EntityGenWindow.this.frame, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE); | |
| 130 | - eBtn.setEnabled(true); | |
| 131 | - } catch (Exception e1) { | |
| 132 | - e1.printStackTrace(); | |
| 99 | + btnNewButton.addActionListener(e -> { | |
| 100 | + List<String> tableNameList = new ArrayList<String>(); | |
| 101 | + String tableNameStr = ta_tableList.getText(); | |
| 102 | + String[] tableNameSplitBack = tableNameStr.split("\n"); | |
| 103 | + for(int i=0; i<tableNameSplitBack.length; ++i){ | |
| 104 | + String tableNameBack = tableNameSplitBack[i]; | |
| 105 | + String[] tableNameCommoArr = tableNameBack.split(","); | |
| 106 | + for(int j=0; j<tableNameCommoArr.length; ++j){ | |
| 107 | + tableNameList.add(tableNameCommoArr[j]); | |
| 133 | 108 | } |
| 134 | 109 | } |
| 110 | + try { | |
| 111 | + JButton eBtn = (JButton)e.getSource(); | |
| 112 | + eBtn.setEnabled(false); | |
| 113 | + UiUtils.generateEntity(EntityGenWindow.this.prop, tf_dbPackage.getText(), tf_outputDir.getText(), tf_dbName.getText(), tableNameList, createAllTable); | |
| 114 | + JOptionPane.showMessageDialog(EntityGenWindow.this, "生成完成", "提示信息", JOptionPane.INFORMATION_MESSAGE); | |
| 115 | + eBtn.setEnabled(true); | |
| 116 | + } catch (Exception e1) { | |
| 117 | + e1.printStackTrace(); | |
| 118 | + } | |
| 135 | 119 | }); |
| 136 | - btnNewButton.setBounds(319, 348, 113, 38); | |
| 120 | + btnNewButton.setBounds(319, 360, 113, 38); | |
| 137 | 121 | panel.add(btnNewButton); |
| 138 | 122 | |
| 139 | 123 | JLabel label_2 = new JLabel("(逗号分隔或换行)"); |
| ... | ... | @@ -143,16 +127,14 @@ public class EntityGenWindow { |
| 143 | 127 | panel.add(label_2); |
| 144 | 128 | |
| 145 | 129 | JButton button = new JButton("选择文件"); |
| 146 | - button.addActionListener(new ActionListener() { | |
| 147 | - public void actionPerformed(ActionEvent e) { | |
| 148 | - JFileChooser fileChooser = new JFileChooser(); | |
| 149 | - fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); | |
| 150 | - fileChooser.setCurrentDirectory(new File(tf_outputDir.getText())); | |
| 151 | - int status = fileChooser.showOpenDialog(EntityGenWindow.this.frame); | |
| 152 | - if (status == JFileChooser.APPROVE_OPTION) { | |
| 153 | - File selectedFile = fileChooser.getSelectedFile(); | |
| 154 | - tf_outputDir.setText(selectedFile.getPath()); | |
| 155 | - } | |
| 130 | + button.addActionListener(e -> { | |
| 131 | + JFileChooser fileChooser = new JFileChooser(); | |
| 132 | + fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); | |
| 133 | + fileChooser.setCurrentDirectory(new File(tf_outputDir.getText())); | |
| 134 | + int status = fileChooser.showOpenDialog(EntityGenWindow.this); | |
| 135 | + if (status == JFileChooser.APPROVE_OPTION) { | |
| 136 | + File selectedFile = fileChooser.getSelectedFile(); | |
| 137 | + tf_outputDir.setText(selectedFile.getPath()); | |
| 156 | 138 | } |
| 157 | 139 | }); |
| 158 | 140 | button.setBounds(562, 239, 93, 23); |
| ... | ... | @@ -206,6 +188,7 @@ public class EntityGenWindow { |
| 206 | 188 | EntityGenWindow.this.prop = prop; |
| 207 | 189 | EntityGenWindow.this.tf_outputDir.setText(prop.getProperty("OutputPath")); |
| 208 | 190 | EntityGenWindow.this.tf_dbPackage.setText(prop.getProperty("packageName")); |
| 191 | + EntityGenWindow.this.tf_dbName.setText(prop.getProperty("SchameName")); | |
| 209 | 192 | } |
| 210 | 193 | }); |
| 211 | 194 | } | ... | ... |
| ... | ... | @@ -0,0 +1,27 @@ |
| 1 | +/* | |
| 2 | + * Created by JFormDesigner on Thu May 16 15:05:27 CST 2019 | |
| 3 | + */ | |
| 4 | + | |
| 5 | +package com.taover.ui; | |
| 6 | + | |
| 7 | +import java.awt.*; | |
| 8 | +import javax.swing.*; | |
| 9 | +import net.miginfocom.swing.*; | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * @author unknown | |
| 13 | + */ | |
| 14 | +public class RunEntityGenWindow { | |
| 15 | + public static void main(String args[]){ | |
| 16 | + EventQueue.invokeLater(new Runnable() { | |
| 17 | + public void run() { | |
| 18 | + try { | |
| 19 | + EntityGenWindow window = new EntityGenWindow(); | |
| 20 | + window.setVisible(true); | |
| 21 | + } catch (Exception e) { | |
| 22 | + e.printStackTrace(); | |
| 23 | + } | |
| 24 | + } | |
| 25 | + }); | |
| 26 | + } | |
| 27 | +} | ... | ... |
src/com/taover/ui/UiUtils.java
| ... | ... | @@ -33,18 +33,17 @@ public class UiUtils { |
| 33 | 33 | return conn; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public static void generateEntity(Properties prop, String dbPackage, String outputPath, List<String> tableNameList, boolean createAllTable) throws Exception{ | |
| 36 | + public static void generateEntity(Properties prop, String dbPackage, String outputPath, String schameName, List<String> tableNameList, boolean createAllTable) throws Exception{ | |
| 37 | 37 | String driver = prop.getProperty("driver"); |
| 38 | 38 | String user = prop.getProperty("User"); |
| 39 | 39 | String password = prop.getProperty("Password"); |
| 40 | 40 | String url = prop.getProperty("URL"); |
| 41 | - String schameName = prop.getProperty("SchameName"); | |
| 42 | 41 | generateEntity(driver, user, password, url, dbPackage, outputPath, schameName, tableNameList, createAllTable); |
| 43 | 42 | } |
| 44 | 43 | |
| 45 | 44 | 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{ |
| 46 | 45 | //取数据库连接 |
| 47 | - Connection conn = getConnection(driver, user, password, url); | |
| 46 | + Connection conn = getConnection(driver, user, password, url+schameName); | |
| 48 | 47 | |
| 49 | 48 | //是否生成全部表实体 |
| 50 | 49 | if (createAllTable) { |
| ... | ... | @@ -69,7 +68,7 @@ public class UiUtils { |
| 69 | 68 | String tableNameCurr = (String) tableNameList.get(i); |
| 70 | 69 | |
| 71 | 70 | //取得表中所有列 |
| 72 | - Vector<TableColumn> columnsInTable = TableColumn.GetTableInfo(conn, null, tableNameCurr, "%", "mysql"); | |
| 71 | + Vector<TableColumn> columnsInTable = TableColumn.GetTableInfo(conn, schameName, tableNameCurr, "%", "mysql"); | |
| 73 | 72 | if (columnsInTable == null || columnsInTable.size() == 0) { |
| 74 | 73 | System.out.println(tableNameCurr + " : 生成失败，得不到表中列明"); |
| 75 | 74 | continue; | ... | ... |
| ... | ... | @@ -0,0 +1,16 @@ |
| 1 | +#顶层po、dao文件生成总目录 | |
| 2 | +OutputPath=D:\\dblist\\ | |
| 3 | +#数据库名 | |
| 4 | +SchameName=songshuyun_stat | |
| 5 | +#数据库库连接信息 | |
| 6 | +User=tylife | |
| 7 | +Password=lexi365 | |
| 8 | +#数据库驱动类型 | |
| 9 | +driver=com.mysql.jdbc.Driver | |
| 10 | +#数据库连接url | |
| 11 | +URL=jdbc\:mysql\://127.0.0.1\:3306/ | |
| 12 | +#数据库类型 | |
| 13 | +dbtype=mysql | |
| 14 | +#数据库顶层包名 | |
| 15 | +#packageName=com.taover.printer.db | |
| 16 | +packageName=com.ssy.java.entity | ... | ... |