Skip to content

Commit cc9e9a4

Browse files
author
quding
committed
add excelDemo
1 parent 229f5fe commit cc9e9a4

File tree

135 files changed

+16
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+16
-16
lines changed

‎Jersey--Demo/.idea/artifacts/Jersey_war.xml renamed to ‎Jersey-Demo/.idea/artifacts/Jersey_war.xml

File renamed without changes.

‎Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml renamed to ‎Jersey-Demo/.idea/artifacts/Jersey_war_exploded.xml

File renamed without changes.

‎Jersey--Demo/.idea/compiler.xml renamed to ‎Jersey-Demo/.idea/compiler.xml

File renamed without changes.

‎Jersey--Demo/.idea/copyright/profiles_settings.xml renamed to ‎Jersey-Demo/.idea/copyright/profiles_settings.xml

File renamed without changes.

‎Jersey--Demo/.idea/encodings.xml renamed to ‎Jersey-Demo/.idea/encodings.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__junit_junit_4_10.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml renamed to ‎Jersey-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml

File renamed without changes.

‎Jersey--Demo/.idea/misc.xml renamed to ‎Jersey-Demo/.idea/misc.xml

File renamed without changes.

‎Jersey--Demo/.idea/modules.xml renamed to ‎Jersey-Demo/.idea/modules.xml

File renamed without changes.

‎Jersey--Demo/.idea/uiDesigner.xml renamed to ‎Jersey-Demo/.idea/uiDesigner.xml

File renamed without changes.

‎Jersey--Demo/.idea/workspace.xml renamed to ‎Jersey-Demo/.idea/workspace.xml

File renamed without changes.

‎Jersey--Demo/Jersey工程.iml renamed to ‎Jersey-Demo/Jersey工程.iml

File renamed without changes.

‎Jersey--Demo/pom.xml renamed to ‎Jersey-Demo/pom.xml

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/ResultVO.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/ResultVO.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/application/RESTApplication.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/application/RESTApplication.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/dao/DeviceMapper.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/dao/DeviceMapper.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/exception/ErrorEntity.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/exception/ErrorEntity.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/filter/PreRequestFilter.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/filter/PreRequestFilter.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/filter/ResponseFilter.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/filter/ResponseFilter.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/model/Device.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/model/Device.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/model/ReqDevice.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/model/ReqDevice.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/model/ServicesBean.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/model/ServicesBean.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/resources/DeviceController.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/resources/DeviceController.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/service/DeviceService.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/service/DeviceService.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/util/CheckUtil.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/util/CheckUtil.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/util/Constants.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/util/Constants.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/util/DecriptUtil.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/util/DecriptUtil.java

File renamed without changes.

‎Jersey--Demo/src/main/java/com/haikong/util/DeviceUtil.java renamed to ‎Jersey-Demo/src/main/java/com/haikong/util/DeviceUtil.java

File renamed without changes.

‎Jersey--Demo/src/main/resources/applicationContext.xml renamed to ‎Jersey-Demo/src/main/resources/applicationContext.xml

File renamed without changes.

‎Jersey--Demo/src/main/resources/db.properties renamed to ‎Jersey-Demo/src/main/resources/db.properties

File renamed without changes.

‎Jersey--Demo/src/main/resources/db.sql renamed to ‎Jersey-Demo/src/main/resources/db.sql

File renamed without changes.

‎Jersey--Demo/src/main/resources/log4j.properties renamed to ‎Jersey-Demo/src/main/resources/log4j.properties

File renamed without changes.

‎Jersey--Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml renamed to ‎Jersey-Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml

File renamed without changes.

‎Jersey--Demo/src/main/resources/mybatis/SqlMapConfig.xml renamed to ‎Jersey-Demo/src/main/resources/mybatis/SqlMapConfig.xml

File renamed without changes.

‎Jersey--Demo/src/main/webapp/WEB-INF/web.xml renamed to ‎Jersey-Demo/src/main/webapp/WEB-INF/web.xml

