add to local

admin/css/chunk-02145a57.ee5a2bf3.css

@@ -1 +0,0 @@
-.login_container[data-v-11c423e0]{width:90%}

admin/css/chunk-44d9165f.04ecd3e1.css

@@ -1 +0,0 @@
-.el-menu[data-v-e497cf3e]{height:calc(100vh - 62px)}.el-dropdown-link[data-v-e497cf3e]{color:#409eff}

admin/css/chunk-8a298e90.70ccbcf1.css

@@ -1 +0,0 @@
-.box-card[data-v-00bd42f6]{color:#fff;background:#6b6b6b;margin-top:10px}.el-dropdown-link[data-v-00bd42f6]{cursor:pointer;color:#409eff}.el-icon-arrow-down[data-v-00bd42f6]{font-size:12px}.clearfix[data-v-00bd42f6]{display:flex;align-items:center;justify-content:space-between}.el-tag[data-v-00bd42f6]{background:transparent;color:#fff}.info[data-v-00bd42f6]{display:flex}.info .label[data-v-00bd42f6]{width:80px;text-align:right}.info .value[data-v-00bd42f6]{flex:1}

admin/css/index.66872d16.css

@@ -1 +0,0 @@
-*{margin:0;padding:0;box-sizing:border-box;font-family:sans-serif}body,html{font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,微软雅黑,Arial,sans-serif}#app,body,html{height:100%}

application/index/controller/Order.php

@@ -15,10 +15,6 @@ class Order extends Base
 
     public function CheckOrder(){
         $order_sn = input('param.order_sn');
-        //todo 检查订单是否存在。
-        //1,如果订单已经存在，并且在传入的柜子和箱子中，返回正确，做一下操作记录。
-        //2,如果订单已经存在，但不在传入的柜子和箱子中，返回错误。
-        //3,其余返回正确。
 
         //商网接口
         $postData['orderCode'] = $order_sn;
@@ -31,8 +27,6 @@ class Order extends Base
         if(!empty($result) && $result['code'] == 0) {
             $existed = $result['data']['isEffective'] != 0;
             if($existed == true){
-//                $OrderModel = new OrderModel();
-//                $order = $OrderModel->checkOrder($order_sn);
                 $BoxModel = new BoxModel();
                 $order = $BoxModel->where('order_sn',$order_sn)->find();
                 if(!empty($order)){
@@ -199,8 +193,8 @@ class Order extends Base
                 json_error(1007,'日期有误');
             }
             $start_time = $param['start_time'];
-            
-            
+
+
             $end_time = $param['end_time'];
             $TimeWhere[] = ['enter_time','between',"$start_time,$end_time"];
         }
@@ -271,7 +265,7 @@ class Order extends Base
     }
     /**
      * 生成订单并绑定箱子
-    */
+     */
     private function CreateOrder($order_sn , $box_number , $cabinet, $code)
     {
         $data['order_sn'] = $order_sn;
@@ -300,7 +294,7 @@ class Order extends Base
 
     /**
      * 生成校验码
-    */
+     */
     private function createRandCode()
     {
         while (true)

conf/nginx/nginx-debug-http.conf

@@ -29,7 +29,7 @@ http
     {
     	listen       8080;
         set  $folder_name /var/www/html/public;
-        server_name zngapi.hemadj.com;
+        server_name 192.168.1.200;
         root $folder_name;
         index index.html index.php;
     	client_max_body_size 100m;
@@ -70,26 +70,4 @@ http
             include        fastcgi_params;
         }
     }
-
-    server
-    {
-        listen       8080;
-        set  $folder_name /var/www/html/admin;
-        server_name zngadm.hemadj.com;
-        root $folder_name;
-        index index.html index.php;
-        client_max_body_size 100m;
-        proxy_connect_timeout 500s;
-        proxy_read_timeout 500s;
-        proxy_send_timeout 500s;
-        fastcgi_connect_timeout 75;
-        fastcgi_read_timeout 600;
-        fastcgi_send_timeout 600;
-
-        charset utf-8;
-
-        location / {
-            index  index.html index.htm index.php;
-        }
-    }
 }

config/database.php

@@ -13,15 +13,16 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '10.129.178.90',//'39.97.239.116',//'host.docker.internal',
+    'hostname'        => '39.97.239.116',//'host.docker.internal','10.129.178.90'
     // 数据库名
     'database'        => 'songcan',
     // 用户名
-    'username'        => 'tianruihengan',//'root',
+    'username'        => 'songcan',//'root',
     // 密码
-    'password'        => 'Alidts_123456',//'55668899',//
+    'password'        => 'bfhFKR4azH5irEW2',//'55668899',//
     // 端口
     'hostport'        => '3306',
+
     // 连接dsn
     'dsn'             => '',
     // 数据库连接参数

docker-compose-mac.yml

@@ -22,6 +22,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD/conf/redis/6379.conf:/etc/redis/redis.conf
+      - $PWD/conf/redis:/var/redis
     container_name: "logic-redis"
     command: [redis-server,"/etc/redis/redis.conf"]
 

extend/queue.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types=0);
 
 /**
  * 队列处理

public/index.php

@@ -14,14 +14,16 @@ namespace think;
 
 
 if($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
-    header("Access-Control-Allow-Origin: http://10.64.81.2");
+//    header("Access-Control-Allow-Origin: http://10.64.81.2");
+    header("Access-Control-Allow-Origin: http://192.168.1.200:8081");
     header("Access-Control-Allow-Headers:DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type, Accept-Language, Origin, Accept-Encoding");
     header('Access-Control-Allow-Methods: GET, POST, PUT,DELETE,PATCH');
     header("Access-Control-Allow-Credentials: true");
     exit;
 }
 else {
-    header("Access-Control-Allow-Origin: http://10.64.81.2");
+//    header("Access-Control-Allow-Origin: http://10.64.81.2");
+    header("Access-Control-Allow-Origin: http://192.168.1.200:8081");
     header('Access-Control-Allow-Methods: GET, POST, PUT,DELETE,PATCH');
     header("Access-Control-Allow-Credentials: true");
     header("Access-Control-Allow-Headers:DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type, Accept-Language, Origin, Accept-Encoding");