报告下载

.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_40_21_ALL.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alipay.sdk:alipay-sdk-java:4.40.21.ALL">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/alipay/sdk/alipay-sdk-java/4.40.21.ALL/alipay-sdk-java-4.40.21.ALL.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/alipay/sdk/alipay-sdk-java/4.40.21.ALL/alipay-sdk-java-4.40.21.ALL-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/alipay/sdk/alipay-sdk-java/4.40.21.ALL/alipay-sdk-java-4.40.21.ALL-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_9_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okhttp3:okhttp:4.9.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okhttp3/okhttp/4.9.3/okhttp-4.9.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okhttp3/okhttp/4.9.3/okhttp-4.9.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okhttp3/okhttp/4.9.3/okhttp-4.9.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_squareup_okio_okio_2_8_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okio:okio:2.8.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okio/okio/2.8.0/okio-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okio/okio/2.8.0/okio-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/com/squareup/okio/okio/2.8.0/okio-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.62">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/bouncycastle/bcprov-jdk15on/1.62/bcprov-jdk15on-1.62.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/bouncycastle/bcprov-jdk15on/1.62/bcprov-jdk15on-1.62-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/bouncycastle/bcprov-jdk15on/1.62/bcprov-jdk15on-1.62-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains:annotations:13.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_21.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_21.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xml-apis:xml-apis:1.0.b2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../../repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../../repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/workspace.xml

@@ -28,8 +28,28 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="">
+    <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="默认的">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_40_21_ALL.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_9_3.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_2_8_0.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_21.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_21.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/util/AlipayUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jeesite/common/constant/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jeesite/common/constant/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/bjflapi.iml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/bjflapi.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/modules/sys/utils/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/modules/sys/utils/R.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/modules/sys/utils/StatusMsgEnum.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/jeesite-web.iml" beforeDir="false" afterPath="$PROJECT_DIR$/web/jeesite-web.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -54,6 +74,14 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
@@ -66,7 +94,9 @@
     </option>
   </component>
   <component name="ProjectId" id="2LgEqg6qaK0CSc5Ydb7fH75XPDZ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="autoscrollToSource" value="true" />
     <option name="showExcludedFiles" value="false" />
@@ -79,9 +109,10 @@
     <property name="RequestMappingsPanelWidth0" value="75" />
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../maintenance-support/maintenance-support-java" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.25287357" />
@@ -92,9 +123,19 @@
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\work\bjfl\admin_api\modules\report\src\main\java\com\jeesite\modules\report\web" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Git\xiangxi\bjfl_web\modules\basedata\src\main\resources\mappings\modules\basedata" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.jeesite.modules.bjflapi.report" />
+      <recent name="com.jeesite.modules.sys.utils" />
+      <recent name="com.jeesite.modules.report.dto" />
+      <recent name="com.jeesite.modules.config.web.interceptor" />
+      <recent name="com.jeesite.modules.bjflapi" />
+    </key>
   </component>
   <component name="RunAnythingCache">
     <myKeys>
@@ -156,7 +197,7 @@
       <module name="jeesite-module-report" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.jeesite.modules.report.util.*" />
+          <option name="PATTERN" value="com.jeesite.modules.sys.utils.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -169,7 +210,7 @@
       <module name="jeesite-module-report" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.jeesite.modules.report.util.*" />
+          <option name="PATTERN" value="com.jeesite.modules.sys.utils.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -428,6 +469,7 @@
       <workItem from="1734268366747" duration="59000" />
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
+      <workItem from="1734658594781" duration="94117000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1676368709673</created>
@@ -597,7 +639,112 @@
       <option name="project" value="LOCAL" />
       <updated>1697013185527</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="研究报告的优化">
