소스 검색

重命名模块名称

wuweihao 2 년 전
부모
커밋
f2424db3e0
100개의 변경된 파일365개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      zhoushan-system-api/pom.xml
  2. 0 0
      gis_application/src/main/java/com/fdage/ZhoushanSystemApiApplication.java
  3. 0 0
      gis_application/src/main/java/com/fdage/aop/WebControllerLog.java
  4. 0 0
      gis_application/src/main/java/com/fdage/aop/WebLogAspect.java
  5. 0 0
      gis_application/src/main/java/com/fdage/config/InterceptorConfig.java
  6. 0 0
      gis_application/src/main/java/com/fdage/controller/ApiController.java
  7. 0 0
      gis_application/src/main/java/com/fdage/controller/CollectionController.java
  8. 0 0
      gis_application/src/main/java/com/fdage/controller/DataStatisticsController.java
  9. 0 0
      gis_application/src/main/java/com/fdage/controller/EquipmentController.java
  10. 0 0
      gis_application/src/main/java/com/fdage/controller/ExhibitionController.java
  11. 0 0
      gis_application/src/main/java/com/fdage/controller/InformationController.java
  12. 0 0
      gis_application/src/main/java/com/fdage/controller/LogController.java
  13. 0 0
      gis_application/src/main/java/com/fdage/controller/LoginController.java
  14. 0 0
      gis_application/src/main/java/com/fdage/controller/PositionController.java
  15. 0 0
      gis_application/src/main/java/com/fdage/controller/ResourceController.java
  16. 0 0
      gis_application/src/main/java/com/fdage/controller/RoleController.java
  17. 0 0
      gis_application/src/main/java/com/fdage/controller/SceneController.java
  18. 0 0
      gis_application/src/main/java/com/fdage/controller/SseController.java
  19. 0 0
      gis_application/src/main/java/com/fdage/controller/UserController.java
  20. 0 0
      gis_application/src/main/java/com/fdage/controller/VideoController.java
  21. 0 0
      gis_application/src/main/java/com/fdage/listner/LoggerInterceptor.java
  22. 0 0
      gis_application/src/main/java/com/fdage/listner/Swagger2.java
  23. 0 0
      gis_application/src/main/java/com/fdage/shiro/JWTFilter.java
  24. 0 0
      gis_application/src/main/java/com/fdage/shiro/JWTToken.java
  25. 0 0
      gis_application/src/main/java/com/fdage/shiro/JWTUtil.java
  26. 0 0
      gis_application/src/main/java/com/fdage/shiro/JwtAuthenticationException.java
  27. 0 0
      gis_application/src/main/java/com/fdage/shiro/JwtUtil2.java
  28. 0 0
      gis_application/src/main/java/com/fdage/shiro/MyRealm.java
  29. 0 0
      gis_application/src/main/java/com/fdage/shiro/ShiroConfig.java
  30. 0 0
      gis_application/src/main/java/com/fdage/util/FileUtil.java
  31. 0 0
      gis_application/src/main/java/com/fdage/util/VerifyCodeUtil.java
  32. 0 0
      gis_application/src/main/resources/application-dev.yml
  33. 0 0
      gis_application/src/main/resources/application-sit.yml
  34. 0 0
      gis_application/src/main/resources/application.yml
  35. 0 0
      gis_application/src/main/resources/logback-spring.xml
  36. 0 0
      gis_application/src/main/resources/sh/shutdown.sh
  37. 0 0
      gis_application/src/main/resources/sh/startup.sh
  38. 0 0
      gis_application/src/main/resources/static/collection/importData.xlsx
  39. 0 0
      gis_application/src/main/resources/static/exhibition/1596186417162_blob
  40. 0 0
      gis_application/src/main/resources/static/exhibition/1596189084442_blob
  41. 0 0
      gis_application/src/main/resources/static/exhibition/1596189140546_blob
  42. 0 0
      gis_application/src/main/resources/static/exhibition/1596189564593_blob
  43. 0 0
      gis_application/src/main/resources/static/exhibition/1596189869919_blob
  44. 0 0
      gis_application/src/main/resources/static/exhibition/1596190721836_6.png
  45. 0 0
      gis_application/src/main/resources/static/exhibition/1596190788080_2_compressed.jpg
  46. 0 0
      gis_application/src/main/resources/static/exhibition/1596190825036_6.png
  47. 0 0
      gis_application/src/main/resources/static/exhibition/1596190848270_6.png
  48. 0 0
      gis_application/src/main/resources/static/exhibition/1596190887905_6.png
  49. 0 0
      gis_application/src/main/resources/static/exhibition/1596190919878_72578776_13.jpg
  50. 0 0
      gis_application/src/main/resources/static/exhibition/1596191321390_6.png
  51. 0 0
      gis_application/src/main/resources/static/exhibition/1596447050697_1_compressed.jpg
  52. 0 0
      gis_application/src/main/resources/static/exhibition/1596447392511_72578776_13.jpg
  53. 0 0
      gis_application/src/main/resources/static/exhibition/1596447392511_72578776_14.jpg
  54. 0 0
      gis_application/src/main/resources/static/exhibition/1596447392511_72578776_18.jpg
  55. 0 0
      gis_application/src/main/resources/static/exhibition/1596447392516_72578776_22.jpg
  56. 0 0
      gis_application/src/main/resources/static/exhibition/1596447643716_72578776_13.jpg
  57. 0 0
      gis_application/src/main/resources/static/exhibition/1596447972662_2_compressed.jpg
  58. 0 0
      gis_application/src/main/resources/static/exhibition/1596448196988_6.png
  59. 0 0
      gis_application/src/main/resources/static/exhibition/1596448574587_1_compressed.jpg
  60. 0 0
      gis_application/src/main/resources/static/exhibition/1596448574587_2.png
  61. 0 0
      gis_application/src/main/resources/static/exhibition/1596448574587_2_compressed.jpg
  62. 0 0
      gis_application/src/main/resources/static/exhibition/1596448574587_6.png
  63. 0 0
      gis_application/src/main/resources/static/exhibition/1596448575033_7.png
  64. 0 0
      gis_application/src/main/resources/static/exhibition/1596448575155_1.png
  65. 0 0
      gis_application/src/main/resources/static/exhibition/1596448575323_baoli.png
  66. 0 0
      gis_application/src/main/resources/static/exhibition/1596449245116_2.png
  67. 0 0
      gis_application/src/main/resources/static/exhibition/1596449245116_6.png
  68. 0 0
      gis_application/src/main/resources/static/exhibition/1596449607618_1422.png
  69. 0 0
      gis_application/src/main/resources/static/exhibition/1596449725286_1422.png
  70. 0 0
      gis_application/src/main/resources/static/exhibition/1596450062428_1422.png
  71. 0 0
      gis_application/src/main/resources/static/head/1568800765341_timg (1).jpg
  72. 0 0
      gis_application/src/main/resources/static/head/1568801143326_timg.jpg
  73. 0 0
      gis_application/src/main/resources/static/head/1568801751741_timg.jpg
  74. 0 0
      gis_application/src/main/resources/static/head/1568801890654_timg (1).jpg
  75. 0 0
      gis_application/src/main/resources/static/head/1569382213805_2016-08-01_10_33_43.mp4
  76. 0 0
      gis_application/src/main/resources/static/head/1569383057144_20190924141422.h264
  77. 0 0
      gis_application/src/main/resources/static/head/1596440670606_72578776_13.jpg
  78. 0 0
      gis_application/src/main/resources/static/head/1596440976130_app-icon.png
  79. 0 0
      gis_application/src/main/resources/static/head/test.h264
  80. 0 0
      gis_application/src/main/resources/static/index.html
  81. 0 0
      gis_application/src/main/resources/static/information/1568776657385_timg (1).jpg
  82. 0 0
      gis_application/src/main/resources/static/information/1568776834246_timg (1).jpg
  83. 0 0
      gis_application/src/main/resources/static/information/1568776847364_timg (1).jpg
  84. 0 0
      gis_application/src/main/resources/static/information/1568776868001_timg.jpg
  85. 0 0
      gis_application/src/main/resources/static/information/1568777449690_timg (1).jpg
  86. 0 0
      gis_application/src/main/resources/static/information/1568778077444_微信图片_20190830113544.jpg
  87. 0 0
      gis_application/src/main/resources/static/information/1568778144730_timg.jpg
  88. 0 0
      gis_application/src/main/resources/static/information/1568778265057_timg.jpg
  89. 0 0
      gis_application/src/test/java/com/fdage/VirtualHouseApiApplicationTests.java
  90. 70 0
      gis_application/target/classes/application-dev.yml
  91. 77 0
      gis_application/target/classes/application-sit.yml
  92. 36 0
      gis_application/target/classes/application.yml
  93. 156 0
      gis_application/target/classes/logback-spring.xml
  94. 11 0
      gis_application/target/classes/sh/shutdown.sh
  95. 12 0
      gis_application/target/classes/sh/startup.sh
  96. BIN
      gis_application/target/classes/static/collection/importData.xlsx
  97. BIN
      gis_application/target/classes/static/exhibition/1596186417162_blob
  98. BIN
      gis_application/target/classes/static/exhibition/1596189084442_blob
  99. BIN
      gis_application/target/classes/static/exhibition/1596189140546_blob
  100. 0 0
      gis_application/target/classes/static/exhibition/1596189564593_blob

