新增内嵌窗口

app/admin/pan_manage.py

@@ -85,7 +85,6 @@ def rm_pan():
 def setDefaultPan():
     pan=request.form.get('pan')
     set('default_pan',pan)
-    redis_client.delete(key)
     redis_client.delete("od_users")
     redis_client.set('default_pan',pan)
     return jsonify({'msg':'修改成功'})

app/front/views.py

@@ -88,7 +88,7 @@ def index(path=None):
     if password!=False:
         if (not request.cookies.get(md5_p) or request.cookies.get(md5_p)!=password) and has_verify_==False:
             if total=='files' and GetConfig('encrypt_file')=="no":
-                if GetConfig("verify_url")=="True":
+                if GetConfig("verify_url")=="True" and action not in ['share','iframe']:
                     if token is None:
                         return abort(403)
                     elif VerifyToken(token,path):
@@ -100,7 +100,7 @@ def index(path=None):
             resp=MakeResponse(render_template('theme/{}/password.html'.format(GetConfig('theme')),path=path,cur_user=user))
             return resp
     if total=='files':
-        if GetConfig("verify_url")=="True":
+        if GetConfig("verify_url")=="True" and action not in ['share','iframe']:
             if token is None:
                 return abort(403)
             elif VerifyToken(token,path):
@@ -144,15 +144,14 @@ def show(fileid,user,action='download',token=None):
     ext=name.split('.')[-1].lower()
     url=request.url.replace(':80','').replace(':443','').encode('utf-8').split('?')[0]
     url='/'.join(url.split('/')[:3])+'/'+urllib.quote('/'.join(url.split('/')[3:]))
-    inner_url='/'+urllib.quote('/'.join(url.split('/')[3:]))
     if GetConfig("verify_url")=="True":
-        url=url+'?token='+token
-        if action!='share':
+        url=url+'?token='+GenerateToken(path)
+        if action not in ['share','iframe']:
             if token is None:
                 return abort(403)
             elif VerifyToken(token,path)==False:
                 return abort(403)
-    if request.method=='POST' or action=='share':
+    if request.method=='POST' or action in ['share','iframe']:
         InfoLogger().print_r(u'share page:{}'.format(path))
         if ext in GetConfig('show_redirect').split(','):
             downloadUrl,play_url=GetDownloadUrl(fileid,user)
@@ -162,16 +161,32 @@ def show(fileid,user,action='download',token=None):
             url = 'https://view.officeapps.live.com/op/view.aspx?src='+urllib.quote(downloadUrl)
             resp=MakeResponse(redirect(url))
         elif ext in GetConfig('show_image').split(','):
