增加字段

.idea/compiler.xml

@@ -23,15 +23,15 @@
           <entry name="$MAVEN_REPOSITORY$/joda-time/joda-time/2.9/joda-time-2.9.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar" />
         </processorPath>
-        <module name="generator" />
-        <module name="framework" />
+        <module name="admin" />
         <module name="scheduled" />
+        <module name="config" />
         <module name="system" />
-        <module name="distribution" />
         <module name="example" />
+        <module name="framework" />
         <module name="bootstrap" />
-        <module name="config" />
-        <module name="admin" />
+        <module name="distribution" />
+        <module name="generator" />
       </profile>
     </annotationProcessing>
   </component>

.idea/workspace.xml

@@ -12,30 +12,46 @@
       <change beforePath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/target/classes/config/application-prod.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/target/classes/config/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/classes/config/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NewsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NewsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticetypeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticetypeService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
     </list>
     <list id="4a792d78-9a34-41da-b33b-8e23add163e1" name="1" comment="">
       <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/framework-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/framework-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" />
@@ -96,7 +112,7 @@
   <component name="MavenImportPreferences">
     <option name="enabledProfiles">
       <list>
-        <option value="prod" />
+        <option value="uat" />
       </list>
     </option>
     <option name="disabledProfiles">
@@ -497,6 +513,11 @@
       <workItem from="1631237208541" duration="24000" />
       <workItem from="1631237259352" duration="915000" />
       <workItem from="1631878712214" duration="2130000" />
+      <workItem from="1638437921364" duration="2000000" />
+      <workItem from="1638443514822" duration="614000" />
+      <workItem from="1638445910881" duration="612000" />
+      <workItem from="1638494470087" duration="26000" />
+      <workItem from="1639017569756" duration="3127000" />
     </task>
     <task id="LOCAL-00001" summary="上传项目">
       <created>1625797686627</created>
@@ -577,70 +598,34 @@
     <option name="LAST_COMMIT_MESSAGE" value="新闻表 增加描述字段" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="361" y="74" key="#Plugins" timestamp="1624963006648">
+    <state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1639017664789">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="361" y="74" key="#Plugins/0.0.1536.824@0.0.1536.824" timestamp="1624963006648" />
-    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1625040317986">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1625040317986" />
-    <state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1631169479489">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1631169479489" />
-    <state x="586" y="22" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog" timestamp="1628749112112">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="586" y="22" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/0.0.1536.824@0.0.1536.824" timestamp="1628749112112" />
-    <state x="495" y="252" width="618" height="319" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1624930043181">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="495" y="252" width="618" height="319" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1536.824@0.0.1536.824" timestamp="1624930043181" />
-    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1625629042847">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1625629042847" />
-    <state x="499" y="159" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog" timestamp="1625562302652">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="499" y="159" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1536.824@0.0.1536.824" timestamp="1625562302652" />
-    <state x="434" y="57" width="661" height="767" key="#xdebugger.evaluate" timestamp="1625564326839">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="434" y="57" width="661" height="767" key="#xdebugger.evaluate/0.0.1536.824@0.0.1536.824" timestamp="1625564326839" />
+    <state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1639017664789" />
     <state x="346" y="0" key="CommitChangelistDialog2" timestamp="1631254868972">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1631254868972" />
-    <state width="657" height="618" key="DebuggerActiveHint" timestamp="1625564044324">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="657" height="618" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1625564044324" />
     <state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1631254854045">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1631254854045" />
-    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1625797418458">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1625797418458" />
-    <state width="1493" height="162" key="GridCell.Tab.0.bottom" timestamp="1631880669274">
+    <state width="1493" height="325" key="GridCell.Tab.0.bottom" timestamp="1639019356756">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="162" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1631880669274" />
-    <state width="1493" height="162" key="GridCell.Tab.0.center" timestamp="1631880669274">
+    <state width="1493" height="325" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
+    <state width="1493" height="325" key="GridCell.Tab.0.center" timestamp="1639019356756">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="162" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1631880669274" />
-    <state width="1493" height="162" key="GridCell.Tab.0.left" timestamp="1631880669274">
+    <state width="1493" height="325" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
+    <state width="1493" height="325" key="GridCell.Tab.0.left" timestamp="1639019356756">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="162" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1631880669274" />
-    <state width="1493" height="162" key="GridCell.Tab.0.right" timestamp="1631880669274">
+    <state width="1493" height="325" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
+    <state width="1493" height="325" key="GridCell.Tab.0.right" timestamp="1639019356756">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="162" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1631880669274" />
+    <state width="1493" height="325" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
     <state width="1493" height="321" key="GridCell.Tab.1.bottom" timestamp="1631154135992">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -657,18 +642,6 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1493" height="321" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1631154135992" />