+ 3 - 2
zhoushan-system-api/pom.xml

@@ -9,10 +9,11 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.fdage</groupId>
-	<artifactId>zhoushan-system-api</artifactId>
+	<!--<artifactId>zhoushan-system-api</artifactId>-->
+	<artifactId>gis_application</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>zhoushan-system-api</name>
+	<name>gis_application</name>
 	<description>Demo project for Spring Boot</description>
 
 	<properties>

zhoushan-system-api/src/main/java/com/fdage/ZhoushanSystemApiApplication.java → gis_application/src/main/java/com/fdage/ZhoushanSystemApiApplication.java


zhoushan-system-api/src/main/java/com/fdage/aop/WebControllerLog.java → gis_application/src/main/java/com/fdage/aop/WebControllerLog.java


zhoushan-system-api/src/main/java/com/fdage/aop/WebLogAspect.java → gis_application/src/main/java/com/fdage/aop/WebLogAspect.java


zhoushan-system-api/src/main/java/com/fdage/config/InterceptorConfig.java → gis_application/src/main/java/com/fdage/config/InterceptorConfig.java


zhoushan-system-api/src/main/java/com/fdage/controller/ApiController.java → gis_application/src/main/java/com/fdage/controller/ApiController.java


zhoushan-system-api/src/main/java/com/fdage/controller/CollectionController.java → gis_application/src/main/java/com/fdage/controller/CollectionController.java


