测试9

.gitlab-ci.yml

@@ -29,9 +29,8 @@ test:
     - echo "run test....."
     - path=`pwd`
     - sudo bash ci/judgePush.sh $path
-#    - php vendor/bin/phpunit --testsuite=Services
-    - email=`sudo git log --pretty=format:"%ce" -1`
-    - sudo bash ci/sendEmail.sh $email
+    - php vendor/bin/phpunit --testsuite=Services
+    - sudo bash ci/sendEmail.sh
 
 test_failed:
   stage: test_failed

app/Http/Controllers/api/email/SendEmailsController.php

@@ -21,7 +21,7 @@ class SendEmailsController extends Controller
         }else{
             $email=User::query()->where('name','ldaaww')->pluck('email');
             $load=[
-                'title'=>'上传代码测试成功',
+                'title'=>'上传代码邮件通知',
                 'description'=>'开发者上传代码成功，如需部署请做后续操作',
             ];
         }

ci/sendEmail.sh

@@ -3,7 +3,9 @@
 email=$*
 
 if [ "$email" == '' ]; then
-    echo "failed"
+#    curl -i -X POST -d "status=success" http://bswas/api/email/send/gitPushSendEmail
+    curl -v "http://bswas/api/email/send/gitPushSendEmail?status=success"
 elif [ "$email" != '' ]; then
-    echo "email"
+#    curl -i -X POST -d "status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!" http://bswas/api/email/send/gitPushSendEmail
+    curl -v "http://bswas/api/email/send/gitPushSendEmail?status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!"
 fi

routes/api/email/send.php

@@ -5,4 +5,4 @@ use Illuminate\Support\Facades\Route;
 /*
 文件地址前缀：/api/email/send
 */
-Route::middleware(['throttle:1,1'])->post('gitPushSendEmail', "SendEmailsController@send");
+Route::middleware(['throttle:1,1'])->get('gitPushSendEmail', "SendEmailsController@send");