Merge branch 'raccount' into rchannel

admin/control/arw_monitor.php

@@ -0,0 +1,38 @@
+<?php
+
+class arw_monitorControl extends SystemControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function indexOp()
+    {
+        $ins = Cache::getInstance('cacheredis');
+        $name = 'disk_monitor';
+        $hash_data = $ins->hget($name, '');
+        $result = [];
+        foreach ($hash_data as $ip => $str)
+        {
+            $str = str_replace('\t', "", $str);
+            $str = ltrim($str,'#');
+            $arrs = explode('#', $str);
+            foreach ($arrs as $arr) {
+                $data = explode(':', $arr);
+                $key = ltrim($data[0],'_');
+                $value = $data[1];
+                if($key == 'cur_time') {
+                    $cur_time = explode('-',$value);
+                    $value = "$cur_time[0]-$cur_time[1]-$cur_time[2] $cur_time[3]:$cur_time[4]:$cur_time[5]";
+                }else{
+                    $key = str_replace('_', "/", $key);
+                }
+                $item[$key] = $value;
+            }
+            $result[$ip] = $item;
+        }
+        Tpl::output('data', $result);
+        Tpl::showpage('arw.monitor');
+    }
+}

admin/include/limit.php

@@ -52,6 +52,8 @@ $_limit =  array(
         array('name'=> '通道价格明细', 'op'=>null, 'act'=>'provider_price'),
         array('name'=> '任务列表', 'op'=>null, 'act'=>'task'),
         array('name'=> '异常订单列表', 'op'=>null, 'act'=>'refill_error'),
+        array('name'=> '服务器磁盘监控', 'op'=>null, 'act'=>'arw_monitor'),
+
     )),
 	array('name'=>$lang['nc_store'], 'child'=>array(
 		array('name'=>$lang['nc_store_manage'], 'op'=>null, 'act'=>'store'),

admin/include/menu.php

@@ -116,6 +116,7 @@ $arr = array(
 					array('args'=>'index,provider_price&card_type=2,merchant',			'text'=>'通道价格明细'),
 					array('args'=>'index,task,merchant',					'text'=>'任务列表'),
 					array('args'=>'index,refill_error,merchant',			'text'=>'异常订单列表'),
+					array('args'=>'index,arw_monitor,merchant',			'text'=>'服务器磁盘监控'),
 				)
 			),
 			4 => array(

admin/templates/default/arw.monitor.php

@@ -0,0 +1,117 @@
+<style>
+    th label { display: inline-block;width: 60px; }
+    .lineLi {
+        min-width: 150px;
+        font-size: 12px;
+        color:#000;
+    }
+    #prompt ul .noLineLi {
+        background:none;
+    }
+    #prompt div {
+        display:inline-block;
+        background:none
+    }
+    #prompt ul .lineLi {
+        color:#000;
+    }
+    th {
+        width: 10px;
+    }
+    .txt2 {
+        position: relative;
+    }
+    .btn-search {
+        position: absolute;
+        left: 332px;
+        margin-top: 3px;
+    }
+
+</style>
+
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>服务器磁盘监控</h3>
+            <ul class="tab-base">
+                <li><a href="JavaScript:void(0);" class="current"><span>监控列表</span></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+        <table class="tb-type1 noborder search" style="min-width:1400px">
+            <tbody>
+            <tr>
+                <td class="tip_info">
+                    _dev_开头：总量，可用 <br/>
+                    _mnt_开头：总占用 <br/>
+                    cur_time：信息更新日期
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    <table class="table tb-type2 nobdb" style="min-width:1400px">
+        <thead>
+        <tr class="thead">
+            <th class="align-center">服务器ip</th>
+            <th class="align-left">详细信息</th>
+        </thead>
+        <tbody id="tbody">
+        <?php if (count($output['data']) > 0) { ?>
+            <?php
+            foreach ($output['data'] as $key => $value) { ?>
+                <tr class="hover trFlex">
+                    <td class="align-center"><?php echo $key; ?></td>
+                    <td class="align-left">
+                    <?php foreach ($value as $k => $v){ ?>
+                        <span style="color: red">
+                                <?php echo $k;?>
+                        </span>
+                        <span style="color: green">
+                                <?php echo $v;?>
+                        </span>
+                        <br/>
+                    <?php }?>
+                    </td>
+                </tr>
+            <?php } ?>
+        <?php } else { ?>
+            <tr class="no_data">
+                <td colspan="8"><?php echo $lang['nc_no_record']; ?></td>
+            </tr>
+        <?php } ?>
+        </tbody>
+        <tfoot>
+        <tr class="tfoot">
+            <td colspan="8" id="dataFuncs">
+                <div class="pagination"> <?php echo $output['show_page']; ?> </div>
+            </td>
+        </tr>
+        </tfoot>
+    </table>
+</div>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/jquery.ui.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"
+        charset="utf-8"></script>
+<link rel="stylesheet" type="text/css"
+      href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/js/xm-select.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
+<script type="text/javascript">
+    $(function () {
+        $('#ncsubmit').click(function () {
+
+            $('#formSearch').submit();
+        });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
+    })
+</script>

