瀏覽代碼

生成报告

wucl 1 年之前
父節點
當前提交
ea36411141
共有 100 個文件被更改,包括 33479 次插入930 次删除
  1. 3 0
      .idea/encodings.xml
  2. 4 4
      .idea/libraries/Maven__cn_hutool_hutool_all_5_3_3.xml
  3. 4 4
      .idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml
  4. 231 626
      .idea/workspace.xml
  5. 5 5
      biz-base/biz-base.iml
  6. 二進制
      biz-base/jrebel-classpath-12708.jar
  7. 1 6
      biz-base/pom.xml
  8. 55 1
      biz-base/src/main/java/com/dayou/controller/FileController.java
  9. 0 7
      biz-base/src/main/java/com/dayou/controller/GlobalConfigController.java
  10. 0 10
      biz-base/src/main/java/com/dayou/controller/ItemStageController.java
  11. 21 10
      biz-base/src/main/java/com/dayou/controller/ReportHeadlineController.java
  12. 105 0
      biz-base/src/main/java/com/dayou/controller/ReportMainController.java
  13. 97 0
      biz-base/src/main/java/com/dayou/controller/ReportNounController.java
  14. 27 32
      biz-base/src/main/java/com/dayou/controller/ReportSectionController.java
  15. 103 0
      biz-base/src/main/java/com/dayou/controller/ReportSectionTemplateController.java
  16. 6 0
      biz-base/src/main/resources/application-local.yml
  17. 5 0
      biz-base/src/main/resources/application-prod.yml
  18. 4 0
      biz-base/src/main/resources/application-test.yml
  19. 4 0
      biz-base/src/main/resources/application.yml
  20. 94 0
      biz-base/src/main/resources/config.json
  21. 11856 0
      biz-base/src/main/resources/ftl/land/city_price.ftl
  22. 3823 0
      biz-base/src/main/resources/ftl/land/risk.ftl
  23. 二進制
      biz-base/src/main/resources/report_template/land/risk/base.docx
  24. 二進制
      biz-base/src/main/resources/report_template/land/risk/headline_1.docx
  25. 41 210
      biz-base/src/test/java/BrokerageTest.java
  26. 105 0
      biz-base/src/test/java/rich/DataToHtmlTest.java
  27. 94 0
      biz-base/src/test/java/rich/TestMainSimple.java
  28. 6 0
      biz-base/target/classes/application-local.yml
  29. 5 0
      biz-base/target/classes/application-prod.yml
  30. 4 0
      biz-base/target/classes/application-test.yml
  31. 4 0
      biz-base/target/classes/application.yml
  32. 二進制
      biz-base/target/classes/com/dayou/BaseApplication.class
  33. 二進制
      biz-base/target/classes/com/dayou/controller/BrokerageBaseAmountController.class
  34. 二進制
      biz-base/target/classes/com/dayou/controller/BrokerageMarketerRatioController.class
  35. 二進制
      biz-base/target/classes/com/dayou/controller/BrokeragePostRatioController.class
  36. 二進制
      biz-base/target/classes/com/dayou/controller/BrokerageVariableController.class
  37. 二進制
      biz-base/target/classes/com/dayou/controller/BusinessOpportunityController.class
  38. 二進制
      biz-base/target/classes/com/dayou/controller/BusinessReplyController.class
  39. 二進制
      biz-base/target/classes/com/dayou/controller/CustomerController.class
  40. 二進制
      biz-base/target/classes/com/dayou/controller/DepartmentController.class
  41. 二進制
      biz-base/target/classes/com/dayou/controller/DictDataController.class
  42. 二進制
      biz-base/target/classes/com/dayou/controller/DictTypeController.class
  43. 二進制
      biz-base/target/classes/com/dayou/controller/DistrictsController.class
  44. 二進制
      biz-base/target/classes/com/dayou/controller/FileController.class
  45. 二進制
      biz-base/target/classes/com/dayou/controller/GisUserController.class
  46. 二進制
      biz-base/target/classes/com/dayou/controller/GisVisitedController.class
  47. 二進制
      biz-base/target/classes/com/dayou/controller/GlobalConfigController.class
  48. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageDetailController.class
  49. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageGeneralController.class
  50. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceController.class
  51. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceDetailController.class
  52. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistController.class
  53. 二進制
      biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistDeductionController.class
  54. 二進制
      biz-base/target/classes/com/dayou/controller/ItemController.class
  55. 二進制
      biz-base/target/classes/com/dayou/controller/ItemEvaluateController.class
  56. 二進制
      biz-base/target/classes/com/dayou/controller/ItemStageController.class
  57. 二進制
      biz-base/target/classes/com/dayou/controller/ItemStageUserController.class
  58. 二進制
      biz-base/target/classes/com/dayou/controller/ItemUserController.class
  59. 二進制
      biz-base/target/classes/com/dayou/controller/ItemUserLogController.class
  60. 二進制
      biz-base/target/classes/com/dayou/controller/MarketLogController.class
  61. 二進制
      biz-base/target/classes/com/dayou/controller/MarketStatController.class
  62. 二進制
      biz-base/target/classes/com/dayou/controller/MenuController.class
  63. 二進制
      biz-base/target/classes/com/dayou/controller/MessageController.class
  64. 二進制
      biz-base/target/classes/com/dayou/controller/NoteController.class
  65. 二進制
      biz-base/target/classes/com/dayou/controller/OnlyOfficeCallbackController.class
  66. 二進制
      biz-base/target/classes/com/dayou/controller/OperationLogController.class
  67. 二進制
      biz-base/target/classes/com/dayou/controller/PaymentCollectionController.class
  68. 二進制
      biz-base/target/classes/com/dayou/controller/PostController.class
  69. 二進制
      biz-base/target/classes/com/dayou/controller/PostPrivilegeController.class
  70. 二進制
      biz-base/target/classes/com/dayou/controller/ReportHeadlineController.class
  71. 二進制
      biz-base/target/classes/com/dayou/controller/ReportMainController.class
  72. 二進制
      biz-base/target/classes/com/dayou/controller/ReportNounController.class
  73. 二進制
      biz-base/target/classes/com/dayou/controller/ReportSectionController.class
  74. 二進制
      biz-base/target/classes/com/dayou/controller/ReportSectionTemplateController.class
  75. 94 0
      biz-base/target/classes/config.json
  76. 11856 0
      biz-base/target/classes/ftl/land/city_price.ftl
  77. 3823 0
      biz-base/target/classes/ftl/land/risk.ftl
  78. 二進制
      biz-base/target/classes/report_template/land/risk/base.docx
  79. 二進制
      biz-base/target/classes/report_template/land/risk/headline_1.docx
  80. 5 4
      common/common.iml
  81. 5 0
      common/pom.xml
  82. 11 0
      common/src/main/java/com/dayou/configuration/DfsConfig.java
  83. 11 4
      common/src/main/java/com/dayou/configuration/WebConfig.java
  84. 2 0
      common/src/main/java/com/dayou/constants/JwtConstants.java
  85. 2 0
      common/src/main/java/com/dayou/exception/ErrorCode.java
  86. 0 7
      common/src/main/java/com/dayou/interceptor/PermissionInterceptor.java
  87. 121 0
      common/src/main/java/com/dayou/ueditor/ActionEnter.java
  88. 209 0
      common/src/main/java/com/dayou/ueditor/ConfigManager.java
  89. 24 0
      common/src/main/java/com/dayou/ueditor/Encoder.java
  90. 153 0
      common/src/main/java/com/dayou/ueditor/PathFormat.java
  91. 61 0
      common/src/main/java/com/dayou/ueditor/UEditorConfig.java
  92. 42 0
      common/src/main/java/com/dayou/ueditor/define/ActionMap.java
  93. 5 0
      common/src/main/java/com/dayou/ueditor/define/ActionState.java
  94. 77 0
      common/src/main/java/com/dayou/ueditor/define/AppInfo.java
  95. 93 0
      common/src/main/java/com/dayou/ueditor/define/BaseState.java
  96. 31 0
      common/src/main/java/com/dayou/ueditor/define/FileType.java
  97. 20 0
      common/src/main/java/com/dayou/ueditor/define/MIMEType.java
  98. 109 0
      common/src/main/java/com/dayou/ueditor/define/MultiState.java
  99. 18 0
      common/src/main/java/com/dayou/ueditor/define/State.java
  100. 0 0
      common/src/main/java/com/dayou/ueditor/define/UeRespoVO.java

+ 3 - 0
.idea/encodings.xml

@@ -3,6 +3,9 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/biz-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/biz-base/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/land/risk.ftl" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/office.ftl" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/test.ftl" charset="GBK" />
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dao/src/main/java" charset="UTF-8" />

+ 4 - 4
.idea/libraries/Maven__cn_hutool_hutool_all_5_3_3.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: cn.hutool:hutool-all:5.3.3">
+  <library name="Maven: cn.hutool:hutool-all:5.8.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.3.3/hutool-all-5.3.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.1/hutool-all-5.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.3.3/hutool-all-5.3.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.1/hutool-all-5.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.3.3/hutool-all-5.3.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.8.1/hutool-all-5.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 4 - 4
.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.freemarker:freemarker:2.3.30">
+  <library name="Maven: org.freemarker:freemarker:2.3.29">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.29/freemarker-2.3.29-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 231 - 626
.idea/workspace.xml