+      <created>1734665103577</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1734665103577</updated>
+    </task>
+    <task id="LOCAL-00026" summary="网站用户注册">
+      <created>1734680578880</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1734680578881</updated>
+    </task>
+    <task id="LOCAL-00027" summary="修改密码">
+      <created>1734684410671</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1734684410671</updated>
+    </task>
+    <task id="LOCAL-00028" summary="修改密码">
+      <created>1734689905955</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1734689905955</updated>
+    </task>
+    <task id="LOCAL-00029" summary="新增市场概括">
+      <created>1734748258157</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1734748258157</updated>
+    </task>
+    <task id="LOCAL-00030" summary="简报分类">
+      <created>1734754137763</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1734754137764</updated>
+    </task>
+    <task id="LOCAL-00031" summary="简报">
+      <created>1734765445609</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1734765445609</updated>
+    </task>
+    <task id="LOCAL-00032" summary="用户订单">
+      <created>1734768659538</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1734768659538</updated>
+    </task>
+    <task id="LOCAL-00033" summary="修改密码">
+      <created>1734774529374</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1734774529374</updated>
+    </task>
+    <task id="LOCAL-00034" summary="忘记密码">
+      <created>1734923535021</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1734923535021</updated>
+    </task>
+    <task id="LOCAL-00035" summary="简报">
+      <created>1734938692187</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1734938692188</updated>
+    </task>
+    <task id="LOCAL-00036" summary="简报查询">
+      <created>1734947692048</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1734947692048</updated>
+    </task>
+    <task id="LOCAL-00037" summary="简报">
+      <created>1734948019915</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1734948019915</updated>
+    </task>
+    <task id="LOCAL-00038" summary="按钮权限">
+      <created>1735007297455</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1735007297455</updated>
+    </task>
+    <task id="LOCAL-00039" summary="简报下载">
+      <created>1735026920662</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1735026920662</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -623,12 +770,35 @@
             </State>
           </value>
         </entry>
+        <entry key="ed946976-efc8-4c95-8fe2-52a6bfe143c3">
+          <value>
+            <State>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="roots">
+                    <value>
+                      <list>
+                        <option value="$PROJECT_DIR$" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1" />
-    <MESSAGE value="2" />
     <MESSAGE value="报告" />
     <MESSAGE value="修复图片丢失" />
     <MESSAGE value="用户信息优化" />
@@ -643,9 +813,29 @@
     <MESSAGE value="修改包名" />
     <MESSAGE value="bug修复" />
     <MESSAGE value="更新" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新" />
+    <MESSAGE value="研究报告的优化" />
+    <MESSAGE value="网站用户注册" />
+    <MESSAGE value="新增市场概括" />
+    <MESSAGE value="简报分类" />
+    <MESSAGE value="用户订单" />
+    <MESSAGE value="修改密码" />
+    <MESSAGE value="忘记密码" />
+    <MESSAGE value="简报查询" />
+    <MESSAGE value="简报" />
+    <MESSAGE value="按钮权限" />
+    <MESSAGE value="简报下载" />
+    <option name="LAST_COMMIT_MESSAGE" value="简报下载" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java</url>
+          <line>178</line>
+          <option name="timeStamp" value="24" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

common/src/main/java/com/jeesite/common/constant/Constants.java

@@ -199,4 +199,9 @@ public interface Constants {
         String PAY_SUCCESS = "1";
         String PAY_ERROR = "2";
     }
+
+    interface briefReportFileType{
+        String PDF = "pdf";
+        String PPT = "ppt";
+    }
 }

modules/bjflapi/bjflapi.iml

@@ -37,7 +37,6 @@
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
@@ -48,7 +47,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.4" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:4.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:6.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
@@ -203,5 +201,16 @@
     <orderEntry type="module" module-name="jeesite-module-basedata" />
     <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.40.21.ALL" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83_noneautotype" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>

modules/bjflapi/pom.xml

@@ -29,6 +29,12 @@
             <artifactId>jeesite-module-researchReport</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.40.21.ALL</version>
+        </dependency>
     </dependencies>
 
     <developers>

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java

@@ -2,10 +2,13 @@ package com.jeesite.modules.bjflapi.report;
 
 import com.jeesite.common.constant.Constants;
 import com.jeesite.common.lang.StringUtils;
+import com.jeesite.modules.report.entity.ResearchBriefReport;
 import com.jeesite.modules.report.entity.WebsiteUserOrder;
 import com.jeesite.modules.report.entity.WebsiteUserOrderDown;
+import com.jeesite.modules.report.service.ResearchBriefReportService;
 import com.jeesite.modules.report.service.WebsiteUserOrderDownService;
 import com.jeesite.modules.report.service.WebsiteUserOrderService;
+import com.jeesite.modules.sys.utils.R;
 import com.jeesite.modules.sys.utils.RedisUtil;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "${adminPath}/api/report/websiteUserOrder")
