diff --git a/.idea/artifacts/autoCode_war.xml b/.idea/artifacts/autoCode_war.xml new file mode 100644 index 0000000000000000000000000000000000000000..64be1080b95605a9122822388d4946d1d3934a90 --- /dev/null +++ b/.idea/artifacts/autoCode_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/autoCode_war_exploded.xml b/.idea/artifacts/autoCode_war_exploded.xml new file mode 100644 index 0000000000000000000000000000000000000000..63d3c74e5c9f4d5d5853ba717741d47bb3d2066c --- /dev/null +++ b/.idea/artifacts/autoCode_war_exploded.xml @@ -0,0 +1,66 @@ + + + $PROJECT_DIR$/target/autoCode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..6cd71c152f9936c0b6b27f6826f881e4722a982e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..30ff5cb79106a1706b39c305da86ff96a2d96118 --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_2_2_3.xml b/.idea/libraries/Maven__asm_asm_2_2_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..421187a1628d2f5bcb678d55410b723ca6d9306a --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml b/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..55692b94d6ec205db8b766407c9125db1b5c0777 --- /dev/null +++ b/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_0_4.xml b/.idea/libraries/Maven__com_alibaba_druid_1_0_4.xml new file mode 100644 index 0000000000000000000000000000000000000000..a040a47cdcad92e2f08d580d0fa87a6a6b7da64a --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml new file mode 100644 index 0000000000000000000000000000000000000000..08dbed5f61da451153eff01ec182ab509f2c3025 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_12_1_0_1_atlassian_hosted.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_12_1_0_1_atlassian_hosted.xml new file mode 100644 index 0000000000000000000000000000000000000000..07bf7df803daa95f5d25f0a95813903a36ca8a97 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_12_1_0_1_atlassian_hosted.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..9bd771e109c36028b81f4b92c2978d516b96495e --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..d0e20adb50d992b74c4accd6f9166838e1981c2b --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..3caee7e547658dba7cc48a47d96dc95bd160a2cc --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_2_0.xml b/.idea/libraries/Maven__commons_digester_commons_digester_2_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..902d9593efafeb57d004ffe52f65805a10558608 --- /dev/null +++ b/.idea/libraries/Maven__commons_digester_commons_digester_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e8b8d3352ec8bf1c0d4ea9809752f706f779c11 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..b770f56aa973a210ba6b27bc867394d3695317ef --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_3.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..d693c15ec870b7e8d86f93c97dc4762222836224 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..14681ee84083f43045a16158c0e62720d8f4e0bd --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b644e9112115411788cb21e2670a67bb2496aa1 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jstl_jstl_1_2.xml b/.idea/libraries/Maven__jstl_jstl_1_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..40b16728618a97b86cd8dbcd60d22c1fb16915d2 --- /dev/null +++ b/.idea/libraries/Maven__jstl_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_8.xml b/.idea/libraries/Maven__junit_junit_4_8.xml new file mode 100644 index 0000000000000000000000000000000000000000..96a3a184622696c3d7df9d06abc0492f372f316e --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_16.xml b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml new file mode 100644 index 0000000000000000000000000000000000000000..11837b5f9975a2ab334d64a79a01d29f1165d136 --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_31.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_31.xml new file mode 100644 index 0000000000000000000000000000000000000000..84b61ed97a8bc1e1ce4e889178c5e29ba8bf0f34 --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_31.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_oschina_durcframework_durcframework_core_1_0_16.xml b/.idea/libraries/Maven__net_oschina_durcframework_durcframework_core_1_0_16.xml new file mode 100644 index 0000000000000000000000000000000000000000..52c74e1c131d84f94cac94f1957e80e4ca35fa35 --- /dev/null +++ b/.idea/libraries/Maven__net_oschina_durcframework_durcframework_core_1_0_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_jxls_jxls_core_1_0_RC_2.xml b/.idea/libraries/Maven__net_sf_jxls_jxls_core_1_0_RC_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..2a703dadd7cd7ce2149c9cde1d40ea645cfcfbe4 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_jxls_jxls_core_1_0_RC_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_jtds_jtds_1_2_2.xml b/.idea/libraries/Maven__net_sourceforge_jtds_jtds_1_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..543fcb031e92319a251a742bb619a940740b2363 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_jtds_jtds_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..5bdad0716175bcf73406ed028f87f75a725f4c85 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..f76ee0471439502526eb8deaed01a569c419abad --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_jexl_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml new file mode 100644 index 0000000000000000000000000000000000000000..af87c75cf5eb2e01ba4cdea07ccd6592c36641f3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml new file mode 100644 index 0000000000000000000000000000000000000000..261591963ebe094a9401c9d883fbb7625c382616 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_29.xml b/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_29.xml new file mode 100644 index 0000000000000000000000000000000000000000..dd7b6172be6f1aec7a4a6bf07cbf8f21ae5a83aa --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_servlet_api_6_0_29.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml new file mode 100644 index 0000000000000000000000000000000000000000..7a2914a604a29cbb09bd6292e7414542235b9f3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_12.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_12.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa73c5281087e696d09f9dfa6d52ede17fe7cb33 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_12.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_12.xml new file mode 100644 index 0000000000000000000000000000000000000000..c2fbed94e26cd92501f172c8bb7115ec174b7237 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_3_1_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_3_1_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..dec1b18da038de5e5200416fc5d1c506f1f02807 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_3_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_0_CR2.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_0_CR2.xml new file mode 100644 index 0000000000000000000000000000000000000000..3812cdd4206900d8bdb74674677ebdd6f0522224 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_0_CR2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_2_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_2_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..669edf4d50abb14b29633104f758c3f8bf2fab04 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..5d67e68d6d6339e527ecfe278ead1af6fe31ed26 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sitemesh_sitemesh_3_0_0.xml b/.idea/libraries/Maven__org_sitemesh_sitemesh_3_0_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..c7abd9eef85e978286b5ce7ae9f000b6e774032c --- /dev/null +++ b/.idea/libraries/Maven__org_sitemesh_sitemesh_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..48ecb4e663783a831b51420a55330316544f9764 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..9b3110834e1fe574c934c4177ccfb0a6f84952ac --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..68610c25c57b75bcd5b3bf7aedd18d3b875d533b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1fbd948df41f2cb6f26e949cc605527d82df81d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..88754b7d35bdd89ef2738d8996d2eaf05d6d383d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..4ce94f8d50450c65755a8c84332337e5d8d3d668 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..a545973b0dc7f4f8086539d4e58bbd46192fbc33 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..e7d613270bb564c9720e888709d45ea6c0371b04 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..daee99f2c8c048877f10fac286eb6530d0817af9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..20cf3d6b8d4e3521457b0ff6937adab24b8e2f4c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..2c0e34875d28d122c5aaef04208f728ce27cb91c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..d64cb7e7bd1cdae28deb0da1984f2377a893a536 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..c369292c8405324ad4057a82f1897936becbe3c5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..221256e3a933723c3d8779126208dbceb12f2d80 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__taglibs_standard_1_1_2.xml b/.idea/libraries/Maven__taglibs_standard_1_1_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..8d7bb7395d9cfcbc1d07f07ffeacfca177b9d003 --- /dev/null +++ b/.idea/libraries/Maven__taglibs_standard_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..bf192445c9f7376f32a0f99b991def1751c3258b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + jdk-8u_131x64 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..dcae96f04b74bb21eeee16f59ced47990ebcc674 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000000000000000000000000000000000000..6dddd269deac048cf631a773c43d5ecef42b3ea6 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000000000000000000000000000000000000..e96534fb27b68192f27f985d3879e173ec77adb8 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000000000000000000000000000000000..99ca648f4c312a9ecfe5884b9befe77000cd60ff --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1146 @@ + + + + + + + + + + + + + + + + + jetty + formPanel + DB_ITEMS + .js + addNew + poolPreparedStatements + sql + buildColumnDefinition + sitemesh + + + IsIdentity + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1553245929665 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/autoCode.iml b/autoCode.iml new file mode 100644 index 0000000000000000000000000000000000000000..1c7aa198985ac5524b6a8b7d395cdf03e7775457 --- /dev/null +++ b/autoCode.iml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 62527bbb96fec775b6a6ed0c5eca9f36e8ef29a5..4cd34ca3546e8f01665867efca46e40e77f04e47 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,12 @@ jtds 1.2.2 + + + com.oracle + ojdbc6 + 12.1.0.1-atlassian-hosted + org.apache.ant ant diff --git a/run.bat b/run.bat index 5b405e9589426e1f56a1b6bff9af3c662b856c6c..7679119804646755603d9f231f409bf4150bb639 100644 --- a/run.bat +++ b/run.bat @@ -1,3 +1,3 @@ -c: -cd C:\Users\hc.tang\git\autoCode +D: +cd D:\WorkSapce\IntelliJ_2016\autoCode mvn jetty:run \ No newline at end of file diff --git a/src/main/java/org/durcframework/autocode/controller/DataSourceConfigController.java b/src/main/java/org/durcframework/autocode/controller/DataSourceConfigController.java index 37380be7be7c961b56004dff360c94bbde68a7fd..1dff34b02f9bcdbb70a57e1349f8b739f793dd0e 100644 --- a/src/main/java/org/durcframework/autocode/controller/DataSourceConfigController.java +++ b/src/main/java/org/durcframework/autocode/controller/DataSourceConfigController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class DataSourceConfigController extends CrudController { + // oracle.jdbc.driver.OracleDriver @RequestMapping("/addDataSource.do") public @ResponseBody MessageResult addDataSource(DataSourceConfig dataSourceConfig) { diff --git a/src/main/java/org/durcframework/autocode/generator/DataBaseConfig.java b/src/main/java/org/durcframework/autocode/generator/DataBaseConfig.java index f49180ce5655d57d4dfe56cba72862eb4706e28b..8647d6ff0f0dbeaaf6c0703b523092577f6e2d63 100644 --- a/src/main/java/org/durcframework/autocode/generator/DataBaseConfig.java +++ b/src/main/java/org/durcframework/autocode/generator/DataBaseConfig.java @@ -3,7 +3,6 @@ package org.durcframework.autocode.generator; import java.util.HashMap; import java.util.Map; - public class DataBaseConfig { private static Map jdbcUrlMap = new HashMap(); @@ -12,6 +11,7 @@ public class DataBaseConfig { // net.sourceforge.jtds.jdbc.Driver // com.microsoft.sqlserver.jdbc.SQLServerDriver jdbcUrlMap.put("com.mysql.jdbc.Driver", "jdbc:mysql://%s:%s/%s?useUnicode=true&characterEncoding=UTF-8"); + jdbcUrlMap.put("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%s:%s"); jdbcUrlMap.put("net.sourceforge.jtds.jdbc.Driver", "jdbc:jtds:sqlserver://%s:%s;databaseName=%s"); } diff --git a/src/main/java/org/durcframework/autocode/generator/SQLServiceFactory.java b/src/main/java/org/durcframework/autocode/generator/SQLServiceFactory.java index 49e7c248deff6ea12b746883e4f2d98848ad7760..055a856da1331e00f03337b21e78588a6b2f25e2 100644 --- a/src/main/java/org/durcframework/autocode/generator/SQLServiceFactory.java +++ b/src/main/java/org/durcframework/autocode/generator/SQLServiceFactory.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import org.durcframework.autocode.generator.mysql.MySqlService; +import org.durcframework.autocode.generator.oracle.OracleService; import org.durcframework.autocode.generator.sqlserver.SqlServerService; import org.durcframework.core.DurcException; @@ -36,9 +37,14 @@ public class SQLServiceFactory { if (driverClass.contains("mysql")) { return new MySqlService(); } + if (driverClass.contains("jtds")) { return new SqlServerService(); } + + if (driverClass.contains("oracle")) { + return new OracleService(); + } if (driverClass.contains("sqlserver")) { return new SqlServerService(); } diff --git a/src/main/java/org/durcframework/autocode/generator/TableSelector.java b/src/main/java/org/durcframework/autocode/generator/TableSelector.java index 1f4e9701f24bcb95786069d7f3c2e19557d09b80..b700576000baa408be953827279e44dcec885fd6 100644 --- a/src/main/java/org/durcframework/autocode/generator/TableSelector.java +++ b/src/main/java/org/durcframework/autocode/generator/TableSelector.java @@ -19,20 +19,26 @@ public abstract class TableSelector { /** * 查询数据库表的SQL - * + * 1.如果是oracle的話則應該傳入用戶名，oracle是根據用戶去管理數據的 + * 2.mysql的话是传入数据库名，mysql和sqlserver是根据数据库去管理的 * @return */ - protected abstract String getShowTablesSQL(String dbName); + protected abstract String getShowTablesSQL(String showParam); protected abstract TableDefinition buildTableDefinition(Map tableMap); public List getTableDefinitions() { - List> resultList = SqlHelper.runSql(getDataBaseConfig(), getShowTablesSQL(dataBaseConfig.getDbName())); + String showParam = dataBaseConfig.getDbName(); + if (dataBaseConfig.getDriverClass().contains("oracle")){ // 如果是oracle数据库则传oracle数据库用户大写 + showParam=dataBaseConfig.getUsername().toUpperCase(); + } + List> resultList = SqlHelper.runSql(getDataBaseConfig(), getShowTablesSQL(showParam)); List tablesList = new ArrayList(resultList.size()); for (Map rowMap : resultList) { TableDefinition tableDefinition = this.buildTableDefinition(rowMap); - tableDefinition.setColumnDefinitions(columnSelector.getColumnDefinitions(tableDefinition.getTableName())); + String tableName=tableDefinition.getTableName(); + tableDefinition.setColumnDefinitions(columnSelector.getColumnDefinitions(tableName)); tablesList.add(tableDefinition); } @@ -40,7 +46,11 @@ public abstract class TableSelector { } public List getSimpleTableDefinitions() { - List> resultList = SqlHelper.runSql(getDataBaseConfig(), getShowTablesSQL(dataBaseConfig.getDbName())); + String showParam = dataBaseConfig.getDbName(); + if (dataBaseConfig.getDriverClass().contains("oracle")){ // 如果是oracle数据库则传oracle数据库用户大写 + showParam=dataBaseConfig.getUsername().toUpperCase(); + } + List> resultList = SqlHelper.runSql(getDataBaseConfig(), getShowTablesSQL(showParam)); List tablesList = new ArrayList(resultList.size()); for (Map rowMap : resultList) { diff --git a/src/main/java/org/durcframework/autocode/generator/oracle/OracleColumnSelector.java b/src/main/java/org/durcframework/autocode/generator/oracle/OracleColumnSelector.java new file mode 100644 index 0000000000000000000000000000000000000000..346712b470b85e40639d750254167ed4e838bc79 --- /dev/null +++ b/src/main/java/org/durcframework/autocode/generator/oracle/OracleColumnSelector.java @@ -0,0 +1,112 @@ +package org.durcframework.autocode.generator.oracle; + +import org.durcframework.autocode.generator.ColumnDefinition; +import org.durcframework.autocode.generator.ColumnSelector; +import org.durcframework.autocode.generator.DataBaseConfig; +import org.springframework.util.StringUtils; + +import java.util.Map; +import java.util.Set; + +/** + * mysql表信息查询 + * + */ +public class OracleColumnSelector extends ColumnSelector { + + public OracleColumnSelector(DataBaseConfig dataBaseConfig) { + super(dataBaseConfig); + } + + /** + * 查询 字段名 类型 编码 是否为空 是否主键 默认值 权限 注释 + * select + * utc.column_name as 字段名,utc.data_type 数据类型,utc.data_length 最大长度, + * CASE utc.nullable WHEN 'N' THEN '否' ELSE '是' END 可空, + * utc.data_default 默认值,ucc.comments 注释,UTC.table_name 表名, + * CASE UTC.COLUMN_NAME + * WHEN (select + * col.column_name + * from + * user_constraints con,user_cons_columns col + * where + * con.constraint_name=col.constraint_name and con.constraint_type='P' + * and col.table_name='DEMO') THEN '是' ELSE '否' END AS 主键 + * from + * user_tab_columns utc,user_col_comments ucc + * where + * utc.table_name = ucc.table_name + * and utc.column_name = ucc.column_name + * and utc.table_name = 'DEMO' + * order by + * column_id; + */ + @Override + protected String getColumnInfoSQL(String tableName) { + StringBuffer sb = new StringBuffer(""); + sb.append(" select "); + sb.append(" utc.column_name as FIELD,utc.data_type TYPE,utc.data_length 最大长度, "); + sb.append(" CASE utc.nullable WHEN 'N' THEN '否' ELSE '是' END 可空, "); + sb.append(" utc.data_default 默认值,ucc.comments COMMENTS,UTC.table_name 表名, "); + sb.append(" CASE UTC.COLUMN_NAME "); + sb.append(" WHEN (select "); + sb.append(" col.column_name "); + sb.append(" from "); + sb.append(" user_constraints con,user_cons_columns col "); + sb.append(" where "); + sb.append(" con.constraint_name=col.constraint_name and con.constraint_type='P' "); + sb.append(" and col.table_name='"+tableName+"') THEN 'true' ELSE 'false' END AS KEY "); + sb.append(" from "); + sb.append(" user_tab_columns utc,user_col_comments ucc "); + sb.append(" where "); + sb.append(" utc.table_name = ucc.table_name "); + sb.append(" and utc.column_name = ucc.column_name "); + sb.append(" and utc.table_name = '"+tableName+"' "); + sb.append(" order by "); + sb.append(" column_id "); + return sb.toString(); + } + + /* + * {FIELD=username, EXTRA=, COMMENT=用户名, COLLATION=utf8_general_ci, PRIVILEGES=select,insert,update,references, KEY=PRI, NULL=NO, DEFAULT=null, TYPE=varchar(20)} + */ + protected ColumnDefinition buildColumnDefinition(Map rowMap){ + Set columnSet = rowMap.keySet(); + + for (String columnInfo : columnSet) { + rowMap.put(columnInfo.toUpperCase(), rowMap.get(columnInfo)); + } + + ColumnDefinition columnDefinition = new ColumnDefinition(); + + columnDefinition.setColumnName((String)rowMap.get("FIELD")); + + columnDefinition.setIsIdentity(false); + + boolean isPk = "true".equalsIgnoreCase((String)rowMap.get("KEY")); + columnDefinition.setIsPk(isPk); + + String type = (String)rowMap.get("TYPE"); + columnDefinition.setType(buildType(type)); + + columnDefinition.setComment((String)rowMap.get("COMMENTS")); + + return columnDefinition; + } + + // 将varchar(50) || 将varchar2 转换成VARCHAR + private String buildType(String type){ + if (StringUtils.hasText(type)) { + int index1 = type.indexOf("("); + int index2 = type.indexOf("2"); + if (index1>0) { + return type.substring(0, index1).toUpperCase(); + }else if(index2>0){ + return type.substring(0, index2).toUpperCase(); + } + return type; + } + return "VARCHAR"; + } + +} diff --git a/src/main/java/org/durcframework/autocode/generator/oracle/OracleService.java b/src/main/java/org/durcframework/autocode/generator/oracle/OracleService.java new file mode 100644 index 0000000000000000000000000000000000000000..1431d57861bf7c0c99bbc162d0c836ad68496630 --- /dev/null +++ b/src/main/java/org/durcframework/autocode/generator/oracle/OracleService.java @@ -0,0 +1,21 @@ +package org.durcframework.autocode.generator.oracle; + +import org.durcframework.autocode.generator.ColumnSelector; +import org.durcframework.autocode.generator.DataBaseConfig; +import org.durcframework.autocode.generator.SQLService; +import org.durcframework.autocode.generator.TableSelector; + +public class OracleService implements SQLService { + + @Override + public TableSelector getTableSelector(DataBaseConfig dataBaseConfig) { + return new OracleTableSelector(new OracleColumnSelector(dataBaseConfig), dataBaseConfig); + } + + @Override + public ColumnSelector getColumnSelector(DataBaseConfig dataBaseConfig) { + return new OracleColumnSelector(dataBaseConfig); + } + + +} diff --git a/src/main/java/org/durcframework/autocode/generator/oracle/OracleTableSelector.java b/src/main/java/org/durcframework/autocode/generator/oracle/OracleTableSelector.java new file mode 100644 index 0000000000000000000000000000000000000000..2dd9fe1df46d939058871f9c4196983025a135f9 --- /dev/null +++ b/src/main/java/org/durcframework/autocode/generator/oracle/OracleTableSelector.java @@ -0,0 +1,53 @@ +package org.durcframework.autocode.generator.oracle; + +import org.durcframework.autocode.generator.ColumnSelector; +import org.durcframework.autocode.generator.DataBaseConfig; +import org.durcframework.autocode.generator.TableDefinition; +import org.durcframework.autocode.generator.TableSelector; + +import java.util.Map; + +/** + * 查询mysql数据库表 + */ +public class OracleTableSelector extends TableSelector { + + public OracleTableSelector(ColumnSelector columnSelector, + DataBaseConfig dataBaseConfig) { + super(columnSelector, dataBaseConfig); + } + + /** + * SELECT a.TABLE_NAME,b.COMMENTS + * FROM ALL_TABLES a,USER_TAB_COMMENTS b + * WHERE a.TABLE_NAME=b.TABLE_NAME + * AND a.OWNER='SYSTEM' + * @param showParam + * @return + */ + @Override + protected String getShowTablesSQL(String showParam) { + StringBuffer sb = new StringBuffer(""); + sb.append(" SELECT a.TABLE_NAME as NAME,b.COMMENTS as COMMENTS "); + sb.append(" FROM ALL_TABLES a,USER_TAB_COMMENTS b "); + sb.append(" WHERE a.TABLE_NAME=b.TABLE_NAME "); + if(this.getSchTableNames() != null && this.getSchTableNames().size() > 0) { + StringBuilder tables = new StringBuilder(); + for (String table : this.getSchTableNames()) { + tables.append(",'").append(table).append("'"); + } + sb.append(" AND a.TABLE_NAME IN (" + tables.substring(1) + ")"); + } + sb.append(" AND a.OWNER='"+showParam+"'"); + return sb.toString(); + } + + @Override + protected TableDefinition buildTableDefinition(Map tableMap) { + TableDefinition tableDefinition = new TableDefinition(); + tableDefinition.setTableName((String)tableMap.get("NAME")); + tableDefinition.setComment((String)tableMap.get("COMMENTS")); + return tableDefinition; + } + +} diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties index 47ea540c619bdc0f6e257bd5843fd0d7a4951b67..6ed9ffcf1cec546f167331d523336237aa6d0837 100644 --- a/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -1,5 +1,5 @@ jdbc.driverClass=com.mysql.jdbc.Driver -jdbc.jdbcUrl=jdbc:mysql://localhost:3306/jc_autoCode +jdbc.jdbcUrl=jdbc:mysql://localhost:3306/auto_code jdbc.user=root jdbc.password=root jdbc.initialPoolSize=3 diff --git a/src/main/resources/spring/database-config.xml b/src/main/resources/spring/database-config.xml index 83a7cb3a9255db8a4bba72db98e71cba7bb7762b..b5630885eb39a6e858fc85cd4d48be7a1dc47f8d 100644 --- a/src/main/resources/spring/database-config.xml +++ b/src/main/resources/spring/database-config.xml @@ -39,7 +39,7 @@ - + diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml index c7252985791087c11c60b80d72abb680edd261c9..37e7fa6228128b5fc190c841cca3bd2b5cce4444 100644 --- a/src/main/webapp/WEB-INF/sitemesh3.xml +++ b/src/main/webapp/WEB-INF/sitemesh3.xml @@ -3,7 +3,7 @@ - diff --git a/src/main/webapp/download/1552373409218.zip b/src/main/webapp/download/1552373409218.zip new file mode 100644 index 0000000000000000000000000000000000000000..ceb3a6cd92a7d5b29fa5f52c15a10f693d74b3da Binary files /dev/null and b/src/main/webapp/download/1552373409218.zip differ diff --git a/src/main/webapp/sys/dataSource.jsp b/src/main/webapp/sys/dataSource.jsp index 7f2b9bda4230250301d18aa84b1fcc4c6e3c7cbc..b343012d11b2179589f713c42a41041b9d775aff 100644 --- a/src/main/webapp/sys/dataSource.jsp +++ b/src/main/webapp/sys/dataSource.jsp @@ -65,11 +65,13 @@ var delUrl = ctx + 'delDataSource.do'; // 删除 var DB_ITEMS =[ {text:'MySql',value:'com.mysql.jdbc.Driver'} + ,{text:'Oracle',value:'oracle.jdbc.driver.OracleDriver'} ,{text:'SqlServer',value:'net.sourceforge.jtds.jdbc.Driver'} ]; var portMap = { 'com.mysql.jdbc.Driver':3306 + ,'oracle.jdbc.driver.OracleDriver':1521 ,'net.sourceforge.jtds.jdbc.Driver':1433 }