diff --git a/yimian/.viminfo b/yimian/.viminfo index a54ada06..b5f1c040 100755 --- a/yimian/.viminfo +++ b/yimian/.viminfo @@ -15,8 +15,8 @@ $ # Command Line History (newest to oldest): :wq -:q! :q +:q! :w :Q! :Wq @@ -33,47 +33,7 @@ $ # Registers: ""0 LINE 0 - - - - $total_arr[$ii]['date']=date('Y-m-d', strtotime('-'.($ii+1).'day')); - $total_arr[$ii]['total']=$tmp; - - - - - $firstTime = $firstItem['datetime']; - $firstDate = substr($firstTime, 0, 10); - - $datetime_start = date_create($firstDate); - $datetime_end = date_create(date('Y-m-d')); - $days = date_diff($datetime_start, $datetime_end)->days; - - for($ii = 0; $ii < (($days < 30) ? $days: 30); $ii ++){ - - $sql = "select * from account where datetime>='".date('Y-m-d',strtotime('-'.($ii+1).' day'))." 00:00:00' and datetime<'".date('Y-m-d', strtotime("-$ii day"))." 00:00:00' order by id DESC limit 1"; - $result = $conn->query($sql); - - $tmp = 0; - while($row = $result->fetch_assoc()) { - $tmp = $row['total']; - } - $total_arr[$ii]['date']=date('Y-m-d', strtotime('-'.($ii+1).'day')); - $total_arr[$ii]['total']=$tmp; - - - } - - for($i = 0; $i < count($total_arr); $i++){ - if($i < count($total_arr) - 1) $total_arr[$i]['val'] = $total_arr[$i]['total'] - $total_arr[$i+1]['total']; - else $total_arr[$i]['val'] = 0; - } - - for($i = 0; $i < count($total_arr); $i ++){ - if($i < count($total_arr) - 7) $total_arr[$i]['week_val'] = $total_arr[$i]['total'] - $total_arr[$i+7]['total']; - else $total_arr[$i]['week_val'] = 0; - } - + include '/home/ushio/conf/dbKeys/log.db.key.php'; "1 CHAR 0 @@ -170,18 +130,29 @@ $ # File marks: -'0 30 58 ~/www/settlement/imgbed/upload.php -'1 1 0 ~/www/settlement/imgbed/upload -'2 16 17 ~/www/settlement/imgbed/js/jquery.imageuploader.js -'3 52 44 ~/www/settlement/imgbed/js/main.js -'4 5 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js -'5 26 17 ~/www/settlement/api/getCurrent.php -'6 13 57 ~/www/settlement/api/getCurrent.php -'7 15 0 ~/www/settlement/api/getCurrent.php -'8 14 32 ~/www/settlement/api/getDetail.php -'9 1 0 ~/www/settlement/api/get +'0 1 7 ~/www/settlement/imgbed/.gitignore +'1 4 0 ~/www/settlement/func/functions.php +'2 2 0 /home/ushio/www/api/functions.php +'3 5 68 ~/www/settlement/api/test.php +'4 341 0 ~/www/settlement/func/functions.php +'5 122 0 ~/www/settlement/api/index.php +'6 30 58 ~/www/settlement/imgbed/upload.php +'7 1 0 ~/www/settlement/imgbed/upload +'8 16 17 ~/www/settlement/imgbed/js/jquery.imageuploader.js +'9 52 44 ~/www/settlement/imgbed/js/main.js # Jumplist (newest first): +-' 1 7 ~/www/settlement/imgbed/.gitignore +-' 4 0 ~/www/settlement/func/functions.php +-' 327 0 ~/www/settlement/func/functions.php +-' 341 8 ~/www/settlement/func/functions.php +-' 2 0 /home/ushio/www/api/functions.php +-' 1 0 /home/ushio/www/api/functions.php +-' 5 68 ~/www/settlement/api/test.php +-' 1 0 ~/www/settlement/api/test.php +-' 86 0 ~/www/settlement/func/functions.php +-' 122 0 ~/www/settlement/api/index.php +-' 78 0 ~/www/settlement/api/index.php -' 30 58 ~/www/settlement/imgbed/upload.php -' 27 16 ~/www/settlement/imgbed/upload.php -' 1 0 ~/www/settlement/imgbed/upload @@ -197,7 +168,6 @@ $ -' 14 32 ~/www/settlement/api/getDetail.php -' 1 0 ~/www/settlement/api/getDetail.php -' 1 0 ~/www/settlement/api/get --' 78 0 ~/www/settlement/api/index.php -' 29 0 ~/www/settlement/api/index.php -' 10 43 ~/www/settlement/api/getAccountEvents.php -' 1 0 ~/www/settlement/api/getAccountEvents.php @@ -237,8 +207,7 @@ $ -' 53 0 ~/www/settlement/api/getWeekData.php -' 25 28 ~/www/settlement/api/getWeekData.php -' 6 0 ~/www/settlement/api/getWeekData.php --' 85 0 ~/www/settlement/func/functions.php --' 87 0 ~/www/settlement/func/functions.php +-' 88 0 ~/www/settlement/func/functions.php -' 1 0 ~/www/settlement/api/index.php -' 104 0 ~/www/settlement/api/index.php -' 1 0 ~/www/settlement/api/getWeekData.php @@ -256,33 +225,91 @@ $ -' 150 0 ~/www/settlement/api/index.php -' 76 8 ~/www/settlement/api/index.php -' 135 0 ~/www/settlement/api/index.php --' 8 0 ~/www/settlement/func/functions.php --' 442 6 ~/www/settlement/func/functions.php --' 299 6 ~/www/settlement/func/functions.php --' 150 38 ~/www/settlement/func/functions.php --' 116 38 ~/www/settlement/func/functions.php --' 9 1 ~/www/settlement/func/functions.php +-' 9 0 ~/www/settlement/func/functions.php +-' 443 6 ~/www/settlement/func/functions.php +-' 300 6 ~/www/settlement/func/functions.php +-' 151 38 ~/www/settlement/func/functions.php +-' 117 38 ~/www/settlement/func/functions.php +-' 10 1 ~/www/settlement/func/functions.php -' 1 0 ~/www/settlement/func/functions.php -' 5 0 ~/www/settlement/api/index.php -' 2 9 ~/www/settlement/index.php -' 1 0 ~/www/settlement/index.php --' 78 1 ~/www/settlement/func/functions.php +-' 79 1 ~/www/settlement/func/functions.php -' 1 0 ~/www/settlement/.config.php -' 1 0 ~/www/settlement/.gitignore -' 149 0 /home/ushio/www/api/functions.php -' 227 0 /home/ushio/www/api/functions.php --' 1 0 /home/ushio/www/api/functions.php --' 1 0 /home/ushio/www/api/mail/index.php --' 1 0 /home/ushio/www/api/mail/in --' 5 36 /etc/dnsmasq.d/sola.conf --' 1 0 /etc/dnsmasq.d/sola.conf --' 1 0 ~/www/smartfarm/routes/api.js --' 4 25 ~/www/wx/.env --' 1 0 ~/www/wx/.env --' 70 0 ~/www/smartfarm/html/chart-station.html # History of marks within files (newest to oldest): +> ~/www/settlement/imgbed/.gitignore + " 1 7 + ^ 1 8 + . 1 7 + + 1 7 + +> ~/www/settlement/func/functions.php + " 4 0 + ^ 88 0 + . 4 0 + + 3 37 + + 9 2 + + 4 0 + +> /home/ushio/www/api/functions.php + " 2 0 + +> ~/www/settlement/api/test.php + " 5 68 + ^ 5 69 + . 5 68 + + 3 57 + + 5 68 + +> ~/www/settlement/api/index.php + " 122 0 + ^ 104 0 + . 3 37 + + 6 0 + + 5 56 + + 60 14 + + 48 21 + + 96 1 + + 103 1 + + 96 0 + + 103 0 + + 98 0 + + 110 20 + + 146 49 + + 110 0 + + 116 9 + + 123 13 + + 116 8 + + 117 9 + + 132 18 + + 116 9 + + 115 24 + + 116 8 + + 115 9 + + 116 36 + + 117 36 + + 123 12 + + 8 15 + + 80 15 + + 85 0 + + 86 0 + + 85 26 + + 86 1 + + 87 0 + + 85 0 + + 75 21 + + 74 62 + + 75 0 + + 5 0 + + 2 0 + + 3 37 + > ~/www/settlement/imgbed/upload.php " 30 58 ^ 30 59 @@ -361,49 +388,6 @@ $ > ~/www/settlement/api/get " 1 0 -> ~/www/settlement/api/index.php - " 78 0 - ^ 104 0 - . 3 37 - + 6 0 - + 5 56 - + 60 14 - + 48 21 - + 96 1 - + 103 1 - + 96 0 - + 103 0 - + 98 0 - + 110 20 - + 146 49 - + 110 0 - + 116 9 - + 123 13 - + 116 8 - + 117 9 - + 132 18 - + 116 9 - + 115 24 - + 116 8 - + 115 9 - + 116 36 - + 117 36 - + 123 12 - + 8 15 - + 80 15 - + 85 0 - + 86 0 - + 85 26 - + 86 1 - + 87 0 - + 85 0 - + 75 21 - + 74 62 - + 75 0 - + 5 0 - + 2 0 - + 3 37 - > ~/www/settlement/api/getAccountEvents.php " 10 43 ^ 10 44 @@ -568,13 +552,6 @@ $ " 1 0 ^ 1 0 -> ~/www/settlement/func/functions.php - " 85 0 - ^ 87 0 - . 8 2 - + 3 37 - + 8 2 - > ~/www/settlement/index.html " 193 29 ^ 193 30 @@ -589,21 +566,3 @@ $ . 6 24 + 4 22 + 6 24 - -> ~/www/settlement/index.php - " 2 9 - ^ 2 10 - . 2 9 - + 1 5 - + 2 9 - -> ~/www/settlement/.gitignore - " 2 10 - ^ 2 11 - . 2 10 - + 1 0 - + 2 10 - -> ~/www/settlement/.config.php - " 1 0 - ^ 1 0 diff --git a/yimian/conf/nginx/settlement.yimian.xyz.conf b/yimian/conf/nginx/settlement.yimian.xyz.conf index 5c516a06..72529c1c 100644 --- a/yimian/conf/nginx/settlement.yimian.xyz.conf +++ b/yimian/conf/nginx/settlement.yimian.xyz.conf @@ -14,6 +14,7 @@ server { server_name settlement.yimian.xyz; root /home/yimian/www/settlement; index index.php index.html; + client_max_body_size 50m; ssl_certificate /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.crt; #2 ssl_certificate_key /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.key; #3 diff --git a/yimian/www/settlement/api/test.php b/yimian/www/settlement/api/test.php new file mode 100644 index 00000000..bfed4351 --- /dev/null +++ b/yimian/www/settlement/api/test.php @@ -0,0 +1,5 @@ +