Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -7,13 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5e0a6283-3bb9-4464-9eb8-7061908be2e9" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/cas" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/config" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text/open/config" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/log4j.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,16 +42,18 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="D:/maven/apache-maven-3.6.1" />
+        <option name="userSettingsFile" value="D:\maven\apache-maven-3.6.1\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="importAutomatically" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
-  </component>
   <component name="ProjectId" id="1YeXFSQMCuc7Ew6NW28UfdCrHuR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -64,13 +63,14 @@
     <option name="showMembers" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" 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="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="Application" factoryName="Application">
@@ -96,11 +96,14 @@
       </method>
     </configuration>
     <configuration name="tomcat8" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.31" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="UPDATING_POLICY" value="restart-server" />
+      <option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
+      <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=utf-8" />
+      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
+      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
         <artifact name="hsdataportal:war exploded">
           <settings>
-            <option name="CONTEXT_PATH" value="/hsdataportal_war_exploded" />
+            <option name="CONTEXT_PATH" value="/hsdataportal" />
           </settings>
         </artifact>
       </deployment>
@@ -171,8 +174,8 @@
   <component name="SbtLocalSettings">
     <option name="projectSyncType">
       <map>
-        <entry key="$PROJECT_DIR$/../../../../DCW/BigData/GIT/NewSparkApp-MySQL" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/大数据平台/GIT/NewSparkApp-MySQL" value="PREVIEW" />
+        <entry key="D:/../DCW/BigData/GIT/NewSparkApp-MySQL" value="PREVIEW" />
+        <entry key="D:/../DCW/大数据平台/GIT/NewSparkApp-MySQL" value="PREVIEW" />
       </map>
     </option>
   </component>
@@ -189,7 +192,7 @@
               <path>
                 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
                 <item name="Tomcat Server" type="7427dc5b:ServiceModel$ServiceGroupNode" />
-                <item name="Finished" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+                <item name="Running" type="7427dc5b:ServiceModel$ServiceGroupNode" />
               </path>
             </expand>
             <select />
@@ -214,6 +217,10 @@
       <workItem from="1575597045187" duration="123000" />
       <workItem from="1583303931371" duration="2233000" />
       <workItem from="1583373953901" duration="2325000" />
+      <workItem from="1583818992805" duration="2697000" />
+      <workItem from="1583821886251" duration="191000" />
+      <workItem from="1583822114539" duration="144000" />
+      <workItem from="1583822528854" duration="1371000" />
     </task>
     <servers />
   </component>
@@ -221,100 +228,133 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583374099371">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state x="104" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583822612694">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state x="104" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1583822612694" />
     <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1280.735@0.23.1280.735" timestamp="1583374099371" />
     <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1583375590595">
       <screen x="0" y="23" width="1280" height="735" />
     </state>
     <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser/0.23.1280.735@0.23.1280.735" timestamp="1583375590595" />
-    <state width="846" height="183" key="GridCell.Tab.0.bottom" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state x="241" y="2" key="#com.intellij.j2ee.appServerIntegrations.ApplicationServersConfigurable" timestamp="1583819501488">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="241" y="2" key="#com.intellij.j2ee.appServerIntegrations.ApplicationServersConfigurable/0.0.1280.680@0.0.1280.680" timestamp="1583819501488" />
+    <state x="264" y="0" key="CommitChangelistDialog2" timestamp="1583823996830">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="264" y="0" key="CommitChangelistDialog2/0.0.1280.680@0.0.1280.680" timestamp="1583823996830" />
+    <state x="121" y="56" key="DiffContextDialog" timestamp="1583823922138">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="121" y="56" key="DiffContextDialog/0.0.1280.680@0.0.1280.680" timestamp="1583823922138" />
+    <state x="421" y="99" key="FileChooserDialogImpl" timestamp="1583819114280">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1583819114280" />
+    <state width="845" height="231" key="GridCell.Tab.0.bottom" timestamp="1583822556293">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="845" height="231" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583822556293" />
     <state width="1238" height="228" key="GridCell.Tab.0.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.0.center" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.center" timestamp="1583822556292">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1583822556292" />
     <state width="1238" height="228" key="GridCell.Tab.0.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.0.left" timestamp="1583376074487">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.left" timestamp="1583822556291">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1583822556291" />
     <state width="1238" height="228" key="GridCell.Tab.0.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010600" />
     <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074487" />
     <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363192" />
