Commit 50c3f52d4d5f561bc9d19635366d0f3aaae82342
1 parent
6ae2f185
Exists in
master
1.完善代码
Showing
3 changed files
with
108 additions
and
155 deletions
Show diff stats
.idea/workspace.xml
| @@ -2,12 +2,10 @@ | @@ -2,12 +2,10 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment=""> | 4 | <list default="true" id="3efc7ab8-4392-46f3-b152-36346d230d70" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/src/local.db.properties" afterDir="false" /> | 5 | + <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> |
| 6 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" /> | ||
| 9 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" /> | 7 | <change beforePath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" afterDir="false" /> |
| 10 | - <change beforePath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" afterDir="false" /> | 8 | + <change beforePath="$PROJECT_DIR$/src/erp.default.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/erp.default.properties" afterDir="false" /> |
| 11 | </list> | 9 | </list> |
| 12 | <ignored path="$PROJECT_DIR$/out/" /> | 10 | <ignored path="$PROJECT_DIR$/out/" /> |
| 13 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| @@ -23,44 +21,12 @@ | @@ -23,44 +21,12 @@ | ||
| 23 | <favorites_list name="code-generater" /> | 21 | <favorites_list name="code-generater" /> |
| 24 | </component> | 22 | </component> |
| 25 | <component name="FileEditorManager"> | 23 | <component name="FileEditorManager"> |
| 26 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 24 | + <leaf> |
| 27 | <file pinned="false" current-in-tab="false"> | 25 | <file pinned="false" current-in-tab="false"> |
| 28 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | ||
| 29 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 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" /> | ||
| 32 | - <folding> | ||
| 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" /> | ||
| 36 | - </folding> | ||
| 37 | - </state> | ||
| 38 | - </provider> | ||
| 39 | - </entry> | ||
| 40 | - </file> | ||
| 41 | - <file pinned="false" current-in-tab="false"> | ||
| 42 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java"> | ||
| 43 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 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" /> | ||
| 46 | - </state> | ||
| 47 | - </provider> | ||
| 48 | - </entry> | ||
| 49 | - </file> | ||
| 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"> | ||
| 60 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | 26 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 61 | <provider selected="true" editor-type-id="text-editor"> | 27 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | 28 | + <state relative-caret-position="-330"> |
| 29 | + <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | ||
| 64 | <folding> | 30 | <folding> |
| 65 | <element signature="e#407#408#0" expanded="true" /> | 31 | <element signature="e#407#408#0" expanded="true" /> |
| 66 | <element signature="e#461#462#0" expanded="true" /> | 32 | <element signature="e#461#462#0" expanded="true" /> |
| @@ -70,51 +36,46 @@ | @@ -70,51 +36,46 @@ | ||
| 70 | </entry> | 36 | </entry> |
| 71 | </file> | 37 | </file> |
| 72 | <file pinned="false" current-in-tab="false"> | 38 | <file pinned="false" current-in-tab="false"> |
| 73 | - <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java"> | 39 | + <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> |
| 74 | <provider selected="true" editor-type-id="text-editor"> | 40 | <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" /> | 41 | + <state relative-caret-position="242"> |
| 42 | + <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> | ||
| 77 | </state> | 43 | </state> |
| 78 | </provider> | 44 | </provider> |
| 79 | </entry> | 45 | </entry> |
| 80 | </file> | 46 | </file> |
| 81 | <file pinned="false" current-in-tab="false"> | 47 | <file pinned="false" current-in-tab="false"> |
| 82 | - <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | 48 | + <entry file="file://$PROJECT_DIR$/src/default.properties"> |
| 83 | <provider selected="true" editor-type-id="text-editor"> | 49 | <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" /> | 50 | + <state relative-caret-position="396"> |
| 51 | + <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> | ||
| 86 | </state> | 52 | </state> |
| 87 | </provider> | 53 | </provider> |
| 88 | </entry> | 54 | </entry> |
| 89 | </file> | 55 | </file> |
| 90 | <file pinned="false" current-in-tab="false"> | 56 | <file pinned="false" current-in-tab="false"> |
| 91 | - <entry file="file://$PROJECT_DIR$/src/local.db.properties"> | 57 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> |
| 92 | <provider selected="true" editor-type-id="text-editor"> | 58 | <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" /> | 59 | + <state relative-caret-position="197"> |
| 60 | + <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> | ||
| 95 | </state> | 61 | </state> |
| 96 | </provider> | 62 | </provider> |
| 97 | </entry> | 63 | </entry> |
| 98 | </file> | 64 | </file> |
| 99 | <file pinned="false" current-in-tab="false"> | 65 | <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"> | 66 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> |
| 106 | <provider selected="true" editor-type-id="text-editor"> | 67 | <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" /> | 68 | + <state relative-caret-position="392"> |
| 69 | + <caret line="119" column="38" lean-forward="true" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="38" /> | ||
| 109 | </state> | 70 | </state> |
| 110 | </provider> | 71 | </provider> |
| 111 | </entry> | 72 | </entry> |
| 112 | </file> | 73 | </file> |
| 113 | - <file pinned="false" current-in-tab="false"> | ||
| 114 | - <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java"> | 74 | + <file pinned="false" current-in-tab="true"> |
| 75 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | ||
| 115 | <provider selected="true" editor-type-id="text-editor"> | 76 | <provider selected="true" editor-type-id="text-editor"> |
| 116 | - <state relative-caret-position="616"> | ||
| 117 | - <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" /> | 77 | + <state relative-caret-position="132"> |
| 78 | + <caret line="6" selection-start-line="6" selection-end-line="6" /> | ||
| 118 | </state> | 79 | </state> |
| 119 | </provider> | 80 | </provider> |
| 120 | </entry> | 81 | </entry> |
| @@ -138,13 +99,14 @@ | @@ -138,13 +99,14 @@ | ||
| 138 | <component name="IdeDocumentHistory"> | 99 | <component name="IdeDocumentHistory"> |
| 139 | <option name="CHANGED_PATHS"> | 100 | <option name="CHANGED_PATHS"> |
| 140 | <list> | 101 | <list> |
| 141 | - <option value="$PROJECT_DIR$/.gitignore" /> | ||
| 142 | <option value="$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java" /> | 102 | <option value="$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java" /> |
| 143 | <option value="$PROJECT_DIR$/src/com/taover/ui/Temp.form" /> | 103 | <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" /> | 104 | <option value="$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java" /> |
| 146 | <option value="$PROJECT_DIR$/src/local.db.properties" /> | 105 | <option value="$PROJECT_DIR$/src/local.db.properties" /> |
| 147 | <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> | 106 | <option value="$PROJECT_DIR$/src/com/taover/ui/UiUtils.java" /> |
| 107 | + <option value="$PROJECT_DIR$/src/erp.default.properties" /> | ||
| 108 | + <option value="$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java" /> | ||
| 109 | + <option value="$PROJECT_DIR$/.gitignore" /> | ||
| 148 | </list> | 110 | </list> |
| 149 | </option> | 111 | </option> |
| 150 | </component> | 112 | </component> |
| @@ -189,6 +151,11 @@ | @@ -189,6 +151,11 @@ | ||
| 189 | <path> | 151 | <path> |
| 190 | <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | 152 | <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> |
| 191 | <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | 153 | <item name="code-generater" type="462c0819:PsiDirectoryNode" /> |
| 154 | + <item name="lib" type="462c0819:PsiDirectoryNode" /> | ||
| 155 | + </path> | ||
| 156 | + <path> | ||
| 157 | + <item name="code-generater" type="b2602c69:ProjectViewProjectNode" /> | ||
| 158 | + <item name="code-generater" type="462c0819:PsiDirectoryNode" /> | ||
| 192 | <item name="src" type="462c0819:PsiDirectoryNode" /> | 159 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 193 | </path> | 160 | </path> |
| 194 | </expand> | 161 | </expand> |
| @@ -271,18 +238,31 @@ | @@ -271,18 +238,31 @@ | ||
| 271 | <workItem from="1557914479970" duration="3550000" /> | 238 | <workItem from="1557914479970" duration="3550000" /> |
| 272 | <workItem from="1557989274327" duration="323000" /> | 239 | <workItem from="1557989274327" duration="323000" /> |
| 273 | <workItem from="1557989640809" duration="476000" /> | 240 | <workItem from="1557989640809" duration="476000" /> |
| 274 | - <workItem from="1557990143187" duration="4364000" /> | 241 | + <workItem from="1557990143187" duration="4624000" /> |
| 242 | + <workItem from="1558071853030" duration="1949000" /> | ||
| 243 | + <workItem from="1559183094225" duration="50000" /> | ||
| 244 | + <workItem from="1560395502888" duration="609000" /> | ||
| 245 | + <workItem from="1561008621174" duration="1180000" /> | ||
| 275 | </task> | 246 | </task> |
| 276 | <servers /> | 247 | <servers /> |
| 277 | </component> | 248 | </component> |
| 278 | <component name="TimeTrackingManager"> | 249 | <component name="TimeTrackingManager"> |
| 279 | - <option name="totallyTimeSpent" value="8713000" /> | 250 | + <option name="totallyTimeSpent" value="12761000" /> |
| 251 | + </component> | ||
| 252 | + <component name="TodoView"> | ||
| 253 | + <todo-panel id="selected-file"> | ||
| 254 | + <is-autoscroll-to-source value="true" /> | ||
| 255 | + </todo-panel> | ||
| 256 | + <todo-panel id="all"> | ||
| 257 | + <are-packages-shown value="true" /> | ||
| 258 | + <is-autoscroll-to-source value="true" /> | ||
| 259 | + </todo-panel> | ||
| 280 | </component> | 260 | </component> |
| 281 | <component name="ToolWindowManager"> | 261 | <component name="ToolWindowManager"> |
| 282 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 262 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
| 283 | <editor active="true" /> | 263 | <editor active="true" /> |
| 284 | <layout> | 264 | <layout> |
| 285 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.25799572" /> | 265 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49838188" visible="true" weight="0.19296375" /> |
| 286 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 266 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 287 | <window_info id="Image Layers" order="2" /> | 267 | <window_info id="Image Layers" order="2" /> |
| 288 | <window_info id="Designer" order="3" /> | 268 | <window_info id="Designer" order="3" /> |
| @@ -291,15 +271,15 @@ | @@ -291,15 +271,15 @@ | ||
| 291 | <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> | 271 | <window_info id="Favorites" order="6" sideWeight="0.50161815" side_tool="true" weight="0.25" /> |
| 292 | <window_info anchor="bottom" id="Message" order="0" /> | 272 | <window_info anchor="bottom" id="Message" order="0" /> |
| 293 | <window_info anchor="bottom" id="Find" order="1" /> | 273 | <window_info anchor="bottom" id="Find" order="1" /> |
| 294 | - <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" /> | ||
| 295 | - <window_info anchor="bottom" id="Debug" order="3" weight="0.3991323" /> | 274 | + <window_info anchor="bottom" id="Run" order="2" weight="0.329718" /> |
| 275 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.22993493" /> | ||
| 296 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | 276 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 297 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | 277 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 298 | - <window_info anchor="bottom" id="TODO" order="6" /> | 278 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.329718" /> |
| 299 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 279 | <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" /> | 280 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.329718" /> |
| 301 | <window_info anchor="bottom" id="Database Changes" order="9" /> | 281 | <window_info anchor="bottom" id="Database Changes" order="9" /> |
| 302 | - <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" /> | 282 | + <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3286334" /> |
| 303 | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> | 283 | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> |
| 304 | <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> | 284 | <window_info anchor="bottom" id="Messages" order="12" weight="0.329718" /> |
| 305 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 285 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| @@ -340,13 +320,6 @@ | @@ -340,13 +320,6 @@ | ||
| 340 | </state> | 320 | </state> |
| 341 | </provider> | 321 | </provider> |
| 342 | </entry> | 322 | </entry> |
| 343 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | ||
| 344 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 345 | - <state relative-caret-position="132"> | ||
| 346 | - <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" /> | ||
| 347 | - </state> | ||
| 348 | - </provider> | ||
| 349 | - </entry> | ||
| 350 | <entry file="file://$APPLICATION_CONFIG_DIR$/extensions/com.intellij.database/schema/Generate POJOs.groovy"> | 323 | <entry file="file://$APPLICATION_CONFIG_DIR$/extensions/com.intellij.database/schema/Generate POJOs.groovy"> |
| 351 | <provider selected="true" editor-type-id="text-editor"> | 324 | <provider selected="true" editor-type-id="text-editor"> |
| 352 | <state relative-caret-position="-1016"> | 325 | <state relative-caret-position="-1016"> |
| @@ -357,30 +330,9 @@ | @@ -357,30 +330,9 @@ | ||
| 357 | </state> | 330 | </state> |
| 358 | </provider> | 331 | </provider> |
| 359 | </entry> | 332 | </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> | 333 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindowE.jfd" /> |
| 334 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.jfd" /> | ||
| 335 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/ddd.java" /> | ||
| 384 | <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/awt/event/ActionListener.java"> | 336 | <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"> | 337 | <provider selected="true" editor-type-id="text-editor"> |
| 386 | <state relative-caret-position="572"> | 338 | <state relative-caret-position="572"> |
| @@ -388,104 +340,81 @@ | @@ -388,104 +340,81 @@ | ||
| 388 | </state> | 340 | </state> |
| 389 | </provider> | 341 | </provider> |
| 390 | </entry> | 342 | </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"> | 343 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.java" /> |
| 344 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityJForm.jfd" /> | ||
| 345 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/Temp.form" /> | ||
| 346 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.jfd" /> | ||
| 347 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/TT.java" /> | ||
| 348 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java"> | ||
| 415 | <provider selected="true" editor-type-id="text-editor"> | 349 | <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" /> | 350 | + <state relative-caret-position="167"> |
| 351 | + <caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" /> | ||
| 418 | </state> | 352 | </state> |
| 419 | </provider> | 353 | </provider> |
| 420 | </entry> | 354 | </entry> |
| 421 | <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java"> | 355 | <entry file="file://$PROJECT_DIR$/src/com/taover/db/Constants.java"> |
| 422 | <provider selected="true" editor-type-id="text-editor"> | 356 | <provider selected="true" editor-type-id="text-editor"> |
| 423 | - <state relative-caret-position="306"> | 357 | + <state relative-caret-position="308"> |
| 424 | <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> | 358 | <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> |
| 425 | </state> | 359 | </state> |
| 426 | </provider> | 360 | </provider> |
| 427 | </entry> | 361 | </entry> |
| 428 | - <entry file="file://$PROJECT_DIR$/src/com/taover/db/GenerateEntity.java"> | 362 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java"> |
| 429 | <provider selected="true" editor-type-id="text-editor"> | 363 | <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" /> | 364 | + <state relative-caret-position="6886"> |
| 365 | + <caret line="427" column="38" selection-start-line="427" selection-start-column="38" selection-end-line="427" selection-end-column="38" /> | ||
| 432 | </state> | 366 | </state> |
| 433 | </provider> | 367 | </provider> |
| 434 | </entry> | 368 | </entry> |
| 435 | - <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java"> | 369 | + <entry file="file://$PROJECT_DIR$/src/local.db.properties"> |
| 436 | <provider selected="true" editor-type-id="text-editor"> | 370 | <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" /> | 371 | + <state relative-caret-position="220"> |
| 372 | + <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" /> | ||
| 439 | </state> | 373 | </state> |
| 440 | </provider> | 374 | </provider> |
| 441 | </entry> | 375 | </entry> |
| 442 | <entry file="file://$PROJECT_DIR$/src/print.default.properties"> | 376 | <entry file="file://$PROJECT_DIR$/src/print.default.properties"> |
| 443 | <provider selected="true" editor-type-id="text-editor" /> | 377 | <provider selected="true" editor-type-id="text-editor" /> |
| 444 | </entry> | 378 | </entry> |
| 445 | - <entry file="file://$PROJECT_DIR$/src/local.db.properties"> | 379 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DatabaseMetaData.java"> |
| 446 | <provider selected="true" editor-type-id="text-editor"> | 380 | <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" /> | 381 | + <state relative-caret-position="36080"> |
| 382 | + <caret line="1663" column="14" selection-start-line="1663" selection-start-column="14" selection-end-line="1663" selection-end-column="14" /> | ||
| 449 | </state> | 383 | </state> |
| 450 | </provider> | 384 | </provider> |
| 451 | </entry> | 385 | </entry> |
| 452 | - <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> | 386 | + <entry file="file://$PROJECT_DIR$/src/com/taover/db/Tools.java"> |
| 453 | <provider selected="true" editor-type-id="text-editor"> | 387 | <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" /> | 388 | + <state relative-caret-position="616"> |
| 389 | + <caret line="50" column="25" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" /> | ||
| 456 | </state> | 390 | </state> |
| 457 | </provider> | 391 | </provider> |
| 458 | </entry> | 392 | </entry> |
| 459 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java"> | 393 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/RunEntityGenWindow.java"> |
| 460 | <provider selected="true" editor-type-id="text-editor"> | 394 | <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" /> | 395 | + <state relative-caret-position="220"> |
| 396 | + <caret line="14" column="43" lean-forward="true" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" /> | ||
| 463 | </state> | 397 | </state> |
| 464 | </provider> | 398 | </provider> |
| 465 | </entry> | 399 | </entry> |
| 466 | - <entry file="file://$PROJECT_DIR$/src/com/taover/db/TableColumn.java"> | 400 | + <entry file="file://$PROJECT_DIR$/src/default.properties"> |
| 467 | <provider selected="true" editor-type-id="text-editor"> | 401 | <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" /> | 402 | + <state relative-caret-position="396"> |
| 403 | + <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" /> | ||
| 470 | </state> | 404 | </state> |
| 471 | </provider> | 405 | </provider> |
| 472 | </entry> | 406 | </entry> |
| 473 | - <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | 407 | + <entry file="file://$PROJECT_DIR$/src/erp.default.properties"> |
| 474 | <provider selected="true" editor-type-id="text-editor"> | 408 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | ||
| 477 | - <folding> | ||
| 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" /> | ||
| 481 | - </folding> | 409 | + <state relative-caret-position="242"> |
| 410 | + <caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" /> | ||
| 482 | </state> | 411 | </state> |
| 483 | </provider> | 412 | </provider> |
| 484 | </entry> | 413 | </entry> |
| 485 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> | 414 | <entry file="file://$PROJECT_DIR$/src/com/taover/ui/UiUtils.java"> |
| 486 | <provider selected="true" editor-type-id="text-editor"> | 415 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | 416 | + <state relative-caret-position="-330"> |
| 417 | + <caret line="26" column="51" lean-forward="true" selection-start-line="26" selection-start-column="51" selection-end-line="26" selection-end-column="51" /> | ||
| 489 | <folding> | 418 | <folding> |
| 490 | <element signature="e#407#408#0" expanded="true" /> | 419 | <element signature="e#407#408#0" expanded="true" /> |
| 491 | <element signature="e#461#462#0" expanded="true" /> | 420 | <element signature="e#461#462#0" expanded="true" /> |
| @@ -493,5 +422,26 @@ | @@ -493,5 +422,26 @@ | ||
| 493 | </state> | 422 | </state> |
| 494 | </provider> | 423 | </provider> |
| 495 | </entry> | 424 | </entry> |
| 425 | + <entry file="jar://C:/Program Files/Java/jdk1.8.0_161/src.zip!/java/sql/DriverManager.java"> | ||
| 426 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 427 | + <state relative-caret-position="197"> | ||
| 428 | + <caret line="204" column="29" selection-start-line="204" selection-start-column="29" selection-end-line="204" selection-end-column="29" /> | ||
| 429 | + </state> | ||
| 430 | + </provider> | ||
| 431 | + </entry> | ||
| 432 | + <entry file="file://$PROJECT_DIR$/src/com/taover/ui/EntityGenWindow.java"> | ||
| 433 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 434 | + <state relative-caret-position="392"> | ||
| 435 | + <caret line="119" column="38" lean-forward="true" selection-start-line="119" selection-start-column="38" selection-end-line="119" selection-end-column="38" /> | ||
| 436 | + </state> | ||
| 437 | + </provider> | ||
| 438 | + </entry> | ||
| 439 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | ||
| 440 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 441 | + <state relative-caret-position="132"> | ||
| 442 | + <caret line="6" selection-start-line="6" selection-end-line="6" /> | ||
| 443 | + </state> | ||
| 444 | + </provider> | ||
| 445 | + </entry> | ||
| 496 | </component> | 446 | </component> |
| 497 | </project> | 447 | </project> |
| 498 | \ No newline at end of file | 448 | \ No newline at end of file |
src/com/taover/ui/EntityGenWindow.java
| @@ -115,6 +115,9 @@ public class EntityGenWindow extends JFrame{ | @@ -115,6 +115,9 @@ public class EntityGenWindow extends JFrame{ | ||
| 115 | eBtn.setEnabled(true); | 115 | eBtn.setEnabled(true); |
| 116 | } catch (Exception e1) { | 116 | } catch (Exception e1) { |
| 117 | e1.printStackTrace(); | 117 | e1.printStackTrace(); |
| 118 | + | ||
| 119 | + JOptionPane.showMessageDialog(EntityGenWindow.this, "生成失败", "系统报错："+e1.getMessage(), JOptionPane.INFORMATION_MESSAGE); | ||
| 120 | + eBtn.setEnabled(true); | ||
| 118 | } | 121 | } |
| 119 | }); | 122 | }); |
| 120 | btnNewButton.setBounds(319, 360, 113, 38); | 123 | btnNewButton.setBounds(319, 360, 113, 38); |
src/erp.default.properties
| @@ -15,7 +15,7 @@ DBLikeStr=% | @@ -15,7 +15,7 @@ DBLikeStr=% | ||
| 15 | #数据库驱动类型 | 15 | #数据库驱动类型 |
| 16 | driver=com.mysql.jdbc.Driver | 16 | driver=com.mysql.jdbc.Driver |
| 17 | #数据库连接url | 17 | #数据库连接url |
| 18 | -URL=jdbc\:mysql\://127.0.0.1\:3306/erp | 18 | +URL=jdbc\:mysql\://127.0.0.1\:3306/ |
| 19 | #URL=jdbc\:mysql\://localhost\:3306/taoverprinter | 19 | #URL=jdbc\:mysql\://localhost\:3306/taoverprinter |
| 20 | #数据库类型 | 20 | #数据库类型 |
| 21 | dbtype=mysql | 21 | dbtype=mysql |