diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a9907f4..018e2ea 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,95 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/PHPMailerAutoload.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/class.phpmailer.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/class.phpmaileroauth.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/class.pop3.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/class.smtp.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/composer.lock" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/DKIM.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/code_generator.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/contactform.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/contents.html" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/contentsutf8.html" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/exceptions.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/gmail.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/gmail_xoauth.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/images/phpmailer.png" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/images/phpmailer_mini.png" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/index.html" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/mail.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/mailing_list.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/pop_before_smtp.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/scripts/XRegExp.js" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/scripts/shAutoloader.js" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/scripts/shBrushPhp.js" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/scripts/shCore.js" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/scripts/shLegacy.js" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/send_file_upload.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/send_multiple_file_upload.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/sendmail.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/signed-mail.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/smtp.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/smtp_check.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/smtp_no_auth.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/ssl_options.phps" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCore.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreDefault.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreDjango.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreEclipse.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreEmacs.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreFadeToGrey.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreMDUltra.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreMidnight.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shCoreRDark.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeAppleScript.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeDefault.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeDjango.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeEclipse.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeEmacs.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeFadeToGrey.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeMDUltra.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeMidnight.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeRDark.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/shThemeVisualStudio.css" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/examples/styles/wrapping.png" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/extras/README.md" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/extras/htmlfilter.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-rs.php" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" afterPath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.lock" afterPath="$PROJECT_DIR$/composer.lock" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/installed.json" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/VERSION" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/VERSION" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/composer.json" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/composer.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/get_oauth_token.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/get_oauth_token.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php" afterPath="$PROJECT_DIR$/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -104,7 +16,7 @@ <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="562"> + <state relative-caret-position="412"> <caret line="1954" column="38" lean-forward="true" selection-start-line="1954" selection-start-column="38" selection-end-line="1954" selection-end-column="38" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> @@ -191,8 +103,8 @@ <file leaf-file-name="Common.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="25"> - <caret line="286" column="0" lean-forward="true" selection-start-line="286" selection-start-column="0" selection-end-line="286" selection-end-column="0" /> + <state relative-caret-position="400"> + <caret line="313" column="65" lean-forward="false" selection-start-line="313" selection-start-column="65" selection-end-line="313" selection-end-column="65" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#1303#1352#0#PHP" expanded="false" /> @@ -200,195 +112,195 @@ <element signature="e#10241#10839#0#PHP" expanded="false" /> <element signature="e#10845#10922#0#PHP" expanded="false" /> <element signature="e#10927#15190#0#PHP" expanded="false" /> - <marker date="1576199975403" expanded="false" signature="1720:9443" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1738:1873" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1758:1824" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1897:1944" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1945:1983" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2007:2034" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2035:2190" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2191:3278" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2214:2230" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2231:3278" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2257:2284" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2257:2301" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2302:2380" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2332:2344" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2404:2431" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2404:2448" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2449:2527" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2480:2492" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2551:2578" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2551:2595" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2596:2674" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2627:2639" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2698:2725" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2698:2742" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2743:2824" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2774:2786" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2848:2892" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2893:2978" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2925:2937" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3002:3029" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3002:3046" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3047:3129" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3081:3093" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3153:3180" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3153:3197" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3198:3261" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3303:3709" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3331:3397" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3440:3485" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3519:3528" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3571:3580" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3609:3618" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3733:3751" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3752:4068" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3780:3846" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3885:3913" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3915:3921" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3921:3927" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3927:3933" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3933:3939" ph=" " /> - <marker date="1576199975403" expanded="false" signature="3992:4001" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4092:4110" ph="..." /> - <marker date="1576199975403" expanded="true" signature="4111:4470" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4139:4205" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4246:4291" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4293:4299" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4299:4305" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4305:4311" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4311:4317" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4400:4409" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4494:4541" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4543:4549" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4549:4555" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4555:4561" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4561:4567" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4622:4631" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4750:4797" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4799:4805" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4805:4811" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4811:4817" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4817:4823" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4877:4886" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4960:4976" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5029:5076" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5078:5084" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5084:5090" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5090:5096" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5096:5102" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5130:5156" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5242:5260" ph="..." /> - <marker date="1576199975403" expanded="true" signature="5261:5859" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5289:5355" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5394:5441" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5449:5455" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5455:5461" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5461:5467" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5552:5599" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5601:5607" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5607:5613" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5613:5619" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5619:5625" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5726:5773" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5775:5781" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5781:5787" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5787:5793" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5793:5799" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5883:5901" ph="..." /> - <marker date="1576199975403" expanded="true" signature="5902:7585" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5930:5996" ph="..." /> - <marker date="1576199975403" expanded="true" signature="6035:6082" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6084:6090" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6090:6096" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6096:6102" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6102:6108" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6134:6150" ph="..." /> - <marker date="1576199975403" expanded="true" signature="6270:6317" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6319:6325" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6325:6331" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6331:6337" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6337:6343" ph=" " /> - <marker date="1576199975403" expanded="true" signature="6495:6542" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6544:6550" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6550:6556" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6556:6562" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6562:6568" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6687:6734" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6736:6742" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6742:6748" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6748:6754" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6754:6760" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6844:6891" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6893:6899" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6899:6905" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6905:6911" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6911:6917" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6977:7024" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7026:7032" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7032:7038" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7038:7044" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7044:7050" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7234:7281" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7283:7289" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7289:7295" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7295:7301" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7301:7307" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7435:7482" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7484:7490" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7490:7496" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7496:7502" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7502:7508" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7609:7627" ph="..." /> - <marker date="1576199975403" expanded="true" signature="7628:8128" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7656:7722" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7763:7810" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7812:7818" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7818:7824" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7824:7830" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7830:7836" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7948:7995" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7997:8003" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8003:8009" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8009:8015" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8015:8021" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8152:8170" ph="..." /> - <marker date="1576199975403" expanded="true" signature="8171:9171" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8199:8265" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8304:8351" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8353:8359" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8359:8365" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8365:8371" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8371:8377" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8443:8490" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8492:8498" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8498:8504" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8504:8510" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8510:8516" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8573:8620" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8622:8628" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8628:8634" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8634:8640" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8640:8646" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8724:8771" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8773:8779" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8779:8785" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8785:8791" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8791:8797" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8890:8937" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8939:8945" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8945:8951" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8951:8957" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8957:8963" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9037:9084" ph="..." /> - <marker date="1576199975403" expanded="false" signature="9086:9092" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9092:9098" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9098:9104" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9104:9110" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9195:9275" ph="..." /> - <marker date="1576199975403" expanded="false" signature="9336:9416" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1720:9443" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1738:1873" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1758:1824" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1897:1944" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1945:1983" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2007:2034" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2035:2190" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2191:3278" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2214:2230" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2231:3278" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2257:2284" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2257:2301" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2302:2380" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2332:2344" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2404:2431" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2404:2448" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2449:2527" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2480:2492" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2551:2578" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2551:2595" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2596:2674" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2627:2639" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2698:2725" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2698:2742" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2743:2824" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2774:2786" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2848:2892" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2893:2978" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2925:2937" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3002:3029" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3002:3046" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3047:3129" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3081:3093" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3153:3180" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3153:3197" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3198:3261" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3303:3709" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3331:3397" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3440:3485" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3519:3528" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3571:3580" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3609:3618" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3733:3751" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3752:4068" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3780:3846" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3885:3913" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3915:3921" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3921:3927" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3927:3933" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3933:3939" ph=" " /> + <marker date="1576200329735" expanded="false" signature="3992:4001" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4092:4110" ph="..." /> + <marker date="1576200329735" expanded="true" signature="4111:4470" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4139:4205" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4246:4291" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4293:4299" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4299:4305" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4305:4311" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4311:4317" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4400:4409" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4494:4541" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4543:4549" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4549:4555" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4555:4561" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4561:4567" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4622:4631" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4750:4797" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4799:4805" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4805:4811" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4811:4817" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4817:4823" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4877:4886" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4960:4976" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5029:5076" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5078:5084" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5084:5090" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5090:5096" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5096:5102" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5130:5156" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5242:5260" ph="..." /> + <marker date="1576200329735" expanded="true" signature="5261:5859" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5289:5355" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5394:5441" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5449:5455" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5455:5461" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5461:5467" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5552:5599" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5601:5607" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5607:5613" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5613:5619" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5619:5625" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5726:5773" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5775:5781" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5781:5787" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5787:5793" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5793:5799" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5883:5901" ph="..." /> + <marker date="1576200329735" expanded="true" signature="5902:7585" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5930:5996" ph="..." /> + <marker date="1576200329735" expanded="true" signature="6035:6082" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6084:6090" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6090:6096" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6096:6102" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6102:6108" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6134:6150" ph="..." /> + <marker date="1576200329735" expanded="true" signature="6270:6317" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6319:6325" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6325:6331" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6331:6337" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6337:6343" ph=" " /> + <marker date="1576200329735" expanded="true" signature="6495:6542" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6544:6550" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6550:6556" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6556:6562" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6562:6568" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6687:6734" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6736:6742" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6742:6748" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6748:6754" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6754:6760" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6844:6891" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6893:6899" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6899:6905" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6905:6911" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6911:6917" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6977:7024" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7026:7032" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7032:7038" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7038:7044" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7044:7050" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7234:7281" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7283:7289" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7289:7295" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7295:7301" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7301:7307" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7435:7482" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7484:7490" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7490:7496" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7496:7502" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7502:7508" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7609:7627" ph="..." /> + <marker date="1576200329735" expanded="true" signature="7628:8128" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7656:7722" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7763:7810" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7812:7818" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7818:7824" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7824:7830" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7830:7836" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7948:7995" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7997:8003" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8003:8009" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8009:8015" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8015:8021" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8152:8170" ph="..." /> + <marker date="1576200329735" expanded="true" signature="8171:9171" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8199:8265" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8304:8351" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8353:8359" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8359:8365" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8365:8371" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8371:8377" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8443:8490" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8492:8498" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8498:8504" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8504:8510" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8510:8516" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8573:8620" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8622:8628" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8628:8634" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8634:8640" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8640:8646" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8724:8771" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8773:8779" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8779:8785" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8785:8791" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8791:8797" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8890:8937" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8939:8945" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8945:8951" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8951:8957" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8957:8963" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9037:9084" ph="..." /> + <marker date="1576200329735" expanded="false" signature="9086:9092" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9092:9098" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9098:9104" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9104:9110" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9195:9275" ph="..." /> + <marker date="1576200329735" expanded="false" signature="9336:9416" ph="..." /> </folding> </state> </provider> @@ -646,7 +558,7 @@ <workItem from="1576128183316" duration="7364000" /> <workItem from="1576135696788" duration="17540000" /> <workItem from="1576153922472" duration="9154000" /> - <workItem from="1576196503707" duration="3139000" /> + <workItem from="1576196503707" duration="3344000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -673,7 +585,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="427431000" /> + <option name="totallyTimeSpent" value="427636000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -1116,7 +1028,7 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="562"> + <state relative-caret-position="412"> <caret line="1954" column="38" lean-forward="true" selection-start-line="1954" selection-start-column="38" selection-end-line="1954" selection-end-column="38" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> @@ -1201,8 +1113,8 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="25"> - <caret line="286" column="0" lean-forward="true" selection-start-line="286" selection-start-column="0" selection-end-line="286" selection-end-column="0" /> + <state relative-caret-position="400"> + <caret line="313" column="65" lean-forward="false" selection-start-line="313" selection-start-column="65" selection-end-line="313" selection-end-column="65" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#1303#1352#0#PHP" expanded="false" /> @@ -1210,195 +1122,195 @@ <element signature="e#10241#10839#0#PHP" expanded="false" /> <element signature="e#10845#10922#0#PHP" expanded="false" /> <element signature="e#10927#15190#0#PHP" expanded="false" /> - <marker date="1576199975403" expanded="false" signature="1720:9443" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1738:1873" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1758:1824" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1897:1944" ph="..." /> - <marker date="1576199975403" expanded="false" signature="1945:1983" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2007:2034" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2035:2190" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2191:3278" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2214:2230" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2231:3278" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2257:2284" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2257:2301" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2302:2380" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2332:2344" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2404:2431" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2404:2448" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2449:2527" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2480:2492" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2551:2578" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2551:2595" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2596:2674" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2627:2639" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2698:2725" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2698:2742" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2743:2824" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2774:2786" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2848:2892" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2893:2978" ph="..." /> - <marker date="1576199975403" expanded="true" signature="2925:2937" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3002:3029" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3002:3046" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3047:3129" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3081:3093" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3153:3180" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3153:3197" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3198:3261" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3303:3709" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3331:3397" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3440:3485" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3519:3528" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3571:3580" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3609:3618" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3733:3751" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3752:4068" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3780:3846" ph="..." /> - <marker date="1576199975403" expanded="false" signature="3885:3913" ph="..." /> - <marker date="1576199975403" expanded="true" signature="3915:3921" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3921:3927" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3927:3933" ph=" " /> - <marker date="1576199975403" expanded="true" signature="3933:3939" ph=" " /> - <marker date="1576199975403" expanded="false" signature="3992:4001" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4092:4110" ph="..." /> - <marker date="1576199975403" expanded="true" signature="4111:4470" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4139:4205" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4246:4291" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4293:4299" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4299:4305" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4305:4311" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4311:4317" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4400:4409" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4494:4541" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4543:4549" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4549:4555" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4555:4561" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4561:4567" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4622:4631" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4750:4797" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4799:4805" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4805:4811" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4811:4817" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4817:4823" ph=" " /> - <marker date="1576199975403" expanded="false" signature="4877:4886" ph="..." /> - <marker date="1576199975403" expanded="false" signature="4960:4976" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5029:5076" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5078:5084" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5084:5090" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5090:5096" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5096:5102" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5130:5156" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5242:5260" ph="..." /> - <marker date="1576199975403" expanded="true" signature="5261:5859" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5289:5355" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5394:5441" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5449:5455" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5455:5461" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5461:5467" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5552:5599" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5601:5607" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5607:5613" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5613:5619" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5619:5625" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5726:5773" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5775:5781" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5781:5787" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5787:5793" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5793:5799" ph=" " /> - <marker date="1576199975403" expanded="false" signature="5883:5901" ph="..." /> - <marker date="1576199975403" expanded="true" signature="5902:7585" ph="..." /> - <marker date="1576199975403" expanded="false" signature="5930:5996" ph="..." /> - <marker date="1576199975403" expanded="true" signature="6035:6082" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6084:6090" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6090:6096" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6096:6102" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6102:6108" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6134:6150" ph="..." /> - <marker date="1576199975403" expanded="true" signature="6270:6317" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6319:6325" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6325:6331" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6331:6337" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6337:6343" ph=" " /> - <marker date="1576199975403" expanded="true" signature="6495:6542" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6544:6550" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6550:6556" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6556:6562" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6562:6568" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6687:6734" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6736:6742" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6742:6748" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6748:6754" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6754:6760" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6844:6891" ph="..." /> - <marker date="1576199975403" expanded="false" signature="6893:6899" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6899:6905" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6905:6911" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6911:6917" ph=" " /> - <marker date="1576199975403" expanded="false" signature="6977:7024" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7026:7032" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7032:7038" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7038:7044" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7044:7050" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7234:7281" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7283:7289" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7289:7295" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7295:7301" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7301:7307" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7435:7482" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7484:7490" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7490:7496" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7496:7502" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7502:7508" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7609:7627" ph="..." /> - <marker date="1576199975403" expanded="true" signature="7628:8128" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7656:7722" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7763:7810" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7812:7818" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7818:7824" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7824:7830" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7830:7836" ph=" " /> - <marker date="1576199975403" expanded="false" signature="7948:7995" ph="..." /> - <marker date="1576199975403" expanded="false" signature="7997:8003" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8003:8009" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8009:8015" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8015:8021" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8152:8170" ph="..." /> - <marker date="1576199975403" expanded="true" signature="8171:9171" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8199:8265" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8304:8351" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8353:8359" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8359:8365" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8365:8371" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8371:8377" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8443:8490" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8492:8498" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8498:8504" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8504:8510" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8510:8516" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8573:8620" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8622:8628" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8628:8634" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8634:8640" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8640:8646" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8724:8771" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8773:8779" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8779:8785" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8785:8791" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8791:8797" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8890:8937" ph="..." /> - <marker date="1576199975403" expanded="false" signature="8939:8945" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8945:8951" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8951:8957" ph=" " /> - <marker date="1576199975403" expanded="false" signature="8957:8963" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9037:9084" ph="..." /> - <marker date="1576199975403" expanded="false" signature="9086:9092" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9092:9098" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9098:9104" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9104:9110" ph=" " /> - <marker date="1576199975403" expanded="false" signature="9195:9275" ph="..." /> - <marker date="1576199975403" expanded="false" signature="9336:9416" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1720:9443" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1738:1873" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1758:1824" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1897:1944" ph="..." /> + <marker date="1576200329735" expanded="false" signature="1945:1983" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2007:2034" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2035:2190" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2191:3278" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2214:2230" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2231:3278" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2257:2284" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2257:2301" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2302:2380" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2332:2344" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2404:2431" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2404:2448" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2449:2527" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2480:2492" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2551:2578" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2551:2595" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2596:2674" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2627:2639" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2698:2725" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2698:2742" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2743:2824" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2774:2786" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2848:2892" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2893:2978" ph="..." /> + <marker date="1576200329735" expanded="true" signature="2925:2937" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3002:3029" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3002:3046" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3047:3129" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3081:3093" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3153:3180" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3153:3197" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3198:3261" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3303:3709" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3331:3397" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3440:3485" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3519:3528" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3571:3580" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3609:3618" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3733:3751" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3752:4068" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3780:3846" ph="..." /> + <marker date="1576200329735" expanded="false" signature="3885:3913" ph="..." /> + <marker date="1576200329735" expanded="true" signature="3915:3921" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3921:3927" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3927:3933" ph=" " /> + <marker date="1576200329735" expanded="true" signature="3933:3939" ph=" " /> + <marker date="1576200329735" expanded="false" signature="3992:4001" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4092:4110" ph="..." /> + <marker date="1576200329735" expanded="true" signature="4111:4470" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4139:4205" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4246:4291" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4293:4299" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4299:4305" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4305:4311" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4311:4317" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4400:4409" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4494:4541" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4543:4549" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4549:4555" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4555:4561" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4561:4567" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4622:4631" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4750:4797" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4799:4805" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4805:4811" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4811:4817" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4817:4823" ph=" " /> + <marker date="1576200329735" expanded="false" signature="4877:4886" ph="..." /> + <marker date="1576200329735" expanded="false" signature="4960:4976" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5029:5076" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5078:5084" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5084:5090" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5090:5096" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5096:5102" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5130:5156" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5242:5260" ph="..." /> + <marker date="1576200329735" expanded="true" signature="5261:5859" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5289:5355" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5394:5441" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5449:5455" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5455:5461" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5461:5467" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5552:5599" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5601:5607" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5607:5613" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5613:5619" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5619:5625" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5726:5773" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5775:5781" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5781:5787" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5787:5793" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5793:5799" ph=" " /> + <marker date="1576200329735" expanded="false" signature="5883:5901" ph="..." /> + <marker date="1576200329735" expanded="true" signature="5902:7585" ph="..." /> + <marker date="1576200329735" expanded="false" signature="5930:5996" ph="..." /> + <marker date="1576200329735" expanded="true" signature="6035:6082" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6084:6090" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6090:6096" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6096:6102" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6102:6108" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6134:6150" ph="..." /> + <marker date="1576200329735" expanded="true" signature="6270:6317" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6319:6325" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6325:6331" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6331:6337" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6337:6343" ph=" " /> + <marker date="1576200329735" expanded="true" signature="6495:6542" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6544:6550" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6550:6556" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6556:6562" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6562:6568" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6687:6734" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6736:6742" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6742:6748" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6748:6754" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6754:6760" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6844:6891" ph="..." /> + <marker date="1576200329735" expanded="false" signature="6893:6899" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6899:6905" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6905:6911" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6911:6917" ph=" " /> + <marker date="1576200329735" expanded="false" signature="6977:7024" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7026:7032" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7032:7038" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7038:7044" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7044:7050" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7234:7281" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7283:7289" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7289:7295" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7295:7301" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7301:7307" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7435:7482" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7484:7490" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7490:7496" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7496:7502" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7502:7508" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7609:7627" ph="..." /> + <marker date="1576200329735" expanded="true" signature="7628:8128" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7656:7722" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7763:7810" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7812:7818" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7818:7824" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7824:7830" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7830:7836" ph=" " /> + <marker date="1576200329735" expanded="false" signature="7948:7995" ph="..." /> + <marker date="1576200329735" expanded="false" signature="7997:8003" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8003:8009" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8009:8015" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8015:8021" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8152:8170" ph="..." /> + <marker date="1576200329735" expanded="true" signature="8171:9171" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8199:8265" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8304:8351" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8353:8359" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8359:8365" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8365:8371" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8371:8377" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8443:8490" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8492:8498" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8498:8504" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8504:8510" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8510:8516" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8573:8620" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8622:8628" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8628:8634" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8634:8640" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8640:8646" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8724:8771" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8773:8779" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8779:8785" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8785:8791" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8791:8797" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8890:8937" ph="..." /> + <marker date="1576200329735" expanded="false" signature="8939:8945" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8945:8951" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8951:8957" ph=" " /> + <marker date="1576200329735" expanded="false" signature="8957:8963" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9037:9084" ph="..." /> + <marker date="1576200329735" expanded="false" signature="9086:9092" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9092:9098" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9098:9104" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9104:9110" ph=" " /> + <marker date="1576200329735" expanded="false" signature="9195:9275" ph="..." /> + <marker date="1576200329735" expanded="false" signature="9336:9416" ph="..." /> </folding> </state> </provider> diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 9614607..756c4bd 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -313,7 +313,7 @@ class Common extends Api //Content $mail->isHTML(true); // 是否以HTML文档格式发送 发送后客户端可直接显示对应HTML内容 $mail->Subject = '授权信息'; - $mail->Body = '<a href="$url">'.$url.'</a>'; + $mail->Body = '<a href='.$url.'>'.$url.'</a>'; $mail->AltBody = '如果邮件客户端不支持HTML则显示此内容'; $mail->send();