zhoushan-system-api/src/main/java/com/fdage/controller/DataStatisticsController.java → gis_application/src/main/java/com/fdage/controller/DataStatisticsController.java


zhoushan-system-api/src/main/java/com/fdage/controller/EquipmentController.java → gis_application/src/main/java/com/fdage/controller/EquipmentController.java


zhoushan-system-api/src/main/java/com/fdage/controller/ExhibitionController.java → gis_application/src/main/java/com/fdage/controller/ExhibitionController.java


zhoushan-system-api/src/main/java/com/fdage/controller/InformationController.java → gis_application/src/main/java/com/fdage/controller/InformationController.java


zhoushan-system-api/src/main/java/com/fdage/controller/LogController.java → gis_application/src/main/java/com/fdage/controller/LogController.java


zhoushan-system-api/src/main/java/com/fdage/controller/LoginController.java → gis_application/src/main/java/com/fdage/controller/LoginController.java


zhoushan-system-api/src/main/java/com/fdage/controller/PositionController.java → gis_application/src/main/java/com/fdage/controller/PositionController.java


zhoushan-system-api/src/main/java/com/fdage/controller/ResourceController.java → gis_application/src/main/java/com/fdage/controller/ResourceController.java


zhoushan-system-api/src/main/java/com/fdage/controller/RoleController.java → gis_application/src/main/java/com/fdage/controller/RoleController.java


zhoushan-system-api/src/main/java/com/fdage/controller/SceneController.java → gis_application/src/main/java/com/fdage/controller/SceneController.java


zhoushan-system-api/src/main/java/com/fdage/controller/SseController.java → gis_application/src/main/java/com/fdage/controller/SseController.java


zhoushan-system-api/src/main/java/com/fdage/controller/UserController.java → gis_application/src/main/java/com/fdage/controller/UserController.java


zhoushan-system-api/src/main/java/com/fdage/controller/VideoController.java → gis_application/src/main/java/com/fdage/controller/VideoController.java


zhoushan-system-api/src/main/java/com/fdage/listner/LoggerInterceptor.java → gis_application/src/main/java/com/fdage/listner/LoggerInterceptor.java


zhoushan-system-api/src/main/java/com/fdage/listner/Swagger2.java → gis_application/src/main/java/com/fdage/listner/Swagger2.java


