dever 6 years ago
parent
commit
78552e9735

+ 5 - 1
container/conf/web/nginx/conf.d/domain.conf

@@ -8,7 +8,7 @@ server {
 
     charset $charset;
 
-    set $rootdir /www/jiaoyoucms/public;
+    set $rootdir /www/jy/public;
     root $rootdir;
     index index.php index.html;
 
@@ -41,6 +41,10 @@ server {
     }
 
     location ~ ^(.*)$ {
+        #add_header Access-Control-Allow-Origin http://192.168.0.109:8080;
+        #add_header Access-Control-Allow-Headers X-Requested-With;
+       # add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
+        #add_header Access-Control-Allow-Credentials true;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
 

+ 2 - 1
container/conf/web/nginx/conf.d/site.conf

@@ -65,7 +65,8 @@ server {
         # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini (No settings!)
 
         # With php-cgi alone:
-        fastcgi_pass web-php7:9000;
+        fastcgi_pass web-php7_swoole:9000;
+        #fastcgi_pass web-php7:9000;
         #fastcgi_pass web-php5:9000;
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;

+ 1 - 0
container/conf/web/php7/conf.d/00_fileinfo.ini

@@ -0,0 +1 @@
+extension=fileinfo.so

+ 1 - 0
container/conf/web/php7/conf.d/00_tokenizer.ini

@@ -0,0 +1 @@
+extension=tokenizer.so

+ 1 - 1
container/conf/web/php7/php.ini

@@ -1780,7 +1780,7 @@ ldap.max_links = -1
 
 [opcache]
 ; Determines if Zend OPCache is enabled
-opcache.enable=1
+opcache.enable=0
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
 opcache.enable_cli=0

+ 36 - 0
container/conf/web/smproxy/database.json

@@ -0,0 +1,36 @@
+{
+  "database": {
+    "account": {
+      "root": {
+        "user": "root",
+        "password": "123456"
+      }
+    },
+    "serverInfo": {
+      "server1": {
+        "write": {
+          "host": ["web-mysql"],
+          "port": 3306,
+          "timeout": 2,
+          "account": "root"
+        },
+        "read": {
+          "host": ["web-mysql"],
+          "port": 3306,
+          "timeout": 2,
+          "account": "root"
+        }
+      }
+    },
+    "databases": {
+      "wonderful": {
+        "serverInfo": "server1",
+        "startConns": "swoole_cpu_num()*10",
+        "maxSpareConns": "swoole_cpu_num()*10",
+        "maxSpareExp": 3600,
+        "maxConns": "swoole_cpu_num()*20",
+        "charset": "utf8mb4"
+      }
+    }
+  }
+}

+ 43 - 0
container/conf/web/smproxy/server.json

@@ -0,0 +1,43 @@
+{
+  "server": {
+    "user": "root",
+    "password": "123456",
+    "charset": "utf8mb4",
+    "host": "web-php7_smproxy",
+    "port": "3366",
+    "mode": "SWOOLE_PROCESS",
+    "sock_type": "SWOOLE_SOCK_TCP",
+    "logs": {
+      "open":true,
+      "config": {
+        "system": {
+          "log_path": "ROOT/logs",
+          "log_file": "system.log",
+          "format": "Y/m/d"
+        },
+        "mysql": {
+          "log_path": "ROOT/logs",
+          "log_file": "mysql.log",
+          "format": "Y/m/d"
+        }
+      }
+    },
+    "swoole": {
+      "worker_num": "swoole_cpu_num()",
+      "max_coro_num": 6000,
+      "open_tcp_nodelay": true,
+      "daemonize": true,
+      "heartbeat_check_interval": 60,
+      "heartbeat_idle_time": 600,
+      "reload_async": true,
+      "log_file": "ROOT/logs/swoole.log",
+      "pid_file": "ROOT/logs/pid/server.pid"
+    },
+    "swoole_client_setting": {
+      "package_max_length": 16777215
+    },
+    "swoole_client_sock_setting": {
+      "sock_type": "SWOOLE_SOCK_TCP"
+    }
+  }
+}

+ 37 - 0
src/docker/build/dev/php/smproxy/Dockerfile

@@ -0,0 +1,37 @@
+FROM php:7.2.13-cli-alpine
+
+ENV SMProxy_VERSION 1.2.7
+
+RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers \
+    && pecl install swoole \
+    && docker-php-ext-enable swoole \
+    \
+    # xBring in gettext so we can get `envsubst`, then throw
+    # the rest away. To do this, we need to install `gettext`
+    # then move `envsubst` out of the way so `gettext` can
+    # be deleted completely, then move `envsubst` back.
+    && apk add --no-cache --virtual .gettext gettext \
+    && mv /usr/bin/envsubst /tmp/ \
+    \
+    && runDeps="$( \
+        scanelf --needed --nobanner --format '%n#p' /usr/local/bin/php /usr/local/lib/php/extensions/*/*.so /tmp/envsubst \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    )" \
+    && apk add --no-cache --virtual .php-rundeps $runDeps \
+    && apk del .phpize-deps \
+    && apk del .gettext \
+    && mv /tmp/envsubst /usr/local/bin/ \
+    \
+    && cd /usr/local \
+    && wget https://github.com/louislivi/smproxy/releases/download/v$SMProxy_VERSION/smproxy.tar.gz \
+    && tar -zxvf smproxy.tar.gz \
+    && ls -lna
+
+VOLUME /usr/local/smproxy/conf
+VOLUME /usr/local/smproxy/logs
+
+EXPOSE 3366
+
+CMD ["/usr/local/smproxy/SMProxy", "start", "--console"]

+ 9 - 1
src/docker/conf/web.conf

@@ -30,10 +30,18 @@ alias = php,composer,pecl,apk,/install.sh->phpInstall
 
 [php7]
 #port = 8082:8080
-port = 2346:2346
+#image = php7_swoole
+port = 2346:2346,1236:1236,1237:1237,1238:1238
 volumes = {container}web:/www,{container}conf/web/php7:/etc/php7
 alias = php,composer,pecl,apk,/install.sh->phpInstall
 
+[php7_swoole]
+volumes = {container}web:/www,{container}conf/web/php7:/etc/php7
+
+[php7_smproxy]
+port = 3366:3366
+volumes = {container}web:/www,{container}conf/web/php7:/etc/php7,{container}conf/web/smproxy:/usr/local/smproxy/conf,{container}logs/{name}/logs:/usr/local/smproxy/logs
+
 [#nginx]
 #num = 3
 # num和cluster都可以设置有多少个nginx进程,不同的是,cluster仅对ds有效

+ 1 - 0
src/docker/core.conf

@@ -17,6 +17,7 @@ debian				= os/debian
 php5				= dev/php/v5
 php7				= dev/php/v7
 php7_swoole			= dev/php/swoole
+php7_smproxy		= dev/php/smproxy
 java				= dev/java
 java_base			= java/base
 maven				= java/maven

+ 7 - 0
src/shell/webbench

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+set -e
+
+for((i=1;i<=1000;i++));  
+do   
+webbench -c 100 -t 10 "http://mapi.jstyle.cn/wonderful/main/?journal.getList&system=2&test={$RANDOM}"
+done