File renamed without changes.

‎Jersey--Demo/src/main/webapp/index.jsp renamed to ‎Jersey-Demo/src/main/webapp/index.jsp

File renamed without changes.

‎SSM--Demo/doc/readme.md renamed to ‎SSM-Demo/doc/readme.md

‎SSM--Demo/pom.xml renamed to ‎SSM-Demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
<artifactId>mybatis-generator-maven-plugin</artifactId>
200200
<version>1.3.2</version>
201201
<configuration>
202-
<configurationFile>../SSM--Demo/src/main/resources/ModelGenerator.xml</configurationFile>
202+
<configurationFile>../SSM-Demo/src/main/resources/ModelGenerator.xml</configurationFile>
203203
<overwrite>true</overwrite>
204204
<verbose>true</verbose>
205205
</configuration>

‎SSM--Demo/src/main/java/cn/mrdear/controller/BookController.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/entity/Appointment.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/entity/Appointment.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/entity/AppointmentKey.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/entity/AppointmentKey.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/entity/Book.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/entity/Book.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/mapper/AppointmentMapper.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/mapper/AppointmentMapper.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/mapper/BookMapper.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/service/BookService.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/service/BookService.java

File renamed without changes.

‎SSM--Demo/src/main/java/cn/mrdear/service/BookServiceImpl.java renamed to ‎SSM-Demo/src/main/java/cn/mrdear/service/BookServiceImpl.java

File renamed without changes.

‎SSM--Demo/src/main/resources/ModelGenerator.xml renamed to ‎SSM-Demo/src/main/resources/ModelGenerator.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/db.properties renamed to ‎SSM-Demo/src/main/resources/db.properties

File renamed without changes.

‎SSM--Demo/src/main/resources/db.sql renamed to ‎SSM-Demo/src/main/resources/db.sql

File renamed without changes.

‎SSM--Demo/src/main/resources/ehcache.xml renamed to ‎SSM-Demo/src/main/resources/ehcache.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/logback.xml renamed to ‎SSM-Demo/src/main/resources/logback.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/mybatis/mapper/AppointmentMapper.xml renamed to ‎SSM-Demo/src/main/resources/mybatis/mapper/AppointmentMapper.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/mybatis/mapper/BookMapper.xml renamed to ‎SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/mybatis/sqlmapconfig.xml renamed to ‎SSM-Demo/src/main/resources/mybatis/sqlmapconfig.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/spring/applicationContext.xml renamed to ‎SSM-Demo/src/main/resources/spring/applicationContext.xml

File renamed without changes.

‎SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml renamed to ‎SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
4-
xmlns:content="http://www.springframework.org/schema/context"
4+
xmlns:contents="http://www.springframework.org/schema/context"
55
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
66

77
<!-- 自动扫描该包，使SpringMVC认为包下用了@controller注解的类是控制器 -->
8-
<content:component-scan base-package="cn.mrdear.controller"/>
8+
<contents:component-scan base-package="cn.mrdear.controller"/>
99

1010
<!-- 启用默认配置 -->
1111
<mvc:annotation-driven>

‎SSM--Demo/src/main/webapp/WEB-INF/web.xml renamed to ‎SSM-Demo/src/main/webapp/WEB-INF/web.xml

File renamed without changes.

‎SSM--Demo/src/main/webapp/index.jsp renamed to ‎SSM-Demo/src/main/webapp/index.jsp

File renamed without changes.

‎Spring-Boot-Demo/src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ logging.level.cn.mrdear.mapper = trace
1010
#thymeleaf start
1111
spring.thymeleaf.mode=HTML5
1212
spring.thymeleaf.encoding=UTF-8
13-
spring.thymeleaf.content-type=text/html
14-
#开发时关闭缓存,不然没法看到实时页面
13+
spring.thymeleaf.contents-type=text/html
14+
#����ʱ�رջ���,��Ȼû������ʵʱҳ��
1515
spring.thymeleaf.cache=false
1616
#thymeleaf end

