iotcat
/
Ushio-cn-old
mirror of https://github.com/IoTcat/Ushio-cn-old.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

auto update

Browse Source
dependabot/npm_and_yarn/ushio/www/session/lodash-4.17.15
iotcat 5 years ago
parent 6e152d30ad
commit 8cadaa61de
4 changed files with 215 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 295
      yimian/.viminfo
  2. 39
      yimian/www/settlement/api/getWeekData.php
  3. 1
      yimian/www/settlement/imgbed/index.html
  4. 4
      yimian/www/settlement/imgbed/js/jquery.imageuploader.js

295
yimian/.viminfo
Unescape View File

@ -14,9 +14,9 @@
$
# Command Line History (newest to oldest):
:w
:wq
:q
:w
:q!
:Q!
:Wq
@ -32,15 +32,28 @@ $
# Input Line History (newest to oldest):
# Registers:
"0 LINE 0
<li><a id="ushio-blog" href="https://www.eee.dog/"> <span class="glyphicon glyphicon-home"></span> 博客</a></li>
""1 LINE 0
alert(res.val);
""0 CHAR 0
if($i < count($total_arr) - 7)
"1 LINE 0
"2 LINE 0
"3 CHAR 0
$total_arr[$ii][$i]['date']=date('Y-m-d', strtotime('-'.($ii+1).'day'));
$total_arr[$ii][$i++]['total']=$row['total'];
"4 LINE 0
function
"5 LINE 0
"6 LINE 0
alert(res.val);
"7 LINE 0
console.log(res);
"3 LINE 0
"8 LINE 0
echo "kkk";
"4 LINE 0
"9 LINE 0
" ============================================================================
" Netrw Directory Listing (netrw v149)
" /home/yimian/www/settlement/imgbed/upload
@ -51,34 +64,40 @@ $
../
./
invoice/
"5 LINE 0
<li><a id="ushio-blog" href="https://www.eee.dog/"> <span class="glyphicon glyphicon-home"></span> 博客</a></li>
"6 LINE 0
<li><a id="ushio-img" href="https://img.yimian.xyz/imgbed.html"> <span class="glyphicon glyphicon-picture"></span> 探索</a></li>
"7 LINE 0
var_dump($fin);
"8 LINE 0
//no data
"9 LINE 0
if ($result->num_rows > 0) {}else{return 404;}
"- CHAR 0
# File marks:
'0 18 28 ~/www/settlement/imgbed/js/jquery.imageuploader.js
'1 10 52 ~/www/settlement/imgbed/js/jquery.imageuploader.js
'2 27 16 ~/www/settlement/imgbed/upload.php
'3 43 0 ~/www/settlement/imgbed/upload.php
'4 1 0 ~/www/settlement/imgbed/upload
'5 9 455 ~/www/settlement/imgbed/js/jquery.imageuploader.js
'6 1 0 ~/www/settlement/imgbed/js/main.js
'7 5 40 ~/www/settlement/imgbed/js/jquery.min.js
'8 4 0 ~/www/settlement/imgbed/js/jquery.imageuploader.js
'9 10 0 ~/www/settlement/imgbed/js/jquery.hwLayer.js
'0 38 24 ~/www/settlement/api/getWeekData.php
'1 52 0 ~/www/settlement/api/getWeekData.php
'2 42 27 ~/www/settlement/api/getWeekData.php
'3 37 68 ~/www/settlement/api/getWeekData.php
'4 31 36 ~/www/settlement/api/getWeekData.php
'5 48 23 ~/www/settlement/api/getWeekData.php
'6 29 54 ~/www/settlement/api/getWeekData.php
'7 21 40 ~/www/settlement/api/getWeekData.php
'8 19 51 ~/www/settlement/api/getWeekData.php
'9 18 37 ~/www/settlement/api/getWeekData.php
# Jumplist (newest first):
-' 18 28 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 10 4 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 38 24 ~/www/settlement/api/getWeekData.php
-' 52 0 ~/www/settlement/api/getWeekData.php
-' 42 4 ~/www/settlement/api/getWeekData.php
-' 37 4 ~/www/settlement/api/getWeekData.php
-' 31 2 ~/www/settlement/api/getWeekData.php
-' 48 4 ~/www/settlement/api/getWeekData.php
-' 29 10 ~/www/settlement/api/getWeekData.php
-' 21 0 ~/www/settlement/api/getWeekData.php
-' 19 0 ~/www/settlement/api/getWeekData.php
-' 18 0 ~/www/settlement/api/getWeekData.php
-' 17 0 ~/www/settlement/api/getWeekData.php
-' 15 0 ~/www/settlement/api/getWeekData.php
-' 50 0 ~/www/settlement/api/getWeekData.php
-' 46 0 ~/www/settlement/api/getWeekData.php
-' 14 4 ~/www/settlement/imgbed/index.html
-' 1 0 ~/www/settlement/imgbed/index.html
-' 10 5 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 18 12 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 9 0 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 27 16 ~/www/settlement/imgbed/upload.php
-' 43 0 ~/www/settlement/imgbed/upload.php
@ -90,17 +109,14 @@ $
-' 10 0 ~/www/settlement/imgbed/js/jquery.hwLayer.js
-' 1 0 ~/www/settlement/imgbed/js/jquery.hwLayer.js
-' 1 0 ~/www/settlement/imgbed/js/jquery.imageuploader.js
-' 1 0 ~/www/settlement/imgbed/index.html
-' 60 9 ~/www/settlement/imgbed/index.html
-' 61 9 ~/www/settlement/imgbed/index.html
-' 1 29 ~/www/settlement/imgbed/style/main.css
-' 78 0 ~/www/settlement/imgbed/index.html
-' 79 0 ~/www/settlement/imgbed/index.html
-' 1 0 ~/www/settlement/imgbed/upload.php
-' 1 0 ~/www/settlement/imgbed/uploadp
-' 9 20 ~/www/settlement/api/getWeekData.php
-' 25 0 ~/www/settlement/api/getWeekData.php
-' 11 0 ~/www/settlement/api/getWeekData.php
-' 26 0 ~/www/settlement/api/getWeekData.php
-' 14 24 ~/www/settlement/api/getWeekData.php
-' 23 0 ~/www/settlement/api/getWeekData.php
-' 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
@ -162,26 +178,134 @@ $
-' 7 15 /home/ushio/www/oauth/getResource.php
-' 9 0 /home/ushio/www/oauth/AligenieToken.php
-' 3 0 /home/ushio/www/oauth/AligenieToken.php
-' 1 0 /home/ushio/www/oauth/Aligenie
-' 13 0 /home/ushio/www/oauth/AligenieToken.php
-' 15 5 /home/ushio/www/oauth/AligenieAuthorize.php
-' 11 0 /home/ushio/www/oauth/AligenieToken.php
-' 1 0 /home/ushio/www/oauth/getResource.php
-' 1 0 /home/ushio/www/oauth/AligenieToken.php
-' 1 74 /home/ushio/www/oauth/AligenieAuthorize.php
-' 1 0 /home/ushio/www/oauth/OAuth2
-' 172 0 ~/www/homepage/index.html
-' 1 0 ~/www/homepage/index.html
-' 16 2 /etc/crontab
-' 1 0 /etc/crontab
-' 9 0 ~/iot/mqtt/smartfarm/mqtt-server.js
# History of marks within files (newest to oldest):
> ~/www/settlement/api/getWeekData.php
" 38 24
^ 38 25
. 38 25
+ 3 0
+ 6 21
+ 29 4
+ 29 4
+ 27 7
+ 25 8
+ 25 4
+ 25 2
+ 25 2
+ 25 12
+ 27 0
+ 25 10
+ 25 4
+ 25 9
+ 25 0
+ 24 0
+ 6 22
+ 23 122
+ 23 94
+ 53 12
+ 23 54
+ 21 26
+ 34 0
+ 7 14
+ 30 0
+ 21 23
+ 23 94
+ 29 17
+ 27 0
+ 34 0
+ 53 12
+ 23 161
+ 35 0
+ 46 23
+ 47 18
+ 48 17
+ 53 0
+ 21 20
+ 12 0
+ 10 39
+ 11 0
+ 12 36
+ 14 35
+ 15 15
+ 46 1
+ 47 1
+ 48 1
+ 49 1
+ 15 11
+ 17 39
+ 18 33
+ 19 32
+ 18 38
+ 19 7
+ 21 40
+ 36 0
+ 53 8
+ 29 32
+ 7 3
+ 29 34
+ 7 10
+ 29 42
+ 29 4
+ 29 37
+ 29 73
+ 53 0
+ 46 0
+ 47 0
+ 48 0
+ 49 0
+ 48 23
+ 30 0
+ 31 0
+ 28 4
+ 26 8
+ 28 10
+ 23 193
+ 28 22
+ 31 36
+ 36 42
+ 37 4
+ 36 9
+ 37 18
+ 26 0
+ 30 17
+ 31 17
+ 37 67
+ 36 34
+ 37 68
+ 41 47
+ 42 3
+ 41 37
+ 42 32
+ 43 39
+ 38 0
+ 38 0
+ 41 34
+ 37 33
+ 36 34
+ 38 25
> ~/www/settlement/imgbed/index.html
" 14 4
^ 14 37
. 14 36
+ 7 24
+ 18 50
+ 22 90
+ 35 60
+ 39 75
+ 47 123
+ 50 88
+ 49 27
+ 52 198
+ 54 35
+ 14 36
> ~/www/settlement/imgbed/js/jquery.imageuploader.js
" 18 28
^ 18 29
. 18 28
" 10 5
^ 10 6
. 10 4
+ 4 412
+ 9 559
+ 23 0
@ -198,7 +322,8 @@ $
+ 11 16
+ 11 0
+ 16 23
+ 18 28
+ 18 13
+ 10 4
> ~/www/settlement/imgbed/upload.php
" 27 16
@ -232,21 +357,6 @@ $
" 10 0
^ 1 0
> ~/www/settlement/imgbed/index.html
" 1 0
^ 60 10
. 53 35
+ 7 24
+ 17 50
+ 21 90
+ 34 60
+ 38 75
+ 46 123
+ 49 88
+ 48 27
+ 51 198
+ 53 35
> ~/www/settlement/imgbed/style/main.css
" 1 29
^ 1 0
@ -257,53 +367,6 @@ $
" 1 0
^ 1 0
> ~/www/settlement/api/getWeekData.php
" 9 20
^ 9 21
. 9 20
+ 3 57
+ 5 0
+ 3 0
+ 2 0
+ 3 0
+ 6 21
+ 17 0
+ 16 0
+ 15 7
+ 14 4
+ 13 4
+ 13 2
+ 13 2
+ 14 8
+ 15 0
+ 14 6
+ 14 0
+ 14 5
+ 13 0
+ 12 0
+ 6 22
+ 11 122
+ 11 94
+ 26 12
+ 11 54
+ 9 26
+ 19 0
+ 7 14
+ 18 0
+ 9 23
+ 11 94
+ 16 13
+ 15 0
+ 19 0
+ 26 12
+ 11 161
+ 20 0
+ 21 23
+ 22 18
+ 23 17
+ 26 0
+ 9 20
> ~/www/settlement/func/functions.php
" 85 0
^ 87 0

