diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 6b53265..40e3ff5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -50,6 +50,7 @@ Map resultMap = new HashMap(); String result = ""; String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -64,8 +65,9 @@ pgInPgPerson1.setAssetCode(assetCode); pgInPgPersonManager.save(pgInPgPerson1); + String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,"",userName,personType); result = "true"; - msg = "保存成功"; + msg = "人员注册保存成功"+syResult; } else { result = "false"; diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 6b53265..40e3ff5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -50,6 +50,7 @@ Map resultMap = new HashMap(); String result = ""; String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -64,8 +65,9 @@ pgInPgPerson1.setAssetCode(assetCode); pgInPgPersonManager.save(pgInPgPerson1); + String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,"",userName,personType); result = "true"; - msg = "保存成功"; + msg = "人员注册保存成功"+syResult; } else { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java deleted file mode 100644 index 272f034..0000000 --- a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.PgInterface.test; - -public class httpInterfaceTest { - - public static void main(String[] args){ -// -// URL url=new URL(http://www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); -// try{ -// HttpURLConnection conn = (HttpURLConnection) url.openConnection(); -// } -// catch(IOException e){ -// e.printStackTrace(); -// } - - } - -} \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 6b53265..40e3ff5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -50,6 +50,7 @@ Map resultMap = new HashMap(); String result = ""; String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -64,8 +65,9 @@ pgInPgPerson1.setAssetCode(assetCode); pgInPgPersonManager.save(pgInPgPerson1); + String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,"",userName,personType); result = "true"; - msg = "保存成功"; + msg = "人员注册保存成功"+syResult; } else { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java deleted file mode 100644 index 272f034..0000000 --- a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.PgInterface.test; - -public class httpInterfaceTest { - - public static void main(String[] args){ -// -// URL url=new URL(http://www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); -// try{ -// HttpURLConnection conn = (HttpURLConnection) url.openConnection(); -// } -// catch(IOException e){ -// e.printStackTrace(); -// } - - } - -} \ No newline at end of file diff --git a/src/main/resources/spring/applicationContext-filter.xml b/src/main/resources/spring/applicationContext-filter.xml index fd4d361..5b28c16 100644 --- a/src/main/resources/spring/applicationContext-filter.xml +++ b/src/main/resources/spring/applicationContext-filter.xml @@ -3,7 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - @@ -16,6 +15,7 @@ + @@ -74,7 +74,6 @@ - diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 6b53265..40e3ff5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -50,6 +50,7 @@ Map resultMap = new HashMap(); String result = ""; String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -64,8 +65,9 @@ pgInPgPerson1.setAssetCode(assetCode); pgInPgPersonManager.save(pgInPgPerson1); + String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,"",userName,personType); result = "true"; - msg = "保存成功"; + msg = "人员注册保存成功"+syResult; } else { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java deleted file mode 100644 index 272f034..0000000 --- a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.PgInterface.test; - -public class httpInterfaceTest { - - public static void main(String[] args){ -// -// URL url=new URL(http://www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); -// try{ -// HttpURLConnection conn = (HttpURLConnection) url.openConnection(); -// } -// catch(IOException e){ -// e.printStackTrace(); -// } - - } - -} \ No newline at end of file diff --git a/src/main/resources/spring/applicationContext-filter.xml b/src/main/resources/spring/applicationContext-filter.xml index fd4d361..5b28c16 100644 --- a/src/main/resources/spring/applicationContext-filter.xml +++ b/src/main/resources/spring/applicationContext-filter.xml @@ -3,7 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - @@ -16,6 +15,7 @@ + @@ -74,7 +74,6 @@ - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 2674aac..f2bfed0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,11 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> + contextConfigLocation - classpath*:spring/applicationContext*.xml + classpath*:spring/applicationContex*.xml + + org.springframework.web.context.ContextLoaderListener + + + org.springframework.web.context.request.RequestContextListener + + compositeFilter org.springframework.web.filter.DelegatingFilterProxy @@ -22,10 +30,6 @@ /* - - org.springframework.web.context.ContextLoaderListener - - spring org.springframework.web.servlet.DispatcherServlet @@ -33,10 +37,6 @@ contextConfigLocation classpath*:spring/applicationContext*.xml - - contextAttribute - org.springframework.web.context.WebApplicationContext.ROOT - 1 @@ -45,27 +45,48 @@ *.do - - 401 - /common/401.jsp - - - 403 - /common/403.jsp - - - 500 - /common/500.jsp - - - java.lang.Throwable - /common/500.jsp - + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + encodingFilter + /* + + - - - org.springframework.web.context.request.RequestContextListener - - + \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml index f6c9cb9..11b1eed 100644 --- a/.idea/artifacts/PgInterface.xml +++ b/.idea/artifacts/PgInterface.xml @@ -8,6 +8,7 @@ + @@ -41,9 +42,10 @@ - + + - + @@ -68,6 +70,23 @@ + + + + + + + + + + + + + + + + + diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..72213bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,8 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml new file mode 100644 index 0000000..080706a --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml new file mode 100644 index 0000000..89ba965 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml new file mode 100644 index 0000000..270b899 --- /dev/null +++ b/.idea/libraries/Maven__com_mks_api_mksapi_jar_4_10_9049.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 0000000..66e6537 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml new file mode 100644 index 0000000..055afe5 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_5.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 0000000..b770f56 --- /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__io_netty_netty_all_4_1_10_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml new file mode 100644 index 0000000..4a56e11 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_all_4_1_10_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml deleted file mode 100644 index 004138c..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml new file mode 100644 index 0000000..ecb300e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml new file mode 100644 index 0000000..546e6cf --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml new file mode 100644 index 0000000..7c6b3e6 --- /dev/null +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml new file mode 100644 index 0000000..7115228 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml new file mode 100644 index 0000000..d5b2975 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml new file mode 100644 index 0000000..dfdf8d3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml deleted file mode 100644 index a0ffd89..0000000 --- a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml new file mode 100644 index 0000000..0fbcd0a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..00efa84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml new file mode 100644 index 0000000..466c52c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 0000000..56af30b --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml new file mode 100644 index 0000000..f4a1ccd --- /dev/null +++ b/.idea/libraries/Maven__poi_ooxml_schemas_poi_ooxml_schemas_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3076b71..9da4340 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + @@ -29,8 +29,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73e784d..72d6c08 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,9 +7,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -29,7 +59,8 @@ - + + @@ -37,46 +68,59 @@ - + + - + - - - - - + + + + + + + + - + + + + + - + + + - - - - - + + + + + + + + @@ -87,23 +131,59 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,6 +204,16 @@ getConstructionNum getConstructionByType getConstructionByTimeAndStatus + resources + applicationContext + RequestEntity + setRequestEntity + commons-httpclient + http + encode + encodeBuffer + readInputStream + httpClient @@ -142,23 +232,6 @@ @@ -211,55 +301,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -350,9 +465,13 @@ + - + + + + @@ -362,12 +481,23 @@ + + + + + + + + + + + + + @@ -791,6 +921,9 @@ + + + 1521168093758 @@ -1139,7 +1272,7 @@ - @@ -1151,11 +1284,11 @@ - + - - + + @@ -1165,19 +1298,19 @@ - - + + - - - + + + - + @@ -1190,12 +1323,12 @@ - + - + @@ -1207,7 +1340,7 @@ - + @@ -1216,9 +1349,9 @@ - + - + @@ -1231,7 +1364,7 @@ - + @@ -1295,134 +1428,421 @@ + + + + + - - - - - - - - - - - - - + - - + + - - - - + - - + + - - - + - - + + - - - - + - - + + - + - - + + - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1514,4 +1934,7 @@ + + \ No newline at end of file diff --git a/PgInterface.iml b/PgInterface.iml index 7707837..d5c99cd 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -11,8 +11,11 @@ + + + - + @@ -20,7 +23,7 @@ - + @@ -62,9 +65,10 @@ - + + - + @@ -89,6 +93,22 @@ + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82c87f8..182129a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,740 +1,843 @@ - 4.0.0 - com.casic.PgInterface - PgInterface - pom - 1.0-SNAPSHOT - PgInterface - http://maven.apache.org - +4.0.0 +com.casic.PgInterface +PgInterface +war +1.0-SNAPSHOT +PgInterface +http://maven.apache.org + - + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.springframework + spring-test + test + + + org.dbunit + dbunit + jar + test + + + com.github.springtestdbunit + spring-test-dbunit + test + + + javax.servlet + javax.servlet-api + provided + + + javax.servlet.jsp + jsp-api + provided + + + javax.servlet + jstl + + + + + org.springframework + spring-orm + + + org.springframework + spring-webmvc + + + org.springframework + spring-context-support + + + + + javax.mail + mail + + + + + + org.hibernate + hibernate-core + + + org.hibernate + hibernate-validator + + + + + commons-dbcp + commons-dbcp + + + com.oracle + ojdbc6 + + + mysql + mysql-connector-java + + + org.lazyluke + log4jdbc-remix + + + + + org.apache.poi + poi + ${poi.version} + + + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + jul-to-slf4j + + + ch.qos.logback + logback-classic + + + org.fusesource.jansi + jansi + + + org.codehaus.janino + janino + + + + + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + org.apache.commons + commons-lang3 + + + + + javax.ws.rs + javax.ws.rs-api + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + ma.glasnost.orika + orika-core + + + + com.google.code.gson + gson + + + + + + + + + + + org.apache.poi + poi-ooxml + + + + poi-ooxml-schemas + poi-ooxml-schemas + + + + io.netty + netty-all + 4.1.10.Final + + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + + com.aliyun + aliyun-java-sdk-dysmsapi + 1.0.0 + + + + com.aliyun + aliyun-java-sdk-core + 3.3.1 + + + junit + junit + compile + + + com.mks.api + mksapi-jar + 4.10.9049 + + + org.apache.httpcomponents + httpclient + 4.5.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + + + + junit junit + ${junit.version} test org.mockito mockito-core + ${mockito.version} test + + + org.springframework spring-test + ${spring.version} test org.dbunit dbunit - jar + ${dbunit.version} test com.github.springtestdbunit spring-test-dbunit + ${spring-test-dbunit.version} test + + + + + org.seleniumhq.selenium + selenium-htmlunit-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-firefox-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-chrome-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-ie-driver + ${selenium2.version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium2.version} + test + + + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + javax.servlet javax.servlet-api + ${servlet.version} provided javax.servlet.jsp jsp-api + ${jsp.version} provided - - javax.servlet - jstl - - + org.springframework spring-orm + ${spring.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} org.springframework spring-context-support + ${spring.version} - - - javax.mail - mail + org.springframework + spring-tx + ${spring.version} - + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + ${jms.version} + + + javax.servlet + jstl + ${jstl.version} + + - + org.hibernate hibernate-core + ${hibernate.version} + + + xml-apis + xml-apis + + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + + org.hibernate hibernate-validator + ${hibernate-validator.version} + + org.javassist + javassist + ${javassist.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + - commons-dbcp commons-dbcp + ${commons-dbcp.version} com.oracle ojdbc6 + ${oracle.version} mysql mysql-connector-java + ${mysql.version} org.lazyluke log4jdbc-remix + ${log4jdbc-remix.version} - + + + + dom4j + dom4j + ${dom4j.version} + org.apache.poi poi ${poi.version} - + + xmlbeans + xmlbeans + ${xmlbeans.version} + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j jcl-over-slf4j + ${slf4j.version} org.slf4j jul-to-slf4j + ${slf4j.version} ch.qos.logback logback-classic + ${logback.version} org.fusesource.jansi jansi + ${jansi.version} org.codehaus.janino janino + ${janino.version} + - commons-beanutils commons-beanutils + ${commons-beanutils.version} + + + commons-logging + commons-logging + + commons-codec commons-codec + ${commons-codec.version} commons-io commons-io + ${commons-io.version} - - commons-fileupload - commons-fileupload - - - org.apache.commons - commons-lang3 - + - + + + org.glassfish.jersey.ext + jersey-spring3 + ${jersey.version} + javax.ws.rs javax.ws.rs-api + ${rs-api.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + ${jackson-jaxrs-json-provider.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-hibernate4 + ${jackson-datatype-hibernate4.version} ma.glasnost.orika orika-core + ${orika.version} + + + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + c3p0 + + + + + + + + javax.mail + mail + ${mail.version} + + + + + + redis.clients + jedis + ${redis.version} + compile + + + + - com.google.code.gson - gson - - - - - - - - + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + + + poi-ooxml-schemas + poi-ooxml-schemas + ${poi-ooxml-schemas.version} + + - - - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + PgInterface + + - - org.springframework - spring-test - ${spring.version} - test - - - org.dbunit - dbunit - ${dbunit.version} - test - - - com.github.springtestdbunit - spring-test-dbunit - ${spring-test-dbunit.version} - test - - + + + com.fiobox + fiobox + war + + - - - org.seleniumhq.selenium - selenium-htmlunit-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-firefox-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-chrome-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-ie-driver - ${selenium2.version} - test - - - org.seleniumhq.selenium - selenium-support - ${selenium2.version} - test - - + + + –> + org.codehaus.mojo + tomcat-maven-plugin + + http://192.168.0.203:8080/manager/text + test + /xxfw + + --> + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.7 + 1.7 + + ${java.home}/lib/rt.jar + + + + + - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + 1.6 + UTF-8 + UTF-8 + svn://localhost/mossle/tags - - javax.servlet - javax.servlet-api - ${servlet.version} - provided - - - javax.servlet.jsp - jsp-api - ${jsp.version} - provided - + + 2.3.8 + 2.3.8 + 3.9 - - - org.springframework - spring-orm - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${jms.version} - - - javax.servlet - jstl - ${jstl.version} - - + 4.7 + 1.9.5 + 2.42.2 + 1.4.01 + 2.5.0 + 1.2.0 + 3.3.2 + 1.3.1 + 3.0.1 + 2.1 + 7.6.15.v20140411 - - - org.hibernate - hibernate-core - ${hibernate.version} - - - xml-apis - xml-apis - - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - - - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.javassist - javassist - ${javassist.version} - - - net.sf.ehcache - ehcache - ${ehcache.version} - - + 4.0.6.RELEASE + 2.3.16.3 + 3.2.5.RELEASE + 4.3.6.Final + 5.1.2.Final + 3.18.2-GA + 2.8.3 + 2.3.2 + 11.1.0.7.0 + 1.7.7 + 1.1.2 + 1.11 + 2.7.6 + 1.4 + 1.9.2 + 1.9 + 2.4 + 3.9 + 1.2.2 + 0.2.7 + 2.12 + 2.0.1 + 2.4.2 + 2.4.2 + 1.4.7 + 1.1.GA + 2.2.1 + 1.4.181 + 8.0.12 + 5.16.1 + 3.0.1 + 3.0 + 3.5.1 + 1.4.5 + 1.0.0 + 2.11.4 + 1.1.1 + 1.2 + 2.3.20 + 5.6.0 + 6.1.0.Final + 6.1.0.Final + 5.10.0 + 4.0 + 2.3.6 + 4.9.0 + 2.5.0 + 2.0.0 + 2.3.1 - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - com.oracle - ojdbc6 - ${oracle.version} - - - mysql - mysql-connector-java - ${mysql.version} - - - org.lazyluke - log4jdbc-remix - ${log4jdbc-remix.version} - + 1.7 + 2.5 + 3.1 + 2.5 + 2.5.1 + 2.3 + 2.4 + 6.1.26 + 1.1 + 2.2 + 0.4 + 0.0.20081026 + 3.4 + 2.7 + 2.9.1 + 2.17 + 2.17 + 1.6 + 1.2.0 + 2.1 + 1.0-beta-1 + 0.7.1.201405082137 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.fusesource.jansi - jansi - ${jansi.version} - - - org.codehaus.janino - janino - ${janino.version} - - + 1.6.1 + 3.8 + 3.8 + 3.8 + 2.3.0 - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - commons-logging - commons-logging - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - - org.glassfish.jersey.ext - jersey-spring3 - ${jersey.version} - - - javax.ws.rs - javax.ws.rs-api - ${rs-api.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-jaxrs-json-provider.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate4 - ${jackson-datatype-hibernate4.version} - - - ma.glasnost.orika - orika-core - ${orika.version} - - - - - - org.quartz-scheduler - quartz - ${quartz.version} - - - c3p0 - c3p0 - - - - - - - - javax.mail - mail - ${mail.version} - - - - - - redis.clients - jedis - ${redis.version} - compile - - - - - - - poi - poi - ${poi.version} - compile - - - - structs.core - struts2-core - ${struts2-core.version} - compile - - - - xwork.core - xwork-core - ${xwork-core.version} - compile - - - - - - com.google.code.gson - gson - ${gson.version} - - - - - - - patrol - - - - - - - 1.6 - UTF-8 - UTF-8 - svn://localhost/mossle/tags - - - 2.3.8 - 2.3.8 - 3.9 - - 4.7 - 1.9.5 - 2.42.2 - 1.4.01 - 2.5.0 - 1.2.0 - 3.3.2 - 1.3.1 - - 3.0.1 - 2.1 - 7.6.15.v20140411 - - 4.0.6.RELEASE - 2.3.16.3 - 3.2.5.RELEASE - 4.3.6.Final - 5.1.2.Final - 3.18.2-GA - 2.8.3 - 2.3.2 - 11.1.0.7.0 - 1.7.7 - 1.1.2 - 1.11 - 2.7.6 - 1.4 - 1.9.2 - 1.9 - 2.4 - 3.9 - 1.2.2 - 0.2.7 - 2.12 - 2.0.1 - 2.4.2 - 2.4.2 - 1.4.7 - 1.1.GA - 2.2.1 - 1.4.181 - 5.1.32 - 5.16.1 - 3.0.1 - 3.0 - 3.5.1 - 1.4.5 - 1.0.0 - 2.11.4 - 1.1.1 - 1.2 - 2.3.20 - 5.6.0 - 6.1.0.Final - 6.1.0.Final - 5.10.0 - 4.0 - 2.3.6 - 4.9.0 - 2.5.0 - 2.0.0 - 2.3.1 - - 1.7 - 2.5 - 3.1 - 2.5 - 2.5.1 - 2.3 - 2.4 - 6.1.26 - 1.1 - 2.2 - 0.4 - 0.0.20081026 - 3.4 - 2.7 - 2.9.1 - 2.17 - 2.17 - 1.6 - 1.2.0 - 2.1 - 1.0-beta-1 - 0.7.1.201405082137 - + diff --git a/src/main/java/com/casic/PgInterface/core/http/httpURL.java b/src/main/java/com/casic/PgInterface/core/http/httpURL.java new file mode 100644 index 0000000..f76a6c0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/core/http/httpURL.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.core.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +public class httpURL { + + static final String authorizationInput="Uradio:Ur@dio2018";//源码 + static final String authorization ="Base VXJhZGlvOlVyQGRpbzIwMTg=";//Base64加密 + static final String strUrl="http://www.uradiosys.com:8094/api/HostInfo/HostAddOrUpdateByOtherSys";//接口url + + /** + * 接口调用 POST + */ + public static String httpURLConnectionPOST (String paramsJson) { + try { + URL url = new URL(strUrl); + // 将url 以 open方法返回的urlConnection 连接强转为HttpURLConnection连接 (标识一个url所引用的远程对象连接) + HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中 + connection.setDoOutput(true); // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数) + connection.setDoInput(true); // 设置连接输入流为true + connection.setRequestMethod("POST");// 设置请求方式为post + connection.setUseCaches(false);// post请求缓存设为false + connection.setInstanceFollowRedirects(true);//设置该HttpURLConnection实例是否自动执行重定向 + + // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数) + connection.setRequestProperty("Authorization", authorization); + connection.setRequestProperty("Content-Type", "application/json"); + connection.connect();// 建立连接 (请求未开始,直到connection.getInputStream()方法调用时才发起,以上各个参数设置需在此方法之前进行) + + DataOutputStream dataout = new DataOutputStream(connection.getOutputStream());// 创建输入输出流,用于往连接里面输出携带的参数 + + dataout.writeBytes(paramsJson);// 将参数输出到连接 + dataout.flush();// 输出完成后刷新并关闭流 + dataout.close(); // 重要且易忽略步骤 (关闭流,切记!) + + System.out.println(connection.getResponseCode()); + + //连接发起请求,处理服务器响应 (从连接获取到输入流并包装为bufferedReader) + BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + String line; + StringBuilder sb = new StringBuilder(); //用来存储响应数据 + + // 循环读取流,若不到结尾处 + while ((line = bf.readLine()) != null) { + sb.append(line).append(System.getProperty("line.separator")); + } + bf.close();//重要且易忽略步骤 (关闭流,切记!) + connection.disconnect();//销毁连接 + + return sb.toString(); + + } catch (Exception e) { + e.printStackTrace(); + return "定位设备人员同步出错"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index fa66327..e76bd4c 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,9 +1,11 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.http.httpURL; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import net.sf.json.JSONObject; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -113,4 +115,21 @@ return null; } + public String paramToMap(String id,String hostExternalId,String hostName,String description){ + + JSONObject json2=new JSONObject(); + json2.put("ID", id); + json2.put("hostExternalId",hostExternalId); + json2.put("hostName",hostName); + json2.put("description",description); + + return json2.toString(); + } + + public String synchorizedInPgInfo(String id,String hostExternalId,String hostName,String description){ + + String paramsJson=paramToMap(id, hostExternalId, hostName, description); + return httpURL.httpURLConnectionPOST(paramsJson); + } + } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 6b53265..40e3ff5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -50,6 +50,7 @@ Map resultMap = new HashMap(); String result = ""; String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -64,8 +65,9 @@ pgInPgPerson1.setAssetCode(assetCode); pgInPgPersonManager.save(pgInPgPerson1); + String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,"",userName,personType); result = "true"; - msg = "保存成功"; + msg = "人员注册保存成功"+syResult; } else { result = "false"; diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java deleted file mode 100644 index 272f034..0000000 --- a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.PgInterface.test; - -public class httpInterfaceTest { - - public static void main(String[] args){ -// -// URL url=new URL(http://www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); -// try{ -// HttpURLConnection conn = (HttpURLConnection) url.openConnection(); -// } -// catch(IOException e){ -// e.printStackTrace(); -// } - - } - -} \ No newline at end of file diff --git a/src/main/resources/spring/applicationContext-filter.xml b/src/main/resources/spring/applicationContext-filter.xml index fd4d361..5b28c16 100644 --- a/src/main/resources/spring/applicationContext-filter.xml +++ b/src/main/resources/spring/applicationContext-filter.xml @@ -3,7 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - @@ -16,6 +15,7 @@ + @@ -74,7 +74,6 @@ - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 2674aac..f2bfed0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,11 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> + contextConfigLocation - classpath*:spring/applicationContext*.xml + classpath*:spring/applicationContex*.xml + + org.springframework.web.context.ContextLoaderListener + + + org.springframework.web.context.request.RequestContextListener + + compositeFilter org.springframework.web.filter.DelegatingFilterProxy @@ -22,10 +30,6 @@ /* - - org.springframework.web.context.ContextLoaderListener - - spring org.springframework.web.servlet.DispatcherServlet @@ -33,10 +37,6 @@ contextConfigLocation classpath*:spring/applicationContext*.xml - - contextAttribute - org.springframework.web.context.WebApplicationContext.ROOT - 1 @@ -45,27 +45,48 @@ *.do - - 401 - /common/401.jsp - - - 403 - /common/403.jsp - - - 500 - /common/500.jsp - - - java.lang.Throwable - /common/500.jsp - + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + encodingFilter + /* + + - - - org.springframework.web.context.request.RequestContextListener - - + \ No newline at end of file diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index dfc15bf..bf04e32 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