@@ -5,601 +5,169 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="110ed551-3684-4dd7-92e7-37a0b14e5e87" name="Changes" comment="统计修改">
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT.jar.original" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-local.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-prod.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-test.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/BaseApplication.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BrokerageBaseAmountController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BrokerageMarketerRatioController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BrokeragePostRatioController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BrokerageVariableController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BusinessOpportunityController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BusinessReplyController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/CustomerController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DepartmentController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DictDataController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DictTypeController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DistrictsController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/FileController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/GisUserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/GisVisitedController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/GlobalConfigController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageDetailController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageGeneralController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceDetailController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistDeductionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemEvaluateController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemStageController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemStageUserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemUserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ItemUserLogController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MarketLogController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MarketStatController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MenuController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MessageController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/NoteController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/OnlyOfficeCallbackController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/OperationLogController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/PaymentCollectionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/PostController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/PostPrivilegeController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ReportHeadlineController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ReportSectionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/ResourceTransferController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/TeamController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/TeamMemberController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/UserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/UserPostController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/UserTargetController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/VisitController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/rebel.xml" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/jrebel-classpath-12708.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportMainController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportNounController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportSectionTemplateController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/config.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/ftl/land/city_price.ftl" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/ftl/land/risk.ftl" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/test/java/rich/DataToHtmlTest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/test/java/rich/TestMainSimple.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/ActionEnter.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/ConfigManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/Encoder.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/PathFormat.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/UEditorConfig.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/ActionMap.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/ActionState.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/AppInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/BaseState.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/FileType.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/MIMEType.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/MultiState.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/State.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/define/UeRespoVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/hunter/FileManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/hunter/ImageHunter.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/upload/Base64Uploader.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/upload/BinaryUploader.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/upload/StorageManager.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/ueditor/upload/Uploader.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/FileUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/Freemarker.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/RichHtmlHandler.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/WordGeneratorWithFreemarker.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/WordHtmlGeneratorHelper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/WordImageConvertor.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportCalculateParamMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportCalculateTableMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportMainMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportNounMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportSectionTemplateMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportCalculateParamMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportCalculateTableMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportMainMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportNounMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportSectionTemplateMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/bo/ReportNounBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/bo/RichObject.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/CascaderDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/RiskReportDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/SectionTitleDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportCalculateParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportCalculateTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportMain.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportNoun.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportSectionTemplate.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/ReportNounsEnum.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/ReportStatus.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/ReportTypeEnum.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/HeadlineSectionVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/ReportMainVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/ReportSectionTreeVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/ActionConvertHandler.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/GenerateReportEngine.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/annotation/TableHead.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterBaseBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterCapacityScoreBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterEffectDistanceBo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterEffectScoreBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterFormatBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterIndexWeightBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterLevelBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/bo/BusinessCenterScaleBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/calculation/cityPrice/process/CityPriceCalculateProcess.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/CalculateDataDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/CalculateDataRequestDTO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/InputData.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/InputTableData.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/Params.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/TableData.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/dto/TableHead.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/enums/TableNoEnum.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/format/BigDecimalFormatUtil.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/html/DataToHtmlBO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/html/DataToHtmlConvertor.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/html/TableHTML.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/html/builder/CityBaseLandPriceBuilder.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportCalculateParamService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportCalculateTableService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportMainService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportNounService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportSectionTemplateService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportCalculateParamServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportCalculateTableServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportMainServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportNounServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportSectionTemplateServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/biz-base.iml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/biz-base.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/FileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/FileController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/GlobalConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/GlobalConfigController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ItemStageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ItemStageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportHeadlineController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportHeadlineController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportSectionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/ReportSectionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/application-local.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/application-test.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/report_template/land/risk/base.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/report_template/land/risk/headline_1.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/BrokerageTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/test/java/BrokerageTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/application-local.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/application-test.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/biz-base/target/classes/report_template/land/risk/base.docx" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/biz-base/target/classes/report_template/land/risk/headline_1.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/test-classes/BrokerageTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/ApiLogAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$MyBooleanEditor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$MyDateEditor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$MyNumberEditor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$MyPropertyEditorSupport.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer$MyStringEditor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/CommonBindingInitializer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/FormAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/aop/GlobalExceptionHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsycConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$AsyncBiz.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$AsyncLockStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager$BizHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/AsyncManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/CacheConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/DfsConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/MybatisPlusConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/ServiceConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/ShutdownManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/ThreadPoolConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/WebConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/constants/JwtConstants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/controller/BaseController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/dao/CustomBaseMapper$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/dao/CustomBaseMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/event/OperateLogEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/BusinessException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/ErrorCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/base/BaseException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/ExcelParseException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/FileNameLengthLimitExceededException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/FileSizeLimitExceededException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/InvalidExtensionException$InvalidImageExtensionException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/file/InvalidExtensionException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/filter/AFilter1_CorsFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/DefaultPageIntecptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/LoginInterceptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/PermissionInterceptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/RequestWrapper$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/RequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ContentCachingRequestWrapper$RequestCachingInputStream.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ContentCachingRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ConvertUtil$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ConvertUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/Convertor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/DateUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/DigestUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/EnumFactory$CommonEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/EnumFactory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/EnumUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelColmunRender.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelPlusUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil$BatchImportResult$FailResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil$BatchImportResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil$BatchImportStrategy.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil$ExportListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil$ImportListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ExcelUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/FileUploadUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/HttpKit.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ImageCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/IpUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/JwtTokenUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/LoginContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/Md5Utils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/MessageUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/MimeTypeUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/OnlyOfficeFileUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/PermissionContext.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/ReflectUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/RegxUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/SpringContextHolder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/SpringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/TreeUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/WafKit.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/WafRequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/rebel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BrokerageBaseAmountMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BrokerageMarketerRatioMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BrokeragePostRatioMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BrokerageVariableMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BusinessOpportunityMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BusinessReplyMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/CustomerMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/DepartmentMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/DictDataMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/DictTypeMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/DistrictsMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/GisUserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/GisVisitedMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/GlobalConfigMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageDetailMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageGeneralMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageSequenceDetailMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageSequenceMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageTechnicistDeductionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemBrokerageTechnicistMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemEvaluateMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemStageMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemStageUserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemUserLogMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ItemUserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MarketLogMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MarketStatMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MenuMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MessageMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/NoteMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/OperationLogMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/PaymentCollectionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/PostMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/PostPrivilegeMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportHeadlineMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportSectionMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ResourceTransferMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/TeamMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/TeamMemberMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/UserMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/UserPostMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/UserTargetMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/VisitMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BrokerageBaseAmountMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BrokerageMarketerRatioMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BrokeragePostRatioMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BrokerageVariableMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BusinessOpportunityMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BusinessReplyMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/CustomerMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/DepartmentMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/DictDataMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/DictTypeMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/DistrictsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/GisUserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/GisVisitedMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/GlobalConfigMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageDetailMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageGeneralMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageSequenceDetailMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageSequenceMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageTechnicistDeductionMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemBrokerageTechnicistMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemEvaluateMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemStageMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemStageUserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemUserLogMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ItemUserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MarketLogMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MarketStatMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MenuMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MessageMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/NoteMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/OperationLogMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/PaymentCollectionMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/PostMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/PostPrivilegeMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ReportHeadlineMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ReportSectionMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ResourceTransferMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/TeamMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/TeamMemberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/UserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/UserPostMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/UserTargetMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/VisitMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/rebel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/dao-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/dao-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/DataPermission.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/EnchanceSort.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/Excel$ColumnType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/Excel$Type.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/Excel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/ExcelSheet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/Excels.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/ExportCell.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/FormValid.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/IgnoreAuth.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/ImportCell.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/MenuAuth.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/OperLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/annotation/Transfer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/ChatCacheSessionBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/HeadlineTreeBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/LeaderRatioBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/LoginCacheUserBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/MenuTreeBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/PrivilegeTreeBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/SimpleParentModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/Tree.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/bo/UserBaseInfoBo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/BaseEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Constants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/DownloadModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Null.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/PullDownModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/RestResponse.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/SimpleDownloadModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/SimpleListModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/SimpleModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/condition/GisLoginCondition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/condition/LoginCondition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/BaseReport$BaseReportBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/BaseReport.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/BusinessOpportunityDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/CustomerDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/DataPermissionCondition.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/DeductionDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/ItemBrokerageGeneralDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/ItemDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/LogEcharsDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/LoginDTO$LoginDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/LoginDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/MarketStatDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/PaymentDetailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/PaymentExportDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/SequenceSimpleDTO$SequenceSimpleDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/SequenceSimpleDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/SimpleDepartmentModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/SimplePostModel.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/TeamLeaderDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/UpdatePasswordDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/UserBaseDetailDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BrokerageBaseAmount.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BrokerageMarketerRatio.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BrokeragePostRatio.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BrokerageVariable.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BusinessOpportunity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BusinessReply.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Customer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Department.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/DictData.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/DictType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Districts.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/GisUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/GisVisited.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/GlobalConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Item.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageDetail.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageGeneral$ItemBrokerageGeneralBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageGeneral.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageSequence$ItemBrokerageSequenceBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageSequence.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageSequenceDetail$ItemBrokerageSequenceDetailBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageSequenceDetail.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageTechnicist$ItemBrokerageTechnicistBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageTechnicist.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageTechnicistDeduction$ItemBrokerageTechnicistDeductionBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemBrokerageTechnicistDeduction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemEvaluate.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemStage.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemStageUser$ItemStageUserBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemStageUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ItemUserLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/MarketLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Menu.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Message.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Note.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/OperationLog.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/PaymentCollection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Post.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/PostPrivilege.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportHeadline.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportSection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ResourceTransfer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Team.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/TeamMember.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/User.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/UserPost.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/UserTarget.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/Visit.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/BatchTaskTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/BusinessReplyEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/BusinessResourceEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/CodeMsgEnumInterface.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/DataPrivilegeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Finance.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Sys.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/ItemStateEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/MenuEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/MenuTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/MergeKeyInterface.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/OperationTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/SexEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/UnitEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/UserTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BaseAmountVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BrokerageConfigVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BrokerageDetailVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BrokerageGeneralVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BrokerageSequenceDetailVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BrokerageSequenceVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BusinessOpportunityVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/BusinessReplyVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DeductionTechItemVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DeductionTechStatVO$DeductionTechStatVOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DeductionTechStatVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DeductionVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DepartmentPostVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DepartmentStatVO$DepartmentStatVOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DepartmentStatVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DepartmentVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/DistrictsTreeVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/IdNameVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemLogCollectVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemPaymentVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemStageUserVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemStageVO$ParticipatorWeight.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemStageVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemStatVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemUserLogVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ItemVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/LogEcharsVO$Axis.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/LogEcharsVO$EcharsItem.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/LogEcharsVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/LogStatVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/MarketLogVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/MarketStatVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/MarketerRatioVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/NoteCountVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/PaymentCollectionVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/PostRatioVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/PostVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/ResourceTransferVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/TeamMemberVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/TeamVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/TechDeductionVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/UserTargetVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/UserVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/vo/VisitVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/rebel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/domain-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/domain-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$5.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$6.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator$7.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/com/dayou/CodeGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/rebel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/controller.java.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/entity.java.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/mapper.java.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/mapper.xml.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/service.java.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/classes/template/serviceImpl.java.vm" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/gen-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/gen-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/aspect/DataPermissionAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/aspect/OperationLogAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/aspect/ResourceTransferAop.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/bo/BrokerageDetailBO$BrokerageDetailBOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/bo/BrokerageDetailBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/BrokerageCalculateSupport$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/BrokerageCalculateSupport.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/BrokerageCalculator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/MarketerBrokerageCalculator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/NonMarketerMarketerBrokerageCalculator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/annotation/DoBrokerage.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/config/BrokerageConfig$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/config/BrokerageConfig$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/config/BrokerageConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/config/BrokerageSettleSchedule$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/config/BrokerageSettleSchedule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/constants/BrokerageBusiness.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/constants/BrokerageMode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/constants/BrokerageMsg.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/constants/BrokerageRule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/constants/BrokerageState.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/factory/BrokerageCalculateFactory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/handler/LandMarketerBrokerageHandler$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/handler/LandMarketerBrokerageHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/handler/LandNonMarketerBrokerageHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/interceptor/BrokerageInterceptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/brokerage/validator/BrokerageValidator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/dto/ParticipantSettleDTO$ParticipantSettleDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/dto/ParticipantSettleDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/dto/SalarySettleDTO$SalarySettleDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/dto/SalarySettleDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/MessageServerCenter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/MessageTitle.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/MessageTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/bo/BusinessMessageBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/bo/MessageBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/bo/SystemMessageBO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/handler/BusinessMessageHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/handler/SystemMessageHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/schedule/ItemStatusSchedule$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/message/schedule/ItemStatusSchedule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/processor/AppBootProcessor$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/processor/AppBootProcessor$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/processor/AppBootProcessor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/report/ReportServer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBrokerageBaseAmountService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBrokerageMarketerRatioService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBrokeragePostRatioService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBrokerageVariableService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBusinessOpportunityService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBusinessReplyService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/ICustomerService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDepartmentService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDictDataService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDictTypeService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDistrictsService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IGisUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IGisVisitedService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IGlobalConfigService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageDetailService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageGeneralService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageSequenceDetailService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageSequenceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageTechnicistDeductionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemBrokerageTechnicistService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemEvaluateService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemStageService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemStageUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemUserLogService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IItemUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMarketLogService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMarketStatService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMenuService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMessageService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/INoteService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IOperationLogService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IPaymentCollectionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IPostPrivilegeService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IPostService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IReportHeadlineService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IReportSectionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IResourceTransferService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/ITeamMemberService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/ITeamService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IUserPostService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IUserTargetService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IVisitService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BrokerageBaseAmountServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BrokerageMarketerRatioServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BrokeragePostRatioServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BrokerageVariableServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessOpportunityServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessReplyServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/CustomerServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/CustomerServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DepartmentServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DepartmentServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictTypeServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictTypeServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DistrictsServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/GisUserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/GisVisitedServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/GlobalConfigServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageDetailServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageGeneralServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageSequenceDetailServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageTechnicistDeductionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageTechnicistServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemEvaluateServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemStageServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemStageUserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemUserLogServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemUserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MarketLogServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MarketStatServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MenuServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MenuServiceImpl$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MenuServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MessageServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/NoteServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/OperationLogServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PaymentCollectionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PostPrivilegeServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PostPrivilegeServiceImpl$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PostPrivilegeServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PostServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/PostServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ReportHeadlineServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ReportSectionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ResourceTransferServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ResourceTransferServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/TeamMemberServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/TeamServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserPostServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserPostServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserServiceImpl$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserTargetServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/VisitServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/rebel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/service-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/service-1.0-SNAPSHOT.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/common.iml" beforeDir="false" afterPath="$PROJECT_DIR$/common/common.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/DfsConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/DfsConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/WebConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/WebConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/constants/JwtConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/constants/JwtConstants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/exception/ErrorCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/exception/ErrorCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/interceptor/PermissionInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/interceptor/PermissionInterceptor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/EnumFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/EnumFactory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/FileUploadUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/FileUploadUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/DfsConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/DfsConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/WebConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/configuration/WebConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/constants/JwtConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/constants/JwtConstants.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/ErrorCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/exception/ErrorCode.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/PermissionInterceptor.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/interceptor/PermissionInterceptor.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/FileUploadUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/dayou/utils/FileUploadUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/dao.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/dao.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportHeadlineMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportHeadlineMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportSectionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/ReportSectionMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportHeadlineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportHeadlineMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportSectionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/ReportSectionMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportHeadlineMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportHeadlineMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportSectionMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/ReportSectionMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ReportHeadlineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/ReportHeadlineMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/ReportSectionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/ReportSectionMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/domain.iml" beforeDir="false" afterPath="$PROJECT_DIR$/domain/domain.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportHeadline.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportHeadline.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportSection.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/ReportSection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/GlobalConfigEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/GlobalConfigEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Constants.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Constants.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportHeadline.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportHeadline.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportSection.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/ReportSection.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Finance.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Finance.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Sys.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$Sys.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gen/gen.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gen/gen.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/service.iml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/aspect/DataPermissionAop.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/aspect/DataPermissionAop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/report/ReportServer.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IGlobalConfigService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IGlobalConfigService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportHeadlineService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportHeadlineService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportSectionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IReportSectionService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/GlobalConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/GlobalConfigServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportHeadlineServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportHeadlineServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportSectionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ReportSectionServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -613,8 +181,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="AnnotationType" />
-        <option value="Interface" />
         <option value="Enum" />
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -659,13 +227,13 @@
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
     &quot;jdk.selected.JAVA_MODULE&quot;: &quot;1.8&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/development/item-management/item-management-1phase/biz-base/src/main/resources/report_template&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/development/item-management/item-management-1phase/biz-base/src/main/resources/ftl/land&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Libraries&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
     &quot;project.structure.side.proportion&quot;: &quot;0.3764988&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