39
yimian/www/settlement/api/getWeekData.php
Unescape View File

@ -4,22 +4,49 @@ header("Access-Control-Allow-Origin: *");
include '/home/yimian/www/settlement/func/functions.php';
$conn = db__connect();
$fin = Array();
$total_arr = Array();
for($ii = 0; $ii < 10; $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'";
$sql = "select * from account limit 1";
$result = $conn->query($sql);
$firstItem = $result->fetch_assoc();
$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);
$i=0;
$tmp = 0;
while($row = $result->fetch_assoc()) {
$fin[$ii][$i++]=$row;
$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;
}
echo json_encode(array(
"code" => 200,
"data" => $fin
"data" => $total_arr
));

1
yimian/www/settlement/imgbed/index.html
Unescape View File

@ -11,6 +11,7 @@
<link rel="stylesheet" href="./style/hwLayer.css">
<link rel="stylesheet" type="text/css" href="./style/main.css">
<link href="./style/styles.imageuploader.css" rel="stylesheet" type="text/css">
<script>var block_aplayer = true;</script>
<script src="https://cdn.yimian.xyz/ushio-js/ushio-head.min.js"></script>
</head>
<body class="body">

4
yimian/www/settlement/imgbed/js/jquery.imageuploader.js
Unescape View File

@ -7,7 +7,7 @@ var size=0;function addItem(file){var fileName=cleanName(file.name);var fileSize
function formatBytes(bytes,decimals){if(bytes===0)return'0 Bytes';var k=1024;var dm=decimals+1||3;var sizes=['Bytes','KB','MB','GB','TB','PB','EB','ZB','YB'];var i=Math.floor(Math.log(bytes)/Math.log(k));return(bytes/Math.pow(k,i)).toPrecision(dm)+' '+sizes[i]}
function cleanName(name){name=name.replace(/\s+/gi,'-');return name.replace(/[^a-zA-Z0-9.\-]/gi,'');}
function uploadSubmitHandler(){if(state.fileBatch.length!==0){var data=new FormData();for(var i=0;i<state.fileBatch.length;i++){data.append('files[]',state.fileBatch[i].file,state.fileBatch[i].fileName)}size=0;$('#disabled').attr("disabled",true);$('#disabled').text('上传中，请稍等......');$.ajax({type:'POST',url:options.ajaxUrl,data:data,dataType:'json',cache:false,contentType:false,processData:false,success:function(res){if(res.code!='0000'){console.info(res.code);alert('上传时发生了点小插曲，请打开控制器查看原因！')}else{
cookie.set('usr', 'liu');cookie.set('val', '15.32');
//cookie.set('usr', 'liu');cookie.set('val', '15.32');
if(cookie.get('usr') && cookie.get('val')){
$.post('https://settlement.yimian.xyz/api/', {
type: "payment",
@ -15,7 +15,7 @@ function uploadSubmitHandler(){if(state.fileBatch.length!==0){var data=new FormD
val: cookie.get('val'),
img: res.url
},function(res){
console.log(res);
//console.log(res);
alert('Submit OK!!');
window.location.href='https://settlement.yimian.xyz/';
});

Write Preview
Loading…
Cancel
Save