-    <state width="846" height="183" key="GridCell.Tab.0.right" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.right" timestamp="1583822556292">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1583822556292" />
     <state width="1238" height="228" key="GridCell.Tab.0.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.1.bottom" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.bottom" timestamp="1583822257938">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583822257938" />
     <state width="1238" height="228" key="GridCell.Tab.1.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010603" />
     <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.1.center" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.center" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.1.left" timestamp="1583376074489">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.left" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074489" />
     <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.1.right" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.right" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.2.bottom" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.bottom" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.2.center" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.center" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.2.left" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.left" timestamp="1583821702922">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1583821702922" />
     <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.2.right" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.right" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.3.bottom" timestamp="1583376074493">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.bottom" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
     <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363197" />
-    <state width="846" height="183" key="GridCell.Tab.3.center" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.center" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.center/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
-    <state width="846" height="183" key="GridCell.Tab.3.left" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.left" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.left/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.3.right" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.right" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.right/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
     <state width="846" height="183" key="GridCell.Tab.4.bottom" timestamp="1583376074494">
@@ -337,6 +377,22 @@
     </state>
     <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
     <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363198" />
+    <state x="420" y="54" key="RollbackChangesDialog" timestamp="1583821674962">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="420" y="54" key="RollbackChangesDialog/0.0.1280.680@0.0.1280.680" timestamp="1583821674962" />
+    <state x="144" y="0" key="SettingsEditor" timestamp="1583819141799">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="144" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1583819141799" />
+    <state x="337" y="169" key="com.intellij.ide.util.TipDialog" timestamp="1583822529539">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="337" y="169" key="com.intellij.ide.util.TipDialog/0.0.1280.680@0.0.1280.680" timestamp="1583822529539" />
+    <state x="400" y="42" width="617" height="490" key="find.popup" timestamp="1583822811714">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="400" y="42" width="617" height="490" key="find.popup/0.0.1280.680@0.0.1280.680" timestamp="1583822811714" />
   </component>
   <component name="masterDetails">
     <states>

README.md

@@ -16,5 +16,17 @@ userType=admin
 redirectHomeUrl=/share/     
 redirectLoginUrl=/open/account/login.htm     
 
-
-
+共享平台配置cas单点登陆
+
+cas.properties
+
+// 配置本项目中的cas
+casService=http://localhost:8081/cas
+// 配置外面cas项目的登陆
+casServerUrlPrefix=http://39.105.217.215:8080/cas
+// 问号前配置外部cas项目的登陆，后面是跳转页面，为了验证登陆，后面也配置本项目中的cas
+loginUrl=http://39.105.217.215:8080/cas/login?service=http://localhost:8081/cas
+// 配置同上就行
+failureUrl = http://39.105.217.215:8080/cas/login?service=http://localhost:8081/cas
+//  问号前配置外部cas项目的退出，后面是跳转到首页路径
+redirectUrl = http://39.105.217.215:8080/cas/logout?service=http://localhost:8081

src/main/java/com/lightinit/hsdataportal/impl/APIDemandServiceImpl.java

@@ -1,10 +1,9 @@
 package com.lightinit.hsdataportal.impl;
 
-import com.lightinit.hsdataportal.dictionary.DicRequirmentAuditState;
 import com.lightinit.hsdataportal.dictionary.DicPlatformType;
+import com.lightinit.hsdataportal.dictionary.DicRequirmentAuditState;
 import com.lightinit.hsdataportal.dictionary.DicRqrmntSourceType;
 import com.lightinit.hsdataportal.dictionary.DicRqrmntType;
-import com.lightinit.hsdataportal.dictionary.*;
 import com.lightinit.hsdataportal.entity.*;
 import com.lightinit.hsdataportal.mapper.RequirementApiMapper;
 import com.lightinit.hsdataportal.mapper.RequirementFollowMapper;