zhoushan-system-api/src/main/java/com/fdage/shiro/JWTFilter.java → gis_application/src/main/java/com/fdage/shiro/JWTFilter.java


zhoushan-system-api/src/main/java/com/fdage/shiro/JWTToken.java → gis_application/src/main/java/com/fdage/shiro/JWTToken.java


zhoushan-system-api/src/main/java/com/fdage/shiro/JWTUtil.java → gis_application/src/main/java/com/fdage/shiro/JWTUtil.java


zhoushan-system-api/src/main/java/com/fdage/shiro/JwtAuthenticationException.java → gis_application/src/main/java/com/fdage/shiro/JwtAuthenticationException.java


zhoushan-system-api/src/main/java/com/fdage/shiro/JwtUtil2.java → gis_application/src/main/java/com/fdage/shiro/JwtUtil2.java


zhoushan-system-api/src/main/java/com/fdage/shiro/MyRealm.java → gis_application/src/main/java/com/fdage/shiro/MyRealm.java


zhoushan-system-api/src/main/java/com/fdage/shiro/ShiroConfig.java → gis_application/src/main/java/com/fdage/shiro/ShiroConfig.java


zhoushan-system-api/src/main/java/com/fdage/util/FileUtil.java → gis_application/src/main/java/com/fdage/util/FileUtil.java


zhoushan-system-api/src/main/java/com/fdage/util/VerifyCodeUtil.java → gis_application/src/main/java/com/fdage/util/VerifyCodeUtil.java


zhoushan-system-api/src/main/resources/application-dev.yml → gis_application/src/main/resources/application-dev.yml


zhoushan-system-api/src/main/resources/application-sit.yml → gis_application/src/main/resources/application-sit.yml


zhoushan-system-api/src/main/resources/application.yml → gis_application/src/main/resources/application.yml


zhoushan-system-api/src/main/resources/logback-spring.xml → gis_application/src/main/resources/logback-spring.xml


zhoushan-system-api/src/main/resources/sh/shutdown.sh → gis_application/src/main/resources/sh/shutdown.sh


zhoushan-system-api/src/main/resources/sh/startup.sh → gis_application/src/main/resources/sh/startup.sh


zhoushan-system-api/src/main/resources/static/collection/importData.xlsx → gis_application/src/main/resources/static/collection/importData.xlsx


zhoushan-system-api/src/main/resources/static/exhibition/1596186417162_blob → gis_application/src/main/resources/static/exhibition/1596186417162_blob


zhoushan-system-api/src/main/resources/static/exhibition/1596189084442_blob → gis_application/src/main/resources/static/exhibition/1596189084442_blob


zhoushan-system-api/src/main/resources/static/exhibition/1596189140546_blob → gis_application/src/main/resources/static/exhibition/1596189140546_blob


zhoushan-system-api/src/main/resources/static/exhibition/1596189564593_blob → gis_application/src/main/resources/static/exhibition/1596189564593_blob


zhoushan-system-api/src/main/resources/static/exhibition/1596189869919_blob → gis_application/src/main/resources/static/exhibition/1596189869919_blob


zhoushan-system-api/src/main/resources/static/exhibition/1596190721836_6.png → gis_application/src/main/resources/static/exhibition/1596190721836_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596190788080_2_compressed.jpg → gis_application/src/main/resources/static/exhibition/1596190788080_2_compressed.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596190825036_6.png → gis_application/src/main/resources/static/exhibition/1596190825036_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596190848270_6.png → gis_application/src/main/resources/static/exhibition/1596190848270_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596190887905_6.png → gis_application/src/main/resources/static/exhibition/1596190887905_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596190919878_72578776_13.jpg → gis_application/src/main/resources/static/exhibition/1596190919878_72578776_13.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596191321390_6.png → gis_application/src/main/resources/static/exhibition/1596191321390_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596447050697_1_compressed.jpg → gis_application/src/main/resources/static/exhibition/1596447050697_1_compressed.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447392511_72578776_13.jpg → gis_application/src/main/resources/static/exhibition/1596447392511_72578776_13.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447392511_72578776_14.jpg → gis_application/src/main/resources/static/exhibition/1596447392511_72578776_14.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447392511_72578776_18.jpg → gis_application/src/main/resources/static/exhibition/1596447392511_72578776_18.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447392516_72578776_22.jpg → gis_application/src/main/resources/static/exhibition/1596447392516_72578776_22.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447643716_72578776_13.jpg → gis_application/src/main/resources/static/exhibition/1596447643716_72578776_13.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596447972662_2_compressed.jpg → gis_application/src/main/resources/static/exhibition/1596447972662_2_compressed.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596448196988_6.png → gis_application/src/main/resources/static/exhibition/1596448196988_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596448574587_1_compressed.jpg → gis_application/src/main/resources/static/exhibition/1596448574587_1_compressed.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596448574587_2.png → gis_application/src/main/resources/static/exhibition/1596448574587_2.png