@@ -686,13 +254,15 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\report_template" />
-      <recent name="F:\development\item-management\item-management-1phase\sql" />
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\ftl\land" />
       <recent name="F:\development\item-management\item-management-1phase\dao\src\main\resources\mapper" />
-      <recent name="F:\development\item-management\item-management-1phase" />
-      <recent name="F:\development\item-management\item-management-1phase\gen\src\main\resources" />
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\ftl" />
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\report_template\land\risk" />
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\ftl\land" />
+      <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\ftl" />
       <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\report_template\land\risk" />
       <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\report_template" />
       <recent name="F:\development\item-management\item-management-1phase\biz-base\src\main\resources\report_template\land" />
@@ -701,9 +271,9 @@
       <recent name="" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.dayou.controller" />
       <recent name="com.dayou.configuration" />
       <recent name="com.dayou.utils" />
-      <recent name="com.dayou.controller" />
       <recent name="com.dayou.bo" />
       <recent name="com.dayou.enums" />
     </key>
@@ -716,12 +286,12 @@
     </option>
   </component>
   <component name="RunManager" selected="Spring Boot.BaseApplication">
-    <configuration name="CodeGenerator" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.dayou.CodeGenerator" />
-      <module name="gen" />
+    <configuration name="DataToHtmlTest" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="rich.DataToHtmlTest" />
+      <module name="biz-base" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.dayou.*" />
+          <option name="PATTERN" value="rich.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -729,31 +299,40 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="BrokerageTest.output" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="biz-base" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="BrokerageTest" />
-      <option name="METHOD_NAME" value="output" />
-      <option name="TEST_OBJECT" value="method" />
+    <configuration name="TableNoEnum" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.dayou.report.enums.TableNoEnum" />
+      <module name="service" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.dayou.report.enums.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="BrokerageTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="BrokerageTest.testCalculate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="biz-base" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="BrokerageTest" />
-      <option name="METHOD_NAME" value="test" />
+      <option name="METHOD_NAME" value="testCalculate" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="BrokerageTest.transforPDF" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestMainSimple.testDoWord" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="biz-base" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="BrokerageTest" />
-      <option name="METHOD_NAME" value="transforPDF" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="rich.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="rich" />
+      <option name="MAIN_CLASS_NAME" value="rich.TestMainSimple" />
+      <option name="METHOD_NAME" value="testDoWord" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -773,19 +352,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.CodeGenerator" />
-      <item itemvalue="JUnit.BrokerageTest.transforPDF" />
-      <item itemvalue="JUnit.BrokerageTest.output" />
-      <item itemvalue="JUnit.BrokerageTest.test" />
+      <item itemvalue="Application.TableNoEnum" />
+      <item itemvalue="Application.DataToHtmlTest" />
+      <item itemvalue="JUnit.BrokerageTest.testCalculate" />
+      <item itemvalue="JUnit.TestMainSimple.testDoWord" />
       <item itemvalue="Spring Boot.BaseApplication" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.CodeGenerator" />
+        <item itemvalue="JUnit.TestMainSimple.testDoWord" />
         <item itemvalue="Spring Boot.BaseApplication" />
-        <item itemvalue="JUnit.BrokerageTest.transforPDF" />
-        <item itemvalue="JUnit.BrokerageTest.output" />
-        <item itemvalue="JUnit.BrokerageTest.test" />
+        <item itemvalue="Application.TableNoEnum" />
+        <item itemvalue="JUnit.BrokerageTest.testCalculate" />
+        <item itemvalue="Application.DataToHtmlTest" />
       </list>
     </recent_temporary>
   </component>
@@ -965,7 +544,28 @@
       <workItem from="1692665198906" duration="11039000" />
       <workItem from="1692751877783" duration="6310000" />
       <workItem from="1692839097179" duration="3406000" />
-      <workItem from="1692924525767" duration="11431000" />
+      <workItem from="1692924525767" duration="11575000" />
+      <workItem from="1693183447702" duration="12260000" />
+      <workItem from="1693270390476" duration="16103000" />
+      <workItem from="1693356269967" duration="4679000" />
+      <workItem from="1693444608502" duration="18913000" />
+      <workItem from="1693528993687" duration="24960000" />
+      <workItem from="1693788264990" duration="21254000" />
+      <workItem from="1693874486811" duration="18315000" />
+      <workItem from="1693963722002" duration="3500000" />
+      <workItem from="1694048184425" duration="5255000" />
+      <workItem from="1694134383009" duration="7861000" />
+      <workItem from="1694393511725" duration="9153000" />
+      <workItem from="1694479725601" duration="12379000" />
+      <workItem from="1694652499410" duration="22042000" />
+      <workItem from="1694739480389" duration="22208000" />
+      <workItem from="1694998067913" duration="17228000" />
+      <workItem from="1695084140035" duration="24779000" />
+      <workItem from="1695116149237" duration="77000" />
+      <workItem from="1695170843579" duration="14231000" />
+      <workItem from="1695257081911" duration="29434000" />
+      <workItem from="1695290931988" duration="103000" />
+      <workItem from="1695343833124" duration="12583000" />
     </task>
     <task id="LOCAL-00024" summary="数据权限调整">
       <created>1676453906178</created>
@@ -1461,4 +1061,9 @@
     <expand />
     <select />
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/item_management_1phase$TestMainSimple.ic" NAME="TestMainSimple Coverage Results" MODIFIED="1693532702249" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>rich.*</FILTER>
+    </SUITE>
+  </component>
 </project>

+ 5 - 5
biz-base/biz-base.iml

@@ -7,10 +7,10 @@
           <map>
             <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1691475903779" />
+            <entry key="lastExternalPluginCheckTime" value="1695084137817" />
           </map>
         </option>
-        <option name="version" value="3" />
+        <option name="version" value="4" />
       </configuration>
     </facet>
     <facet type="web" name="Web">
@@ -62,7 +62,7 @@
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
@@ -96,7 +96,7 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.72" level="project" />
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" level="project" />
@@ -139,6 +139,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.4.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
@@ -181,7 +182,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.67" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />

二進制
biz-base/jrebel-classpath-12708.jar


+ 1 - 6
biz-base/pom.xml

@@ -59,12 +59,7 @@
             <artifactId>smart-doc</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <!-- jsoup HTML parser library @ https://jsoup.org/ -->
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.11.3</version>
-        </dependency>
+
         <!--测试-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 55 - 1
biz-base/src/main/java/com/dayou/controller/FileController.java

@@ -1,23 +1,30 @@
 package com.dayou.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.dayou.annotation.IgnoreAuth;
 import com.dayou.common.RestResponse;
 import com.dayou.configuration.DfsConfig;
 import com.dayou.exception.ErrorCode;
 import com.dayou.exception.file.InvalidExtensionException;
-import com.dayou.service.IGlobalConfigService;
+import com.dayou.ueditor.ActionEnter;
+import com.dayou.ueditor.define.UeRespoVO;
 import com.dayou.utils.FileUploadUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import static com.dayou.constants.JwtConstants.RESOURCE_PREFIX;
 import static com.dayou.exception.ErrorCode.DEFAULTERROR;
 import static com.dayou.exception.ErrorCode.FILE_EXT_ERROR;
 
@@ -38,10 +45,15 @@ public class FileController {
     @Autowired
     private DfsConfig dfsConfig;
 
+    @Autowired
+    private ActionEnter actionEnter;
 
     @Value("${server.port:80}")
     private Integer port;
 
+    @Value("${ueditor.urlPrefix}")
+    private String urlprefix;
+
     /**
      * 通用上传请求
      */
@@ -68,4 +80,46 @@ public class FileController {
         return RestResponse.error();
     }
 
+    /**
+     * 百度富文本编辑器后端适配接口
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/ueditor/exec")
+    @IgnoreAuth
+    public String exe(HttpServletRequest request) {
+        String res = actionEnter.exec(request);
+        //是在上传 不是回调校验
+        if (request.getParameter("callback") == null && res.contains("SUCCESS")) {
+            UeRespoVO ueRespoVO = JSON.parseObject(res, UeRespoVO.class);
+            // 上传文件路径
+            String filePath = dfsConfig.getPath();
+            String pathname = filePath + ueRespoVO.getUrl();
+            new File(pathname);
+            res = JSON.toJSONString(ueRespoVO);
+        } else {
+            //根基实际url动态替换 url
+            StringBuffer url = request.getRequestURL();
+            String contextPath = request.getServletContext().getContextPath();
+            String realUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();
+
+            String replacementURL = realUrl + RESOURCE_PREFIX;
+            boolean hasPort = PORTPATTERN.matcher(replacementURL).find();
+
+            if (!hasPort) {
+                if (contextPath == null) {
+                    String[] split = replacementURL.split(RESOURCE_PREFIX);
+                    replacementURL = split[0] + ":" + port + RESOURCE_PREFIX;
+                } else {
+                    String[] split = replacementURL.split(contextPath);
+                    replacementURL = split[0] + ":" + port + contextPath + split[1];
+                }
+            }
+            res = res.replaceAll(urlprefix, replacementURL);
+        }
+        return res;
+    }
+
 }

+ 0 - 7
biz-base/src/main/java/com/dayou/controller/GlobalConfigController.java

@@ -112,12 +112,5 @@ public class GlobalConfigController extends BaseController {
         List<String> list = EnumFactory.getEnumByKey(key);
         return RestResponse.data(list);
     }
-
-    @GetMapping("/byKey/{key}")
-    public RestResponse<BrokerageConfigVO> getConfigByKey(@PathVariable("key") String key) {
-        BrokerageConfigVO result = globalConfigService.getConfigByKey(key);
-        return RestResponse.data(result);
-    }
-
 }
 

+ 0 - 10
biz-base/src/main/java/com/dayou/controller/ItemStageController.java

@@ -3,27 +3,17 @@ package com.dayou.controller;
 import com.dayou.annotation.DataPermission;
 import com.dayou.annotation.OperLog;
 import com.dayou.vo.ItemStageVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RestController;
-import com.dayou.controller.BaseController;
 import com.dayou.service.IItemStageService;
 import com.dayou.entity.ItemStage;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
-import com.dayou.common.PullDownModel;
-import com.dayou.utils.ConvertUtil;
-import com.dayou.utils.HttpKit;
-import com.dayou.exception.ErrorCode;
-import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.http.MediaType;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 

+ 21 - 10
biz-base/src/main/java/com/dayou/controller/ReportHeadlineController.java

@@ -1,26 +1,18 @@
 package com.dayou.controller;
 
 import com.dayou.bo.HeadlineTreeBO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import com.dayou.common.CascaderDTO;
+import com.dayou.vo.IdNameVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RestController;
-import com.dayou.controller.BaseController;
 import com.dayou.service.IReportHeadlineService;
 import com.dayou.entity.ReportHeadline;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
-import com.dayou.utils.ConvertUtil;
-import com.dayou.utils.HttpKit;
-import com.dayou.exception.ErrorCode;
-import java.util.Date;
 import java.util.List;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.http.MediaType;
-import org.springframework.web.multipart.MultipartFile;
 /**
  * 报告标题
  *
@@ -90,5 +82,24 @@ public class ReportHeadlineController extends BaseController {
         return RestResponse.data(tree);
     }
 
+    /**
+     * 获取根标题(模板类型)
+     * @return
+     */
+    @GetMapping("/root")
+    public RestResponse<List<ReportHeadline>> getHeadlineRoot(){
+        List<ReportHeadline> roots = reportHeadlineService.getHeadlineRoot();
+        return RestResponse.data(roots);
+    }
+
+    /**
+     * 获取全部报告标题树
+     * @return
+     */
+    @GetMapping("/tree")
+    public RestResponse<List<CascaderDTO>> getAllHeadlineTree(){
+        List<CascaderDTO> trees = reportHeadlineService.getAllHeadlineTree();
+        return RestResponse.data(trees);
+    }
 }
 