@@ -20,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 @Service
 public class APIDemandServiceImpl implements IAPIDemandService {
@@ -112,6 +112,7 @@ public class APIDemandServiceImpl implements IAPIDemandService {
 
     @Override
     public ResultState follow(Long id, Long userId, String resourceType) {
+        TimeZone.setDefault(TimeZone.getTimeZone("CTT"));
         DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
         ResultState<Long> resultState = new ResultState<Long>() ;
 
@@ -127,6 +128,7 @@ public class APIDemandServiceImpl implements IAPIDemandService {
             requirementFollow.setPlatformType(resourceType);
             requirementFollow.setFollowerId(userId);
             requirementFollow.setRqrmntId(id);
+            requirementFollow.setCreatedAt(new Date());
             result = followMapper.insert(requirementFollow) ;
             resultState.setData(requirementFollow.getId());
             resultState.setMsg("关注成功");

src/main/resources/config.properties

@@ -9,7 +9,7 @@
 #jdbc.sentry.username=root
 #jdbc.sentry.password=iuGoto8#@20w
 
-jdbc.sentry.url=jdbc:mysql://rm-2zea3p7q7lrvjs8s4.mysql.rds.aliyuncs.com/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+jdbc.sentry.url=jdbc:mysql://rm-2zea3p7q7lrvjs8s4.mysql.rds.aliyuncs.com/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2b8
 jdbc.sentry.username=hsdataplatform
 jdbc.sentry.password=Lightinit@1
 jdbc.sentry.driverClassName=com.mysql.cj.jdbc.Driver
@@ -59,12 +59,12 @@ redis.server=192.168.107.112
 
 
 
-#userType=user
-#redirectHomeUrl=/open/
-#redirectLoginUrl=/open/account/login.htm
-userType=admin
-redirectHomeUrl=/share/
+userType=user
+redirectHomeUrl=/open/
 redirectLoginUrl=/open/account/login.htm
+#userType=admin
+#redirectHomeUrl=/share/
+#redirectLoginUrl=/open/account/login.htm
 imageContextPath=http://localhost:8080/hsdataimages/
 ##\u521B\u4E1A\u5DE5\u5382 \u70B9\u51FB\u8FDB\u5165
 devops=http://121.17.30.198:8097/devops-web/

src/main/resources/log4j.properties

@@ -1,6 +1,6 @@
 #mybatis log4j config
-#log4j.rootLogger=debug,stdout,D,E
-log4j.rootLogger=info,E
+log4j.rootLogger=debug,stdout,D,E
+#log4j.rootLogger=info,E
 
 ### \u8F93\u51FA\u4FE1\u606F\u5230\u63A7\u5236\u62AC ###
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -18,7 +18,7 @@ log4j.logger.java.sql.PreparedStatement=DEBUG
 log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.D.DatePattern = '-'yyyy-MM-dd
 log4j.appender.D.Encoding=UTF-8
-log4j.appender.D.File = D://logs/hsdataportal/debug.log
+log4j.appender.D.File = /Library/ideawork/gitwork/hsdataLog/logs/share/debug.log
 log4j.appender.D.Append = true
 log4j.appender.D.Threshold = DEBUG
 log4j.appender.D.layout = org.apache.log4j.PatternLayout
@@ -29,8 +29,8 @@ log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.E.DatePattern='-'yyyy-MM-dd
 log4j.appender.E.Encoding=UTF-8
 #log4j.appender.E.File=D://logs/hsdataportal/error.log
-log4j.appender.E.File=/home/log/hsdataportal-share/error.log
+log4j.appender.E.File=/Library/ideawork/gitwork/hsdataLog/logs/share/debug.log
 log4j.appender.E.Append=true
-log4j.appender.E.Threshold=ERROR
+log4j.appender.E.Threshold=DEBUG
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n

src/main/resources/sqlmaps/RequirementMapper.xml

@@ -418,7 +418,7 @@
       <if test="rqrmntName !=null and rqrmntName!=''">
         <bind name="rqrmntNameLike" value="'%'+rqrmntName+'%'"></bind>
       </if>
-      SELECT  DISTINCT(r.id) AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.rqrmnt_state,r.view_times,
+      SELECT  r.id AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.rqrmnt_state,r.view_times,
       (SELECT COUNT(*) FROM requirement_follow rfw WHERE rfw.rqrmnt_id=r.id) AS follow_times,a.id AS admin_id, a.username,s.id AS sector_id,s.sector_name,r.rqrmnt_state
        FROM requirement r
        LEFT JOIN requirement_follow rf ON rf.rqrmnt_id=r.id
@@ -451,7 +451,7 @@
     <if test="rqrmntName !=null and rqrmntName!=''">
       <bind name="rqrmntNameLike" value="'%'+rqrmntName+'%'"></bind>
     </if>
-    SELECT  count(*)
+    SELECT count(*)
     FROM requirement r
     LEFT JOIN requirement_follow rf ON rf.rqrmnt_id=r.id
     INNER JOIN requirement_data rd ON rd.id=r.id
@@ -464,7 +464,7 @@
   </select>
 
   <select id="getDataRequirementDetail" parameterType="com.lightinit.hsdataportal.model.DataRequirementSearchModel" resultType="com.lightinit.hsdataportal.model.DataRequirementDetailModel">
-      SELECT DISTINCT(r.id) AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,u.id AS userId,u.username AS publish_userName,r.publish_at,r.rqrmnt_state,r.view_times,
+      SELECT r.id AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,u.id AS userId,u.username AS publish_userName,r.publish_at,r.rqrmnt_state,r.view_times,
       (SELECT COUNT(*) FROM requirement_follow rfw WHERE rfw.rqrmnt_id=r.id) AS follow_times,a.id AS admin_id, a.username,s.id AS sector_id,s.sector_name,r.rqrmnt_state
       ,rd.data_uses,r.audit_opinion,r.audited_by,r.audited_at,a.id AS auditedBy,a.username AS auditeByName,rd.feedback_desc,rd.feedback_result,feedback_a.id AS feedback_by,feedback_a.username AS feedback_byName,rd.feedback_at
       ,feedback_s.id AS feedbackSectorId, feedback_s.sector_name AS feedback_sectorName FROM requirement r

src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp

@@ -74,7 +74,15 @@
     <div class="bb-mid">
         <div class="bb-top1">
             <div class="bb-font">咨询服务</div>
-            <div class="bb-gengduo"><a href="<%=basePath%>/open/EntrepreneurshipTutoring/openClassList.action">查看更多</a></div>
+            <div class="bb-gengduo">
+                <c:if test="${openClassList.size()>0}">
+                    <a href="<%=basePath%>/open/EntrepreneurshipTutoring/openClassList.action">查看更多</a>
+                </c:if>
+                <c:if test="${openClassList.size()<1}">
+                    <i href="javascript:void(0)" style="text-decoration:none; cursor: default;"><i class="edit" style="opacity: 0.2"></i>查看更多</i>
+                </c:if>
+
+            </div>
             <div class="clearfix"></div>
             <div>
                 <img src="<%=resourcePath%>/images/icon_zuo.png" alt="" class="bb-zuo">

src/main/webapp/pages/open/common/head_script.jsp

@@ -17,4 +17,13 @@
         location.href = "<%=basePath%>/open/account/login.htm";
         return false;
     }
+
+    window.alert = function(name){
+        var iframe = document.createElement("IFRAME");
+        iframe.style.display="none";
+        iframe.setAttribute("src", 'data:text/plain,');
+        document.documentElement.appendChild(iframe);
+        window.frames[0].window.alert(name);
+        iframe.parentNode.removeChild(iframe);
+    };
 </script>

src/main/webapp/pages/open/roadShow/addRoadShow.jsp

@@ -142,7 +142,7 @@
                     <div class="clearfix"></div>
                     <input type="hidden" name="flag" id="flag"/>
                     <button type="button" class="fabu-but" onclick="fabu()">发布</button>
-                    <button type="button" class="fabu-but1" onclick="zancun()">暂存</button>
+                    <%--<button type="button" class="fabu-but1" onclick="zancun()">暂存</button>--%>
                 </form>
             </div>
 
@@ -156,18 +156,18 @@
 <script>
     function fabu() {
         $('.tishi4').text('');//清空验证
-        if($('input[name="roadShowStage"]:checked').val()==null){
-            $("#ra").html("!项目阶段不能为空")
-        }
-        if($('input[name="activityType"]:checked').val()==null){
+        // if($('input[name="projectPhase"]:checked').val()==null){
+        //     $("#ra").html("!项目阶段不能为空")
+        // }
+        if($('input[name="tradeField"]:checked').val()==null){
             $("#rb").html("!行业领域不能为空")
         }
-        if($("#fileImg")[0].files[0]==null) {
-            $("#im").html("!缩略图不能为空")
-        }
-        if($("#file1")[0].files[0]==null) {
-            $("#im1").html("!路演材料1不能为空")
-        }
+        // if($("#fileImg")[0].files[0]==null) {
+        //     $("#im").html("!缩略图不能为空")
+        // }
+        // if($("#file1")[0].files[0]==null) {
+        //     $("#im1").html("!路演材料1不能为空")
+        // }
         $("#flag").val(1);
         var formData = new FormData();
         formData.append("file1",$("#file1")[0].files[0]);
@@ -179,8 +179,8 @@
         formData.append("roadshowIntro", $("#roadshowIntro").val());
         formData.append("financingType", $("#financingType").val());
         formData.append("financingAmount", $("#financingAmount").val());
-        formData.append("projectPhase", $("#projectPhase").val());
-        formData.append("tradeField", $("#tradeField").val());
+        formData.append("projectPhase", $('input[name="projectPhase"]:checked').val());
+        formData.append("tradeField", $('input[name="tradeField"]:checked').val());
         formData.append("roadshowTag", $("#roadshowTag").val());
         formData.append("flag", $("#flag").val());
 

src/main/webapp/pages/open/static/about.jsp

@@ -20,7 +20,7 @@
 
                     <ul>
                         <li style="text-indent: 2em">
-                                衡水大数据信息服务平台-资源开放平台是运用大数据、云计算、API
+                                衡水大数据信息服务平台-资源开放平台是运用大数据、云计算、API
                             等技术打造的资源集聚、资源开放、资源交易、应用创新综合服务平台，采
                             用互联网思维快速传递、放大数据资源的价值，在安全可控的前提下，集众
                             智汇众力，将大数据资源应用至市民、企业、城市管理等各个领域。平台汇

src/main/webapp/pages/share/data_requirement/index.jsp

@@ -28,7 +28,7 @@
                     </div>
                 </div>
 
-                <div class="shuju50">
+                <div class="shuju50" id="chakanId">
                     <c:if test="${outputModel !=null}">
                         <c:forEach items="${outputModel}" var="item">
                             <div class="xuqiu1">
@@ -63,7 +63,7 @@
                     <c:if test="${outputModel.size() <1}">
                         <div>暂无数据</div>
                     </c:if>
-                    <div class="chakan0">
+                    <div class="chakan0" id="viewMore">
                         <span class="chakan"></span>
                         &nbsp&nbsp <a class="chakanfont" onclick="lookMore1()">查看更多</a> &nbsp&nbsp
                         <span class="chakan"></span>
@@ -84,6 +84,7 @@
     //查看更多
     var flagMore=false;
     var count=1;
+    var allCount = ${pager.total} ;
     function lookMore1(){
         count++;
         if(flagMore){
@@ -94,8 +95,19 @@
                 flagMore=true;
                 $('.chakanfont').text('已经到底了');
             }else{
-                var connectPoint = $('#chakanId').parent().children('div:last').prev();
-                connectPoint.after(data);
+                // var connectPoint = $('#chakanId').parent().children('div:last').prev();
+                document.getElementById("viewMore").remove();
+                var html = document.getElementById("chakanId").innerHTML;
+                document.getElementById("chakanId").innerHTML = html + data
+                    + '  <div class="chakan0" id="viewMore">\n' +
+                    '                        <span class="chakan"></span>\n' +
+                    '                        &nbsp&nbsp <a class="chakanfont" onclick="lookMore1()">查看更多</a> &nbsp&nbsp\n' +
+                    '                        <span class="chakan"></span>\n' +
+                    '                    </div>';
+                if ($(".xuqiu1").length == allCount){
+                    flagMore=true;
+                    $('.chakanfont').text('已经到底了');
+                }
             }
         })
     }