zhoushan-system-api/src/main/resources/static/exhibition/1596448574587_2_compressed.jpg → gis_application/src/main/resources/static/exhibition/1596448574587_2_compressed.jpg


zhoushan-system-api/src/main/resources/static/exhibition/1596448574587_6.png → gis_application/src/main/resources/static/exhibition/1596448574587_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596448575033_7.png → gis_application/src/main/resources/static/exhibition/1596448575033_7.png


zhoushan-system-api/src/main/resources/static/exhibition/1596448575155_1.png → gis_application/src/main/resources/static/exhibition/1596448575155_1.png


zhoushan-system-api/src/main/resources/static/exhibition/1596448575323_baoli.png → gis_application/src/main/resources/static/exhibition/1596448575323_baoli.png


zhoushan-system-api/src/main/resources/static/exhibition/1596449245116_2.png → gis_application/src/main/resources/static/exhibition/1596449245116_2.png


zhoushan-system-api/src/main/resources/static/exhibition/1596449245116_6.png → gis_application/src/main/resources/static/exhibition/1596449245116_6.png


zhoushan-system-api/src/main/resources/static/exhibition/1596449607618_1422.png → gis_application/src/main/resources/static/exhibition/1596449607618_1422.png


zhoushan-system-api/src/main/resources/static/exhibition/1596449725286_1422.png → gis_application/src/main/resources/static/exhibition/1596449725286_1422.png


zhoushan-system-api/src/main/resources/static/exhibition/1596450062428_1422.png → gis_application/src/main/resources/static/exhibition/1596450062428_1422.png


zhoushan-system-api/src/main/resources/static/head/1568800765341_timg (1).jpg → gis_application/src/main/resources/static/head/1568800765341_timg (1).jpg


zhoushan-system-api/src/main/resources/static/head/1568801143326_timg.jpg → gis_application/src/main/resources/static/head/1568801143326_timg.jpg


zhoushan-system-api/src/main/resources/static/head/1568801751741_timg.jpg → gis_application/src/main/resources/static/head/1568801751741_timg.jpg


zhoushan-system-api/src/main/resources/static/head/1568801890654_timg (1).jpg → gis_application/src/main/resources/static/head/1568801890654_timg (1).jpg


zhoushan-system-api/src/main/resources/static/head/1569382213805_2016-08-01_10_33_43.mp4 → gis_application/src/main/resources/static/head/1569382213805_2016-08-01_10_33_43.mp4


zhoushan-system-api/src/main/resources/static/head/1569383057144_20190924141422.h264 → gis_application/src/main/resources/static/head/1569383057144_20190924141422.h264


zhoushan-system-api/src/main/resources/static/head/1596440670606_72578776_13.jpg → gis_application/src/main/resources/static/head/1596440670606_72578776_13.jpg


zhoushan-system-api/src/main/resources/static/head/1596440976130_app-icon.png → gis_application/src/main/resources/static/head/1596440976130_app-icon.png


zhoushan-system-api/src/main/resources/static/head/test.h264 → gis_application/src/main/resources/static/head/test.h264


zhoushan-system-api/src/main/resources/static/index.html → gis_application/src/main/resources/static/index.html


zhoushan-system-api/src/main/resources/static/information/1568776657385_timg (1).jpg → gis_application/src/main/resources/static/information/1568776657385_timg (1).jpg


zhoushan-system-api/src/main/resources/static/information/1568776834246_timg (1).jpg → gis_application/src/main/resources/static/information/1568776834246_timg (1).jpg


zhoushan-system-api/src/main/resources/static/information/1568776847364_timg (1).jpg → gis_application/src/main/resources/static/information/1568776847364_timg (1).jpg


zhoushan-system-api/src/main/resources/static/information/1568776868001_timg.jpg → gis_application/src/main/resources/static/information/1568776868001_timg.jpg


