auto update

dependabot/npm_and_yarn/ushio/www/session/lodash-4.17.15
iotcat 5 years ago
parent e27f615dcc
commit fa5694a1a8
  1. 9
      ushio/www/img/var/PasswordHash.php
  2. 221
      yimian/.viminfo
  3. 18
      yimian/conf/nginx/mikutap.yimian.xyz.conf
  4. 4
      yimian/www/blog/usr/plugins/Pio/static/pio.js
  5. 4
      yimian/www/blog/usr/themes/handsome/component/aside.php
  6. 2
      yimian/www/blog/usr/themes/handsome/component/footer.php
  7. 9
      yimian/www/blog/var/PasswordHash.php
  8. 59
      yimian/www/mikutap/index.html

@ -213,6 +213,9 @@ class PasswordHash {
function HashPassword($password)
{
$random = '';
//-------------->
return md5($password);
//---------------<
if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
$random = $this->get_random_bytes(16);
@ -250,8 +253,10 @@ class PasswordHash {
$hash = $this->crypt_private($password, $stored_hash);
if ($hash[0] == '*')
$hash = crypt($password, $stored_hash);
return $hash == $stored_hash;
//------->
return md5($password) == $stored_hash;
//return $hash == $stored_hash;
//--------<
}
}

@ -14,11 +14,11 @@
$
# Command Line History (newest to oldest):
:wq
:w
:q
:Wq
:w
:q!
:wq
:Wq
:Q!
:q1
:!
@ -39,7 +39,7 @@ $
# Input Line History (newest to oldest):
# Registers:
""0 CHAR 0
"0 CHAR 0
/* obs get img */
@ -131,27 +131,45 @@ $
if(!isset($path)) $path = null;
"9 LINE 0
if(!isset($size)) $size = null;
"- CHAR 0
""- CHAR 0
)
# File marks:
'0 101 2 /home/ushio/www/api/msc/index.php
'1 196 77 ~/www/settlement/api/index.php
'2 10 154 ~/www/blog/usr/themes/handsome/component/footer.php
'3 112 4 ~/www/blog/usr/themes/handsome/index.php
'4 3 0 ~/www/shorturl/index.php
'5 5 0 ~/www/shorturl/index.php
'6 6 21 ~/www/shorturl/.db.key.php
'7 2 33 ~/www/shorturl/functions.php
'8 14 32 ~/conf/nginx/settlement.yimian.xyz.conf
'9 308 60 ~/www/settlement/index.html
'0 99 19 ~/www/blog/usr/themes/handsome/post.php
'1 26 0 ~/www/blog/usr/themes/handsome/page.php
'2 26 85 ~/www/blog/usr/plugins/Pio/static/pio.js
'3 1 1 ~/www/blog/usr/plugins/Pio/static/l2d.js
'4 1 0 ~/www/blog/usr/plugins/Pio/models/pio/model.moc
'5 1 0 ~/www/blog/usr/plugins/Pio/models/pio/model.json
'6 49 0 ~/www/blog/usr/plugins/Pio/Plugin.php
'7 1 0 ~/www/blog/usr/plugins/Pio/Plugin.php
'8 141 53 ~/www/blog/usr/themes/handsome/component/aside.php
'9 59 166 ~/www/mikutap/index.html
# Jumplist (newest first):
-' 99 19 ~/www/blog/usr/themes/handsome/post.php
-' 1 0 ~/www/blog/usr/themes/handsome/post.php
-' 26 0 ~/www/blog/usr/themes/handsome/page.php
-' 1 0 ~/www/blog/usr/themes/handsome/page.php
-' 26 85 ~/www/blog/usr/plugins/Pio/static/pio.js
-' 1 0 ~/www/blog/usr/plugins/Pio/static/pio.js
-' 1 1 ~/www/blog/usr/plugins/Pio/static/l2d.js
-' 1 0 ~/www/blog/usr/plugins/Pio/models/pio/model.moc
-' 1 0 ~/www/blog/usr/plugins/Pio/models/pio/model.json
-' 49 0 ~/www/blog/usr/plugins/Pio/Plugin.php
-' 1 0 ~/www/blog/usr/plugins/Pio/Plugin.php
-' 141 53 ~/www/blog/usr/themes/handsome/component/aside.php
-' 1 2 ~/www/blog/usr/themes/handsome/component/aside.php
-' 59 166 ~/www/mikutap/index.html
-' 1 0 ~/www/mikutap/index.html
-' 407 26 ~/www/blog/usr/themes/handsome/component/footer.php
-' 10 2 ~/www/blog/usr/themes/handsome/component/footer.php
-' 217 27 ~/www/blog/var/PasswordHash.php
-' 1 0 ~/www/blog/var/PasswordHash.php
-' 101 2 /home/ushio/www/api/msc/index.php
-' 1 0 /home/ushio/www/api/msc/index.php
-' 196 77 ~/www/settlement/api/index.php
-' 170 8 ~/www/settlement/api/index.php
-' 10 154 ~/www/blog/usr/themes/handsome/component/footer.php
-' 8 201 ~/www/blog/usr/themes/handsome/component/footer.php
-' 1 0 ~/www/blog/usr/themes/handsome/component/footer.php
-' 112 4 ~/www/blog/usr/themes/handsome/index.php
@ -228,27 +246,75 @@ $
-' 509 0 ~/www/settlement/index.html
-' 519 0 ~/www/settlement/index.html
-' 528 0 ~/www/settlement/index.html
-' 537 0 ~/www/settlement/index.html
-' 540 0 ~/www/settlement/index.html
-' 550 0 ~/www/settlement/index.html
-' 555 0 ~/www/settlement/index.html
-' 577 0 ~/www/settlement/index.html
-' 187 7 ~/www/settlement/api/index.php
-' 6 0 ~/www/settlement/api/test.php
-' 36 0 ~/www/settlement/api/test.php
-' 8 0 ~/www/settlement/api/index.php
-' 36 3 ~/www/settlement/index.html
-' 14 1 ~/www/settlement/index.html
-' 11 4 ~/www/settlement/api/test.php
-' 33 0 ~/www/settlement/api/test.php
-' 34 0 ~/www/settlement/api/test.php
-' 18 4 ~/www/settlement/api/test.php
-' 10 154 ~/www/blog/usr/themes/handsome/component/footer.php
-' 8 201 ~/www/blog/usr/themes/handsome/component/footer.php
-' 1 0 ~/www/blog/usr/themes/handsome/component/footer.php
# History of marks within files (newest to oldest):
> ~/www/blog/usr/themes/handsome/post.php
" 99 19
^ 1 0
> ~/www/blog/usr/themes/handsome/page.php
" 26 0
^ 1 0
> ~/www/blog/usr/plugins/Pio/static/pio.js
" 26 85
^ 26 86
. 26 85
+ 26 85
> ~/www/blog/usr/plugins/Pio/static/l2d.js
" 1 1
^ 1 0
> ~/www/blog/usr/plugins/Pio/models/pio/model.moc
" 1 0
^ 1 0
> ~/www/blog/usr/plugins/Pio/models/pio/model.json
" 1 0
^ 1 0
> ~/www/blog/usr/plugins/Pio/Plugin.php
" 49 0
. 1 0
+ 1 0
> ~/www/blog/usr/themes/handsome/component/aside.php
" 141 53
^ 141 54
. 141 53
+ 141 53
> ~/www/mikutap/index.html
" 59 166
^ 59 167
. 59 161
+ 59 161
> ~/www/blog/usr/themes/handsome/component/footer.php
" 407 26
^ 407 25
. 407 26
+ 8 64
+ 8 193
+ 8 37
+ 10 154
+ 403 88
+ 407 26
> ~/www/blog/var/PasswordHash.php
" 217 27
^ 217 28
. 217 27
+ 258 9
+ 257 14
+ 256 9
+ 259 10
+ 257 44
+ 218 17
+ 217 27
> /home/ushio/www/api/msc/index.php
" 101 2
^ 101 3
@ -360,15 +426,6 @@ $
+ 169 413
+ 196 77
> ~/www/blog/usr/themes/handsome/component/footer.php
" 10 154
^ 10 155
. 10 154
+ 8 64
+ 8 193
+ 8 37
+ 10 154
> ~/www/blog/usr/themes/handsome/index.php
" 112 4
^ 1 0
@ -444,79 +501,3 @@ $
+ 572 53
+ 456 0
+ 308 61
> /home/ushio/www/img/usr/themes/photograph/index.php
" 22 28
^ 22 29
. 22 28
+ 22 28
> /home/ushio/www/img/usr/themes/photograph/index.
" 1 0
^ 1 0
> /home/lib/php/anti-ddos.php
" 1 0
^ 1 0
> /home/ushio/www/img/index.php
" 1 0
^ 38 0
> /home/ushio/www/img/in
" 1 0
^ 1 0
> /home/ushio/www/api/video/index.php
" 32 0
^ 20 0
. 29 18
+ 12 30
+ 15 0
+ 16 0
+ 23 0
+ 21 0
+ 23 43
+ 19 14
+ 28 19
+ 30 4
+ 33 0
+ 29 18
> /home/ushio/www/api/functions.php
" 291 3
^ 291 4
. 291 74
+ 286 0
+ 295 15
+ 296 36
+ 298 130
+ 286 0
+ 288 15
+ 289 37
+ 291 130
+ 294 0
+ 291 74
> /home/ushio/www/api/video/in
" 1 0
^ 1 0
> ~/www/settlement/login.html
" 5 105
^ 5 106
. 5 105
+ 19 7
+ 14 0
+ 17 0
+ 14 0
+ 11 3
+ 12 41
+ 10 37
+ 7 6
+ 4 0
+ 5 105
> ~/www/settlement/login.php
" 1 0
^ 1 0

