Browse Source

add to local

stanley-king 4 năm trước cách đây
mục cha
commit
f805603e54

+ 1 - 0
admin/css/chunk-02145a57.ee5a2bf3.css

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

+ 1 - 0
admin/css/chunk-44d9165f.04ecd3e1.css

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

+ 1 - 0
admin/css/chunk-8a298e90.70ccbcf1.css

@@ -0,0 +1 @@
+.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}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/css/chunk-vendors.5ad50e34.css


+ 1 - 0
admin/css/index.66872d16.css

@@ -0,0 +1 @@
+*{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%}

BIN
admin/favicon.ico


BIN
admin/fonts/element-icons.535877f5.woff


BIN
admin/fonts/element-icons.732389de.ttf


BIN
admin/img/login.85baf3ba.jpg


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/index.html


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-02145a57.dffb849f.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-2d0aef1a.9f7c4ea4.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-2d0c4c63.33a471c2.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-2d0cfee0.f1db52cc.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-2d221823.c4d9d70d.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-2d22657a.623212d4.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-44d9165f.65bd6fc0.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-7c7aa788.74529b53.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 274 - 0
admin/js/chunk-8a298e90.d28eaa8a.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/chunk-d5453138.320c4023.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 27 - 0
admin/js/chunk-vendors.f1a753cf.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
admin/js/index.75a0bd86.js


+ 30 - 32
conf/nginx/nginx-prod-http.conf

@@ -2,7 +2,6 @@
 user nginx;
 worker_processes  1;
 error_log   /var/error.log  info;
-#pid        logs/nginx.pid;
 worker_rlimit_nofile 1024;
 
 events {
@@ -28,8 +27,8 @@ http
     server 
     {
     	listen       80;
-        set  $folder_name /var/www/html;
-        server_name www.xyzshops.cn;
+        set  $folder_name /var/www/html/public;
+        server_name apizng.eavic.com;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;
@@ -39,48 +38,47 @@ http
         fastcgi_connect_timeout 75;
         fastcgi_read_timeout 600;   
         fastcgi_send_timeout 600;   
-
         charset utf-8;
-        
-        location /logs {
-            deny all;
-            return 403;
-        }
 
-        location /data/log {
-            deny all;
-            return 403;
-        }
         location / {
             index  index.html index.htm index.php;
         }
-        
-        location /mshop {
-            root $folder_name;
-            autoindex on;        
-            index  index.html index.htm index.php;
-	        try_files $uri $uri/ /mshop/index.html;
+
+        if (!-e $request_filename) {
+            rewrite  ^(.*)$  /index.php?s=/$1  last;
         }
 
-        location ~ /mobile/[/\w]+\.php$ {
+        location ~ \.php {
+         add_header Cache-Control no-store;
+            set  $folder_name /var/www/html/public;
             root           $folder_name;
-            fastcgi_pass   mobilesrv:9100;
+            fastcgi_pass   lfpm:9000;
             fastcgi_index  index.php;
+            fastcgi_split_path_info ^(.+\.php)(.*)$;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            include fastcgi_params;
+            include        fastcgi_params;
         }
+    }
+    server
+    {
+        listen       80;
+        set  $folder_name /var/www/html/admin;
+        server_name zng.eavic.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;
 
-        location ~ /mobile/[/\w]+\.html$ {
-            try_files $uri $uri/ /mobile/index.html;
-        }
+        charset utf-8;
 
-        location ~ \.php$ {
-	        add_header Cache-Control no-store;
-            root           $folder_name;
-            fastcgi_pass   fpmsrv:9000;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            include        fastcgi_params;
+        location / {
+            index  index.html index.htm index.php;
         }
     }
 }

+ 20 - 109
docker-compose.yml

@@ -1,141 +1,52 @@
 version: "3.7"
 
 services:
-  nginxsrv:
+  lnginx:
     image: nginx:alpine
     ports:
-      - "443:443"
+      - "80:80"
     volumes:
-      - $PWD:/var/www/html
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/nginx/cert:/etc/nginx/cert
-      - $PWD/conf/nginx/nginx-prod-https.conf:/etc/nginx/nginx.conf:ro
+      - $PWD/conf/nginx/nginx-prod-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD:/var/www/html
     links:
-      - mobilesrv
-      - fpmsrv
-    container_name: "panda-nginx"
+      - lfpm
+    container_name: "logic-nginx"
     command: [nginx,'-g','daemon off;']
 
-  redisrv:
+  lredis:
     image: redis:alpine
     ports:
-      - "6379:6379"
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/redis/6379.conf:/usr/local/etc/redis/redis.conf
-      - $PWD/conf/redis:/var/redis
-    container_name: "panda-redis"
-    command: [ "redis-server"]
-
-  mobilesrv:
-    image: php-zts-debug:7.3.18
-    ports:
-      - "9100:9100"
+      - "6380:6379"
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/docker-php-start:/usr/local/bin/docker-php-start
-    links:
-      - redisrv
-    container_name: "panda-mobile"
-    command: ['docker-php-start']
-    depends_on:
-      - "redisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
+      - $PWD/conf/redis/6379.conf:/etc/redis/redis.conf
+    container_name: "logic-redis"
+    command: [redis-server,"/etc/redis/redis.conf"]
 
-  fpmsrv:
+  lfpm:
     image: php-fpm:alpine
-    ports:
-      - "9000:9000"
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
       - $PWD/conf/php-fpm/php.ini:/usr/local/etc/php/php.ini
       - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
-    container_name: "panda-web"
+    container_name: "logic-web"
     command: [docker-php-fpm-start]
-    depends_on:
-      - "redisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  QueueSrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
-    links:
-      - redisrv
-    container_name: "panda-queue"
-    command: [docker-queue-start]
-    depends_on:
-      - "redisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  SearchSrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/searcher/docker-search-start:/usr/local/bin/docker-start
-    links:
-      - redisrv
-    container_name: "panda-searcher"
-    command: [docker-start]
-    depends_on:
-      - "redisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
-
-  crontabsrv:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - $PWD/conf/crontab/root:/var/spool/cron/crontabs/root
-      - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
     links:
-      - redisrv
-    container_name: "panda-crontab"
-    command: [docker-start]
+      - lredis
     depends_on:
-      - "redisrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
+      - lredis
 
-  phpcli:
+  lphp:
     image: php-zts-debug:7.3.18
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
     links:
-      - redisrv
-    container_name: "panda-php"
+      - lredis
+    container_name: "logic-php"
     depends_on:
-      - "redisrv"
-      - "fpmsrv"
-      - "SearchSrv"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.125"
+      - "lredis"