|
|
@@ -2,113 +2,19 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_10.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_10.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_18.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_16.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_16.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_16.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_14_Final.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_5_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_3_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/static/images/seat.png" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/static/images/seatChoose.png" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaStatistic.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cinema.iml" beforeDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/common.css" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/index.js" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ViewController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ViewController.class" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/static/css/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/css/common.css" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/static/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/js/index.js" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/templates/adminMovieDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/adminMovieDetail.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/templates/adminMovieManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/adminMovieManage.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/templates/adminSessionManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/adminSessionManage.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/static/css/cinemaHall.css" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/css/cinemaHall.css" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/templates/adminCinemaManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/adminCinemaManage.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/templates/adminPromotionManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/adminPromotionManage.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/templates/adminSessionManage.html" beforeDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
@@ -136,92 +42,38 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/AccountController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="153">
|
|
|
- <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/CinemaApplication.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="170">
|
|
|
- <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/FileController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="153">
|
|
|
- <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="602">
|
|
|
- <caret line="53" column="5" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/interceptor/SessionInterceptor.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="136">
|
|
|
- <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/config/InterceptorConfiguration.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="153">
|
|
|
- <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
- <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="68">
|
|
|
+ <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#select#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/common.css">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="406">
|
|
|
- <caret line="56" column="18" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="294">
|
|
|
+ <caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
|
|
|
+ <state relative-caret-position="136">
|
|
|
+ <caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/images/seatChoose.png">
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
@@ -243,14 +95,17 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/static/js/index.js" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/static/css/common.css" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaStatistic.html" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -260,11 +115,9 @@
|
|
|
<other-services-enabled>true</other-services-enabled>
|
|
|
<auto-save>true</auto-save>
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="815" />
|
|
|
- <option name="y" value="51" />
|
|
|
+ <component name="ProjectFrameBounds" fullScreen="true">
|
|
|
<option name="width" value="1680" />
|
|
|
- <option name="height" value="964" />
|
|
|
+ <option name="height" value="1050" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
@@ -431,13 +284,17 @@
|
|
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554966618386" />
|
|
|
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554976638298" />
|
|
|
<property name="list.type.of.created.stylesheet" value="CSS" />
|
|
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
|
|
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
<property name="settings.editor.selected.configurable" value="project.propCompiler" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
|
|
|
+ <recent name="$PROJECT_DIR$/src/main/resources/static/css" />
|
|
|
+ </key>
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="$PROJECT_DIR$/src/main/resources/static/images" />
|
|
|
</key>
|
|
|
@@ -474,18 +331,18 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1554901806328</updated>
|
|
|
<workItem from="1554901808817" duration="665000" />
|
|
|
- <workItem from="1554961600361" duration="4582000" />
|
|
|
+ <workItem from="1554961600361" duration="7649000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="5247000" />
|
|
|
+ <option name="totallyTimeSpent" value="8314000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="717" y="64" width="1680" height="964" extended-state="0" />
|
|
|
+ <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25274727" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25274727" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Designer" order="2" />
|
|
|
<window_info id="Image Layers" order="3" />
|
|
|
@@ -493,16 +350,16 @@
|
|
|
<window_info id="UI Designer" order="5" />
|
|
|
<window_info id="Favorites" order="6" side_tool="true" />
|
|
|
<window_info id="Web" order="7" side_tool="true" />
|
|
|
- <window_info anchor="bottom" id="Problems" order="0" />
|
|
|
+ <window_info anchor="bottom" id="Problems" order="0" weight="0.32959184" />
|
|
|
<window_info anchor="bottom" id="Message" order="1" />
|
|
|
<window_info anchor="bottom" id="Find" order="2" />
|
|
|
- <window_info active="true" anchor="bottom" id="Run" order="3" visible="true" weight="0.36582568" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="3" visible="true" weight="0.27040815" />
|
|
|
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="7" />
|
|
|
<window_info anchor="bottom" id="Spring" order="8" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="9" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="9" weight="0.20714286" />
|
|
|
<window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Messages" order="12" />
|
|
|
@@ -600,55 +457,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="340">
|
|
|
- <caret line="34" column="89" selection-start-line="34" selection-start-column="89" selection-end-line="34" selection-end-column="89" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="340">
|
|
|
- <caret line="20" column="46" lean-forward="true" selection-start-line="20" selection-start-column="46" selection-end-line="20" selection-end-column="46" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="391">
|
|
|
- <caret line="23" column="82" selection-start-line="23" selection-start-column="82" selection-end-line="23" selection-end-column="82" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="496">
|
|
|
- <caret line="33" column="89" selection-start-line="33" selection-start-column="89" selection-end-line="33" selection-end-column="89" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="434">
|
|
|
- <caret line="26" column="89" selection-start-line="26" selection-start-column="89" selection-end-line="26" selection-end-column="89" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-595">
|
|
|
- <caret selection-end-column="29" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#div#3;n#div#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#span#1;n#div#3;n#div#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/images/sunIcon.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
@@ -658,22 +466,9 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/images/webIcon.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/images/msgIcon.png">
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/images/fileIcon.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/images/defaultAvatar.jpg">
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="223">
|
|
|
- <caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="602">
|
|
|
@@ -716,33 +511,113 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/CinemaApplication.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="170">
|
|
|
+ <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/seat.png">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/images/msgIcon.png">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/images/defaultAvatar.jpg">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/images/seat.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="22" column="48" lean-forward="true" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
|
|
|
+ <state relative-caret-position="187">
|
|
|
+ <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/images/seatChoose.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/CinemaApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="170">
|
|
|
- <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
|
|
+ <state relative-caret-position="496">
|
|
|
+ <caret line="33" column="89" selection-start-line="33" selection-start-column="89" selection-end-line="33" selection-end-column="89" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="510">
|
|
|
+ <caret line="30" column="46" selection-start-line="30" selection-start-column="46" selection-end-line="30" selection-end-column="46" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-4">
|
|
|
+ <caret selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
+ <state relative-caret-position="357">
|
|
|
<caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="65">
|
|
|
+ <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="340">
|
|
|
+ <caret line="34" column="89" selection-start-line="34" selection-start-column="89" selection-end-line="34" selection-end-column="89" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="191">
|
|
|
+ <caret line="27" column="43" selection-start-line="27" selection-start-column="36" selection-end-line="27" selection-end-column="43" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="136">
|
|
|
+ <caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="294">
|
|
|
+ <caret line="21" column="24" lean-forward="true" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="68">
|
|
|
+ <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#select#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|