wupengfei %!s(int64=2) %!d(string=hai) anos
pai
achega
e555aa5bdd

+ 6 - 5
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/OpenSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/OpenSearch.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/General.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/General.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/PlatformSwitch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/PlatformSwitch.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -123,7 +124,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/api/controller" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../sp" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -250,7 +251,7 @@
       <workItem from="1677805207495" duration="7323000" />
       <workItem from="1678063982310" duration="24531000" />
       <workItem from="1678149106133" duration="24129000" />
-      <workItem from="1678236784872" duration="3322000" />
+      <workItem from="1678236784872" duration="16311000" />
     </task>
     <servers />
   </component>
@@ -384,10 +385,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1676355565535" />
-    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1678094744972">
+    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1678251857373">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1678094744972" />
+    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1678251857373" />
     <state x="1051" y="472" key="MultipleFileMergeDialog" timestamp="1671416392056">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 1 - 1
application/api/controller/General.php

@@ -83,7 +83,7 @@ class General extends Base
      * @url /api/General/switchSet
      * @header name:Authorization require:1 desc:Token
      * @param name:id type:int require:1 default:-- desc:记录id
-     * @param name:type type:int require:1 default:-- desc:类型【1=>'问答通知开关',2=>'视频追更',3=>'图文追更',4=>'资料追更',5=>'供应商追更',6=>'招聘追更',7=>'视频通知开关',8=>图文通知开关,9=>资料通知开关】
+     * @param name:type type:int require:1 default:-- desc:类型【1=>'问答通知开关',2=>'视频追更',3=>'图文追更',4=>'资料追更',5=>'供应商追更',6=>'招聘追更',7=>'视频通知开关',8=>图文通知开关,9=>资料通知开关10=>新闻通知
      * @return name:status type:int default:1 desc:1开启0关闭
      */
     public function switchSet()

+ 1 - 0
application/common/model/PlatformSwitch.php

@@ -15,6 +15,7 @@ class PlatformSwitch extends Model
         7=>'视频通知',
         8=>'图文通知',
         9=>'资料通知',
+        10=>'新闻通知',
     ];
 
     /**