data/config/xyz/refill.ini.php

@@ -2529,86 +2529,86 @@ $yunchonggong_yd_phone = ['name' => 'yunchonggong_yd', 'store_id' => 120, 'quali
 $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qualitys' => '2',
     'amount' => [
         1  => [
-            ['goods_id' => 7051, 'price' => 1.021, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7051, 'price' => 1.017, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7051, 'price' => 1.031, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         2  => [
-            ['goods_id' => 7052, 'price' => 2.042, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7052, 'price' => 2.034, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7052, 'price' => 2.062, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         3  => [
-            ['goods_id' => 7053, 'price' => 3.063, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7053, 'price' => 3.051, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7053, 'price' => 3.093, 'quality' => 2, 'card_type' => 'chinatelecom']
 
         ],
         4  => [
-            ['goods_id' => 7054, 'price' => 4.084, 'quality' => 2, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7054, 'price' => 4.068, 'quality' => 2, 'card_type' => 'chinaunicom']
         ],
         5  => [
             ['goods_id' => 7055, 'price' => 5.305, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7055, 'price' => 5.105, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7055, 'price' => 5.085, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7055, 'price' => 5.255, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         6  => [
             ['goods_id' => 7056, 'price' => 6.306, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7056, 'price' => 6.126, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7056, 'price' => 6.102, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7056, 'price' => 6.2562, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         7  => [
             ['goods_id' => 7057, 'price' => 7.308, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7057, 'price' => 7.147, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7057, 'price' => 7.119, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7057, 'price' => 7.2569, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         8  => [
             ['goods_id' => 7058, 'price' => 8.308, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7058, 'price' => 8.168, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7058, 'price' => 8.136, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7058, 'price' => 8.2584, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         9  => [
             ['goods_id' => 7059, 'price' => 9.3105, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7059, 'price' => 9.189, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7059, 'price' => 9.153, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7059, 'price' => 9.2592, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
         10 => [
             ['goods_id' => 7060, 'price' => 10.46, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7060, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7060, 'price' => 10.17, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7060, 'price' => 10.11, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7061, 'price' => 20.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7061, 'price' => 20.27, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7061, 'price' => 20.18, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7062, 'price' => 29.985, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7062, 'price' => 30.27, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.125, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7063, 'price' => 49.975, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7064, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7065, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7065, 'price' => 200.46, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7066, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7066, 'price' => 300.69, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 7067, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7067, 'price' => 501.15, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7067, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -5005,22 +5005,22 @@ $feimingyunew_phone = ['name' => 'feimingyunew', 'store_id' => 199, 'qualitys' =
         30 => [
             ['goods_id' => 7675, 'price' => 28.83, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7675, 'price' => 28.26, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7675, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7675, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7676, 'price' => 48.05, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7676, 'price' => 47.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7676, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
+            ['goods_id' => 7676, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 7677, 'price' => 96.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7677, 'price' => 94.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7677, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7677, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7678, 'price' => 192.2, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7678, 'price' => 188.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7678, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7678, 'price' => 189, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
 //        300 => [
 //            ['goods_id' => 7679, 'price' => 288.3, 'quality' => 1, 'card_type' => 'chinamobile'],

util/arw_monitor.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+source /etc/profile
+
+cur_time=$(date "+%Y-%m-%d-%H-%M-%S")
+echo $cur_time "-1" >> /mnt/xyzshop/util/a.log
+
+df_dirs=(${XYZ_DF_DIRS//:/ })
+du_dirs=(${XYZ_DU_DIRS//:/ })
+
+echo $cur_time "-2" >> /mnt/xyzshop/util/a.log
+echo $XYZ_DF_DIRS "-2" >> /mnt/xyzshop/util/a.log
+echo $cur_time "-2" >> /mnt/xyzshop/util/a.log
+
+declare -A reports
+reports=(['cur_time']=$cur_time)
+
+function df_check() {
+  # shellcheck disable=SC2068
+  for dir in ${df_dirs[@]}
+  do
+    ret=$(df -h | grep $dir | awk 'BEGIN{OFS=","}{print $2,$4}')
+    key=${dir////_}
+    reports[$key]=$ret
+  done
+}
+
+function du_check() {
+  # shellcheck disable=SC2068
+  for dir in ${du_dirs[@]}
+  do
+    cd $dir
+    ret=$(du -h -d 0)
+    key=${dir////_}
+    reports[$key]=$ret
+  done
+}
+
+df_check
+echo $cur_time "-3" >> /mnt/xyzshop/util/a.log
+du_check
+echo $cur_time "-4" >> /mnt/xyzshop/util/a.log
+
+str_report=''
+for key in $(echo ${!reports[*]})
+do
+    str_report="$str_report#$key:${reports[$key]}"
+done
+
+echo $str_report >> /mnt/xyzshop/util/a.log
+redis_host=$XYZ_REDIS_HOST
+netip=$XYZ_NETIP
+echo "HSET nc_disk_monitor $netip '$str_report'" | redis-cli -h $redis_host -p 6379
+echo $cur_time "-6" >> /mnt/xyzshop/util/a.log

util/purge.sh

@@ -3,7 +3,7 @@
 # MyISAM直接更改数据库目录下的文件即可
 
 
-
+source /etc/profile
 declare -i cur_diff=0 min_diff=3600
 
 time_diff() {

util/test.sh

@@ -1,35 +1,4 @@
 #!/bin/bash
 
-declare -i cur_diff=0 min_diff=3600
-
-time_diff() {
-  cur_sec=`date '+%s'`
-  echo $cur_sec
-
-  today=$(date "+%Y-%m-%d")
-  today_time=`date -d "$today" +%s`
-  echo $today_time
-
-  cur_diff=`expr $cur_sec - $today_time`
-}
-
-time_diff
-echo $cur_diff,$min_diff
-
-if [[ $cur_diff -gt $min_diff ]]; then
-  echo 'can purge'
-else
-  echo '请等到凌晨一点后删除'
-  exit
-fi
-
-
-server_ip='39.103.141.163'
-vdb=$(df -h | grep /dev/vdb1 | awk 'BEGIN{OFS=","}{print $1,$2,$3,$4}')
-vdc=$(df -h | grep /dev/vdc1 | awk 'BEGIN{OFS=","}{print $1,$2,$3,$4}')
-echo "HSET vdb $server_ip $vdb" | redis-cli -h '127.0.0.1' -p 6379
-echo "HSET vdc $server_ip $vdc" | redis-cli -h '127.0.0.1' -p 6379
-
-
-echo "HGET vdb $server_ip" | redis-cli -h '127.0.0.1' -p 6379
-echo "HGET vdc $server_ip" | redis-cli -h '127.0.0.1' -p 6379
+cur_time=$(date "+%Y-%m-%d-%H-%M-%S")
+echo $cur_time > /mnt/xyzshop/util/test.log