-            resp=MakeResponse(render_template('theme/{}/show/image.html'.format(GetConfig('theme')),url=url,inner_url=inner_url,path=path,cur_user=user,name=name))
+            if action=='share':
+                resp=MakeResponse(render_template('theme/{}/show/image.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
+            else:
+                resp=MakeResponse(render_template('show/image.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
+
         elif ext in GetConfig('show_video').split(','):
-            resp=MakeResponse(render_template('theme/{}/show/video.html'.format(GetConfig('theme')),url=url,inner_url=inner_url,path=path,cur_user=user,name=name))
+            if action=='share':
+                resp=MakeResponse(render_template('theme/{}/show/video.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
+            else:
+                resp=MakeResponse(render_template('show/video.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
         elif ext in GetConfig('show_dash').split(','):
-            resp=MakeResponse(render_template('theme/{}/show/video2.html'.format(GetConfig('theme')),url=url,inner_url=inner_url,path=path,cur_user=user,name=name))
+            if action=='share':
+                resp=MakeResponse(render_template('theme/{}/show/video2.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
+            else:
+                resp=MakeResponse(render_template('show/video2.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
         elif ext in GetConfig('show_audio').split(','):
-            resp=MakeResponse(render_template('theme/{}/show/audio.html'.format(GetConfig('theme')),url=url,inner_url=inner_url,path=path,cur_user=user,name=name))
+            if action=='share':
+                resp=MakeResponse(render_template('theme/{}/show/audio.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
+            else:
+                resp=MakeResponse(render_template('show/audio.html'.format(GetConfig('theme')),url=url,path=path,cur_user=user,name=name))
         elif ext in GetConfig('show_code').split(','):
             content=common._remote_content(fileid,user)
-            resp=MakeResponse(render_template('theme/{}/show/code.html'.format(GetConfig('theme')),content=content,url=url,inner_url=inner_url,language=CodeType(ext),path=path,cur_user=user,name=name))
+            if action=="share":
+                resp=MakeResponse(render_template('theme/{}/show/code.html'.format(GetConfig('theme')),content=content,url=url,language=CodeType(ext),path=path,cur_user=user,name=name))
+            else:
+                resp=MakeResponse(render_template('show/code.html'.format(GetConfig('theme')),content=content,url=url,language=CodeType(ext),path=path,cur_user=user,name=name))
         elif name=='.password':
             resp=MakeResponse(abort(404))
         else:

app/templates/show/audio.html

@@ -0,0 +1,47 @@
+{%extends 'show/iframe_base.html'%}
+
+{%block content%}
+<link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/aplayer/1.10.1/APlayer.min.css">
+<script src="https://cdnjs.loli.net/ajax/libs/aplayer/1.10.1/APlayer.min.js"></script>
+
+  <div class="mdui-typo mdui-shadow-3 mudi-center" id="audio-player"></div>
+  <script>
+        //参考了olaindex
+        $(function () {
+            var cnt=1;
+            const ap = new APlayer({
+                container: document.getElementById('audio-player'),
+                audio: [{
+                    name: '{{ name }}',
+                    url: "{{url}}",
+                    cover: 'cover.jpg'
+                }]
+            });
+            // 防止出现401 token过期
+
+                ap.on('error', function () {
+                    if(cnt<=3){
+                        console.log('播放出错，尝试第'+cnt+'次')
+                        let last = ap.audio.currentTime;
+                        ap.audio.src = "{{url}}";
+                        ap.audio.load();
+                        ap.audio.currentTime = last;
+                        ap.play();
+                        cnt=cnt+1;
+                        }
+                });
+
+            // 如果是播放状态 & 没有播放完 每25分钟重载视频防止卡死
+            setInterval(function () {
+                if (!ap.audio.paused && !ap.audio.ended) {
+                    let last = ap.audio.currentTime;
+                    ap.audio.src = "{{url}}";
+                    ap.audio.load();
+                    ap.audio.currentTime = last;
+                    ap.play();
+                }
+            }, 1000 * 60 * 25)
+        });
+  </script>
+</div>
+{%endblock content%}

app/templates/show/code.html

@@ -0,0 +1,21 @@
+{%extends 'show/iframe_base.html'%}
+
+{%block content%}
+<pre id="editor" >{{content|safe}}</pre>
+<script src="https://cdn.staticfile.org/ace/1.4.2/ace.js"></script>
+<script src="https://cdn.staticfile.org/ace/1.4.2/ext-language_tools.js"></script>
+<script>
+    var editor = ace.edit("editor");
+    editor.setTheme("ace/theme/ambiance");
+    editor.setFontSize(18);
+    editor.session.setMode("ace/mode/{{language}}");
+
+    //Autocompletion
+    editor.setOptions({
+        enableBasicAutocompletion: true,
+        enableSnippets: true,
+        enableLiveAutocompletion: true,
+        maxLines: Infinity
+    });
+</script>
+{%endblock content%}

app/templates/show/iframe_base.html

@@ -0,0 +1,15 @@
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="referrer" content="no-referrer">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+<title>PyOne</title>
+<script src="https://cdn.staticfile.org/jquery/3.3.1/jquery.min.js"></script>
+
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" bgcolor="#000000">
+    {%block content%}
+    {%endblock content%}
+    <div style="display: none;">
+    {{GetConfig('tj_code')|safe}}
+    </div>
+</body>
+

app/templates/show/image.html

@@ -0,0 +1,5 @@
+{%extends 'show/iframe_base.html'%}
+
+{%block content%}
+<img src="{{url}}" style="width:100%;height:100%;"/>
+{%endblock content%}

app/templates/show/video.html

@@ -0,0 +1,46 @@
+{%extends 'show/iframe_base.html'%}
+{%block content%}
+    <link class="dplayer-css" rel="stylesheet" href="https://cdn.staticfile.org/dplayer/1.25.0/DPlayer.min.css">
+    <script src="https://cdn.staticfile.org/dplayer/1.25.0/DPlayer.min.js"></script>
+    <div id="dplayer"  style="width:100%;height:100%;"></div>
+    <script>
+      $(function () {
+          const dp = new DPlayer({
+              container: document.getElementById('dplayer'),
+              lang: 'zh-cn',
+              video: {
+                  url: "{{url}}",
+                  type: 'auto'
+              },
+              autoplay: true
+          });
+          // 防止出现401 token过期
+          var cnt=1;
+          dp.on('error', function () {
+              if(cnt<=3){
+                  console.log('获取资源错误，开始重新加载！');
+                  let last = dp.video.currentTime;
+                  dp.video.src = "{{url}}";
+                  dp.video.load();
+                  dp.video.currentTime = last;
+                  dp.play();
+                  cnt=cnt+1;
+              }
+
+          });
+          // 如果是播放状态 & 没有播放完 每25分钟重载视频防止卡死
+          setInterval(function () {
+              if (!dp.video.paused && !dp.video.ended) {
+                  console.log('开始重新加载！');
+                  let last = dp.video.currentTime;
+                  dp.video.src = "{{url}}";
+                  dp.video.load();
+                  dp.video.currentTime = last;
+                  dp.play();
+              }
+          }, 1000 * 60 * 25)
+      });
+    </script>
+{%endblock content%}
+
+

app/templates/show/video2.html

@@ -0,0 +1,46 @@
+{%extends 'show/iframe_base.html'%}
+
+{%block content%}
+<link class="dplayer-css" rel="stylesheet" href="https://cdn.staticfile.org/dplayer/1.25.0/DPlayer.min.css">
+<script src="https://cdn.staticfile.org/dashjs/2.9.2/dash.all.min.js"></script>
+<script src="https://cdn.staticfile.org/dplayer/1.25.0/DPlayer.min.js"></script>
+<div id="dplayer"  style="width:100%;height:100%;"></div>
+<script>
+  $(function () {
+      const dp = new DPlayer({
+          container: document.getElementById('dplayer'),
+          lang: 'zh-cn',
+          video: {
+              url: "{{url}}",
+              type: 'auto'
+          },
+          autoplay: true
+      });
+      // 防止出现401 token过期
+      var cnt=1;
+      dp.on('error', function () {
+          if(cnt<=3){
+              console.log('获取资源错误，开始重新加载！');
+              let last = dp.video.currentTime;
+              dp.video.src = "{{url}}";
+              dp.video.load();
+              dp.video.currentTime = last;
+              dp.play();
+              cnt=cnt+1;
+          }
+
+      });
+      // 如果是播放状态 & 没有播放完 每25分钟重载视频防止卡死
+      setInterval(function () {
+          if (!dp.video.paused && !dp.video.ended) {
+              console.log('开始重新加载！');
+              let last = dp.video.currentTime;
+              dp.video.src = "{{url}}";
+              dp.video.load();
+              dp.video.currentTime = last;
+              dp.play();
+          }
+      }, 1000 * 60 * 25)
+  });
+</script>
+{%endblock content%}

app/templates/theme/bst4/show/audio.html

@@ -16,13 +16,16 @@
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-share-alt" aria-hidden="true"></i>分享地址
                 </span>
-            {%if GetConfig("verify_url")=="True"%}
-            <input id="share" class="form-control" type="text" value="{{url}}&action=share" />
-            {%else%}
-            <input id="share" class="form-control" type="text" value="{{url}}?action=share" />
-            {%endif%}
+            <input id="share" class="form-control" type="text" value="{{url.split('?')[0]}}?action=share" />
             <a class="input-group-addon" onclick="copyUrl('share')">点击复制</a>
         </div>
+        <div class="input-group">
+            <span class="input-group-addon" id="basic-addon1">
+                    <i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口
+                </span>
+            <input id="iframe" class="form-control" type="text" value="{{url.split('?')[0]}}?action=iframe" />
+            <a class="input-group-addon" onclick="copyUrl('iframe')">点击复制</a>
+        </div>
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-link" aria-hidden="true"></i>调用地址

app/templates/theme/bst4/show/code.html

@@ -15,13 +15,16 @@
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-share-alt" aria-hidden="true"></i>分享地址
                 </span>
-            {%if GetConfig("verify_url")=="True"%}
-            <input id="share" class="form-control" type="text" value="{{url}}&action=share" />
-            {%else%}
-            <input id="share" class="form-control" type="text" value="{{url}}?action=share" />
-            {%endif%}
+            <input id="share" class="form-control" type="text" value="{{url.split('?')[0]}}?action=share" />
             <a class="input-group-addon" onclick="copyUrl('share')">点击复制</a>
         </div>
+        <div class="input-group">
+            <span class="input-group-addon" id="basic-addon1">
+                    <i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口
+                </span>
+            <input id="iframe" class="form-control" type="text" value="{{url.split('?')[0]}}?action=iframe" />
+            <a class="input-group-addon" onclick="copyUrl('iframe')">点击复制</a>
+        </div>
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-link" aria-hidden="true"></i>调用地址

app/templates/theme/bst4/show/video.html

@@ -13,13 +13,16 @@
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-share-alt" aria-hidden="true"></i>分享地址
                 </span>
-            {%if GetConfig("verify_url")=="True"%}
-            <input id="share" class="form-control" type="text" value="{{url}}&action=share" />
-            {%else%}
-            <input id="share" class="form-control" type="text" value="{{url}}?action=share" />
-            {%endif%}
+            <input id="share" class="form-control" type="text" value="{{url.split('?')[0]}}?action=share" />
             <a class="input-group-addon" onclick="copyUrl('share')">点击复制</a>
         </div>
+        <div class="input-group">
+            <span class="input-group-addon" id="basic-addon1">
+                    <i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口
+                </span>
+            <input id="iframe" class="form-control" type="text" value="{{url.split('?')[0]}}?action=iframe" />
+            <a class="input-group-addon" onclick="copyUrl('iframe')">点击复制</a>
+        </div>
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-link" aria-hidden="true"></i>调用地址

app/templates/theme/bst4/show/video2.html

@@ -13,13 +13,16 @@
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-share-alt" aria-hidden="true"></i>分享地址
                 </span>
-            {%if GetConfig("verify_url")=="True"%}
-            <input id="share" class="form-control" type="text" value="{{url}}&action=share" />
-            {%else%}
-            <input id="share" class="form-control" type="text" value="{{url}}?action=share" />
-            {%endif%}
+            <input id="share" class="form-control" type="text" value="{{url.split('?')[0]}}?action=share" />
             <a class="input-group-addon" onclick="copyUrl('share')">点击复制</a>
         </div>
+        <div class="input-group">
+            <span class="input-group-addon" id="basic-addon1">
+                    <i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口
+                </span>
+            <input id="iframe" class="form-control" type="text" value="{{url.split('?')[0]}}?action=iframe" />
+            <a class="input-group-addon" onclick="copyUrl('iframe')">点击复制</a>
+        </div>
         <div class="input-group">
             <span class="input-group-addon" id="basic-addon1">
                     <i class="fa fa-link" aria-hidden="true"></i>调用地址

app/templates/theme/bst_sketchy/show/audio.html

@@ -12,25 +12,37 @@
   <br>
     <!-- 固定标签 -->
     <div class="form-horizontal">
+      <div class="form-group">
         <div class="form-group">
-          <div class="form-group">
-            <div class="input-group mb-3">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
-              </div>
-              {%if GetConfig("verify_url")=="True"%}
-              <input type="text" class="form-control" value='{{url}}&action=share' id="share">
-              {%else%}
-              <input type="text" class="form-control" value='{{url}}?action=share' id="share">
-              {%endif%}
-              <a onclick="copyUrl('share')">
-              <div class="input-group-append">
-                <span class="input-group-text">点击复制</span>
-              </div>
-              </a>
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=share' id="share">
+            <a onclick="copyUrl('share')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
+            </div>
+            </a>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <div class="form-group">
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=iframe' id="iframe">
+            <a onclick="copyUrl('iframe')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
             </div>
+            </a>
           </div>
         </div>
+      </div>
 
         <div class="form-group">
           <div class="form-group">

app/templates/theme/bst_sketchy/show/code.html

@@ -11,25 +11,37 @@
 
     <!-- 固定标签 -->
     <div class="form-horizontal">
+      <div class="form-group">
         <div class="form-group">
-          <div class="form-group">
-            <div class="input-group mb-3">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
-              </div>
-              {%if GetConfig("verify_url")=="True"%}
-              <input type="text" class="form-control" value='{{url}}&action=share' id="share">
-              {%else%}
-              <input type="text" class="form-control" value='{{url}}?action=share' id="share">
-              {%endif%}
-              <a onclick="copyUrl('share')">
-              <div class="input-group-append">
-                <span class="input-group-text">点击复制</span>
-              </div>
-              </a>
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=share' id="share">
+            <a onclick="copyUrl('share')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
+            </div>
+            </a>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <div class="form-group">
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=iframe' id="iframe">
+            <a onclick="copyUrl('iframe')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
             </div>
+            </a>
           </div>
         </div>
+      </div>
 
         <div class="form-group">
           <div class="form-group">

app/templates/theme/bst_sketchy/show/video.html

@@ -9,25 +9,37 @@
   <br>
     <!-- 固定标签 -->
     <div class="form-horizontal">
+      <div class="form-group">
         <div class="form-group">
-          <div class="form-group">
-            <div class="input-group mb-3">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
-              </div>
-              {%if GetConfig("verify_url")=="True"%}
-              <input type="text" class="form-control" value='{{url}}&action=share' id="share">
-              {%else%}
-              <input type="text" class="form-control" value='{{url}}?action=share' id="share">
-              {%endif%}
-              <a onclick="copyUrl('share')">
-              <div class="input-group-append">
-                <span class="input-group-text">点击复制</span>
-              </div>
-              </a>
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=share' id="share">
+            <a onclick="copyUrl('share')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
+            </div>
+            </a>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <div class="form-group">
+          <div class="input-group mb-3">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口</span>
+            </div>
+            <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=iframe' id="iframe">
+            <a onclick="copyUrl('iframe')">
+            <div class="input-group-append">
+              <span class="input-group-text">点击复制</span>
             </div>
+            </a>
           </div>
         </div>
+      </div>
 
         <div class="form-group">
           <div class="form-group">

app/templates/theme/bst_sketchy/show/video2.html

@@ -15,11 +15,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址</span>
               </div>
-              {%if GetConfig("verify_url")=="True"%}
-              <input type="text" class="form-control" value='{{url}}&action=share' id="share">
-              {%else%}
-              <input type="text" class="form-control" value='{{url}}?action=share' id="share">
-              {%endif%}
+              <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=share' id="share">
               <a onclick="copyUrl('share')">
               <div class="input-group-append">
                 <span class="input-group-text">点击复制</span>
@@ -29,6 +25,23 @@
           </div>
         </div>
 
+        <div class="form-group">
+          <div class="form-group">
+            <div class="input-group mb-3">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口</span>
+              </div>
+              <input type="text" class="form-control" value='{{url.split("?")[0]}}?action=iframe' id="iframe">
+              <a onclick="copyUrl('iframe')">
+              <div class="input-group-append">
+                <span class="input-group-text">点击复制</span>
+              </div>
+              </a>
+            </div>
+          </div>
+        </div>
+
+
         <div class="form-group">
           <div class="form-group">
             <div class="input-group mb-3">

app/templates/theme/layui/show/audio.html

@@ -16,11 +16,15 @@
       <div class="layui-form-item" pane>
         <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址(点击复制)</a></label>
         <div class="layui-input-block">
-          {%if GetConfig("verify_url")=="True"%}
-          <input type="text" id="share" class="layui-input" value="{{url}}&action=share" >
-          {%else%}
-          <input type="text" id="share" class="layui-input" value="{{url}}?action=share" >
-          {%endif%}
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
+        </div>
+      </div>
+    </div>
+    <div class="layui-form layui-form-pane">
+      <div class="layui-form-item" pane>
+        <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口(点击复制)</a></label>
+        <div class="layui-input-block">
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
         </div>
       </div>
     </div>

app/templates/theme/layui/show/code.html

@@ -13,11 +13,15 @@
   <div class="layui-form-item" pane>
     <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址(点击复制)</a></label>
     <div class="layui-input-block">
-      {%if GetConfig("verify_url")=="True"%}
-      <input type="text" id="share" class="layui-input" value="{{url}}&action=share" >
-      {%else%}
-      <input type="text" id="share" class="layui-input" value="{{url}}?action=share" >
-      {%endif%}
+        <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
+    </div>
+  </div>
+</div>
+<div class="layui-form layui-form-pane">
+  <div class="layui-form-item" pane>
+    <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口(点击复制)</a></label>
+    <div class="layui-input-block">
+        <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
     </div>
   </div>
 </div>

app/templates/theme/layui/show/video.html

@@ -12,11 +12,15 @@
       <div class="layui-form-item" pane>
         <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址(点击复制)</a></label>
         <div class="layui-input-block">
-          {%if GetConfig("verify_url")=="True"%}
-          <input type="text" id="share" class="layui-input" value="{{url}}&action=share" >
-          {%else%}
-          <input type="text" id="share" class="layui-input" value="{{url}}?action=share" >
-          {%endif%}
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
+        </div>
+      </div>
+    </div>
+    <div class="layui-form layui-form-pane">
+      <div class="layui-form-item" pane>
+        <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口(点击复制)</a></label>
+        <div class="layui-input-block">
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
         </div>
       </div>
     </div>

app/templates/theme/layui/show/video2.html

@@ -12,11 +12,15 @@
       <div class="layui-form-item" pane>
         <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>分享地址(点击复制)</a></label>
         <div class="layui-input-block">
-            {%if GetConfig("verify_url")=="True"%}
-            <input type="text" id="share" class="layui-input" value="{{url}}&action=share" >
-            {%else%}
-            <input type="text" id="share" class="layui-input" value="{{url}}?action=share" >
-            {%endif%}
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
+        </div>
+      </div>
+    </div>
+    <div class="layui-form layui-form-pane">
+      <div class="layui-form-item" pane>
+        <label class="layui-form-label"><a onclick="copyUrl('share')"><i class="fa fa-share-alt" aria-hidden="true"></i>内嵌窗口(点击复制)</a></label>
+        <div class="layui-input-block">
+            <input type="text" id="share" class="layui-input" value="{{url.split('?')[0]}}?action=share" >
         </div>
       </div>
     </div>

app/templates/theme/material/show/any.html

@@ -1,5 +0,0 @@
-{%extends 'theme/'+GetConfig('theme')+'/layout.html'%}
-
-{%block content%}
-{{content}}
-{%endblock content%}

app/templates/theme/material/show/audio.html

@@ -13,11 +13,11 @@
   <!-- 固定标签 -->
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">分享地址</label>
-    {%if GetConfig("verify_url")=="True"%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}&action=share" onclick="copyUrl('share')"/>
-    {%else%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}?action=share" onclick="copyUrl('share')"/>
-    {%endif%}
+    <input class="mdui-textfield-input" type="text" id="share" value="{{url.split('?')[0]}}?action=share" onclick="copyUrl('share')"/>
+  </div>
+  <div class="mdui-textfield">
+    <label class="mdui-textfield-label">内嵌窗口</label>
+    <input class="mdui-textfield-input" type="text" id="iframe" value="{{url.split('?')[0]}}?action=iframe" onclick="copyUrl('iframe')"/>
   </div>
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">调用地址</label>

app/templates/theme/material/show/code.html

@@ -11,11 +11,11 @@
 </div>
 <div class="mdui-textfield">
   <label class="mdui-textfield-label">分享地址</label>
- {%if GetConfig("verify_url")=="True"%}
- <input class="mdui-textfield-input" type="text" id="share" value="{{url}}&action=share" onclick="copyUrl('share')"/>
- {%else%}
- <input class="mdui-textfield-input" type="text" id="share" value="{{url}}?action=share" onclick="copyUrl('share')"/>
- {%endif%}
+ <input class="mdui-textfield-input" type="text" id="share" value="{{url.split('?')[0]}}?action=share" onclick="copyUrl('share')"/>
+</div>
+<div class="mdui-textfield">
+  <label class="mdui-textfield-label">内嵌窗口</label>
+ <input class="mdui-textfield-input" type="text" id="iframe" value="{{url.split('?')[0]}}?action=iframe" onclick="copyUrl('iframe')"/>
 </div>
 <div class="mdui-textfield">
   <label class="mdui-textfield-label">调用地址</label>

app/templates/theme/material/show/image.html

@@ -7,11 +7,7 @@
     <br>
     <div class="mdui-textfield">
       <label class="mdui-textfield-label">分享地址</label>
-      {%if GetConfig("verify_url")=="True"%}
-      <input class="mdui-textfield-input" type="text" id="share" value="{{url}}&action=share" onclick="copyUrl('share')"/>
-      {%else%}
-      <input class="mdui-textfield-input" type="text" id="share" value="{{url}}?action=share" onclick="copyUrl('share')"/>
-      {%endif%}
+      <input class="mdui-textfield-input" type="text" id="share" value="{{url.split('?')[0]}}?action=share" onclick="copyUrl('share')"/>
     </div>
     <div class="mdui-textfield">
       <label class="mdui-textfield-label">调用地址</label>

app/templates/theme/material/show/video.html

@@ -10,11 +10,11 @@
   <!-- 固定标签 -->
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">分享地址</label>
-    {%if GetConfig("verify_url")=="True"%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}&action=share" onclick="copyUrl('share')"/>
-    {%else%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}?action=share" onclick="copyUrl('share')"/>
-    {%endif%}
+    <input class="mdui-textfield-input" type="text" id="share" value="{{url.split('?')[0]}}?action=share" onclick="copyUrl('share')"/>
+  </div>
+  <div class="mdui-textfield">
+    <label class="mdui-textfield-label">内嵌窗口</label>
+    <input class="mdui-textfield-input" type="text" id="iframe" value="{{url.split('?')[0]}}?action=iframe" onclick="copyUrl('iframe')"/>
   </div>
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">调用地址</label>

app/templates/theme/material/show/video2.html

@@ -11,16 +11,17 @@
   <!-- 固定标签 -->
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">分享地址</label>
-    {%if GetConfig("verify_url")=="True"%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}&action=share" onclick="copyUrl('share')"/>
-    {%else%}
-    <input class="mdui-textfield-input" type="text" id="share" value="{{url}}?action=share" onclick="copyUrl('share')"/>
-    {%endif%}
+    <input class="mdui-textfield-input" type="text" id="share" value="{{url.split('?')[0]}}?action=share" onclick="copyUrl('share')"/>
+  </div>
+  <div class="mdui-textfield">
+    <label class="mdui-textfield-label">内嵌窗口</label>
+    <input class="mdui-textfield-input" type="text" id="iframe" value="{{url.split('?')[0]}}?action=iframe" onclick="copyUrl('iframe')"/>
   </div>
   <div class="mdui-textfield">
     <label class="mdui-textfield-label">调用地址</label>
     <input class="mdui-textfield-input" type="text" id="out_use" value="{{url}}" onclick="copyUrl('out_use')"/>
   </div>
+
 </div>
 <script>
   $(function () {

update.sh

@@ -180,7 +180,7 @@ echo "2019.05.28更新版本：修复开启负债均衡之后，文件名有特
 echo "2019.05.29更新版本：支持自定义线程数"
 echo "2019.05.31更新版本：新增功能：1）下载链接验证开关；优化：1）aria2信息不对时，无法添加任务"
 echo "2019.06.13更新版本：新增功能：文件展示设置"
-echo "2019.06.14更新版本：稍微完善一下日志记录；分享页面取消token验证；修复开启下载验证之后，后台文件打开失败的bug"
+echo "2019.06.14更新版本：稍微完善一下日志记录；分享页面取消token验证；修复开启下载验证之后，后台文件打开失败的bug；新增内嵌窗口"
 echo "---------------------------------------------------------------"
 echo "更新完成！"
 echo "如果网站无法访问，请检查config.py!"