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

add acg.watch

Browse Source
master
IoTgod 5 years ago
parent 746dc27488
commit d34df75494
15 changed files with 106 additions and 19 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. 37
      server/cn/etc/nginx/nginx.conf
  2. 2
      server/cn/home/www/api/index.php
  3. 2
      server/cn/home/www/api/video/video.php
  4. 2
      server/cn/home/www/api/video/video_dogecloud_api.php
  5. 2
      server/cn/home/www/api/video/video_fp.php
  6. 2
      server/cn/home/www/api/video/video_redirect.php
  7. 2
      server/cn/home/www/api/video/video_toUrl.php
  8. 16
      server/cn/home/www/cdn/dplayer/setup.js
  9. 0
      server/cn/home/www/etc/video/404.mp4/index.php
  10. 45
      server/cn/home/www/etc/video/video_address.php
  11. 6
      server/cn/home/www/functions.php
  12. 2
      server/cn/home/www/img/usr/themes/photograph/footer.php
  13. 2
      server/cn/home/www/photo/usr/themes/photograph/footer.php
  14. 2
      server/cn/home/www/video/.gitignore
  15. 3
      server/cn/home/www/video/README.md

37
server/cn/etc/nginx/nginx.conf
Unescape View File

@ -479,7 +479,7 @@ http {
server_name video.yimian.xyz; #1
root /home/www/video;
root /home/www/etc/video;
index index.php index.html;
client_max_body_size 1000M;
@ -508,6 +508,41 @@ http {
}
server {
listen 443 ssl;
listen 80;
server_name api.yimian.xyz; #1
root /home/www/api;
index index.php index.html;
client_max_body_size 1000M;
ssl_certificate /etc/letsencrypt/live/api.yimian.xyz/fullchain.pem; #2
ssl_certificate_key /etc/letsencrypt/live/api.yimian.xyz/privkey.pem; #3
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_prefer_server_ciphers on;
error_page 404 = /404.php;
if (-f $request_filename/index.html){ rewrite (.*) $1/index.html break; }
if (-f $request_filename/index.php){ rewrite (.*) $1/index.php; }
if (!-f $request_filename){ rewrite (.*) /index.php; }
location ~ \.php$ {
try_files $uri =404;
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
}
server {
listen 443 ssl;
listen 80;

2
server/cn/home/www/api/index.php
Unescape View File

@ -0,0 +1,2 @@
<h2>Welcome to Yimian API</h2>
<p><a href="https://iotcat.me">Go to IoTcat's Home Page</a></p>

2
server/cn/home/www/video/api/video.php → server/cn/home/www/api/video/video.php
Unescape View File

@ -2,6 +2,8 @@
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$id= $_REQUEST[id];
$conn=db__connect();

2
server/cn/home/www/video/api/video_dogecloud_api.php → server/cn/home/www/api/video/video_dogecloud_api.php
Unescape View File

@ -2,6 +2,8 @@
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$vcode= $_REQUEST[vcode];
$ip= $_REQUEST[ip];

2
server/cn/home/www/video/api/video_fp.php → server/cn/home/www/api/video/video_fp.php
Unescape View File

@ -2,6 +2,8 @@
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$id= $_REQUEST[id];
$fp= $_REQUEST[fp];
$seek= $_REQUEST[seek];

2
server/cn/home/www/video/api/video_redirect.php → server/cn/home/www/api/video/video_redirect.php
Unescape View File

@ -2,6 +2,8 @@
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$id= $_REQUEST[id];
$conn=db__connect();

2
server/cn/home/www/video/api/video_toUrl.php → server/cn/home/www/api/video/video_toUrl.php
Unescape View File

@ -2,6 +2,8 @@
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$id= $_REQUEST[id];
$conn=db__connect();

16
server/cn/home/www/cdn/dplayer/setup.js
Unescape View File

@ -18,11 +18,11 @@ const dp = new DPlayer({
lang: 'zh-cn',
hotkey: true,
preload: 'auto',
logo: 'https://cn.yimian.xyz/etc/img/logo/logo_white.png',
logo: 'https://cdn.yimian.xyz/img/logo/logo_white.png',
volume: 0.7,
mutex: true,
video: {
url: 'https://cn.yimian.xyz/video/404.mp4'
url: 'https://video.yimian.xyz/404.mp4'
},
danmaku: {
id: 'null',
@ -45,7 +45,7 @@ dp.on('error',function dpError(){
if(err<8)
{
var sk=dp.video.currentTime;
newVideo_detail(g_vId,'https://cn.yimian.xyz/video/video_address.php?fp='+fp+'&id='+g_vId,1,sk+2,null,1);
newVideo_detail(g_vId,'https://video.yimian.xyz/video_address.php?fp='+fp+'&id='+g_vId,1,sk+2,null,1);
//alert(dp.video.currentTime);
err++;
}
@ -88,7 +88,7 @@ function newVideo(id,next,seek)
{
$.ajax({
type: "POST",
url: '/etc/api/video.php',
url: 'https://api.yimian.xyz/video/video.php',
data: { "id": id},
traditional: true,
dataType: 'json',
@ -108,11 +108,11 @@ function newVideo(id,next,seek)
if(!seek){seek=cookie.get('vTime_'+g_vId)}
newVideo_detail(msg.id,'https://cn.yimian.xyz/video/video_address.php?fp='+fp+'&id='+msg.id,next,seek,msg.aid);
newVideo_detail(msg.id,'https://video.yimian.xyz/video_address.php?fp='+fp+'&id='+msg.id,next,seek,msg.aid);
cookie.set('vWatching',g_vId);
//record video for usr
timeUpdate_count=0;
$.post("/etc/api/video_fp.php",{"fp":fp,"id":g_vId,"seek":0,"ip":returnCitySN.cip});
$.post("https://api.yimian.xyz/video/video_fp.php",{"fp":fp,"id":g_vId,"seek":0,"ip":returnCitySN.cip});
},
error: function (data,type, err) {
alert('Can not Get Video!');
@ -127,7 +127,7 @@ function nextVideo()
$.ajax({
type: "POST",
url: '/etc/api/video_redirect.php',
url: 'https://api.yimian.xyz/video/video_redirect.php',
data: { "id": id},
traditional: true,
dataType: 'json',
@ -146,7 +146,7 @@ function videotoUrl(id)
{
$.ajax({
type: "POST",
url: '/etc/api/video_toUrl.php',
url: 'https://api.yimian.xyz/video/video_toUrl.php',
data: { "id": id},
traditional: true,
dataType: 'json',

0
server/cn/home/www/video/404.mp4/index.php → server/cn/home/www/etc/video/404.mp4/index.php
Unescape View File

45
server/cn/home/www/etc/video/video_address.php
Unescape View File

@ -0,0 +1,45 @@
<?php
include '../../functions.php';
header('Access-Control-Allow-Origin:*');
$id=$_REQUEST['id'];
$fp=$_REQUEST['fp'];
if(isset($_SESSION['s_fp']))
{
if($_SESSION['s_fp']!=$fp) {header("Location: https://yimian-video.obs.myhwclouds.com/404.mp4");die();}
}
if(!isset($fp)||$fp=="") {header("Location: https://yimian-video.obs.myhwclouds.com/404.mp4");die();}
$conn=db__connect();
$usr=db__getData($conn,"fp","fp",$fp);
if($usr[0]['usr']=="")
{
$res=db__getData($conn,"videolog","fp",$fp);
$cnt=0;
foreach($res as $each)
{
if($each['time']>(time()-3600*24)) $cnt++;
}
if($cnt>20)
{
echo json_encode(array("code"=>2));
die();
}
}
$video=db__getData($conn,"video","id",$id);
header("Location: ".$video[0]['url1']);

6
server/cn/home/www/functions.php
Unescape View File

@ -457,9 +457,9 @@ function dplayer__setup()
{
echo "<script src=\"https://pv.sohu.com/cityjson?ie=utf-8\"></script>
";
echo "<link rel=\"stylesheet\" href=\"https://cn.yimian.xyz/etc/dplayer/DPlayer.min.css\">
<script src=\"https://cn.yimian.xyz/etc/dplayer/DPlayer.min.js\"></script>";
echo "<script type=\"text/javascript\" src=\"/etc/dplayer/setup.js\"></script>
echo "<link rel=\"stylesheet\" href=\"https://cdn.yimian.xyz/dplayer/DPlayer.min.css\">
<script src=\"https://cdn.yimian.xyz/dplayer/DPlayer.min.js\"></script>";
echo "<script type=\"text/javascript\" src=\"https://cdn.yimian.xyz/dplayer/setup.js\"></script>
";
echo "<script src=\"https://pv.sohu.com/cityjson?ie=utf-8\"></script>";
}

2
server/cn/home/www/img/usr/themes/photograph/footer.php
Unescape View File

@ -14,7 +14,7 @@
<p class="related"><?php echo $hotKeysDesc; ?></p>
<?php endif; ?>
<?php if ($this->options->poweredby == 'y'): ?>
<p class="related">POWERED BY <a href="http://typecho.org/" target="_blank">TYPECHO</a> / THEME BY <a href="https://photo.siitake.cn/photograph.html" target="_blank">SIITAKE</a> / DEVELOPED BY <a href="https://iotgod.net" target="_blank">IoTgod</a></p>
<p class="related">POWERED BY <a href="http://typecho.org/" target="_blank">TYPECHO</a> / THEME BY <a href="https://photo.siitake.cn/photograph.html" target="_blank">SIITAKE</a> / DEVELOPED BY <a href="https://iotcat.me" target="_blank">IoTcat</a></p>
<?php endif; ?>
<?php if ($this->options->statCount == 'y'): $stat = statCount(); ?>
<p class="related">本站共<?php echo $stat['pic'] ?>张图片在<?php echo $stat['post'] ?>个相册中，他们被分成<?php echo $stat['cate'] ?>个类别<!--，并有<?php //echo $stat['page'] ?>个页面和<?php// echo $stat['comm'] ?>条评论--></p>

2
server/cn/home/www/photo/usr/themes/photograph/footer.php
Unescape View File

@ -14,7 +14,7 @@
<p class="related"><?php echo $hotKeysDesc; ?></p>
<?php endif; ?>
<?php if ($this->options->poweredby == 'y'): ?>
<p class="related">POWERED BY <a href="http://typecho.org/" target="_blank">TYPECHO</a> / THEME BY <a href="https://photo.siitake.cn/photograph.html" target="_blank">SIITAKE</a> / DEVELOPED BY <a href="https://iotgod.net" target="_blank">IoTgod</a></p>
<p class="related">POWERED BY <a href="http://typecho.org/" target="_blank">TYPECHO</a> / THEME BY <a href="https://photo.siitake.cn/photograph.html" target="_blank">SIITAKE</a> / DEVELOPED BY <a href="https://iotcat.me" target="_blank">IoTcat</a></p>
<?php endif; ?>
<?php if ($this->options->statCount == 'y'): $stat = statCount(); ?>
<p class="related">本站共<?php echo $stat['pic'] ?>张图片在<?php echo $stat['post'] ?>个相册中，他们被分成<?php echo $stat['cate'] ?>个类别<!--，并有<?php //echo $stat['page'] ?>个页面和<?php// echo $stat['comm'] ?>条评论--></p>

2
server/cn/home/www/video/.gitignore vendored
Unescape View File

@ -1,2 +0,0 @@
config.php
old_version

3
server/cn/home/www/video/README.md
Unescape View File

@ -1,3 +0,0 @@
# YimianVideo
Video System power for Yimian Web
## Deverloped from Dplayer
Write Preview
Loading…
Cancel
Save