zhoushan-system-api/src/main/resources/static/information/1568777449690_timg (1).jpg → gis_application/src/main/resources/static/information/1568777449690_timg (1).jpg


zhoushan-system-api/src/main/resources/static/information/1568778077444_微信图片_20190830113544.jpg → gis_application/src/main/resources/static/information/1568778077444_微信图片_20190830113544.jpg


zhoushan-system-api/src/main/resources/static/information/1568778144730_timg.jpg → gis_application/src/main/resources/static/information/1568778144730_timg.jpg


zhoushan-system-api/src/main/resources/static/information/1568778265057_timg.jpg → gis_application/src/main/resources/static/information/1568778265057_timg.jpg


zhoushan-system-api/src/test/java/com/fdage/VirtualHouseApiApplicationTests.java → gis_application/src/test/java/com/fdage/VirtualHouseApiApplicationTests.java


+ 70 - 0
gis_application/target/classes/application-dev.yml

@@ -0,0 +1,70 @@
+
+
+
+spring:
+  jmx:
+    default-domain: zhoushan_system
+    enabled: false
+  application:
+    name: zhoushan_system
+  servlet:
+    multipart:
+      maxFileSize: 1000MB
+      maxRequestSize: 1000MB
+  datasource:
+    # db 项目测试服务器
+    url: jdbc:mysql://8.135.106.227:3306/${project.en}?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+    username: root
+    password: 4dkk2021testproject%
+    driver-class-name: com.mysql.jdbc.Driver
+# Redis数据库索引(默认为0)
+  redis:
+    database: 0
+    host: 127.0.0.1
+    port: 6379
+    password:
+# 连接超时时间 单位 ms(毫秒)
+    timeout: 3000ms
+# 连接池中的最大空闲连接,默认值也是8。
+    jedis:
+      pool:
+        max-idle: 8
+#连接池中的最小空闲连接,默认值也是0。
+        min-idle: 0
+# 如果赋值为-1,则表示不限制;如果pool已经分配了maxActive个jedis实例,则此时pool的状态为exhausted(耗尽)。
+        max-active: 8
+# 等待可用连接的最大时间,单位毫秒,默认值为-1,表示永不超时。如果超过等待时间,则直接抛出JedisConnectionException
+        max-wait: -1ms
+# 配置静态资源跟目录
+  mvc:
+    static-path-pattern: /**
+  resources:
+    static-locations: file:${my.file.path}
+
+upload:
+  head: ${my.file.path}/head
+  information: ${my.file.path}/information
+  collection: ${my.file.path}/collection
+  exhibition: ${my.file.path}/exhibition
+
+
+
+swagger:
+  package: com.fdage.controller
+  title: ${project.sc}-dev
+  description: ${swagger.title}
+  version: 1.0
+
+
+# 服务器存放地址
+my:
+  file:
+    path: E:/data/${project.en}_data
+
+logging:
+  path: E:/log/${project.en}_log
+  config: classpath:logback-spring.xml
+  level:
+    com:
+      fdage: debug
+

+ 77 - 0
gis_application/target/classes/application-sit.yml

@@ -0,0 +1,77 @@
+
+
+
+spring:
+  jmx:
+    default-domain: zhoushan_system
+    enabled: false
+  application:
+    name: zhoushan_system
+  servlet:
+    multipart:
+      maxFileSize: 1000MB
+      maxRequestSize: 1000MB
+  datasource:
+#    url: jdbc:mysql://47.107.253.212:3306/zhoushan_system?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+#    username: root
+#    password: 4dagecui2019
+    # db 项目测试服务器
+    url: jdbc:mysql://8.135.106.227:3306/${project.en}?useSSL=false&useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+    username: root
+    password: 4dkk2021testproject%
+    driver-class-name: com.mysql.jdbc.Driver
+# Redis数据库索引(默认为0)
+  redis:
+    database: 0
+    host: 127.0.0.1
+    port: 6379
+    password:
+# 连接超时时间 单位 ms(毫秒)
+    timeout: 3000ms
+# 连接池中的最大空闲连接,默认值也是8。
+    jedis:
+      pool:
+        max-idle: 8
+#连接池中的最小空闲连接,默认值也是0。
+        min-idle: 0
+# 如果赋值为-1,则表示不限制;如果pool已经分配了maxActive个jedis实例,则此时pool的状态为exhausted(耗尽)。
+        max-active: 8
+# 等待可用连接的最大时间,单位毫秒,默认值为-1,表示永不超时。如果超过等待时间,则直接抛出JedisConnectionException
+        max-wait: -1ms
+# 配置静态资源跟目录
+  mvc:
+    static-path-pattern: /**
+  resources:
+    static-locations: file:${my.file.path}
+
+upload:
+  head: ${my.file.path}/head
+  information: ${my.file.path}/information
+  collection: ${my.file.path}/collection
+  exhibition: ${my.file.path}/exhibition
+
+
+
+swagger:
+  package: com.fdage.controller
+  title: ${project.sc}-sit
+  description: ${swagger.title}
+  version: 1.0
+
+
+# 服务器存放地址
+my:
+  file:
+    path: /root/data/${project.en}_data
+
+
+logging:
+  path: /root/log/${project.en}_log
+  config: classpath:logback-spring.xml
+  level:
+    com:
+      fdage: debug
+
+
+
+

+ 36 - 0
gis_application/target/classes/application.yml

@@ -0,0 +1,36 @@
+spring:
+  profiles:
+    active: dev
+
+server:
+  port: 8002
+
+mybatis:
+  mapperLocations: classpath*:mapper/*/*.xml
+  typeAliasesPackage: com.fdage.pojo
+  configuration:
+    map-underscore-to-camel-case: true
+
+# page分页
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+
+project:
+  sc: 常熟博物馆
+  en: museum_changshu
+
+
+# tk.mybatis 配置自动识别字段转换
+#mapper:
+#  identity: MYSQL
+#  mappers: tk.mybatis.mapper.common.Mapper
+
+# 允许上传文件后缀
+my:
+  file:
+    allow: .jpg,.gif,.png,.ico,.bmp,.jpeg,.zip,.zp,.rar,.mp3,.mp4,.avi,.mov,.4dage,.wav,.wma,.m4a,.obj
+

