diff --git a/.idea/artifacts/toutiao_war.xml b/.idea/artifacts/toutiao_war.xml new file mode 100644 index 0000000..cbe8c50 --- /dev/null +++ b/.idea/artifacts/toutiao_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/toutiao_war_exploded.xml b/.idea/artifacts/toutiao_war_exploded.xml new file mode 100644 index 0000000..c706fa8 --- /dev/null +++ b/.idea/artifacts/toutiao_war_exploded.xml @@ -0,0 +1,93 @@ + + + $PROJECT_DIR$/target/toutiao-0.0.1-SNAPSHOT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..d2007f4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml new file mode 100644 index 0000000..cdd7959 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml new file mode 100644 index 0000000..6c2a760 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml new file mode 100644 index 0000000..3cd56f9 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml new file mode 100644 index 0000000..910f84b --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml new file mode 100644 index 0000000..cfcab12 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml new file mode 100644 index 0000000..1a718d6 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml new file mode 100644 index 0000000..89164c5 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml new file mode 100644 index 0000000..6307d67 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml new file mode 100644 index 0000000..59098ba --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml new file mode 100644 index 0000000..578b079 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_1_1.xml b/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_1_1.xml new file mode 100644 index 0000000..b2fc755 --- /dev/null +++ b/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_2_0.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_2_0.xml new file mode 100644 index 0000000..9d24b39 --- /dev/null +++ b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml new file mode 100644 index 0000000..284ba86 --- /dev/null +++ b/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml b/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml new file mode 100644 index 0000000..38653c2 --- /dev/null +++ b/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml new file mode 100644 index 0000000..27424a1 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml new file mode 100644 index 0000000..13afda2 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml new file mode 100644 index 0000000..f116060 --- /dev/null +++ b/.idea/libraries/Maven__commons_digester_commons_digester_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml new file mode 100644 index 0000000..5e8b8d3 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml b/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml new file mode 100644 index 0000000..476d18d --- /dev/null +++ b/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml new file mode 100644 index 0000000..2b062b5 --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml new file mode 100644 index 0000000..88d626e --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml new file mode 100644 index 0000000..6c692c8 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml new file mode 100644 index 0000000..2970b5e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml new file mode 100644 index 0000000..fdb7ead --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_5.xml new file mode 100644 index 0000000..3aaba10 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml new file mode 100644 index 0000000..072320e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml new file mode 100644 index 0000000..9674c05 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml new file mode 100644 index 0000000..e4c6c81 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml new file mode 100644 index 0000000..09827ab --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml new file mode 100644 index 0000000..588a181 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml new file mode 100644 index 0000000..9962a4b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml new file mode 100644 index 0000000..637262e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml new file mode 100644 index 0000000..45edb2d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml new file mode 100644 index 0000000..7a2914a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml new file mode 100644 index 0000000..2e6b0aa --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml new file mode 100644 index 0000000..687b798 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_2_5_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_2_5_0.xml new file mode 100644 index 0000000..7c5aab4 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 0000000..78dbe45 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml new file mode 100644 index 0000000..6c5e17f --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml new file mode 100644 index 0000000..186d87f --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml new file mode 100644 index 0000000..a6eefaf --- /dev/null +++ b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20140107.xml b/.idea/libraries/Maven__org_json_json_20140107.xml new file mode 100644 index 0000000..0092a09 --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20140107.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml new file mode 100644 index 0000000..a523703 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml new file mode 100644 index 0000000..dc8a00a --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml new file mode 100644 index 0000000..774f47c --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_1.xml new file mode 100644 index 0000000..cc347dd --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_1.xml new file mode 100644 index 0000000..0cef385 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml new file mode 100644 index 0000000..7ab319b --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml new file mode 100644 index 0000000..da69f6c --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_3_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_3_0.xml new file mode 100644 index 0000000..0b92ed6 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml new file mode 100644 index 0000000..2f93a63 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml new file mode 100644 index 0000000..dd05efc --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml new file mode 100644 index 0000000..0f9744a --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml new file mode 100644 index 0000000..1b644dd --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml new file mode 100644 index 0000000..a193527 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml new file mode 100644 index 0000000..d24946a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_4_0_RELEASE.xml new file mode 100644 index 0000000..399cdba --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml new file mode 100644 index 0000000..07ae94e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_4_0_RELEASE.xml new file mode 100644 index 0000000..0aa225e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml new file mode 100644 index 0000000..59f1e83 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml new file mode 100644 index 0000000..f965e34 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_4_0_RELEASE.xml new file mode 100644 index 0000000..043e888 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml new file mode 100644 index 0000000..2f661ba --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_velocity_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_velocity_1_4_0_RELEASE.xml new file mode 100644 index 0000000..8edb54a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_velocity_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml new file mode 100644 index 0000000..e2e3a71 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_4_0_RELEASE.xml new file mode 100644 index 0000000..e04d1a4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_4_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_4_0_RELEASE.xml new file mode 100644 index 0000000..907120a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_4_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml new file mode 100644 index 0000000..4508a6b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml new file mode 100644 index 0000000..d650bb8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml new file mode 100644 index 0000000..b497541 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml new file mode 100644 index 0000000..0cc3aa4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml new file mode 100644 index 0000000..aca549b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml new file mode 100644 index 0000000..e802cd8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml new file mode 100644 index 0000000..7b6a300 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml new file mode 100644 index 0000000..144d742 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml new file mode 100644 index 0000000..0254b40 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml new file mode 100644 index 0000000..2b7b1d4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml new file mode 100644 index 0000000..e4b70bb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml new file mode 100644 index 0000000..20e2920 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml new file mode 100644 index 0000000..25203a0 --- /dev/null +++ b/.idea/libraries/Maven__oro_oro_2_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml new file mode 100644 index 0000000..213d5c0 --- /dev/null +++ b/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__sslext_sslext_1_2_0.xml b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml new file mode 100644 index 0000000..e8c7831 --- /dev/null +++ b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml new file mode 100644 index 0000000..9aadd29 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5f61bad --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3acd307 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..445c900 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,936 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1533175482807 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/src/main/java/com/nowcoder/controller/MessageController.java + 87 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + scala-sdk-2.11.12 + + + + + + + + 1.8 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/nowcoder/ToutiaoApplication.java b/src/main/java/com/nowcoder/ToutiaoApplication.java index 86d49fe..7a48cc7 100644 --- a/src/main/java/com/nowcoder/ToutiaoApplication.java +++ b/src/main/java/com/nowcoder/ToutiaoApplication.java @@ -3,8 +3,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication +@EnableTransactionManagement public class ToutiaoApplication extends SpringBootServletInitializer{ @Override diff --git a/src/main/java/com/nowcoder/async/EventConsumer.java b/src/main/java/com/nowcoder/async/EventConsumer.java index a0d9abc..0bd3811 100644 --- a/src/main/java/com/nowcoder/async/EventConsumer.java +++ b/src/main/java/com/nowcoder/async/EventConsumer.java @@ -53,13 +53,16 @@ public void afterPropertiesSet() throws Exception { } } + //todo: java开发规范:不要单独创建线程,最好使用线程池管理线程 //根据前面的map可以知道取出的时间由谁来处理 Thread thread = new Thread(new Runnable() { @Override public void run() { + logger.info("监听事件的线程"); while (true) { String key = RedisKeyUtil.getEventQueueKey(); List events = jedisAdapter.brpop(0, key); + logger.info("从消息队列取出事件"); for (String msg : events) { //redis自带消息key要过滤掉 if (msg.equals(key)) { @@ -72,6 +75,7 @@ public void run() { } for (EventHandler eventHandler : config.get(eventModel.getEventType())) { eventHandler.doHandle(eventModel); + logger.info("从消息队列消费消息"); } } } diff --git a/src/main/java/com/nowcoder/async/EventProducer.java b/src/main/java/com/nowcoder/async/EventProducer.java index e3a830a..509a548 100644 --- a/src/main/java/com/nowcoder/async/EventProducer.java +++ b/src/main/java/com/nowcoder/async/EventProducer.java @@ -25,6 +25,7 @@ public boolean fireEvent(EventModel eventModel) { String key = RedisKeyUtil.getEventQueueKey(); jedisAdapter.lpush(key, json); // jedisAdapter.setObject(eventModel); + logger.info("将事件放入消息队列"); return true; }catch (Exception e) { logger.error("事件放入队列失败" + e.getMessage()); diff --git a/src/main/java/com/nowcoder/async/handler/LikeHandler.java b/src/main/java/com/nowcoder/async/handler/LikeHandler.java index 044b7b7..953ea6b 100644 --- a/src/main/java/com/nowcoder/async/handler/LikeHandler.java +++ b/src/main/java/com/nowcoder/async/handler/LikeHandler.java @@ -38,9 +38,12 @@ public void doHandle(EventModel eventModel) { User user = userService.getUser(eventModel.getActorId()); message.setContent("用户" + user.getName() + "赞了你的资讯" + ",http://127.0.0.1:8088/news/" + eventModel.getEntityId()); + message.setConversationId(eventModel.getActorId() < eventModel.getEntityOwnerId() ? + String.format("%d_%d", eventModel.getActorId(), eventModel.getEntityOwnerId()) : + String.format("%d_%d", eventModel.getEntityOwnerId(), eventModel.getActorId())); message.setCreatedDate(new Date()); messageService.addMessage(message); - + logger.info("事件:发送站内信"); System.out.println("like"); logger.info(eventModel.toString()); } diff --git a/src/main/java/com/nowcoder/dao/MessageDAO.java b/src/main/java/com/nowcoder/dao/MessageDAO.java index 2ac4ab3..ce92cf8 100644 --- a/src/main/java/com/nowcoder/dao/MessageDAO.java +++ b/src/main/java/com/nowcoder/dao/MessageDAO.java @@ -22,7 +22,8 @@ public interface MessageDAO { ") values (#{fromId},#{toId},#{content},#{hasRead},#{conversationId},#{createdDate})"}) int addMessage(Message message); - @Select({"select ", INSERT_FIELDS, " ,count(id) as id from ( select * from ", TABLE_NAME, " where from_id=#{userId} or to_id=#{userId} order by id desc) tt group by conversation_id order by id desc limit #{offset},#{limit}"}) + @Select({"select ", INSERT_FIELDS, " ,count(id) as id from ( select * from ", TABLE_NAME, " where from_id=#{userId} " + + "or to_id=#{userId} order by id desc) tt group by conversation_id order by id desc limit #{offset},#{limit}"}) List getConversationList(@Param("userId") int userId, @Param("offset") int offset, @Param("limit") int limit); @Select({"select count(id) from ", TABLE_NAME, " where has_read = 0 and to_id=#{userId} and conversation_id=#{conversationId}"}) diff --git a/src/main/java/com/nowcoder/interceptor/LoginRequiredInterceptor.java b/src/main/java/com/nowcoder/interceptor/LoginRequiredInterceptor.java index af97de6..e526030 100644 --- a/src/main/java/com/nowcoder/interceptor/LoginRequiredInterceptor.java +++ b/src/main/java/com/nowcoder/interceptor/LoginRequiredInterceptor.java @@ -5,6 +5,8 @@ import com.nowcoder.model.HostHolder; import com.nowcoder.model.LoginTicket; import com.nowcoder.model.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -24,8 +26,11 @@ public class LoginRequiredInterceptor implements HandlerInterceptor { @Autowired private HostHolder hostHolder; + private static final Logger logger = LoggerFactory.getLogger(LoginRequiredInterceptor.class); + @Override public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception { + logger.info("拦截器:用户无权登陆 "); //这个拦截器可以让没有登陆的用户无法访问某些页面、 if (hostHolder.getUser() == null) { httpServletResponse.sendRedirect("/?pop=1"); diff --git a/src/main/java/com/nowcoder/interceptor/PassportInterceptor.java b/src/main/java/com/nowcoder/interceptor/PassportInterceptor.java index 9705a13..51ac2d9 100644 --- a/src/main/java/com/nowcoder/interceptor/PassportInterceptor.java +++ b/src/main/java/com/nowcoder/interceptor/PassportInterceptor.java @@ -5,6 +5,8 @@ import com.nowcoder.model.HostHolder; import com.nowcoder.model.LoginTicket; import com.nowcoder.model.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -29,9 +31,12 @@ public class PassportInterceptor implements HandlerInterceptor{ @Autowired private HostHolder hostHolder; + private static final Logger logger = LoggerFactory.getLogger(PassportInterceptor.class); + //true继续请求,false拒绝请求 @Override public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception { + logger.info("拦截器:判断用户登陆信息"); //处理用户信息,判断是否有ticket,一个用户一个ticket,但是有时限 String ticket = null; if (httpServletRequest.getCookies() != null) { diff --git a/src/main/java/com/nowcoder/service/MessageService.java b/src/main/java/com/nowcoder/service/MessageService.java index 753f58b..a0f0e44 100644 --- a/src/main/java/com/nowcoder/service/MessageService.java +++ b/src/main/java/com/nowcoder/service/MessageService.java @@ -12,6 +12,12 @@ /** * Created by nowcoder on 2016/7/7. */ + +//todo: 这个点赞发信息功能有问题 + +// 数据流程是: 点赞 => 点赞信息发送到redis消息队列的生产者进程,同时消费者不断取出来消息进行消费,也就是给被点赞者发信息 + + @Service public class MessageService { @Autowired diff --git a/src/main/java/com/nowcoder/service/NewsService.java b/src/main/java/com/nowcoder/service/NewsService.java index adcc16b..3b3a89c 100644 --- a/src/main/java/com/nowcoder/service/NewsService.java +++ b/src/main/java/com/nowcoder/service/NewsService.java @@ -9,6 +9,7 @@ import org.apache.velocity.texen.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -21,7 +22,11 @@ /** * Created by nowcoder on 2016/7/2. */ + + + @Service +@Transactional() public class NewsService { @Autowired private NewsDAO newsDAO; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index de86cea..ddcd3b4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=8088 # DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) spring.datasource.url=jdbc:mysql://localhost:3306/toutiao?useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.username=root -spring.datasource.password=1234 +spring.datasource.password=root mybatis.config-location=classpath:mybatis-config.xml # VELOCITY TEMPLATES (VelocityAutoConfiguration) spring.velocity.suffix=.html diff --git a/src/main/resources/sql/comment.sql b/src/main/resources/sql/comment.sql new file mode 100644 index 0000000..7b1aa8a --- /dev/null +++ b/src/main/resources/sql/comment.sql @@ -0,0 +1,12 @@ +drop table if exists comment; + +create table comment ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) not null, + `entity_id` int(11) not null, + `entity_type` int(2) not null, + `status` int(2) not null, + `content` varchar(64) not null, + `created_date` datetime not null, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/src/main/resources/sql/login_ticket.sql b/src/main/resources/sql/login_ticket.sql new file mode 100644 index 0000000..4467ab7 --- /dev/null +++ b/src/main/resources/sql/login_ticket.sql @@ -0,0 +1,9 @@ +DROP TABLE IF EXISTS login_ticket; +CREATE TABLE login_ticket ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL, + `ticket` varchar(64) NOT NULL, + `expired` datetime NOT NULL, + `status` int(2) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/src/main/resources/sql/message.sql b/src/main/resources/sql/message.sql new file mode 100644 index 0000000..ce30d46 --- /dev/null +++ b/src/main/resources/sql/message.sql @@ -0,0 +1,11 @@ +drop table if exists message; +create table message ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `from_id` int(11) not null , + `to_id` int(11) not null, + `content` varchar(64) not null, + `has_read` int(2) not null, + `conversation_id` varchar(64) not null, + `created_date` datetime not null, + PRIMARY KEY (`id`) +)ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/src/main/resources/sql/news.sql b/src/main/resources/sql/news.sql index 454ecf4..23a765f 100644 --- a/src/main/resources/sql/news.sql +++ b/src/main/resources/sql/news.sql @@ -1,12 +1,12 @@ -DROP TABLE IF EXISTS 'news'; -CREATE TABLE 'news'( - `id` int(11) unsigned NOT NULL AUTO_INCREAMENT, - `titie` varchar(128) NOT NULL DEFAULT '', +DROP TABLE IF EXISTS news; +CREATE TABLE news( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `title` varchar(128) NOT NULL DEFAULT '', `link` varchar(256) NOT NULL DEFAULT '', `image` varchar(256) NOT NULL DEFAULT '', `like_count` int(11) NOT NULL, `comment_count` int(11) NOT NULL, - `create_date` datetime NOT NULL, + `created_date` datetime NOT NULL, `user_id` int(11) NOT NULL, PRIMARY KEY (`id`) -)ENGINE = InnoDB AUTO_INCREAMENT=11 DEFAULT CHARSET=utf8 \ No newline at end of file +)ENGINE = InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/src/main/resources/sql/user.sql b/src/main/resources/sql/user.sql index 6494ec9..76aec7b 100644 --- a/src/main/resources/sql/user.sql +++ b/src/main/resources/sql/user.sql @@ -1,8 +1,10 @@ -DROP TABLE IF EXISTS `user`; -CREATE TABLE `user` ( +DROP TABLE IF EXISTS user; +CREATE TABLE user ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(64) NOT NULL, `password` varchar(64) NOT NULL, + `salt` varchar(64) NOT NULL, + `head_url` varchar(64) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name_UNIQUE` (`name`) ) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..ddcd3b4 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1,10 @@ +server.port=8088 +# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) +spring.datasource.url=jdbc:mysql://localhost:3306/toutiao?useUnicode=true&characterEncoding=utf8&useSSL=false +spring.datasource.username=root +spring.datasource.password=root +mybatis.config-location=classpath:mybatis-config.xml +# VELOCITY TEMPLATES (VelocityAutoConfiguration) +spring.velocity.suffix=.html +spring.velocity.cache=false +spring.velocity.toolbox-config-location=toolbox.xml diff --git a/target/classes/com/nowcoder/ToutiaoApplication.class b/target/classes/com/nowcoder/ToutiaoApplication.class new file mode 100644 index 0000000..f8c2775 Binary files /dev/null and b/target/classes/com/nowcoder/ToutiaoApplication.class differ diff --git a/target/classes/com/nowcoder/aspect/LogAspect.class b/target/classes/com/nowcoder/aspect/LogAspect.class new file mode 100644 index 0000000..344deb6 Binary files /dev/null and b/target/classes/com/nowcoder/aspect/LogAspect.class differ diff --git a/target/classes/com/nowcoder/async/EventConsumer$1.class b/target/classes/com/nowcoder/async/EventConsumer$1.class new file mode 100644 index 0000000..c2b1eed Binary files /dev/null and b/target/classes/com/nowcoder/async/EventConsumer$1.class differ diff --git a/target/classes/com/nowcoder/async/EventConsumer.class b/target/classes/com/nowcoder/async/EventConsumer.class new file mode 100644 index 0000000..778cd7a Binary files /dev/null and b/target/classes/com/nowcoder/async/EventConsumer.class differ diff --git a/target/classes/com/nowcoder/async/EventHandler.class b/target/classes/com/nowcoder/async/EventHandler.class new file mode 100644 index 0000000..6aa6494 Binary files /dev/null and b/target/classes/com/nowcoder/async/EventHandler.class differ diff --git a/target/classes/com/nowcoder/async/EventModel.class b/target/classes/com/nowcoder/async/EventModel.class new file mode 100644 index 0000000..5c7358e Binary files /dev/null and b/target/classes/com/nowcoder/async/EventModel.class differ diff --git a/target/classes/com/nowcoder/async/EventProducer.class b/target/classes/com/nowcoder/async/EventProducer.class new file mode 100644 index 0000000..b5fa161 Binary files /dev/null and b/target/classes/com/nowcoder/async/EventProducer.class differ diff --git a/target/classes/com/nowcoder/async/EventType.class b/target/classes/com/nowcoder/async/EventType.class new file mode 100644 index 0000000..af078d2 Binary files /dev/null and b/target/classes/com/nowcoder/async/EventType.class differ diff --git a/target/classes/com/nowcoder/async/handler/LikeHandler.class b/target/classes/com/nowcoder/async/handler/LikeHandler.class new file mode 100644 index 0000000..22eef31 Binary files /dev/null and b/target/classes/com/nowcoder/async/handler/LikeHandler.class differ diff --git a/target/classes/com/nowcoder/async/handler/LoginExceptionHandler.class b/target/classes/com/nowcoder/async/handler/LoginExceptionHandler.class new file mode 100644 index 0000000..e68075d Binary files /dev/null and b/target/classes/com/nowcoder/async/handler/LoginExceptionHandler.class differ diff --git a/target/classes/com/nowcoder/configuration/ToutiaoWebConfiguration.class b/target/classes/com/nowcoder/configuration/ToutiaoWebConfiguration.class new file mode 100644 index 0000000..1abb487 Binary files /dev/null and b/target/classes/com/nowcoder/configuration/ToutiaoWebConfiguration.class differ diff --git a/target/classes/com/nowcoder/controller/HomeController.class b/target/classes/com/nowcoder/controller/HomeController.class new file mode 100644 index 0000000..aeb8669 Binary files /dev/null and b/target/classes/com/nowcoder/controller/HomeController.class differ diff --git a/target/classes/com/nowcoder/controller/IndexController.class b/target/classes/com/nowcoder/controller/IndexController.class new file mode 100644 index 0000000..c1cb809 Binary files /dev/null and b/target/classes/com/nowcoder/controller/IndexController.class differ diff --git a/target/classes/com/nowcoder/controller/LikeController.class b/target/classes/com/nowcoder/controller/LikeController.class new file mode 100644 index 0000000..b76c4b9 Binary files /dev/null and b/target/classes/com/nowcoder/controller/LikeController.class differ diff --git a/target/classes/com/nowcoder/controller/LoginController.class b/target/classes/com/nowcoder/controller/LoginController.class new file mode 100644 index 0000000..23fe753 Binary files /dev/null and b/target/classes/com/nowcoder/controller/LoginController.class differ diff --git a/target/classes/com/nowcoder/controller/MessageController.class b/target/classes/com/nowcoder/controller/MessageController.class new file mode 100644 index 0000000..df456c0 Binary files /dev/null and b/target/classes/com/nowcoder/controller/MessageController.class differ diff --git a/target/classes/com/nowcoder/controller/NewsController.class b/target/classes/com/nowcoder/controller/NewsController.class new file mode 100644 index 0000000..f859699 Binary files /dev/null and b/target/classes/com/nowcoder/controller/NewsController.class differ diff --git a/target/classes/com/nowcoder/controller/SettingController.class b/target/classes/com/nowcoder/controller/SettingController.class new file mode 100644 index 0000000..b05832b Binary files /dev/null and b/target/classes/com/nowcoder/controller/SettingController.class differ diff --git a/target/classes/com/nowcoder/controller/UserController.class b/target/classes/com/nowcoder/controller/UserController.class new file mode 100644 index 0000000..3af780f Binary files /dev/null and b/target/classes/com/nowcoder/controller/UserController.class differ diff --git a/target/classes/com/nowcoder/dao/CommentDAO.class b/target/classes/com/nowcoder/dao/CommentDAO.class new file mode 100644 index 0000000..40c8792 Binary files /dev/null and b/target/classes/com/nowcoder/dao/CommentDAO.class differ diff --git a/target/classes/com/nowcoder/dao/LoginTicketDAO.class b/target/classes/com/nowcoder/dao/LoginTicketDAO.class new file mode 100644 index 0000000..96de7a0 Binary files /dev/null and b/target/classes/com/nowcoder/dao/LoginTicketDAO.class differ diff --git a/target/classes/com/nowcoder/dao/MessageDAO.class b/target/classes/com/nowcoder/dao/MessageDAO.class new file mode 100644 index 0000000..a5f85bd Binary files /dev/null and b/target/classes/com/nowcoder/dao/MessageDAO.class differ diff --git a/target/classes/com/nowcoder/dao/NewsDAO.class b/target/classes/com/nowcoder/dao/NewsDAO.class new file mode 100644 index 0000000..718a80c Binary files /dev/null and b/target/classes/com/nowcoder/dao/NewsDAO.class differ diff --git a/target/classes/com/nowcoder/dao/NewsDAO.xml b/target/classes/com/nowcoder/dao/NewsDAO.xml new file mode 100644 index 0000000..858966d --- /dev/null +++ b/target/classes/com/nowcoder/dao/NewsDAO.xml @@ -0,0 +1,20 @@ + + + + news + id,title, link, image, like_count, comment_count,created_date,user_id + + + diff --git a/target/classes/com/nowcoder/dao/UserDAO.class b/target/classes/com/nowcoder/dao/UserDAO.class new file mode 100644 index 0000000..d34956b Binary files /dev/null and b/target/classes/com/nowcoder/dao/UserDAO.class differ diff --git a/target/classes/com/nowcoder/interceptor/LoginRequiredInterceptor.class b/target/classes/com/nowcoder/interceptor/LoginRequiredInterceptor.class new file mode 100644 index 0000000..44ebce2 Binary files /dev/null and b/target/classes/com/nowcoder/interceptor/LoginRequiredInterceptor.class differ diff --git a/target/classes/com/nowcoder/interceptor/PassportInterceptor.class b/target/classes/com/nowcoder/interceptor/PassportInterceptor.class new file mode 100644 index 0000000..1b08d46 Binary files /dev/null and b/target/classes/com/nowcoder/interceptor/PassportInterceptor.class differ diff --git a/target/classes/com/nowcoder/model/Comment.class b/target/classes/com/nowcoder/model/Comment.class new file mode 100644 index 0000000..61df12d Binary files /dev/null and b/target/classes/com/nowcoder/model/Comment.class differ diff --git a/target/classes/com/nowcoder/model/EntityType.class b/target/classes/com/nowcoder/model/EntityType.class new file mode 100644 index 0000000..1bdd4b4 Binary files /dev/null and b/target/classes/com/nowcoder/model/EntityType.class differ diff --git a/target/classes/com/nowcoder/model/HostHolder.class b/target/classes/com/nowcoder/model/HostHolder.class new file mode 100644 index 0000000..7aed5ab Binary files /dev/null and b/target/classes/com/nowcoder/model/HostHolder.class differ diff --git a/target/classes/com/nowcoder/model/LoginTicket.class b/target/classes/com/nowcoder/model/LoginTicket.class new file mode 100644 index 0000000..f478eef Binary files /dev/null and b/target/classes/com/nowcoder/model/LoginTicket.class differ diff --git a/target/classes/com/nowcoder/model/Message.class b/target/classes/com/nowcoder/model/Message.class new file mode 100644 index 0000000..9a0af7d Binary files /dev/null and b/target/classes/com/nowcoder/model/Message.class differ diff --git a/target/classes/com/nowcoder/model/News.class b/target/classes/com/nowcoder/model/News.class new file mode 100644 index 0000000..bb00a00 Binary files /dev/null and b/target/classes/com/nowcoder/model/News.class differ diff --git a/target/classes/com/nowcoder/model/User.class b/target/classes/com/nowcoder/model/User.class new file mode 100644 index 0000000..ee8365b Binary files /dev/null and b/target/classes/com/nowcoder/model/User.class differ diff --git a/target/classes/com/nowcoder/model/ViewObject.class b/target/classes/com/nowcoder/model/ViewObject.class new file mode 100644 index 0000000..d412fb9 Binary files /dev/null and b/target/classes/com/nowcoder/model/ViewObject.class differ diff --git a/target/classes/com/nowcoder/service/AliService.class b/target/classes/com/nowcoder/service/AliService.class new file mode 100644 index 0000000..82c330c Binary files /dev/null and b/target/classes/com/nowcoder/service/AliService.class differ diff --git a/target/classes/com/nowcoder/service/CommentService.class b/target/classes/com/nowcoder/service/CommentService.class new file mode 100644 index 0000000..42ddd9e Binary files /dev/null and b/target/classes/com/nowcoder/service/CommentService.class differ diff --git a/target/classes/com/nowcoder/service/LikeService.class b/target/classes/com/nowcoder/service/LikeService.class new file mode 100644 index 0000000..2269155 Binary files /dev/null and b/target/classes/com/nowcoder/service/LikeService.class differ diff --git a/target/classes/com/nowcoder/service/MessageService.class b/target/classes/com/nowcoder/service/MessageService.class new file mode 100644 index 0000000..591dc00 Binary files /dev/null and b/target/classes/com/nowcoder/service/MessageService.class differ diff --git a/target/classes/com/nowcoder/service/NewsService.class b/target/classes/com/nowcoder/service/NewsService.class new file mode 100644 index 0000000..1b0ec7b Binary files /dev/null and b/target/classes/com/nowcoder/service/NewsService.class differ diff --git a/target/classes/com/nowcoder/service/QiniuService.class b/target/classes/com/nowcoder/service/QiniuService.class new file mode 100644 index 0000000..a0b7451 Binary files /dev/null and b/target/classes/com/nowcoder/service/QiniuService.class differ diff --git a/target/classes/com/nowcoder/service/ToutiaoService.class b/target/classes/com/nowcoder/service/ToutiaoService.class new file mode 100644 index 0000000..d0c25e9 Binary files /dev/null and b/target/classes/com/nowcoder/service/ToutiaoService.class differ diff --git a/target/classes/com/nowcoder/service/UserService.class b/target/classes/com/nowcoder/service/UserService.class new file mode 100644 index 0000000..c3c9f02 Binary files /dev/null and b/target/classes/com/nowcoder/service/UserService.class differ diff --git a/target/classes/com/nowcoder/util/JedisAdapter.class b/target/classes/com/nowcoder/util/JedisAdapter.class new file mode 100644 index 0000000..63ca3a2 Binary files /dev/null and b/target/classes/com/nowcoder/util/JedisAdapter.class differ diff --git a/target/classes/com/nowcoder/util/MailSender.class b/target/classes/com/nowcoder/util/MailSender.class new file mode 100644 index 0000000..e0c221f Binary files /dev/null and b/target/classes/com/nowcoder/util/MailSender.class differ diff --git a/target/classes/com/nowcoder/util/RedisKeyUtil.class b/target/classes/com/nowcoder/util/RedisKeyUtil.class new file mode 100644 index 0000000..5fb3f0e Binary files /dev/null and b/target/classes/com/nowcoder/util/RedisKeyUtil.class differ diff --git a/target/classes/com/nowcoder/util/ToutiaoUtil.class b/target/classes/com/nowcoder/util/ToutiaoUtil.class new file mode 100644 index 0000000..2770edf Binary files /dev/null and b/target/classes/com/nowcoder/util/ToutiaoUtil.class differ diff --git a/target/classes/mybatis-config.xml b/target/classes/mybatis-config.xml new file mode 100644 index 0000000..d7ed841 --- /dev/null +++ b/target/classes/mybatis-config.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/sql/comment.sql b/target/classes/sql/comment.sql new file mode 100644 index 0000000..7b1aa8a --- /dev/null +++ b/target/classes/sql/comment.sql @@ -0,0 +1,12 @@ +drop table if exists comment; + +create table comment ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) not null, + `entity_id` int(11) not null, + `entity_type` int(2) not null, + `status` int(2) not null, + `content` varchar(64) not null, + `created_date` datetime not null, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/sql/login_ticket.sql b/target/classes/sql/login_ticket.sql new file mode 100644 index 0000000..4467ab7 --- /dev/null +++ b/target/classes/sql/login_ticket.sql @@ -0,0 +1,9 @@ +DROP TABLE IF EXISTS login_ticket; +CREATE TABLE login_ticket ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL, + `ticket` varchar(64) NOT NULL, + `expired` datetime NOT NULL, + `status` int(2) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/sql/message.sql b/target/classes/sql/message.sql new file mode 100644 index 0000000..ce30d46 --- /dev/null +++ b/target/classes/sql/message.sql @@ -0,0 +1,11 @@ +drop table if exists message; +create table message ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `from_id` int(11) not null , + `to_id` int(11) not null, + `content` varchar(64) not null, + `has_read` int(2) not null, + `conversation_id` varchar(64) not null, + `created_date` datetime not null, + PRIMARY KEY (`id`) +)ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/sql/news.sql b/target/classes/sql/news.sql new file mode 100644 index 0000000..23a765f --- /dev/null +++ b/target/classes/sql/news.sql @@ -0,0 +1,12 @@ +DROP TABLE IF EXISTS news; +CREATE TABLE news( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `title` varchar(128) NOT NULL DEFAULT '', + `link` varchar(256) NOT NULL DEFAULT '', + `image` varchar(256) NOT NULL DEFAULT '', + `like_count` int(11) NOT NULL, + `comment_count` int(11) NOT NULL, + `created_date` datetime NOT NULL, + `user_id` int(11) NOT NULL, + PRIMARY KEY (`id`) +)ENGINE = InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/sql/user.sql b/target/classes/sql/user.sql new file mode 100644 index 0000000..76aec7b --- /dev/null +++ b/target/classes/sql/user.sql @@ -0,0 +1,10 @@ +DROP TABLE IF EXISTS user; +CREATE TABLE user ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL, + `password` varchar(64) NOT NULL, + `salt` varchar(64) NOT NULL, + `head_url` varchar(64) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `name_UNIQUE` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 \ No newline at end of file diff --git a/target/classes/static/fonts/Flat-UI-Icons.eot b/target/classes/static/fonts/Flat-UI-Icons.eot new file mode 100644 index 0000000..656ca08 Binary files /dev/null and b/target/classes/static/fonts/Flat-UI-Icons.eot differ diff --git a/target/classes/static/fonts/Flat-UI-Icons.ttf b/target/classes/static/fonts/Flat-UI-Icons.ttf new file mode 100644 index 0000000..73f7f4a Binary files /dev/null and b/target/classes/static/fonts/Flat-UI-Icons.ttf differ diff --git a/target/classes/static/fonts/Flat-UI-Icons.woff b/target/classes/static/fonts/Flat-UI-Icons.woff new file mode 100644 index 0000000..7b8f80f Binary files /dev/null and b/target/classes/static/fonts/Flat-UI-Icons.woff differ diff --git a/target/classes/static/fonts/fontawesome-webfont.eot b/target/classes/static/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..0662cb9 Binary files /dev/null and b/target/classes/static/fonts/fontawesome-webfont.eot differ diff --git a/target/classes/static/fonts/fontawesome-webfont.ttf b/target/classes/static/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..d365924 Binary files /dev/null and b/target/classes/static/fonts/fontawesome-webfont.ttf differ diff --git a/target/classes/static/fonts/fontawesome-webfont.woff b/target/classes/static/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..b9bd17e Binary files /dev/null and b/target/classes/static/fonts/fontawesome-webfont.woff differ diff --git a/target/classes/static/images/img/pop-close.png b/target/classes/static/images/img/pop-close.png new file mode 100644 index 0000000..558c7c6 Binary files /dev/null and b/target/classes/static/images/img/pop-close.png differ diff --git a/target/classes/static/images/res/app-iphone-frame.png b/target/classes/static/images/res/app-iphone-frame.png new file mode 100644 index 0000000..475c068 Binary files /dev/null and b/target/classes/static/images/res/app-iphone-frame.png differ diff --git a/target/classes/static/images/res/qrcode.png b/target/classes/static/images/res/qrcode.png new file mode 100644 index 0000000..a62ab09 Binary files /dev/null and b/target/classes/static/images/res/qrcode.png differ diff --git a/target/classes/static/scripts/bootstrap.min.js b/target/classes/static/scripts/bootstrap.min.js new file mode 100644 index 0000000..63866bc --- /dev/null +++ b/target/classes/static/scripts/bootstrap.min.js @@ -0,0 +1,7 @@ +/*! + * Bootstrap v3.3.0 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.0",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.0",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus","focus"==b.type)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.0",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c="prev"==a?-1:1,d=this.getItemIndex(b),e=(d+c)%this.$items.length;return this.$items.eq(e)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i="next"==b?"first":"last",j=this;if(!f.length){if(!this.options.wrap)return;f=this.$element.find(".item")[i]()}if(f.hasClass("active"))return this.sliding=!1;var k=f[0],l=a.Event("slide.bs.carousel",{relatedTarget:k,direction:h});if(this.$element.trigger(l),!l.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var m=a(this.$indicators.children()[this.getItemIndex(f)]);m&&m.addClass("active")}var n=a.Event("slid.bs.carousel",{relatedTarget:k,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),j.sliding=!1,setTimeout(function(){j.$element.trigger(n)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(n)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a(this.options.trigger).filter('[href="#'+b.id+'"], [data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.0",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0,trigger:'[data-toggle="collapse"]'},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.find("> .panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":a.extend({},e.data(),{trigger:this});c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.0",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('