+ 105 - 0
biz-base/src/main/java/com/dayou/controller/ReportMainController.java

@@ -0,0 +1,105 @@
+package com.dayou.controller;
+
+import com.dayou.vo.ReportMainVO;
+import com.dayou.vo.ReportSectionTreeVO;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IReportMainService;
+import com.dayou.entity.ReportMain;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 报告主表
+ *
+ * @author wucl
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("reportMain")
+@Slf4j
+public class ReportMainController extends BaseController {
+    @Autowired
+    private IReportMainService reportMainService;
+
+    /**
+    * 报告主表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<ReportMainVO>> page(ReportMainVO reportMain, Page page){
+        Page<ReportMainVO> pages=reportMainService.selectPage(page,reportMain);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 报告主表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<ReportMainVO> detail(@PathVariable Long id){
+        ReportMainVO xReportMain =reportMainService.detail(id);
+        return RestResponse.data(xReportMain);
+     }
+
+    /**
+     * 报告主表新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody ReportMain reportMain) {
+        Boolean ret = reportMainService.add(reportMain);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告主表更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> updateNouns(@RequestBody ReportMainVO reportMain) {
+        Boolean ret = reportMainService.updateNouns(reportMain);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告主表删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = reportMainService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 生成报告
+     * @return
+     */
+    @GetMapping("/generate/{id}")
+    public RestResponse<Boolean> generateReport(@PathVariable("id") Long id) throws Exception {
+        Boolean ret = reportMainService.generateReport(id);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 获取报告标题段落树
+     * @param id 报告id
+     * @return
+     */
+    @GetMapping("/tree/{id}")
+    public RestResponse<List<ReportSectionTreeVO>> getReportHeadlineTree(@PathVariable("id") Long id){
+        List<ReportSectionTreeVO> tree = reportMainService.getReportHeadlineTree(id);
+        return RestResponse.data(tree);
+    }
+}
+

+ 97 - 0
biz-base/src/main/java/com/dayou/controller/ReportNounController.java

@@ -0,0 +1,97 @@
+package com.dayou.controller;
+
+import com.dayou.bo.ReportNounBO;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IReportNounService;
+import com.dayou.entity.ReportNoun;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.common.PullDownModel;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 报告名词占位符
+ *
+ * @author wucl
+ * @since 2023-09-05
+ */
+@RestController
+@RequestMapping("reportNoun")
+@Slf4j
+public class ReportNounController extends BaseController {
+    @Autowired
+    private IReportNounService reportNounService;
+
+    /**
+    * 报告名词占位符列表
+    */
+    @GetMapping("/list/{id}")
+    public RestResponse<List<ReportNounBO>> getListByType(@PathVariable("reportType") String reportType){
+        List<ReportNounBO> list = reportNounService.getListByType(reportType);
+        return RestResponse.data(list);
+    }
+
+    /**
+     * 报告名词占位符详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<ReportNoun> detail(@PathVariable Long id){
+        ReportNoun xReportNoun =reportNounService.detail(id);
+        return RestResponse.data(xReportNoun);
+     }
+
+    /**
+     * 报告名词占位符新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody ReportNoun reportNoun) {
+        Boolean ret = reportNounService.add(reportNoun);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告名词占位符更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody ReportNoun reportNoun) {
+        Boolean ret = reportNounService.update(reportNoun);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告名词占位符删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = reportNounService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 报告名词占位符下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<ReportNoun> lambdaQueryWrapper = new LambdaQueryWrapper<ReportNoun>()
+        .select(ReportNoun::getId,ReportNoun::getName)
+        .eq(ReportNoun::getDeleted,false);
+        List<ReportNoun> list= reportNounService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+}
+

+ 27 - 32
biz-base/src/main/java/com/dayou/controller/ReportSectionController.java

@@ -1,7 +1,8 @@
 package com.dayou.controller;
 
-import com.dayou.common.BaseEntity;
-import com.dayou.entity.ReportHeadline;
+import com.dayou.report.dto.CalculateDataRequestDTO;
+import com.dayou.report.dto.InputData;
+import com.dayou.vo.ReportSectionTreeVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,15 +12,14 @@ import com.dayou.service.IReportSectionService;
 import com.dayou.entity.ReportSection;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
-import com.dayou.common.PullDownModel;
-import com.dayou.utils.ConvertUtil;
+
+import javax.validation.Valid;
 import java.util.List;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 /**
- * 报告段落模板
+ * 报告段落
  *
  * @author wucl
- * @since 2023-08-25
+ * @since 2023-08-29
  */
 @RestController
 @RequestMapping("reportSection")
@@ -29,7 +29,7 @@ public class ReportSectionController extends BaseController {
     private IReportSectionService reportSectionService;
 
     /**
-    * 报告段落模板列表
+    * 报告段落列表
     */
     @GetMapping("")
     public RestResponse<Page<ReportSection>> page(ReportSection reportSection, Page page){
@@ -38,7 +38,7 @@ public class ReportSectionController extends BaseController {
     }
 
     /**
-     * 报告段落模板详情
+     * 报告段落详情
      */
     @GetMapping("/{id}")
     public RestResponse<ReportSection> detail(@PathVariable Long id){
@@ -47,7 +47,7 @@ public class ReportSectionController extends BaseController {
      }
 
     /**
-     * 报告段落模板新增
+     * 报告段落新增
      */
     @PostMapping("")
     public RestResponse<Boolean> save(@RequestBody ReportSection reportSection) {
@@ -56,16 +56,16 @@ public class ReportSectionController extends BaseController {
     }
 
     /**
-     * 报告段落模板更新
+     * 报告段落更新
      */
     @PutMapping("")
-    public RestResponse<Boolean> update(@RequestBody ReportSection reportSection) {
-        Boolean ret = reportSectionService.update(reportSection);
+    public RestResponse<Boolean> update(@RequestBody ReportSectionTreeVO treeVO) {
+        Boolean ret = reportSectionService.updateSection(treeVO);
         return RestResponse.data(ret);
     }
 
     /**
-     * 报告段落模板删除
+     * 报告段落删除
      */
     @DeleteMapping("/{id}")
     public RestResponse<Boolean> delete(@PathVariable Long id) {
@@ -73,31 +73,26 @@ public class ReportSectionController extends BaseController {
         return RestResponse.data(ret);
     }
 
-
     /**
-     * 报告段落模板下拉列表
+     * 计算数据接收接口
+     * @param calculateData
+     * @return
      */
-    @GetMapping("/simpleAll")
-    public RestResponse<List<PullDownModel>> simpleAll(){
-        LambdaQueryWrapper<ReportSection> lambdaQueryWrapper = new LambdaQueryWrapper<ReportSection>()
-        .select(ReportSection::getId,ReportSection::getName)
-        .eq(ReportSection::getDeleted,false);
-        List<ReportSection> list= reportSectionService.list(lambdaQueryWrapper);
-        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
-        return RestResponse.data(ret);
+    @PostMapping("/calculate")
+    public RestResponse<Boolean> calculate(@RequestBody @Valid CalculateDataRequestDTO calculateData){
+        Boolean result = reportSectionService.calculate(calculateData);
+        return RestResponse.data(result);
     }
 
     /**
-     * 获取段落模板列表不分页
-     * @param id
+     * 计算数据 结构
+     * @param id headlineId
      * @return
      */
-    @GetMapping("/headline/{id}")
-    public RestResponse<List<ReportSection>> getList(@PathVariable("id") Long id){
-        List<ReportSection> list = reportSectionService.list(new LambdaQueryWrapper<ReportSection>().eq(ReportSection::getHeadlineId, id)
-                        .isNotNull(ReportSection::getSection)
-                .eq(BaseEntity::getDeleted, Boolean.FALSE));
-        return RestResponse.data(list);
+    @GetMapping("/structure/{id}")
+    public RestResponse<InputData> inputDataStructure(@PathVariable("id") Long id){
+        InputData structure = reportSectionService.inputDataStructure(id);
+        return RestResponse.data(structure);
     }
 }
 

+ 103 - 0
biz-base/src/main/java/com/dayou/controller/ReportSectionTemplateController.java

@@ -0,0 +1,103 @@
+package com.dayou.controller;
+
+import com.dayou.common.BaseEntity;
+import com.dayou.vo.HeadlineSectionVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.IReportSectionTemplateService;
+import com.dayou.entity.ReportSectionTemplate;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.common.PullDownModel;
+import com.dayou.utils.ConvertUtil;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+/**
+ * 报告段落模板
+ *
+ * @author wucl
+ * @since 2023-08-25
+ */
+@RestController
+@RequestMapping("reportSectionTemplate")
+@Slf4j
+public class ReportSectionTemplateController extends BaseController {
+    @Autowired
+    private IReportSectionTemplateService reportSectionTemplateService;
+
+    /**
+    * 报告段落模板列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<HeadlineSectionVO>> page(HeadlineSectionVO reportSection, Page page){
+        Page<HeadlineSectionVO> pages=reportSectionTemplateService.getPage(page,reportSection);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 报告段落模板详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<ReportSectionTemplate> detail(@PathVariable Long id){
+        ReportSectionTemplate xReportSectionTemplate =reportSectionTemplateService.detail(id);
+        return RestResponse.data(xReportSectionTemplate);
+     }
+
+    /**
+     * 报告段落模板新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody ReportSectionTemplate reportSectionTemplate) {
+        Boolean ret = reportSectionTemplateService.add(reportSectionTemplate);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告段落模板更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody ReportSectionTemplate reportSectionTemplate) {
+        Boolean ret = reportSectionTemplateService.update(reportSectionTemplate);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 报告段落模板删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = reportSectionTemplateService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 报告段落模板下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<ReportSectionTemplate> lambdaQueryWrapper = new LambdaQueryWrapper<ReportSectionTemplate>()
+        .select(ReportSectionTemplate::getId, ReportSectionTemplate::getName)
+        .eq(ReportSectionTemplate::getDeleted,false);
+        List<ReportSectionTemplate> list= reportSectionTemplateService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 获取段落模板列表不分页
+     * @param id
+     * @return
+     */
+    @GetMapping("/headline/{id}")
+    public RestResponse<List<ReportSectionTemplate>> getList(@PathVariable("id") Long id){
+        List<ReportSectionTemplate> list = reportSectionTemplateService.list(new LambdaQueryWrapper<ReportSectionTemplate>().eq(ReportSectionTemplate::getHeadlineId, id)
+                        .isNotNull(ReportSectionTemplate::getSection)
+                .eq(BaseEntity::getDeleted, Boolean.FALSE));
+        return RestResponse.data(list);
+    }
+}
+

+ 6 - 0
biz-base/src/main/resources/application-local.yml

@@ -21,6 +21,7 @@ spring:
 dfs:
   path: /opt/dfs
   domain: /dfs
+  domainName: https://kps.scdayou.com/dfs
 
 advice:
   file:
@@ -34,3 +35,8 @@ system:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url
+

+ 5 - 0
biz-base/src/main/resources/application-prod.yml

@@ -21,6 +21,7 @@ spring:
 dfs:
   path: /opt/dfs
   domain: /dfs
+  domainName: https://kps.scdayou.com/dfs
 
 
 #系统配置
@@ -29,3 +30,7 @@ system:
     error-limit:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url

+ 4 - 0
biz-base/src/main/resources/application-test.yml

@@ -29,3 +29,7 @@ system:
     error-limit:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url

+ 4 - 0
biz-base/src/main/resources/application.yml

@@ -77,3 +77,7 @@ logging:
     com.local: info
     org.springframework: info
 
+#百度编辑器
+ueditor:
+  config: config.json
+  unified: false

+ 94 - 0
biz-base/src/main/resources/config.json

@@ -0,0 +1,94 @@
+/*       百度编辑器配置   前后端通信相关的配置,注释只允许使用多行方式 */
+{
+    /* 上传图片配置项 */
+    "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
+    "imageFieldName": "upfile", /* 提交的图片表单名称 */
+    "imageMaxSize": 2048000, /* 上传大小限制,单位B */
+    "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
+    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
+    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
+    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageUrlPrefix": "https://kps.scdayou.com/dfs", /* 图片访问路径前缀 */
+    "imagePathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+                                /* {time} 会替换成时间戳 */
+                                /* {yyyy} 会替换成四位年份 */
+                                /* {yy} 会替换成两位年份 */
+                                /* {mm} 会替换成两位月份 */
+                                /* {dd} 会替换成两位日期 */
+                                /* {hh} 会替换成两位小时 */
+                                /* {ii} 会替换成两位分钟 */
+                                /* {ss} 会替换成两位秒 */
+                                /* 非法字符 \ : * ? " < > | */
+                                /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+
+    /* 涂鸦图片上传配置项 */
+    "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
+    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
+    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "scrawlMaxSize": 2048000, /* 上传大小限制,单位B */
+    "scrawlUrlPrefix": "", /* 图片访问路径前缀 */
+    "scrawlInsertAlign": "none",
+
+    /* 截图工具上传 */
+    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
+    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
+    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
+
+    /* 抓取远程图片配置 */
+    "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
+    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
+    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
+    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "catcherUrlPrefix": "", /* 图片访问路径前缀 */
+    "catcherMaxSize": 2048000, /* 上传大小限制,单位B */
+    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
+
+    /* 上传视频配置 */
+    "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
+    "videoFieldName": "upfile", /* 提交的视频表单名称 */
+    "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "videoUrlPrefix": "", /* 视频访问路径前缀 */
+    "videoMaxSize": 102400000, /* 上传大小限制,单位B,默认100MB */
+    "videoAllowFiles": [
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
+
+    /* 上传文件配置 */
+    "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
+    "fileFieldName": "upfile", /* 提交的文件表单名称 */
+    "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "fileUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileMaxSize": 51200000, /* 上传大小限制,单位B,默认50MB */
+    "fileAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ], /* 上传文件格式显示 */
+
+    /* 列出指定目录下的图片 */
+    "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
+    "imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */
+    "imageManagerListSize": 20, /* 每次列出文件数量 */
+    "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+    "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
+
+    /* 列出指定目录下的文件 */
+    "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
+    "fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */
+    "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileManagerListSize": 20, /* 每次列出文件数量 */
+    "fileManagerAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ] /* 列出的文件类型 */
+
+}

File diff suppressed because it is too large
+ 11856 - 0
biz-base/src/main/resources/ftl/land/city_price.ftl


File diff suppressed because it is too large
+ 3823 - 0
biz-base/src/main/resources/ftl/land/risk.ftl


二進制
biz-base/src/main/resources/report_template/land/risk/base.docx


二進制
biz-base/src/main/resources/report_template/land/risk/headline_1.docx


File diff suppressed because it is too large
+ 41 - 210
biz-base/src/test/java/BrokerageTest.java


+ 105 - 0
biz-base/src/test/java/rich/DataToHtmlTest.java

@@ -0,0 +1,105 @@
+//package rich;
+//
+//import com.dayou.report.calculation.cityPrice.bo.BusinessCenterBaseBO;
+//import org.jsoup.Jsoup;
+//import org.jsoup.nodes.Document;
+//import org.jsoup.nodes.Element;
+//import org.jsoup.select.Elements;
+//
+//import java.lang.reflect.Field;
+//import java.math.BigDecimal;
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import static com.dayou.report.html.TableHTML.TABLE;
+//import static com.dayou.report.html.TableHTML.TR;
+//
+///**
+// * 类说明:
+// *
+// * @author: wucl
+// * @since: 2023/9/14
+// * created with IntelliJ IDEA.
+// */
+//public class DataToHtmlTest {
+//
+//    public static void main(String[] args) {
+//       //toHtml();
+//        BusinessCenterBaseBO build = BusinessCenterBaseBO.builder().no(1).name("世纪摩尔购物中心").acreage(BigDecimal.TEN).categories("服装,购物")
+//                .shopNum(BigDecimal.TEN).shoppingNum(BigDecimal.TEN).rent(BigDecimal.TEN).turnover(BigDecimal.TEN).scope("文通路上段2323号").build();
+//
+//        List<Field> fields = Arrays.asList(BusinessCenterBaseBO.class.getDeclaredFields());
+//        fields.stream().forEach(x->{
+//            try {
+//                x.setAccessible(true);
+//                Object o = x.get(build);
+//                System.out.println(o);
+//            } catch (IllegalAccessException e) {
+//                throw new RuntimeException(e);
+//            }
+//
+//        });
+//    }
+//
+//    public static void toHtml(){
+//        String str = TABLE;
+//        Document table = Jsoup.parseBodyFragment(str);
+//        Elements select = table.select(".tableHead");
+//        List<String> label = new ArrayList<>();
+//        label.add("序号");
+//        label.add("商服名称");
+//        label.add("商服中心范围");
+//        label.add("经营种类");
+//        label.add("占地面积");
+//        label.add("店铺数量");
+//        label.add("购物人次");
+//        label.add("营业额");
+//        label.add("平均年租金");
+//        for (String s : label){
+//            String tr = "<td style=\"background-color:rgb(215,215,215); border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\" width=\"auto\" align=\"center\">\n" +s+
+//                    "\t\t\t</td>";
+//            select.append(tr);
+//        }
+//        List<BusinessCenterBaseBO> list = new ArrayList<>();
+//        list.add(BusinessCenterBaseBO.builder().no(1).name("世纪摩尔购物中心").acreage(BigDecimal.TEN).categories("服装,购物")
+//                .shopNum(BigDecimal.TEN).shoppingNum(BigDecimal.TEN).rent(BigDecimal.TEN).turnover(BigDecimal.TEN).scope("文通路上段2323号").build());
+//        Elements body = table.select(".tbody");
+//        for (BusinessCenterBaseBO b : list){
+//            body.append(TR);
+//            Element tr = table.select("tr").last();
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getNo() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getName() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getAcreage() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getCategories() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getShopNum() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getShoppingNum() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getRent() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getTurnover() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//            tr.append("<td style=\\\"border-color: rgb(0, 0, 0); border-width: 1px; border-style: solid;\\\" \" +\n" +
+//                    "            \"                   width=\\\"auto\\\" align=\\\"center\\\">\\\\n\\\" \" +\n" + b.getScope() +
+//                    "            \"                    \\\"\\\\t\\\\t\\\\t</td>");
+//        }
+//        String html = table.body().html();
+//        String s = table.outerHtml();
+//        System.out.println(html);
+//    }
+//
+//
+//}

File diff suppressed because it is too large
+ 94 - 0
biz-base/src/test/java/rich/TestMainSimple.java


+ 6 - 0
biz-base/target/classes/application-local.yml

@@ -21,6 +21,7 @@ spring:
 dfs:
   path: /opt/dfs
   domain: /dfs
+  domainName: https://kps.scdayou.com/dfs
 
 advice:
   file:
@@ -34,3 +35,8 @@ system:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url
+

+ 5 - 0
biz-base/target/classes/application-prod.yml

@@ -21,6 +21,7 @@ spring:
 dfs:
   path: /opt/dfs
   domain: /dfs
+  domainName: https://kps.scdayou.com/dfs
 
 
 #系统配置
@@ -29,3 +30,7 @@ system:
     error-limit:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url

+ 4 - 0
biz-base/target/classes/application-test.yml

@@ -29,3 +29,7 @@ system:
     error-limit:
       lock-time: 30  #登录错误达到限制次数账号锁定时间(单位:分钟),默认30分钟
 
+#百度编辑器
+ueditor:
+  uploadPath: ${dfs.path}
+  urlPrefix: replaceurl  #动态替换url

+ 4 - 0
biz-base/target/classes/application.yml

@@ -77,3 +77,7 @@ logging:
     com.local: info
     org.springframework: info
 
+#百度编辑器
+ueditor:
+  config: config.json
+  unified: false

二進制
biz-base/target/classes/com/dayou/BaseApplication.class


二進制
biz-base/target/classes/com/dayou/controller/BrokerageBaseAmountController.class


二進制
biz-base/target/classes/com/dayou/controller/BrokerageMarketerRatioController.class


二進制
biz-base/target/classes/com/dayou/controller/BrokeragePostRatioController.class


二進制
biz-base/target/classes/com/dayou/controller/BrokerageVariableController.class


二進制
biz-base/target/classes/com/dayou/controller/BusinessOpportunityController.class


二進制
biz-base/target/classes/com/dayou/controller/BusinessReplyController.class


二進制
biz-base/target/classes/com/dayou/controller/CustomerController.class


二進制
biz-base/target/classes/com/dayou/controller/DepartmentController.class


二進制
biz-base/target/classes/com/dayou/controller/DictDataController.class


二進制
biz-base/target/classes/com/dayou/controller/DictTypeController.class


二進制
biz-base/target/classes/com/dayou/controller/DistrictsController.class


二進制
biz-base/target/classes/com/dayou/controller/FileController.class


二進制
biz-base/target/classes/com/dayou/controller/GisUserController.class


二進制
biz-base/target/classes/com/dayou/controller/GisVisitedController.class


二進制
biz-base/target/classes/com/dayou/controller/GlobalConfigController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageDetailController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageGeneralController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageSequenceDetailController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemBrokerageTechnicistDeductionController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemEvaluateController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemStageController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemStageUserController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemUserController.class


二進制
biz-base/target/classes/com/dayou/controller/ItemUserLogController.class


二進制
biz-base/target/classes/com/dayou/controller/MarketLogController.class


二進制
biz-base/target/classes/com/dayou/controller/MarketStatController.class


二進制
biz-base/target/classes/com/dayou/controller/MenuController.class


二進制
biz-base/target/classes/com/dayou/controller/MessageController.class


二進制
biz-base/target/classes/com/dayou/controller/NoteController.class


二進制
biz-base/target/classes/com/dayou/controller/OnlyOfficeCallbackController.class


二進制
biz-base/target/classes/com/dayou/controller/OperationLogController.class


二進制
biz-base/target/classes/com/dayou/controller/PaymentCollectionController.class


二進制
biz-base/target/classes/com/dayou/controller/PostController.class


二進制
biz-base/target/classes/com/dayou/controller/PostPrivilegeController.class


二進制
biz-base/target/classes/com/dayou/controller/ReportHeadlineController.class


二進制
biz-base/target/classes/com/dayou/controller/ReportMainController.class


二進制
biz-base/target/classes/com/dayou/controller/ReportNounController.class


二進制
biz-base/target/classes/com/dayou/controller/ReportSectionController.class


二進制
biz-base/target/classes/com/dayou/controller/ReportSectionTemplateController.class


+ 94 - 0
biz-base/target/classes/config.json

@@ -0,0 +1,94 @@
+/*       百度编辑器配置   前后端通信相关的配置,注释只允许使用多行方式 */
+{
+    /* 上传图片配置项 */
+    "imageActionName": "uploadimage", /* 执行上传图片的action名称 */
+    "imageFieldName": "upfile", /* 提交的图片表单名称 */
+    "imageMaxSize": 2048000, /* 上传大小限制,单位B */
+    "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
+    "imageCompressEnable": true, /* 是否压缩图片,默认是true */
+    "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
+    "imageInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageUrlPrefix": "https://kps.scdayou.com/dfs", /* 图片访问路径前缀 */
+    "imagePathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+                                /* {time} 会替换成时间戳 */
+                                /* {yyyy} 会替换成四位年份 */
+                                /* {yy} 会替换成两位年份 */
+                                /* {mm} 会替换成两位月份 */
+                                /* {dd} 会替换成两位日期 */
+                                /* {hh} 会替换成两位小时 */
+                                /* {ii} 会替换成两位分钟 */
+                                /* {ss} 会替换成两位秒 */
+                                /* 非法字符 \ : * ? " < > | */
+                                /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+
+    /* 涂鸦图片上传配置项 */
+    "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
+    "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
+    "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "scrawlMaxSize": 2048000, /* 上传大小限制,单位B */
+    "scrawlUrlPrefix": "", /* 图片访问路径前缀 */
+    "scrawlInsertAlign": "none",
+
+    /* 截图工具上传 */
+    "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
+    "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
+    "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
+
+    /* 抓取远程图片配置 */
+    "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
+    "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
+    "catcherFieldName": "source", /* 提交的图片列表表单名称 */
+    "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "catcherUrlPrefix": "", /* 图片访问路径前缀 */
+    "catcherMaxSize": 2048000, /* 上传大小限制,单位B */
+    "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
+
+    /* 上传视频配置 */
+    "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
+    "videoFieldName": "upfile", /* 提交的视频表单名称 */
+    "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "videoUrlPrefix": "", /* 视频访问路径前缀 */
+    "videoMaxSize": 102400000, /* 上传大小限制,单位B,默认100MB */
+    "videoAllowFiles": [
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
+
+    /* 上传文件配置 */
+    "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
+    "fileFieldName": "upfile", /* 提交的文件表单名称 */
+    "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+    "fileUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileMaxSize": 51200000, /* 上传大小限制,单位B,默认50MB */
+    "fileAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ], /* 上传文件格式显示 */
+
+    /* 列出指定目录下的图片 */
+    "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
+    "imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */
+    "imageManagerListSize": 20, /* 每次列出文件数量 */
+    "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+    "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
+    "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
+
+    /* 列出指定目录下的文件 */
+    "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
+    "fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */
+    "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileManagerListSize": 20, /* 每次列出文件数量 */
+    "fileManagerAllowFiles": [
+        ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+    ] /* 列出的文件类型 */
+
+}

File diff suppressed because it is too large
+ 11856 - 0
biz-base/target/classes/ftl/land/city_price.ftl


File diff suppressed because it is too large
+ 3823 - 0
biz-base/target/classes/ftl/land/risk.ftl


二進制
biz-base/target/classes/report_template/land/risk/base.docx


二進制
biz-base/target/classes/report_template/land/risk/headline_1.docx


+ 5 - 4
common/common.iml

@@ -7,10 +7,10 @@
           <map>
             <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1691475903779" />
+            <entry key="lastExternalPluginCheckTime" value="1695084137817" />
           </map>
         </option>
-        <option name="version" value="3" />
+        <option name="version" value="4" />
       </configuration>
     </facet>
     <facet type="web" name="Web">
@@ -72,7 +72,7 @@
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
@@ -122,7 +122,7 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.72" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
@@ -172,6 +172,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-test:6.0.11" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.4.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.1.RELEASE" level="project" />

+ 5 - 0
common/pom.xml

@@ -224,6 +224,11 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
         </dependency>
+        <dependency>
+            <!-- jsoup HTML parser library @ https://jsoup.org/ -->
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>

+ 11 - 0
common/src/main/java/com/dayou/configuration/DfsConfig.java

@@ -22,9 +22,20 @@ public class DfsConfig
     private String path;
 
     //生产环境建议用nginx绑定域名映射
+
+    public String getDomainName() {
+        return domainName;
+    }
+
+    public void setDomainName(String domainName) {
+        this.domainName = domainName;
+    }
+
     /** 域名*/
     private String domain;
 
+    private String domainName;
+
     public String getPath() {
         return path;
     }

+ 11 - 4
common/src/main/java/com/dayou/configuration/WebConfig.java

@@ -1,10 +1,14 @@
 package com.dayou.configuration;
 
+import com.dayou.ueditor.ActionEnter;
+import com.dayou.ueditor.ConfigManager;
+import com.dayou.ueditor.UEditorConfig;
 import com.google.common.cache.Cache;
 import com.dayou.filter.AFilter1_CorsFilter;
 import com.dayou.interceptor.LoginInterceptor;
 import com.dayou.interceptor.PermissionInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,12 +33,9 @@ public class WebConfig implements WebMvcConfigurer {
     @Autowired
     private PermissionInterceptor permissionInterceptor;
 
-
     @Autowired
-    private Cache<String, Object> noExpireCache;
+    private UEditorConfig uEditorConfig;
 
-    @Autowired
-    private HandlerExceptionResolver handlerExceptionResolver;
 
 
 
@@ -89,6 +90,12 @@ public class WebConfig implements WebMvcConfigurer {
         return registration;
     }
 
+    @Bean
+    @ConditionalOnMissingBean(ActionEnter.class)
+    public ActionEnter actionEnter() {
+        ActionEnter actionEnter = new ActionEnter(ConfigManager.getInstance(uEditorConfig));
+        return actionEnter;
+    }
 
 
 //    @Bean

+ 2 - 0
common/src/main/java/com/dayou/constants/JwtConstants.java

@@ -28,4 +28,6 @@ public interface JwtConstants {
 
     //30分钟
     Long GIS_EXPIRATION = 60*30L;
+
+    String RESOURCE_PREFIX = "/dfs";
 }

+ 2 - 0
common/src/main/java/com/dayou/exception/ErrorCode.java

@@ -57,6 +57,8 @@ public class ErrorCode {
 
     public static final ErrorCode SETTLE_PASSWORD_ERROR = ErrorCode("10026", "抱歉,查询密码错误!请确认是当前登录用户本人查询。");
 
+    public static final ErrorCode GENERATE_REPORT_ERROR = ErrorCode("10027", "报告生成失败,请联系管理员。");
+
     private String code;
     private String errorMsg;
 

+ 0 - 7
common/src/main/java/com/dayou/interceptor/PermissionInterceptor.java

@@ -1,14 +1,7 @@
 package com.dayou.interceptor;
 
 import com.dayou.annotation.MenuAuth;
-import com.dayou.bo.LoginCacheUserBO;
-import com.dayou.bo.PrivilegeTreeBO;
-import com.dayou.exception.ErrorCode;
-import com.dayou.utils.EnumUtils;
-import com.dayou.utils.LoginContext;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;

+ 121 - 0
common/src/main/java/com/dayou/ueditor/ActionEnter.java

@@ -0,0 +1,121 @@
+package com.dayou.ueditor;
+
+
+import com.dayou.ueditor.define.ActionMap;
+import com.dayou.ueditor.define.AppInfo;
+import com.dayou.ueditor.define.BaseState;
+import com.dayou.ueditor.define.State;
+import com.dayou.ueditor.hunter.FileManager;
+import com.dayou.ueditor.hunter.ImageHunter;
+import com.dayou.ueditor.upload.Uploader;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+public class ActionEnter {
+
+    private HttpServletRequest request = null;
+
+    private String actionType = null;
+
+    private ConfigManager configManager = null;
+
+    public ActionEnter(ConfigManager configManager) {
+        this.configManager = configManager;
+    }
+
+    public String exec(HttpServletRequest request) {
+        this.request = request;
+        this.actionType = request.getParameter("action");
+        String callbackName = this.request.getParameter("callback");
+
+        if (callbackName != null) {
+
+            if (!validCallbackName(callbackName)) {
+                return new BaseState(false, AppInfo.ILLEGAL).toJSONString();
+            }
+
+            return callbackName + "(" + this.invoke() + ");";
+
+        } else {
+            return this.invoke();
+        }
+
+    }
+
+    public String invoke() {
+
+        if (actionType == null || !ActionMap.MAPPING.containsKey(actionType)) {
+            return new BaseState(false, AppInfo.INVALID_ACTION).toJSONString();
+        }
+
+        if (this.configManager == null || !this.configManager.valid()) {
+            return new BaseState(false, AppInfo.CONFIG_ERROR).toJSONString();
+        }
+
+        State state = null;
+
+        int actionCode = ActionMap.getType(this.actionType);
+
+        Map<String, Object> conf = null;
+
+        switch (actionCode) {
+
+            case ActionMap.CONFIG:
+                return this.configManager.getAllConfig().toString();
+
+            case ActionMap.UPLOAD_IMAGE:
+            case ActionMap.UPLOAD_SCRAWL:
+            case ActionMap.UPLOAD_VIDEO:
+            case ActionMap.UPLOAD_FILE:
+                conf = this.configManager.getConfig(actionCode);
+                state = new Uploader(request, conf).doExec();
+                break;
+
+            case ActionMap.CATCH_IMAGE:
+                conf = configManager.getConfig(actionCode);
+                String[] list = this.request.getParameterValues((String) conf.get("fieldName"));
+                state = new ImageHunter(conf).capture(list);
+                break;
+
+            case ActionMap.LIST_IMAGE:
+            case ActionMap.LIST_FILE:
+                conf = configManager.getConfig(actionCode);
+                int start = this.getStartIndex();
+                state = new FileManager(conf).listFile(start);
+                break;
+
+            default:
+                break;
+        }
+
+        return state.toJSONString();
+
+    }
+
+    public int getStartIndex() {
+
+        String start = this.request.getParameter("start");
+
+        try {
+            return Integer.parseInt(start);
+        } catch (Exception e) {
+            return 0;
+        }
+
+    }
+
+    /**
+     * callback参数验证
+     */
+    public boolean validCallbackName(String name) {
+
+        if (name.matches("^[a-zA-Z_]+[\\w0-9_]*$")) {
+            return true;
+        }
+
+        return false;
+
+    }
+
+}

+ 209 - 0
common/src/main/java/com/dayou/ueditor/ConfigManager.java

@@ -0,0 +1,209 @@
+package com.dayou.ueditor;
+
+
+import com.dayou.ueditor.define.ActionMap;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * 配置管理器
+ *
+ * @author hancong03@baidu.com
+ */
+public final class ConfigManager {
+
+    private static final String configFileName = "config.json";
+    private JSONObject jsonConfig = null;
+    // 涂鸦上传filename定义
+    private final static String SCRAWL_FILE_NAME = "scrawl";
+    // 远程图片抓取filename定义
+    private final static String REMOTE_FILE_NAME = "remote";
+    //配置信息
+    private UEditorConfig uEditorConfig;
+
+    /*
+     * 通过一个给定的路径构建一个配置管理器, 该管理器要求地址路径所在目录下必须存在config.properties文件
+     */
+    private ConfigManager(UEditorConfig uEditorConfig) throws IOException {
+        this.uEditorConfig = uEditorConfig;
+        String configPath = uEditorConfig.getConfig();
+        configPath = configPath == null || configPath.isEmpty() ? configFileName : configPath;
+        this.initEnv(configPath);
+    }
+
+    /**
+     * 配置管理器构造工厂
+     *
+     * @param uEditorConfig 配置文件
+     * @return 配置管理器实例或者null
+     */
+    public static ConfigManager getInstance(UEditorConfig uEditorConfig) {
+
+        try {
+            return new ConfigManager(uEditorConfig);
+        } catch (Exception e) {
+            System.err.println("UEditor ConfigManager load error~");
+            return null;
+        }
+
+    }
+
+    // 验证配置文件加载是否正确
+    public boolean valid() {
+        return this.jsonConfig != null;
+    }
+
+    public JSONObject getAllConfig() {
+
+        return this.jsonConfig;
+
+    }
+
+    public Map<String, Object> getConfig(int type) {
+
+        Map<String, Object> conf = new HashMap<String, Object>();
+        String savePath = null;
+
+        try {
+            switch (type) {
+
+                case ActionMap.UPLOAD_FILE:
+                    conf.put("isBase64", "false");
+                    conf.put("maxSize", this.jsonConfig.getLong("fileMaxSize"));
+                    conf.put("allowFiles", this.getArray("fileAllowFiles"));
+                    conf.put("fieldName", this.jsonConfig.getString("fileFieldName"));
+                    savePath = this.jsonConfig.getString("filePathFormat");
+                    break;
+
+                case ActionMap.UPLOAD_IMAGE:
+                    conf.put("isBase64", "false");
+                    conf.put("maxSize", this.jsonConfig.getLong("imageMaxSize"));
+                    conf.put("allowFiles", this.getArray("imageAllowFiles"));
+                    conf.put("fieldName", this.jsonConfig.getString("imageFieldName"));
+                    savePath = this.jsonConfig.getString("imagePathFormat");
+                    break;
+
+                case ActionMap.UPLOAD_VIDEO:
+                    conf.put("maxSize", this.jsonConfig.getLong("videoMaxSize"));
+                    conf.put("allowFiles", this.getArray("videoAllowFiles"));
+                    conf.put("fieldName", this.jsonConfig.getString("videoFieldName"));
+                    savePath = this.jsonConfig.getString("videoPathFormat");
+                    break;
+
+                case ActionMap.UPLOAD_SCRAWL:
+                    conf.put("filename", ConfigManager.SCRAWL_FILE_NAME);
+                    conf.put("maxSize", this.jsonConfig.getLong("scrawlMaxSize"));
+                    conf.put("fieldName", this.jsonConfig.getString("scrawlFieldName"));
+                    conf.put("isBase64", "true");
+                    savePath = this.jsonConfig.getString("scrawlPathFormat");
+                    break;
+
+                case ActionMap.CATCH_IMAGE:
+                    conf.put("filename", ConfigManager.REMOTE_FILE_NAME);
+                    conf.put("filter", this.getArray("catcherLocalDomain"));
+                    conf.put("maxSize", this.jsonConfig.getLong("catcherMaxSize"));
+                    conf.put("allowFiles", this.getArray("catcherAllowFiles"));
+                    conf.put("fieldName", this.jsonConfig.getString("catcherFieldName") + "[]");
+                    savePath = this.jsonConfig.getString("catcherPathFormat");
+                    break;
+
+                case ActionMap.LIST_IMAGE:
+                    conf.put("allowFiles", this.getArray("imageManagerAllowFiles"));
+                    conf.put("dir", this.jsonConfig.getString("imageManagerListPath"));
+                    conf.put("count", this.jsonConfig.getInt("imageManagerListSize"));
+                    break;
+
+                case ActionMap.LIST_FILE:
+                    conf.put("allowFiles", this.getArray("fileManagerAllowFiles"));
+                    conf.put("dir", this.jsonConfig.getString("fileManagerListPath"));
+                    conf.put("count", this.jsonConfig.getInt("fileManagerListSize"));
+                    break;
+                default:
+                    break;
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        conf.put("savePath", savePath);
+        conf.put("rootPath", uEditorConfig.getUploadPath());
+        conf.put("urlPrefix", uEditorConfig.getUrlPrefix());
+        return conf;
+
+    }
+
+    private void initEnv(String configPath) throws IOException {
+
+        String configContent = this.readFile(configPath);
+
+        try {
+            JSONObject jsonConfig = new JSONObject(configContent);
+            //统一url访问前缀
+            if (uEditorConfig.getUnified()) {
+                Iterator iterator = jsonConfig.keys();
+                while (iterator.hasNext()) {
+                    String key = (String) iterator.next();
+                    if (key.contains("UrlPrefix")) {
+                        jsonConfig.put(key, uEditorConfig.getUrlPrefix());
+                    }
+                }
+            }
+            this.jsonConfig = jsonConfig;
+        } catch (Exception e) {
+            this.jsonConfig = null;
+        }
+
+    }
+
+    private String[] getArray(String key) throws JSONException {
+
+        JSONArray jsonArray = this.jsonConfig.getJSONArray(key);
+        String[] result = new String[jsonArray.length()];
+
+        for (int i = 0, len = jsonArray.length(); i < len; i++) {
+            result[i] = jsonArray.getString(i);
+        }
+
+        return result;
+
+    }
+
+    private String readFile(String path) throws IOException {
+
+        StringBuilder builder = new StringBuilder();
+
+        try {
+            InputStream inputStream = getClass().getClassLoader().getResourceAsStream(path);
+            InputStreamReader reader = new InputStreamReader(inputStream, "UTF-8");
+            BufferedReader bfReader = new BufferedReader(reader);
+
+            String tmpContent = null;
+
+            while ((tmpContent = bfReader.readLine()) != null) {
+                builder.append(tmpContent);
+            }
+
+            bfReader.close();
+
+        } catch (UnsupportedEncodingException e) {
+            // 忽略
+        }
+
+        return this.filter(builder.toString());
+
+    }
+
+    // 过滤输入字符串, 剔除多行注释以及替换掉反斜杠
+    private String filter(String input) {
+
+        return input.replaceAll("/\\*[\\s\\S]*?\\*/", "");
+
+    }
+
+}

+ 24 - 0
common/src/main/java/com/dayou/ueditor/Encoder.java

@@ -0,0 +1,24 @@
+package com.dayou.ueditor;
+
+public class Encoder {
+
+	public static String toUnicode ( String input ) {
+		
+		StringBuilder builder = new StringBuilder();
+		char[] chars = input.toCharArray();
+		
+		for ( char ch : chars ) {
+			
+			if ( ch < 256 ) {
+				builder.append( ch );
+			} else {
+				builder.append( "\\u" +  Integer.toHexString( ch& 0xffff ) );
+			}
+			
+		}
+		
+		return builder.toString();
+		
+	}
+	
+}

+ 153 - 0
common/src/main/java/com/dayou/ueditor/PathFormat.java

@@ -0,0 +1,153 @@
+package com.dayou.ueditor;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PathFormat {
+
+    private static final String TIME = "time";
+    private static final String FULL_YEAR = "yyyy";
+    private static final String YEAR = "yy";
+    private static final String MONTH = "mm";
+    private static final String DAY = "dd";
+    private static final String HOUR = "hh";
+    private static final String MINUTE = "ii";
+    private static final String SECOND = "ss";
+    private static final String RAND = "rand";
+    private static Pattern patternOne = Pattern.compile("\\{([^\\}]+)\\}", Pattern.CASE_INSENSITIVE);
+    private static Pattern patternTwo = Pattern.compile("\\{([^\\}]+)\\}", Pattern.CASE_INSENSITIVE);
+
+    private static Date currentDate = null;
+
+    public static String parse(String input) {
+
+        Matcher matcher = patternOne.matcher(input);
+
+        PathFormat.currentDate = new Date();
+
+        StringBuffer sb = new StringBuffer();
+
+        while (matcher.find()) {
+
+            matcher.appendReplacement(sb, PathFormat.getString(matcher.group(1)));
+
+        }
+
+        matcher.appendTail(sb);
+
+        return sb.toString();
+    }
+
+    /**
+     * 格式化路径, 把windows路径替换成标准路径
+     *
+     * @param input 待格式化的路径
+     * @return 格式化后的路径
+     */
+    public static String format(String input) {
+
+        return input.replace("\\", "/");
+
+    }
+
+    public static String parse(String input, String filename) {
+
+        Matcher matcher = patternTwo.matcher(input);
+        String matchStr = null;
+
+        PathFormat.currentDate = new Date();
+
+        StringBuffer sb = new StringBuffer();
+
+        while (matcher.find()) {
+
+            matchStr = matcher.group(1);
+            if (matchStr.indexOf("filename") != -1) {
+                filename = filename.replace("$", "\\$").replaceAll("[\\/:*?\"<>|]", "");
+                matcher.appendReplacement(sb, filename);
+            } else {
+                matcher.appendReplacement(sb, PathFormat.getString(matchStr));
+            }
+
+        }
+
+        matcher.appendTail(sb);
+
+        return sb.toString();
+    }
+
+    private static String getString(String pattern) {
+
+        pattern = pattern.toLowerCase();
+
+        // time 处理
+        if (pattern.indexOf(PathFormat.TIME) != -1) {
+            return PathFormat.getTimestamp();
+        } else if (pattern.indexOf(PathFormat.FULL_YEAR) != -1) {
+            return PathFormat.getFullYear();
+        } else if (pattern.indexOf(PathFormat.YEAR) != -1) {
+            return PathFormat.getYear();
+        } else if (pattern.indexOf(PathFormat.MONTH) != -1) {
+            return PathFormat.getMonth();
+        } else if (pattern.indexOf(PathFormat.DAY) != -1) {
+            return PathFormat.getDay();
+        } else if (pattern.indexOf(PathFormat.HOUR) != -1) {
+            return PathFormat.getHour();
+        } else if (pattern.indexOf(PathFormat.MINUTE) != -1) {
+            return PathFormat.getMinute();
+        } else if (pattern.indexOf(PathFormat.SECOND) != -1) {
+            return PathFormat.getSecond();
+        } else if (pattern.indexOf(PathFormat.RAND) != -1) {
+            return PathFormat.getRandom(pattern);
+        }
+
+        return pattern;
+
+    }
+
+    private static String getTimestamp() {
+        return System.currentTimeMillis() + "";
+    }
+
+    private static String getFullYear() {
+        return new SimpleDateFormat("yyyy").format(PathFormat.currentDate);
+    }
+
+    private static String getYear() {
+        return new SimpleDateFormat("yy").format(PathFormat.currentDate);
+    }
+
+    private static String getMonth() {
+        return new SimpleDateFormat("MM").format(PathFormat.currentDate);
+    }
+
+    private static String getDay() {
+        return new SimpleDateFormat("dd").format(PathFormat.currentDate);
+    }
+
+    private static String getHour() {
+        return new SimpleDateFormat("HH").format(PathFormat.currentDate);
+    }
+
+    private static String getMinute() {
+        return new SimpleDateFormat("mm").format(PathFormat.currentDate);
+    }
+
+    private static String getSecond() {
+        return new SimpleDateFormat("ss").format(PathFormat.currentDate);
+    }
+
+    private static String getRandom(String pattern) {
+
+        int length = 0;
+        pattern = pattern.split(":")[1].trim();
+
+        length = Integer.parseInt(pattern);
+
+        return (Math.random() + "").replace(".", "").substring(0, length);
+
+    }
+
+}

+ 61 - 0
common/src/main/java/com/dayou/ueditor/UEditorConfig.java

@@ -0,0 +1,61 @@
+package com.dayou.ueditor;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Created by pangxiaofeng on 2017/9/27.
+ */
+@ConfigurationProperties(prefix = "ueditor")
+@Configuration
+public class UEditorConfig {
+
+    /**
+     * config.json的文件存放地址
+     */
+    private String config;
+    /**
+     * 是否同统一上传地址:图片上传地址,视频上传地址...
+     */
+    private boolean unified;
+    /**
+     * 文件上传路径
+     */
+    private String uploadPath;
+    /**
+     * 文件url前缀
+     */
+    private String urlPrefix;
+
+    public String getConfig() {
+        return config;
+    }
+
+    public void setConfig(String config) {
+        this.config = config;
+    }
+
+    public String getUploadPath() {
+        return uploadPath;
+    }
+
+    public void setUploadPath(String uploadPath) {
+        this.uploadPath = uploadPath;
+    }
+
+    public String getUrlPrefix() {
+        return urlPrefix;
+    }
+
+    public void setUrlPrefix(String urlPrefix) {
+        this.urlPrefix = urlPrefix;
+    }
+
+    public boolean getUnified() {
+        return unified;
+    }
+
+    public void setUnified(boolean unified) {
+        this.unified = unified;
+    }
+}

+ 42 - 0
common/src/main/java/com/dayou/ueditor/define/ActionMap.java

@@ -0,0 +1,42 @@
+package com.dayou.ueditor.define;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 定义请求action类型
+ * @author hancong03@baidu.com
+ *
+ */
+@SuppressWarnings("serial")
+public final class ActionMap {
+
+	public static final Map<String, Integer> MAPPING;
+	// 获取配置请求
+	public static final int CONFIG = 0;
+	public static final int UPLOAD_IMAGE = 1;
+	public static final int UPLOAD_SCRAWL = 2;
+	public static final int UPLOAD_VIDEO = 3;
+	public static final int UPLOAD_FILE = 4;
+	public static final int CATCH_IMAGE = 5;
+	public static final int LIST_FILE = 6;
+	public static final int LIST_IMAGE = 7;
+	
+	static {
+		MAPPING = new HashMap<String, Integer>(){{
+			put( "config", ActionMap.CONFIG );
+			put( "uploadimage", ActionMap.UPLOAD_IMAGE );
+			put( "uploadscrawl", ActionMap.UPLOAD_SCRAWL );
+			put( "uploadvideo", ActionMap.UPLOAD_VIDEO );
+			put( "uploadfile", ActionMap.UPLOAD_FILE );
+			put( "catchimage", ActionMap.CATCH_IMAGE );
+			put( "listfile", ActionMap.LIST_FILE );
+			put( "listimage", ActionMap.LIST_IMAGE );
+		}};
+	}
+	
+	public static int getType ( String key ) {
+		return ActionMap.MAPPING.get( key );
+	}
+	
+}

+ 5 - 0
common/src/main/java/com/dayou/ueditor/define/ActionState.java

@@ -0,0 +1,5 @@
+package com.dayou.ueditor.define;
+
+public enum ActionState {
+	UNKNOW_ERROR
+}

+ 77 - 0
common/src/main/java/com/dayou/ueditor/define/AppInfo.java

@@ -0,0 +1,77 @@
+package com.dayou.ueditor.define;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class AppInfo {
+	
+	public static final int SUCCESS = 0;
+	public static final int MAX_SIZE = 1;
+	public static final int PERMISSION_DENIED = 2;
+	public static final int FAILED_CREATE_FILE = 3;
+	public static final int IO_ERROR = 4;
+	public static final int NOT_MULTIPART_CONTENT = 5;
+	public static final int PARSE_REQUEST_ERROR = 6;
+	public static final int NOTFOUND_UPLOAD_DATA = 7;
+	public static final int NOT_ALLOW_FILE_TYPE = 8;
+	
+	public static final int INVALID_ACTION = 101;
+	public static final int CONFIG_ERROR = 102;
+	
+	public static final int PREVENT_HOST = 201;
+	public static final int CONNECTION_ERROR = 202;
+	public static final int REMOTE_FAIL = 203;
+	
+	public static final int NOT_DIRECTORY = 301;
+	public static final int NOT_EXIST = 302;
+	
+	public static final int ILLEGAL = 401;
+
+	public static Map<Integer, String> info = new HashMap<Integer, String>(){{
+		
+		put( AppInfo.SUCCESS, "SUCCESS" );
+		
+		// 无效的Action
+		put( AppInfo.INVALID_ACTION, "\u65E0\u6548\u7684Action" );
+		// 配置文件初始化失败
+		put( AppInfo.CONFIG_ERROR, "\u914D\u7F6E\u6587\u4EF6\u521D\u59CB\u5316\u5931\u8D25" );
+		// 抓取远程图片失败
+		put( AppInfo.REMOTE_FAIL, "\u6293\u53D6\u8FDC\u7A0B\u56FE\u7247\u5931\u8D25" );
+		
+		// 被阻止的远程主机
+		put( AppInfo.PREVENT_HOST, "\u88AB\u963B\u6B62\u7684\u8FDC\u7A0B\u4E3B\u673A" );
+		// 远程连接出错
+		put( AppInfo.CONNECTION_ERROR, "\u8FDC\u7A0B\u8FDE\u63A5\u51FA\u9519" );
+		
+		// "文件大小超出限制"
+		put( AppInfo.MAX_SIZE, "\u6587\u4ef6\u5927\u5c0f\u8d85\u51fa\u9650\u5236" );
+		// 权限不足, 多指写权限
+		put( AppInfo.PERMISSION_DENIED, "\u6743\u9650\u4E0D\u8DB3" );
+		// 创建文件失败
+		put( AppInfo.FAILED_CREATE_FILE, "\u521B\u5EFA\u6587\u4EF6\u5931\u8D25" );
+		// IO错误
+		put( AppInfo.IO_ERROR, "IO\u9519\u8BEF" );
+		// 上传表单不是multipart/form-data类型
+		put( AppInfo.NOT_MULTIPART_CONTENT, "\u4E0A\u4F20\u8868\u5355\u4E0D\u662Fmultipart/form-data\u7C7B\u578B" );
+		// 解析上传表单错误
+		put( AppInfo.PARSE_REQUEST_ERROR, "\u89E3\u6790\u4E0A\u4F20\u8868\u5355\u9519\u8BEF" );
+		// 未找到上传数据
+		put( AppInfo.NOTFOUND_UPLOAD_DATA, "\u672A\u627E\u5230\u4E0A\u4F20\u6570\u636E" );
+		// 不允许的文件类型
+		put( AppInfo.NOT_ALLOW_FILE_TYPE, "\u4E0D\u5141\u8BB8\u7684\u6587\u4EF6\u7C7B\u578B" );
+		
+		// 指定路径不是目录
+		put( AppInfo.NOT_DIRECTORY, "\u6307\u5B9A\u8DEF\u5F84\u4E0D\u662F\u76EE\u5F55" );
+		// 指定路径并不存在
+		put( AppInfo.NOT_EXIST, "\u6307\u5B9A\u8DEF\u5F84\u5E76\u4E0D\u5B58\u5728" );
+		
+		// callback参数名不合法
+		put( AppInfo.ILLEGAL, "Callback\u53C2\u6570\u540D\u4E0D\u5408\u6CD5" );
+		
+	}};
+	
+	public static String getStateInfo ( int key ) {
+		return AppInfo.info.get( key );
+	}
+	
+}

+ 93 - 0
common/src/main/java/com/dayou/ueditor/define/BaseState.java

@@ -0,0 +1,93 @@
+package com.dayou.ueditor.define;
+
+
+import com.dayou.ueditor.Encoder;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class BaseState implements State {
+
+    private boolean state = false;
+    private String info = null;
+
+    private Map<String, String> infoMap = new HashMap<String, String>();
+
+    public BaseState() {
+        this.state = true;
+    }
+
+    public BaseState(boolean state) {
+        this.setState(state);
+    }
+
+    public BaseState(boolean state, String info) {
+        this.setState(state);
+        this.info = info;
+    }
+
+    public BaseState(boolean state, int infoCode) {
+        this.setState(state);
+        this.info = AppInfo.getStateInfo(infoCode);
+    }
+
+    @Override
+    public boolean isSuccess() {
+        return this.state;
+    }
+
+    public void setState(boolean state) {
+        this.state = state;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public void setInfo(int infoCode) {
+        this.info = AppInfo.getStateInfo(infoCode);
+    }
+
+    @Override
+    public String toJSONString() {
+        return this.toString();
+    }
+
+    @Override
+    public String toString() {
+
+        String key = null;
+        String stateVal = this.isSuccess() ? AppInfo.getStateInfo(AppInfo.SUCCESS) : this.info;
+
+        StringBuilder builder = new StringBuilder();
+
+        builder.append("{\"state\": \"" + stateVal + "\"");
+
+        Iterator<String> iterator = this.infoMap.keySet().iterator();
+
+        while (iterator.hasNext()) {
+
+            key = iterator.next();
+
+            builder.append(",\"" + key + "\": \"" + this.infoMap.get(key) + "\"");
+
+        }
+
+        builder.append("}");
+
+        return Encoder.toUnicode(builder.toString());
+
+    }
+
+    @Override
+    public void putInfo(String name, String val) {
+        this.infoMap.put(name, val);
+    }
+
+    @Override
+    public void putInfo(String name, long val) {
+        this.putInfo(name, val + "");
+    }
+
+}

+ 31 - 0
common/src/main/java/com/dayou/ueditor/define/FileType.java

@@ -0,0 +1,31 @@
+package com.dayou.ueditor.define;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FileType {
+
+	public static final String JPG = "JPG";
+	
+	private static final Map<String, String> types = new HashMap<String, String>(){{
+		
+		put( FileType.JPG, ".jpg" );
+		
+	}};
+	
+	public static String getSuffix ( String key ) {
+		return FileType.types.get( key );
+	}
+	
+	/**
+	 * 根据给定的文件名,获取其后缀信息
+	 * @param filename
+	 * @return
+	 */
+	public static String getSuffixByFilename ( String filename ) {
+		
+		return filename.substring( filename.lastIndexOf( "." ) ).toLowerCase();
+		
+	}
+	
+}

+ 20 - 0
common/src/main/java/com/dayou/ueditor/define/MIMEType.java

@@ -0,0 +1,20 @@
+package com.dayou.ueditor.define;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MIMEType {
+
+	public static final Map<String, String> types = new HashMap<String, String>(){{
+		put( "image/gif", ".gif" );
+		put( "image/jpeg", ".jpg" );
+		put( "image/jpg", ".jpg" );
+		put( "image/png", ".png" );
+		put( "image/bmp", ".bmp" );
+	}};
+	
+	public static String getSuffix ( String mime ) {
+		return MIMEType.types.get( mime );
+	}
+	
+}

+ 109 - 0
common/src/main/java/com/dayou/ueditor/define/MultiState.java

@@ -0,0 +1,109 @@
+package com.dayou.ueditor.define;
+
+
+import com.dayou.ueditor.Encoder;
+
+import java.util.*;
+
+/**
+ * 多状态集合状态
+ * 其包含了多个状态的集合, 其本身自己也是一个状态
+ * @author hancong03@baidu.com
+ *
+ */
+public class MultiState implements State {
+
+	private boolean state = false;
+	private String info = null;
+	private Map<String, Long> intMap = new HashMap<String, Long>();
+	private Map<String, String> infoMap = new HashMap<String, String>();
+	private List<String> stateList = new ArrayList<String>();
+
+	public MultiState ( boolean state ) {
+		this.state = state;
+	}
+
+	public MultiState ( boolean state, String info ) {
+		this.state = state;
+		this.info = info;
+	}
+
+	public MultiState ( boolean state, int infoKey ) {
+		this.state = state;
+		this.info = AppInfo.getStateInfo( infoKey );
+	}
+
+	@Override
+	public boolean isSuccess() {
+		return this.state;
+	}
+
+	public void addState ( State state ) {
+		stateList.add( state.toJSONString() );
+	}
+
+	/**
+	 * 该方法调用无效果
+	 */
+	@Override
+	public void putInfo(String name, String val) {
+		this.infoMap.put(name, val);
+	}
+
+	@Override
+	public String toJSONString() {
+
+		String stateVal = isSuccess() ? AppInfo.getStateInfo( AppInfo.SUCCESS ) : this.info;
+
+		StringBuilder builder = new StringBuilder();
+
+		builder.append( "{\"state\": \"" + stateVal + "\"" );
+
+		// 数字转换
+		Iterator<String> iterator = this.intMap.keySet().iterator();
+
+		while ( iterator.hasNext() ) {
+
+			stateVal = iterator.next();
+
+			builder.append( ",\""+ stateVal +"\": " + this.intMap.get( stateVal ) );
+
+		}
+
+		iterator = this.infoMap.keySet().iterator();
+
+		while ( iterator.hasNext() ) {
+
+			stateVal = iterator.next();
+
+			builder.append( ",\""+ stateVal +"\": \"" + this.infoMap.get( stateVal ) + "\"" );
+
+		}
+
+		builder.append( ", list: [" );
+
+
+		iterator = this.stateList.iterator();
+
+		while ( iterator.hasNext() ) {
+
+			builder.append( iterator.next() + "," );
+
+		}
+
+		if ( this.stateList.size() > 0 ) {
+			builder.deleteCharAt( builder.length() - 1 );
+		}
+
+		builder.append( " ]}" );
+
+		return Encoder.toUnicode( builder.toString() );
+
+	}
+
+	@Override
+	public void putInfo(String name, long val) {
+		this.intMap.put( name, val );
+	}
+
+}

+ 18 - 0
common/src/main/java/com/dayou/ueditor/define/State.java

@@ -0,0 +1,18 @@
+package com.dayou.ueditor.define;
+
+/**
+ * 处理状态接口
+ * @author hancong03@baidu.com
+ *
+ */
+public interface State {
+	
+	public boolean isSuccess();
+	
+	public void putInfo(String name, String val);
+	
+	public void putInfo(String name, long val);
+	
+	public String toJSONString();
+
+}

+ 0 - 0
common/src/main/java/com/dayou/ueditor/define/UeRespoVO.java


Some files were not shown because too many files changed in this diff