1

app/Controller/BasicDataController.php

@@ -168,4 +168,15 @@ class BasicDataController extends AbstractController
         $data = $BasicDataService->getJob();
         return $this->response->json($data);
     }
+
+    /**
+     * 获取协议内容
+     * @return ResponseInterface
+     */
+    public function getAgreementInfo(): ResponseInterface
+    {
+        $BasicDataService = new BasicDataService();
+        $data = $BasicDataService->getAgreementInfo();
+        return $this->response->json($data);
+    }
 }

app/Controller/TestController.php

@@ -58,11 +58,11 @@ class TestController extends AbstractController
 //        $this->test_10();
 //        $this->test_11();
 //        $this->test_5();
-//        $this->test_1();
+        $this->test_1();
 //        $this->test_11();
 //        $this->test_12();
 //        $this->test_13();
-        $this->test_14();
+//        $this->test_14();
     }
 
     // 获取云证书-首次
@@ -85,22 +85,22 @@ class TestController extends AbstractController
 //            return fail();
 //        }
 
-//        // 测试药师
-//        $data = array();
-//        $data['user_id'] = "534534546";
-//        $data['card_num'] = "410323199603261240";
-//        $result = $ca->getCloudCert($data);
-//
-//        $data = array();
-//        $data['user_id'] = "534534546";
-//        $data['cert_base64'] = $result['certBase64'];
-//        $data['cert_chain_p7'] = $result['certP7'];
-//        $data['cert_serial_number'] = $result['certSerialnumber'];
-//        $data['ca_pin'] = "534534546";
-//        $doctor_pharmacist_cert = UserCaCert::addDoctorPharmacistCert($data);
-//        if (empty($doctor_pharmacist_cert)){
-//            return fail();
-//        }
+        // 测试药师
+        $data = array();
+        $data['user_id'] = "534534546";
+        $data['card_num'] = "410323199603261240";
+        $result = $ca->getCloudCert($data);
+
+        $data = array();
+        $data['user_id'] = "534534546";
+        $data['cert_base64'] = $result['certBase64'];
+        $data['cert_chain_p7'] = $result['certP7'];
+        $data['cert_serial_number'] = $result['certSerialnumber'];
+        $data['ca_pin'] = "534534546";
+        $doctor_pharmacist_cert = UserCaCert::addDoctorPharmacistCert($data);
+        if (empty($doctor_pharmacist_cert)){
+            return fail();
+        }
 
         // 测试企业
 //        $data = array();

app/Model/OperationManual.php

@@ -33,11 +33,6 @@ class OperationManual extends Model
      */
     protected array $fillable = ['manual_id', 'app_type', 'client_type', 'status', 'sort', 'title', 'content', 'created_at', 'updated_at'];
 
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected array $casts = ['manual_id' => 'string', 'app_type' => 'integer', 'client_type' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime'];
-
     protected string $primaryKey = "manual_id";
 
     /**

app/Services/BasicDataService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Model\BasicAgreement;
 use App\Model\BasicBank;
 use App\Model\BasicJob;
 use App\Model\BasicNation;
@@ -113,7 +114,7 @@ class BasicDataService extends BaseService
         $params = array();
         $params['status'] = 1;
 
-        $operation_manual = OperationManual::getList($params);
+        $operation_manual = OperationManual::getList($params,$fields);
         if (empty($operation_manual)) {
             return success();
         }
@@ -326,4 +327,23 @@ class BasicDataService extends BaseService
         }
         return success($basic_job->toArray());
     }
+
+    /**
+     * 获取协议内容
+     * @return array
+     */
+    public function getAgreementInfo(): array
+    {
+        $agreement_id = $this->request->route('agreement_id');
+
+        $params = array();
+        $params['agreement_id'] = $agreement_id;
+        $params['agreement_status'] = 1;
+        $basic_agreement = BasicAgreement::getOne($params);
+        if (empty($basic_agreement)){
+            return success(NULL);
+        }
+
+        return success($basic_agreement->toArray());
+    }
 }

app/Utils/Auth.php

@@ -23,6 +23,7 @@ class Auth
             "/area/province" => "get",// 获取省份信息
             "/area/city" => "get", // 获取城市信息
             "/area/county" => "get", // 获取区县信息
+            "/basic/agreement/" => "get", // 获取协议内容
             "/callback/wxpay/inquiry/success" => "post", // 微信问诊支付回调
             "/callback/wxpay/inquiry/refund" => "post", // 微信问诊退款回调
             "/callback/wxpay/product/success" => "post", // 微信药品支付回调
@@ -55,7 +56,11 @@ class Auth
             }
         }*/
 
+
         if(!empty($this->whiteApi)){
+            // 去除id在路由中的情况
+            $path_info = preg_replace("/(\d+)/",'',$path_info);
+
             if (array_key_exists($path_info, $this->whiteApi)) {
                 if ($this->whiteApi[$path_info] == '*') {
                     return true;