stanley-king 4 rokov pred
rodič
commit
c8251ff0cb
12 zmenil súbory, kde vykonal 37 pridanie a 51 odobranie
  1. 1 1
      .gitignore
  2. 0 14
      mac_start.sh
  3. 18 18
      gcidfiller.php
  4. 0 0
      server/logmonitor.php
  5. 0 0
      server/mac_ugcman
  6. 0 0
      server/mac_webacc
  7. 0 0
      server/qwatch.py
  8. 0 0
      server/restart.py
  9. 0 0
      server/ugcman
  10. 0 0
      server/webacc
  11. 1 1
      upfile.php
  12. 17 17
      util.php

+ 1 - 1
.gitignore

@@ -76,4 +76,4 @@ data/log/20170824.log
 /data/session/
 /installx/
 /data/upload/
-mac_start.sh
+server/mac_start.sh

+ 0 - 14
mac_start.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-#sudo /usr/local/mysql/support-files/mysql.server restart
-sudo pkill nginx
-sleep 1
-sudo nginx
-sudo pkill php-fpm
-sleep 1
-php-fpm
-sudo pkill redis-server
-sleep 1
-sudo redis-server /etc/redis/6379.conf
-sudo redis-server /etc/redis/6380.conf
-sudo pkill -9 $(pidof python)
-./qwatch.py

+ 18 - 18
gcidfiller.php

@@ -1,19 +1,19 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 16/1/11
- * Time: 下午12:43
- */
-
-
-require_once (BASE_ROOT_PATH . '/global.php');
-require_once (BASE_ROOT_PATH . '/fooder.php');
-require_once (BASE_UTIL_PATH . '/gcid_fill.php');
-
-define('StartTime', microtime(true));
-define('TIMESTAMP', time());
-Base::run_util();
-
-$filler = new gcid_fill();
+<?php
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/1/11
+ * Time: 下午12:43
+ */
+
+
+require_once (BASE_ROOT_PATH . '/global.php');
+require_once (BASE_ROOT_PATH . '/fooder.php');
+require_once (BASE_UTIL_PATH . '/gcid_fill.php');
+
+define('StartTime', microtime(true));
+define('TIMESTAMP', time());
+Base::run_util();
+
+$filler = new gcid_fill();
 $filler->proc();

logmonitor.php → server/logmonitor.php


mac_ugcman → server/mac_ugcman


mac_webacc → server/mac_webacc


qwatch.py → server/qwatch.py


restart.py → server/restart.py


ugcman → server/ugcman


webacc → server/webacc


+ 1 - 1
upfile.php

@@ -50,7 +50,7 @@ if ($_POST)
 {
     $base_path = BASE_ROOT_PATH . '/data/upload/upfile';
     $base_site_path = '/data/upload/upfile';
-    $ret = array();
+    $ret = [];
 
     if ($_FILES["file"]["error"] > 0) {
         upfile_joutput_error($_FILES["file"]["error"]);

+ 17 - 17
util.php

@@ -1,18 +1,18 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 16/1/11
- * Time: 下午12:43
- */
-
-require_once(BASE_ROOT_PATH . '/global.php');
-require_once (BASE_ROOT_PATH . '/fooder.php');
-require_once (BASE_UTIL_PATH . '/sku_mapper.php');
-
-define('StartTime', microtime(true));
-define('TIMESTAMP', time());
-Base::run_util();
-
-$skumapper = new sku_mapper();
+<?php
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/1/11
+ * Time: 下午12:43
+ */
+
+require_once(BASE_ROOT_PATH . '/global.php');
+require_once (BASE_ROOT_PATH . '/fooder.php');
+require_once (BASE_UTIL_PATH . '/sku_mapper.php');
+
+define('StartTime', microtime(true));
+define('TIMESTAMP', time());
+Base::run_util();
+
+$skumapper = new sku_mapper();
 $skumapper->proc();