Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	routes/api/email/send.php

.gitlab-ci.yml

@@ -7,13 +7,13 @@ stages:
 cache:
   paths:
     - vendor/
+    - node_modules/
 
 before_script:
 #配置环境
 #  - sudo cp ci/.envCi .env
 #  - sudo bash ci/installEnv.sh
 
-
 build:
   stage: build
   tags:
@@ -29,19 +29,17 @@ test:
     - echo "run test....."
 #    - path=`pwd`
 #    - sudo bash ci/judgePush.sh $path
-#    - vendor/bin/phpunit --testsuite=Unit
-#    TODO 给master用户发送邮件
+#    - php vendor/bin/phpunit --testsuite=Services
+#    - sudo bash ci/sendEmail.sh
 
 test_failed:
   stage: test_failed
   tags:
     - testwas
   script:
-    - echo "run test failed_1"
-#    - user=`sudo git log --pretty=format:"%ce" -1`
-#    - echo "$user"
-#    - sudo bash ci/sendEmail.sh $user
-#    TODO 发送失败邮件
+    - echo "run test_failed"
+#    - email=`sudo git log --pretty=format:"%ce" -1`
+#    - sudo bash ci/sendEmail.sh $email
   when: on_failure
 
 deploy:

app/Http/Controllers/TestController.php

@@ -63,6 +63,7 @@ use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use App\Services\common\QueryService;
+use App\Services\ConfigurationService;
 use App\Services\DeliveryAppointmentService;
 use App\Services\DocWaveHeaderService;
 use App\Services\FeatureService;
@@ -1228,4 +1229,28 @@ TEXT;
         $result=  $service->get(['owner_id' =>3,'date'=>'2021-05-01']);
         dd($result);
     }
+
+    public function testPrice()
+    {
+        $configurationService=app(ConfigurationService::class);
+        $priceCoefficient=$configurationService->getPriceCoefficient();
+        $procurement_unit_prices=[
+            '1298'=>8.3,
+            '1286'=>0.1,
+            '1285'=>2.9,
+            '1284'=>5.4,
+            '1281'=>5.7,
+            '1280'=>40,
+            '1279'=>1,
+            '1277'=>2.15,
+            '1275'=>0.25,];
+        foreach ($procurement_unit_prices as $key=>$value){
+            Procurement::query()->find($key)->update(['unit_price'=>$value]);
+        }
+        $procurement_ids=['1289','1288','1287','1274',];
+        foreach ($procurement_ids as $id){
+            $procurement=Procurement::query()->find($id);
+            $procurement->update(['unit_price'=>$procurement->cost_price*$priceCoefficient]);
+        }
+    }
 }

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

@@ -4,17 +4,27 @@ namespace App\Http\Controllers\api\email;
 
 use App\Events\GitPushedEvent;
 use App\Http\Controllers\Controller;
+use App\User;
 use Illuminate\Http\Request;
 
 class SendEmailsController extends Controller
 {
     public function send(Request $request)
     {
-        $email=$request['email'];
-        $load=[
-            'title'=>$request['title'],
-            'description'=>$request['description'],
-        ];
+        $status=$request['status'];
+        if ($status=='failed'){
+            $email=$request['email'];
+            $load=[
+                'title'=>$request['title'],
+                'description'=>$request['description'],
+            ];
+        }else{
+            $email=User::query()->where('name','ldaaww')->pluck('email');
+            $load=[
+                'title'=>'上传代码邮件通知',
+                'description'=>'开发者上传代码成功，如需部署请做后续操作',
+            ];
+        }
         event(new GitPushedEvent($email,$load));
     }
 }

ci/.envCi

@@ -12,11 +12,11 @@ LOG_CHANNEL=stack
 
 
 DB_CONNECTION=mysql
-DB_HOST=47.103.131.176
-DB_PORT=3306
+DB_HOST=101.133.135.193
+DB_PORT=13306
 DB_DATABASE=bswas_test
-DB_USERNAME=developer
-DB_PASSWORD=developer
+DB_USERNAME=bswas_test
+DB_PASSWORD=123456
 
 
 ORACLE_DRIVER=oracle
@@ -30,12 +30,12 @@ ORACLE_CHARSET=utf8
 ORACLE_PREFIX=
 
 
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
-QUEUE_CONNECTION=database
+BROADCAST_DRIVER=redis
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
-
+CACHE_PREFIX=testwas
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

ci/executeCommand.sh

@@ -11,7 +11,7 @@ update_path=/var/www/update
 # shellcheck disable=SC2006
 for file in `ls $update_path`
      do
-        if [ "composer.json" = "$file" ]; then
+        if [ "composer.json" == "$file" ]; then
             sudo composer install
         elif [ "package.json" == "$file" ]; then
             sudo yarn install

ci/installEnv.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 hasComposer=`command -v composer`
+
 if [[ $hasComposer == '' ]]
     then
 
@@ -45,3 +46,5 @@ if [[ $hasComposer == '' ]]
     composer update
     sudo chown gitlab-runner:docker vendor -R
 fi
+    composer update
+    sudo chown gitlab-runner:docker vendor -R

ci/sendEmail.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
 
-user=$*
-echo "$user"
+email=$*
+
+if [ "$email" == '' ]; then
+    curl -v "https://testwas.baoshi56.com/api/email/send/gitPushSendEmail?status=success"
+elif [ "$email" != '' ]; then
+    curl -v "https://testwas.baoshi56.com/api/email/send/gitPushSendEmail?status=failed&email=$email&title=上传代码邮件通知&description=开发者上传代码失败,请检查错误!"
+fi