-    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1624930037217">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1624930037217" />
-    <state x="408" y="30" key="NewModule_or_Project.wizard" timestamp="1625044053131">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="408" y="30" key="NewModule_or_Project.wizard/0.0.1536.824@0.0.1536.824" timestamp="1625044053131" />
-    <state x="249" y="0" width="1250" height="824" key="SettingsEditor" timestamp="1625044058689">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="249" y="0" width="1250" height="824" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1625044058689" />
     <state x="703" y="321" key="VCS.ChangelistChooser" timestamp="1631254852181">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -677,38 +650,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1631255107978" />
-    <state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1625564074239">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="775" height="419" key="XDebugger.FullValuePopup/0.0.1536.824@0.0.1536.824" timestamp="1625564074239" />
-    <state x="565" y="190" key="chooseDestDirectoryDialog" timestamp="1624930042155">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="565" y="190" key="chooseDestDirectoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1624930042155" />
-    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1625562177079">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1625562177079" />
-    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1629272807133">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1629272807133" />
-    <state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1625021359303">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1625021359303" />
     <state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1631153549690">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1631153549690" />
-    <state x="550" y="185" key="git4idea.merge.GitPullDialog" timestamp="1625797427678">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="550" y="185" key="git4idea.merge.GitPullDialog/0.0.1536.824@0.0.1536.824" timestamp="1625797427678" />
-    <state x="425" y="187" key="run.anything.popup" timestamp="1625651453194">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1625651453194" />
     <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1631152017201">
       <screen x="0" y="0" width="1536" height="824" />
     </state>

admin/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:53:53 CST 2021
+#Thu Dec 09 10:42:31 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=admin

bootstrap/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:31 CST 2021
+#Thu Dec 09 10:42:52 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=bootstrap

config/target/classes/config/application-prod.yml

-spring-boot-plus:
-  # 是否启用ansi控制台输出有颜色的字体，dev环境建议开启，服务器环境设置为false
-  enable-ansi: true
-  # 当前环境服务IP地址
-  server-ip: 114.67.82.178
-  # 文件上传下载配置
-  upload-path: /opt/upload/
-  taskstatus: 1
-
-
-spring:
-  datasource:
-    url: jdbc:mysql://114.67.82.178:3306/hxh?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: root
-    password: changfa123$
-
-  # Redis配置
-  redis:
-    database: 0
-    # redis   bus123$ 8976   127.0.0.1  dapchina  6390
-    host: 127.0.0.1
-    password: bus123$
-    port: 8976
-
-# 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-data:
-  path:
-    template: D:\\svn-repository\\spms\\template\\
-    produce: D:\\svn-repository\\spms\\produce\\

config/target/classes/config/application.yml

@@ -40,7 +40,7 @@ spring:
 ---
 spring:
   profiles:
-    active: prod
+    active: uat
 
 # logback.xml中有详细的日志配置
 logging:

config/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:53:58 CST 2021
+#Thu Dec 09 10:42:34 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=config

distribution/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:32 CST 2021
+#Thu Dec 09 10:42:53 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=distribution

framework/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:09 CST 2021
+#Thu Dec 09 10:42:40 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=framework

generator/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:39 CST 2021
+#Thu Dec 09 10:42:55 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=generator

hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java

@@ -22,6 +22,7 @@ import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
 import io.geekidea.springbootplus.framework.core.validator.groups.Add;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import org.apache.commons.text.StringEscapeUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.validation.annotation.Validated;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -188,5 +189,33 @@ public class NoticeController extends BaseController {
         return ApiResult.ok(paging);
     }
 
+
+    @GetMapping("/getPayInfo")
+    @OperationLogIgnore
+    @ApiOperation(value = "获取某天银联无感文件", notes = "获取某天银联无感文件")
+    public ApiResult<Object> getOnlpayFile(@Param("day") String day) throws Exception {
+
+        HashMap<String,Object> info = noticetypeService.getOnlpayFile(day);
+
+        if(info.get("code").toString().equals("200")){
+            return ApiResult.ok(info.get("data"));
+        }else{
+            return ApiResult.result(ApiCode.FAIL,info.get("info").toString(),null);
+        }
+    }
+
+    @GetMapping("/getPayInfoDetail")
+    @OperationLogIgnore
+    @ApiOperation(value = "获取某天银联无感文件", notes = "获取某天银联无感文件")
+    public ApiResult<Object> getPayInfoDetail(@Param("day") String day) throws Exception {
+
+        HashMap<String,Object> info = noticetypeService.getPayInfoDetail(day);
+
+        if(info.get("code").toString().equals("200")){
+            return ApiResult.ok(info.get("data"));
+        }else{
+            return ApiResult.result(ApiCode.FAIL,info.get("info").toString(),null);
+        }
+    }
 }
 

hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java

@@ -54,4 +54,8 @@ public interface NoticetypeService extends BaseService<Noticetype> {
     Paging<Noticetype> getNoticetypePageList(NoticetypePageParam noticetypePageParam) throws Exception;
 
     HashMap<String, Object> noticeTypeList();
+
+    HashMap<String, Object> getOnlpayFile(String day);
+
+    HashMap<String, Object> getPayInfoDetail(String day);
 }

hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java

@@ -13,13 +13,20 @@ import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.io.IOUtils;
 import org.springframework.transaction.annotation.Transactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.io.*;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
 /**
  *  服务实现类
@@ -101,4 +108,94 @@ public class NoticetypeServiceImpl extends BaseServiceImpl<NoticetypeMapper, Not
         return hashMap;
     }
 
+    @Override
+    public HashMap<String, Object> getOnlpayFile(String day) {
+        HashMap<String, Object> hashMap = new HashMap<>();
+        String filepath = "/root/onlpay/"+day;
+        System.out.println("filepath = " + filepath);
+        File directory = new File(filepath);
+        if(directory.exists()){
+            File[] fileArr = directory.listFiles();
+            StringBuffer content = new StringBuffer();
+            for (int i = 0; i < fileArr.length; i++) {
+                File fileOne = fileArr[i];
+                System.out.println("fileOne.getName() = " + fileOne.getName());
+                System.out.println("fileOne.getName().indexOf(day+\".txt.gz\") = " + fileOne.getName().indexOf(day+".txt.gz"));
+                if(fileOne.getName().indexOf(day+".txt.gz")>=0 && fileOne.getName().indexOf("pre_balance")>=0 ){
+                    try {
+                        File zipfile = new File("/root/onlpay/"+day+"/"+fileOne.getName());
+
+                        InputStream in = new GZIPInputStream(new FileInputStream(zipfile));
+                        List<String> list = IOUtils.readLines(in, "GBK");
+                        for (int j = 1; j < list.size()-1; j++) {
+                            String string = list.get(j);
+                            content.append(string+"，");
+                            System.out.println(string);
+                        }
+
+                        //一定记得关闭流
+                        in.close();
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                }
+            }
+            hashMap.put("code","200");
+            hashMap.put("info","查询成功");
+            hashMap.put("data",content);
+        }else{
+            hashMap.put("code","500");
+            hashMap.put("info","目录不存在");
+        }
+        return hashMap;
+    }
+
+    @Override
+    public HashMap<String, Object> getPayInfoDetail(String day) {
+        HashMap<String, Object> hashMap = new HashMap<>();
+        String filepath = "/root/onlpay/"+day;
+        System.out.println("filepath = " + filepath);
+        File directory = new File(filepath);
+        if(directory.exists()){
+            File[] fileArr = directory.listFiles();
+            StringBuffer content = new StringBuffer();
+            for (int i = 0; i < fileArr.length; i++) {
+                File fileOne = fileArr[i];
+                System.out.println("fileOne.getName() = " + fileOne.getName());
+                if(fileOne.getName().indexOf(day+".csv.gz")>=0 && fileOne.getName().indexOf("tran_")>=0 ){
+                    try {
+                        File zipfile = new File("/root/onlpay/"+day+"/"+fileOne.getName());
+
+                        InputStream in = new GZIPInputStream(new FileInputStream(zipfile));
+                        List<String> list = IOUtils.readLines(in, "GBK");
+                        for (int j = 1; j < list.size()-1; j++) {
+                            String string = list.get(j);
+                            if(string.indexOf("总交易笔数")>=0){
+                                break;
+                            }
+                            content.append(string+"，");
+                            System.out.println(string);
+                        }
+
+                        //一定记得关闭流
+                        in.close();
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                }
+            }
+            hashMap.put("code","200");
+            hashMap.put("info","查询成功");
+            hashMap.put("data",content);
+        }else{
+            hashMap.put("code","500");
+            hashMap.put("info","目录不存在");
+        }
+        return hashMap;
+    }
+
 }

hongxinhui/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:22 CST 2021
+#Thu Dec 09 10:42:48 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=example

scheduled/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:44 CST 2021
+#Thu Dec 09 10:42:56 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=scheduled

system/target/maven-archiver/pom.properties

 #Generated by Maven
-#Fri Sep 17 19:54:24 CST 2021
+#Thu Dec 09 10:42:49 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=system