@@ -24,37 +28,65 @@ public class WebsiteUserOrderControllerApi {
     @Resource
     private WebsiteUserOrderDownService websiteUserOrderDownService;
     @Resource
+    private ResearchBriefReportService researchBriefReportService;
+    @Resource
     private RedisUtil redisUtil;
 
-    @PostMapping(value = "downNum")
-    public void downNum(HttpServletRequest request, WebsiteUserOrder websiteUserOrder) {
+    @PostMapping(value = "downFile")
+    public Map<String, Object> downFile(HttpServletRequest request, WebsiteUserOrder websiteUserOrder) {
         String reportId = websiteUserOrder.getResearchBriefReportId();
         if (StringUtils.isEmpty(reportId)) {
-            return;
+            return R.error("简报为空");
+        }
+        String fileType = websiteUserOrder.getFileType();
+        if (StringUtils.isEmpty(fileType)) {
+            return R.error("下载类型为空");
         }
-        String fileName = websiteUserOrder.getFileName();
-        if (StringUtils.isEmpty(fileName)) {
-            return;
+        //判断简报是否需要收费
+        ResearchBriefReport researchBriefReport = researchBriefReportService.get(reportId);
+        if (researchBriefReport == null ) {
+            return R.error("简报为空");
+        }
+        if (Constants.enableType.NO.equals(researchBriefReport.getUseDownPay())) {
+            return getFileName(fileType, reportId, null);
         }
         String token = request.getHeader(Constants.WEBSITE_TOKEN);//header方式
         if (StringUtils.isEmpty(token)) {
-            return;
+            return R.error(5001, "用户未登录");
         }
         String uid = (String) redisUtil.get(Constants.PREFIX_USER_TOKEN + token);
         if (StringUtils.isEmpty(uid)) {
-            return;
+            return R.error(5001, "用户未登录");
         }
         WebsiteUserOrder orderWhere = new WebsiteUserOrder();
         orderWhere.setWebsiteUserId(uid);
         orderWhere.setResearchBriefReportId(reportId);
         WebsiteUserOrder oldOrder = websiteUserOrderService.get(orderWhere);
         if (oldOrder == null) {
-            return;
+            return R.error(5002, "用户未支付");
+        }
+        if (!Constants.orderPayStatus.PAY_SUCCESS.equals(orderWhere.getPayStatus())) {
+            return R.error("订单未付款");
         }
         WebsiteUserOrderDown downWhere = new WebsiteUserOrderDown();
         downWhere.setWebsiteUserId(uid);
         downWhere.setWebsiteUserOrderId(oldOrder.getId());
-        downWhere.setFileName(fileName);
-        websiteUserOrderDownService.save(downWhere);
+        return getFileName(fileType, reportId, downWhere);
+    }
+
+    private Map<String, Object> getFileName(String fileType, String reportId, WebsiteUserOrderDown down) {
+        String fileName;
+        if (Constants.briefReportFileType.PDF.equals(fileType)) {
+            fileName = researchBriefReportService.convertFile(reportId, Constants.briefReport.BRIEFING_INFO_PDF);
+        } else if (Constants.briefReportFileType.PPT.equals(fileType)) {
+            fileName = researchBriefReportService.convertFile(reportId, Constants.briefReport.BRIEFING_INFO_PPT);
+        } else {
+            return R.error("下载类型不存在");
+        }
+        if (down != null) {
+            down.setFileName(fileName);
+            websiteUserOrderDownService.save(down);
+        }
+        return R.ok(fileName);
     }
 }

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/util/AlipayUtil.java

@@ -0,0 +1,99 @@
+package com.jeesite.modules.bjflapi.util;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradePagePayModel;
+import com.alipay.api.request.AlipayTradePagePayRequest;
+import com.jeesite.modules.report.entity.WebsiteUserOrder;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "alipay")
+@Component
+@Data
+public class AlipayUtil {
+    private static Logger logger = LoggerFactory.getLogger(AlipayUtil.class);
+
+    /**
+     * 应用ID
+     */
+    public String app_id;
+    /**
+     * 商户私钥
+     */
+    public String app_private_key;
+    /**
+     * 支付宝公钥
+     */
+    public String alipay_public_key;
+    /**
+     * 服务器[异步通知]页面路径 必须外网可以正常访问 支付宝会告诉支付成功的信息
+     */
+    public String notify_url;
+    /**
+     * 页面跳转[同步通知]页面路径 必须外网可以正常访问 支付成功跳转到成功页
+     */
+    public String return_url;
+    /**
+     * 签名方式
+     */
+    private String sign_type;
+    /**
+     * 字符编码格式
+     */
+    private String charset;
+    /**
+     * 订单超时时间
+     */
+    private String timeout = "1m";
+    /**
+     * 支付网关
+     */
+    public String gatewayUrl;
+
+    /**
+     * 发起支付请求
+     *
+     * @param userOrder 支付信息
+     * @return
+     * @throws AlipayApiException
+     */
+    public String pay(WebsiteUserOrder userOrder) throws AlipayApiException {
+        // 根据支付宝的配置生成一个支付客户端
+        AlipayClient alipayClient = getAlipayClient();
+
+        // 创建一个支付请求
+        AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
+        // 设置请求参数
+        alipayRequest.setReturnUrl(return_url);
+        alipayRequest.setNotifyUrl(notify_url);
+
+        AlipayTradePagePayModel model = new AlipayTradePagePayModel();
+        // 设置商户订单号
+        model.setOutTradeNo(userOrder.getOrderNumber());
+        // 设置订单总金额
+        model.setTotalAmount(userOrder.getPayPrice().toString());
+        // 设置订单标题
+        model.setSubject(userOrder.getResearchBriefReportTitle());
+        // 设置产品码
+        model.setProductCode("FAST_INSTANT_TRADE_PAY");
+        // 设置PC扫码支付的方式
+        model.setQrPayMode("2");
+        model.setTimeoutExpress(timeout);
+
+        alipayRequest.setBizModel(model);
+        String result = alipayClient.pageExecute(alipayRequest).getBody();
+        // 收到支付宝的响应，响应一个页面，浏览器显示这个页面，就会自动到支付宝的收银台页面
+        logger.info("支付宝响应：{}", result);
+        return result;
+    }
+
+    private AlipayClient getAlipayClient() {
+        return new DefaultAlipayClient(gatewayUrl, app_id, app_private_key, "json", charset, alipay_public_key, sign_type);
+    }
+
+}

modules/core/src/main/java/com/jeesite/modules/sys/utils/R.java

@@ -40,12 +40,6 @@ public class R extends HashMap<String, Object> {
 		r.put("msg", msg);
 		return r;
 	}
-	public static R error(StatusMsgEnum statu) {
-		R r = new R();
-		r.put("code", statu.getStatus());
-		r.put("msg", statu.getMsg());
-		return r;
-	}
 
 	public static R ok(String msg) {
 		R r = new R();
@@ -53,14 +47,6 @@ public class R extends HashMap<String, Object> {
 		return r;
 	}
 
-	public static R ok(StatusMsgEnum statu) {
-		R r = new R();
-		r.put("code",statu.getStatus());
-		r.put("msg", statu.getMsg());
-		return r;
-	}
-
-
 	public static R ok(Map<String, Object> map) {
 		R r = new R();
 		r.putAll(map);

modules/core/src/main/java/com/jeesite/modules/sys/utils/StatusMsgEnum.java

@@ -1,94 +0,0 @@
-package com.jeesite.modules.sys.utils;
-
-public enum StatusMsgEnum {
-    SUCCESS(200, "操作成功！"),
-    FAIL(500, "操作失败！"),
-    adminUploadDocuments(500, "请上传凭证信息！"),
-    PARAM_NULL(101, "参数为空！"),
-    ADD_SUCCESS(200, "添加成功！"),
-    ADD_REPEAT(201, "重复添加(违反唯一约束)"),
-    QUERY_SUCCESS(200, "查询成功！"),
-    QUERY_FALSE(101, "查询失败！"),
-    DELETE_SUCCESS(200, "删除成功！"),
-    UPDATE_SUCCESS(200, "更新成功！"),
-    LOGIN_SUCCESS(200, "登录成功！"),
-    LOGIN_FALSE(101, "登录失败！"),
-    RESET_PASSWORD_SUCCESS(200, "更新密码成功！"),
-    ADD_ROLE_SUCCESS(200, "添加用户成功！"),
-    DELETE_ROLE_SUCCESS(200, "删除用户成功！"),
-    DISABLED_SUCCESS(200, "禁用成功！"),
-    ACTIVE_SUCCESS(200, "启用成功！"),
-    LOGIN_NAME_PSW_ERROR(201, "用户或密码错误"),
-    TOKEN_ERR(202, "token请求异常"),
-    USER_IS_EXISTS(203, "用户名已经存在"),
-    USER_IS_EXISTS1(2031, "手机号已注册"),
-    OSS_GROUP_EXISTS(210, "文件上传组名已经存在"),
-    OSS_GROUP_NAME_NEED(210, "文件上传分组名不能为空"),
-    UPLOAD_PARAM_NEED(213, "文件参数不能为空"),
-    CAN_REGISTER(204, "此用户名可以注册"),
-    NOCAN_REGISTER(204, "用户注册失败"),
-    NEED_LOGIN_NAME_PSW(201, "用户或密码不能为空"),
-    SMSCODESEND_SUCESS(205, "验证码发送成功"),
-    SMSCODE_SENDED_FAIL(207, "验证码再次请求时间未到"),
-    SMSCODESEND_TIMEOUT(208, "验证码已过期"),
-    SMSCODES_NOMATCH(209, "验证码不匹配"),
-    INVICTCODE_ERR(210, "邀请码不存在"),
-    NO_SUCH_SMS_TEMPLATE(210, "没有该短信模板"),
-    SMSCODESEND_FAIL(207, "验证码发送失败，请稍后再试"),
-    USER_DEL(204, "用户已被删除，请联系管理员"),
-    USER_DISABLE(205, "用户已被禁用，请联系管理员"),
-
-    ORDER_PAY_NOSUPPORT(300, "暂不支持此支付方式"),
-    ORDER_PAY_SUCESS(310, "支付成功"),
-    ORDER_PAY_FAIL(320, "支付失败"),
-    ORDER_PAY_WAITING(310, "支付等待"),
-    ORDER_NOEXIST(300, "订单信息不存在"),
-
-    MEMBER_INSUFFICIENT_PRIVILEGES(403, "你还不是服务体系成员，不能学习此视频"),
-
-    /**
-     * 10、待付款  20、待发货 30、待收货
-     * 40、退货 50、完成 60、取消 70、付款失败
-     * 80、过期 90、申请退款 100、待寄售
-     * 110、部分寄售 120、寄售成功 130、已操作退款 140、申请提货
-     */
-    WHOLESALE_10(10, "待付款"),
-    WHOLESALE_20(20, "待发货"),
-    WHOLESALE_30(30, "待收货"),
-    WHOLESALE_40(40, "退货"),
-    WHOLESALE_50(50, "完成"),
-    WHOLESALE_60(60, "取消"),
-    WHOLESALE_70(70, "付款失败"),
-    WHOLESALE_80(80, "过期"),
-    WHOLESALE_90(90, "申请退款"),
-    WHOLESALE_100(100, "待寄售"),
-    WHOLESALE_110(110, "部分寄售"),
-    WHOLESALE_120(120, "寄售成功"),
-    WHOLESALE_130(130, "已操作退款"),
-    WHOLESALE_140(140, "申请提货"),
-
-    /**
-     * 如果收到消息，并处理成功，返回如下json字符串
-     * { "code": 1 }
-     *
-     * 除此之外，都会判定为失败，当失败时，会根据生命周期，重新通知或停止通知
-     */
-    SUPPLY_CHAIN_MESSAGE_CALLBACK_SUCCESS(1, "数字化供应链消息回调成功");
-
-    private Integer status;
-
-    private String msg;
-
-    StatusMsgEnum(Integer status, String msg) {
-        this.status = status;
-        this.msg = msg;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

modules/report/src/main/java/com/jeesite/modules/report/entity/WebsiteUserOrder.java

@@ -41,7 +41,7 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 	private String useDown;		// 是否下载过 0否 1是
 	private Integer downNum;		// 下载次数
 	private String researchBriefReportTitle;		// 简报智库标题
-	private String fileName;
+	private String fileType;
 
 	public WebsiteUserOrder() {
 		this(null);
@@ -139,11 +139,11 @@ public class WebsiteUserOrder extends DataEntity<WebsiteUserOrder> {
 		this.researchBriefReportTitle = researchBriefReportTitle;
 	}
 
-	public String getFileName() {
-		return fileName;
+	public String getFileType() {
+		return fileType;
 	}
 
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
+	public void setFileType(String fileType) {
+		this.fileType = fileType;
 	}
 }

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -148,10 +148,6 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		} else {
 			old.setUseShowPay(Constants.enableType.NO);
 		}
-		if (Constants.enableType.NO.equals(old.getUseShowPay())) {
-			old.setPdfFileName(convertFile(reportId, Constants.briefReport.BRIEFING_INFO_PDF));
-			old.setPptFileName(convertFile(reportId, Constants.briefReport.BRIEFING_INFO_PPT));
-		}
 		return old;
 	}
 
@@ -215,7 +211,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		return page;
 	}
 
-	private String convertFile(String bizKey, String bizType) {
+	public String convertFile(String bizKey, String bizType) {
 		List<FileUpload> list = FileUploadUtils.findFileUpload(bizKey, bizType);
 		if (CollectionUtils.isNotEmpty(list)) {
 			FileEntity fileEntity = list.get(0).getFileEntity();

web/jeesite-web.iml

@@ -38,7 +38,6 @@
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
@@ -205,5 +204,15 @@
     <orderEntry type="module" module-name="jeesite-module-basedata" />
     <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.40.21.ALL" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.21" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>