1

.idea/workspace.xml

@@ -3,8 +3,7 @@
   <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/common/service/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/service/Activity.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -379,7 +378,7 @@
       <workItem from="1689813742376" duration="13449000" />
       <workItem from="1689900489647" duration="18483000" />
       <workItem from="1690159826319" duration="22343000" />
-      <workItem from="1690246325106" duration="18770000" />
+      <workItem from="1690246325106" duration="18890000" />
     </task>
     <servers />
   </component>

application/common.php

@@ -464,6 +464,9 @@ function send_email($email,$content='',$alias = '活动提示')
         // print_r($e->getErrorCode());
         // print_r($e->getErrorMessage());
 
+    }catch (Exception $e)
+    {
+        return $e->getMessage();
     }
     return 1;
 }