+ 156 - 0
gis_application/target/classes/logback-spring.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <property name="LOG_MAX_HISTORY" value="180"/>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
+            <pattern>${LOG_PATH}/%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件:主项目日志 -->
+    <appender name="file.all" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 追加日志到原文件结尾 -->
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+
+    <!--info日志统一输出到这里-->
+    <appender name="file.info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 每小时生成日志文件 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/console-info.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--错误日志统一输出到这里-->
+    <appender name="file.error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error/console-error.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录error级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--warn日志统一输出到这里-->
+    <appender name="file.warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn/console-warn.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外,还配置了日志文件不能超过10M(默认),若超过10M,日志文件会以索引0开始, -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--debug级别日志统一输出到这里-->
+    <appender name="file.debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/debug/console-debug.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <!-- 除按日志记录之外,还配置了日志文件不能超过5M,若超过5M,日志文件会以索引0开始,命名日志文件,例如console-debug.2018-08-24-09.1.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg:日志消息,%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY </onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+    <appender name="file.async" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="file.all" />
+    </appender>
+
+    <!--  日志输出级别 -->
+    <!-- TRACE\DEBUG\INFO\WARN\ERROR\FATAL\OFF -->
+    <root level="INFO">
+        <appender-ref ref="console" />
+        <appender-ref ref="file.async"/>
+        <appender-ref ref="file.error" />
+        <appender-ref ref="file.info" />
+        <appender-ref ref="file.debug" />
+        <appender-ref ref="file.warn" />
+    </root>
+
+</configuration>

+ 11 - 0
gis_application/target/classes/sh/shutdown.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+RESOURCE_NAME=museum_changshu.jar
+   Pid=`awk '{print $1}' tpid`
+
+if [ ${Pid} ]; then
+kill -9 $Pid
+echo 'Kill Process!'
+else
+echo 'Stop failed!'
+fi
+

+ 12 - 0
gis_application/target/classes/sh/startup.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+RESOURCE_NAME=museum_changshu.jar
+rm -f tpid
+nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sit --server.port=8002 & echo $! > tpid
+echo Start Success!
+echo
+
+
+
+
+
+

BIN
gis_application/target/classes/static/collection/importData.xlsx


BIN
gis_application/target/classes/static/exhibition/1596186417162_blob


BIN
gis_application/target/classes/static/exhibition/1596189084442_blob


BIN
gis_application/target/classes/static/exhibition/1596189140546_blob


+ 0 - 0
gis_application/target/classes/static/exhibition/1596189564593_blob


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.