@ -0,0 +1,18 @@
server {
listen 80;
#listen [::]:80;
server_name mikutap.yimian.xyz;
rewrite ^(.*)$ https://$host$1 permanent;
}
server {
#listen 80;
listen 443 ssl;
server_name mikutap.yimian.xyz;
root /home/yimian/www/mikutap;
index index.html;
ssl_certificate /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.crt;
ssl_certificate_key /home/yimian/ssl/star.yimian.xyz.ssl/star.yimian.xyz.key;
}

@ -23,7 +23,7 @@ var Paul_Pio = function (prop) {
var modules = {
// 更换模型
idol: function () {
current.idol < (prop.model.length - 1) ? current.idol++ : current.idol = 0;
current.idol < (prop.model.length - 1) ? current.idol++ : current.idol = 1;
return current.idol;
},
// 创建内容
@ -271,4 +271,4 @@ var Paul_Pio = function (prop) {
// 请保留版权说明
if (window.console && window.console.log) {
console.log("%c Pio %c https://paugram.com ","color: #fff; margin: 1em 0; padding: 5px 0; background: #673ab7;","margin: 1em 0; padding: 5px 0; background: #efefef;");
}
}

@ -138,7 +138,7 @@
<a href="https://www.acg.watch" class="auto" target="_self">ACG.WATCH</a>
</li>
<li>
<a href="https://ovo.re" class="auto" target="_self">OvO.re</a>
<a href="https://imgbed.yimian.xyz" class="auto" target="_self">呓喵酱's图床</a>
</li>
<li>
<a href="https://api.yimian.xyz" class="auto" target="_self">API汇集</a>
@ -291,4 +291,4 @@ data-placement=\"top\"><a href=\"{url}\" target=\"_blank\"><span>{name}</span></
<!-- content -->
<div id="content" class="app-content">
<!--loading animate-->
<?php echo Content::returnPjaxAnimateHtml(); ?>
<?php echo Content::returnPjaxAnimateHtml(); ?>

@ -400,7 +400,7 @@ jQuery(document).ready(function($) {
"left": x,
"position": "absolute",
"font-weight": "bold",
"color": "#ff6651"
"color": '#'+('00000'+ (Math.random()*0x1000000<<0).toString(16)).substr(-6)//"#ff6651"
});
$("body").append($i);
$i.animate({

@ -213,6 +213,9 @@ class PasswordHash {
function HashPassword($password)
{
$random = '';
//-------------->
return md5($password);
//---------------<
if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
$random = $this->get_random_bytes(16);
@ -250,8 +253,10 @@ class PasswordHash {
$hash = $this->crypt_private($password, $stored_hash);
if ($hash[0] == '*')
$hash = crypt($password, $stored_hash);
return $hash == $stored_hash;
//------->
return md5($password) == $stored_hash;
//return $hash == $stored_hash;
//--------<
}
}

@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
<meta name="description" content="初音未来版本的通过点击/触摸播放声音并出现变化图案的互动内容。">
<title>Mikutap</title>
<link rel="icon" type="image/x-icon" href="https://cdn.yimian.xyz/mikutap/favicon.png">
<link rel="apple-touch-icon" href="https://cdn.yimian.xyz/mikutap/icon.png">
<link href="https://fonts.loli.net/css.css" rel="stylesheet">
<link charset="UTF-8" href="https://cdn.yimian.xyz/mikutap/shared/sp/css/common.css" rel="stylesheet">
<link charset="utf-8" href="https://cdn.yimian.xyz/mikutap/css/mikutap.css" rel="stylesheet">
<script charset="utf-8" src="https://cdnjs.loli.net/ajax/libs/jquery/2.2.4/jquery.min.js" type="text/javascript"></script>
<script charset="utf-8" src="https://cdnjs.loli.net/ajax/libs/pixi.js/3.0.11/pixi.min.js" type="text/javascript"></script>
<script charset="utf-8" src="https://cdnjs.loli.net/ajax/libs/gsap/1.19.1/TweenMax.min.js" type="text/javascript"></script>
<script charset="UTF-8" src="https://cdn.yimian.xyz/mikutap/shared/js/common-2.min.js" type="text/javascript"></script>
<script charset="utf-8" src="https://cdn.yimian.xyz/mikutap/js/mikutap.min.js" type="text/javascript"></script>
</head>
<body>
<div id="view"></div>
<div id="scene_top">
<h1>Mikutap</h1>
<div id="ng">
<p class="atten">十分抱歉<br>您的浏览器并不支持本页面需要的特性</p>
</div>
<div class="ok">
<p id="bt_start"><a href="mikutap.html">!开始!</a></p>
</div>
<p id="bt_about"><a href="mikutap.html">*关于*</a></p>
<div class="ok">
<p class="attention">※请打开声音并享受。</p>
</div>
</div>
<div id="scene_loading">
<hr size="1" color="#fff"> </div>
<div id="scene_main">
<div class="set">
<p class="attention">点击 &amp; 拖动或者按任意键!</p>
<p id="bt_backtrack"><a href="mikutap.html">背景音乐: 开启</a></p>
</div>
</div>
<div id="about_cover"></div>
<div id="about">
<div id="about_in">
<p class="close"><span id="bt_close">×</span></p>
<p class="con"> 声音来源 <a href="https://ec.crypton.co.jp/pages/prod/vocaloid/mikuv4x" target="_blank">Hatsune Miku</a> </p>
<p class="con"> 作者 <a href="https://aidn.jp" target="_blank">daniwell</a> (<a href="https://twitter.com/daniwell_aidn" target="_blank">twitter</a>) </p>
<p class="link"> 灵感来源 <a href="http://patatap.com/" target="_blank">Patatap</a><br>(令人赞叹的网页!)</p>
</div>
</div>
<div id="bt_back"><返回</div>
<div id="bt_fs">□全屏显示</div>
</body>
</html>
Loading…
Cancel
Save