‎Spring-Boot-Demo/src/main/resources/templates/hello.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html xmlns:th="http://www.thymeleaf.org">
33
<head>
44
<title>hello</title>
5-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5+
<meta http-equiv="Content-Type" contents="text/html; charset=UTF-8" />
66
</head>
77
<body>
88

‎Util-Demo/src/test/resources/message.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<!DOCTYPE messages SYSTEM "message.dtd" >
33
<messages>
44
<message key="register" >
5-
<content>尊敬的会员，这是您的验证码{code_set}（有效时间{minute_set}分钟），感谢您的关注！</content>
5+
<contents>尊敬的会员，这是您的验证码{code_set}（有效时间{minute_set}分钟），感谢您的关注！</contents>
66
</message>
77
<message key="gift" >
8-
<content>您的朋友{giver_mobile}赠送给您{card_num}张"{card_name}",请及时关注微信"融信科技"公众号，进行查收。</content></message>
8+
<contents>您的朋友{giver_mobile}赠送给您{card_num}张"{card_name}",请及时关注微信"融信科技"公众号，进行查收。</contents></message>
99
<message key="findpassword" >
10-
<content>尊敬的会员，这是您的支付密码已重置为{passwd_set}，登录后请立即修改密码。</content>
10+
<contents>尊敬的会员，这是您的支付密码已重置为{passwd_set}，登录后请立即修改密码。</contents>
1111
</message>
1212
<message key="consume" >
13-
<content>尊敬的会员，您当前账户余额{bal_amt},您尾号{end_code}的卡号消费了{amt_cuy}元，如果不是本人消费，请立即联系管理员处理。</content>
13+
<contents>尊敬的会员，您当前账户余额{bal_amt},您尾号{end_code}的卡号消费了{amt_cuy}元，如果不是本人消费，请立即联系管理员处理。</contents>
1414
</message>
1515
</messages>

‎maven多模块项目/haikong-common/haikong-common.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<orderEntry type="module-library">
4343
<library name="Maven: com.alibaba:jconsole:1.8.0">
4444
<CLASSES>
45-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/jconsole.jar!/" />
45+
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/lib/jconsole.jar!/" />
4646
</CLASSES>
4747
<JAVADOC />
4848
<SOURCES />
@@ -51,7 +51,7 @@
5151
<orderEntry type="module-library">
5252
<library name="Maven: com.alibaba:tools:1.8.0">
5353
<CLASSES>
54-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/tools.jar!/" />
54+
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/lib/tools.jar!/" />
5555
</CLASSES>
5656
<JAVADOC />
5757
<SOURCES />

‎maven多模块项目/haikong-core/src/main/resources/spring/dispatcher-servlet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
4-
xmlns:content="http://www.springframework.org/schema/context"
4+
xmlns:contents="http://www.springframework.org/schema/context"
55
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
66

77
<!-- 自动扫描该包，使SpringMVC认为包下用了@controller注解的类是控制器 -->
8-
<content:component-scan base-package="com.haikong.core.controller"/>
8+
<contents:component-scan base-package="com.haikong.core.controller"/>
99

1010
<!-- 启用默认配置 -->
1111
<mvc:annotation-driven>

‎maven多模块项目/haikong-switch/haikong-switch.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<orderEntry type="module-library">
3333
<library name="Maven: com.alibaba:jconsole:1.8.0">
3434
<CLASSES>
35-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/jconsole.jar!/" />
35+
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/lib/jconsole.jar!/" />
3636
</CLASSES>
3737
<JAVADOC />
3838
<SOURCES />
@@ -41,7 +41,7 @@
4141
<orderEntry type="module-library">
4242
<library name="Maven: com.alibaba:tools:1.8.0">
4343
<CLASSES>
44-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/tools.jar!/" />
44+
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/lib/tools.jar!/" />
4545
</CLASSES>
4646
<JAVADOC />
4747
<SOURCES />

0 commit comments

Comments
 (0)