Home Explore Help
Register Sign In
usoft
/
showdoc
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

管理后台

star7th 7 years ago
parent
b3dcef7c2f
commit
5079860fcb
7 changed files with 10 additions and 9 deletions
Split View Show Diff Stats
  1. 6 5
      server/Application/Api/Controller/AdminUserController.class.php
  2. 1 1
      web/index.html
  3. 0 0
      web/static/css/app.43675489f5abb728a99534de4ea795a6.css
  4. 0 0
      web/static/js/app.1fe74747bae9dd7435ab.js
  5. 0 0
      web/static/js/app.8ef48ded3f253d82bb90.js
  6. 1 1
      web/static/js/manifest.e5bbf0cd004ae5af7526.js
  7. 2 2
      web_src/src/components/admin/Index.vue

+ 6 - 5
server/Application/Api/Controller/AdminUserController.class.php
View File 

@@ -91,11 +91,12 @@ class AdminUserController extends BaseController {
 
 
     //检测showdoc版本更新
 
     public function checkUpdate(){
 
-        header('Access-Control-Allow-Origin: *');//允许跨域请求
 
-        header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Connection, User-Agent, Cookie');
 
-        header('Access-Control-Allow-Credentials : true');//允许跨域请求
 
-        
-        //echo '{"version":"3.0","title":"检测到新版本，点击查看","description":"略","url":"https://www.showdoc.cc/page/14"}';
 
+        //获取当前版本
 
+        $text = file_get_contents("../composer.json");
 
+        $composer = json_decode($text, true);
 
+        $version = $composer['version'] ;
 
+        $url = "https://www.showdoc.cc/server/api/open/checkUpdate?version={$version}";
 
+        echo http_post($url);
 
     }
 
 
 }

+ 1 - 1
web/index.html
View File 

@@ -4,4 +4,4 @@
 
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
 
       //"lang" :'en'
 
       "lang" :'zh-cn'
 
-  }</script><link href=./static/css/app.7bfef7255366bafdb4bc481cbd24ef4e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.506682e59b10e0c39445.js></script><script type=text/javascript src=./static/js/vendor.6ec312a9f1e4bcc005ef.js></script><script type=text/javascript src=./static/js/app.8ef48ded3f253d82bb90.js></script></body></html>
 
+  }</script><link href=./static/css/app.43675489f5abb728a99534de4ea795a6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.e5bbf0cd004ae5af7526.js></script><script type=text/javascript src=./static/js/vendor.6ec312a9f1e4bcc005ef.js></script><script type=text/javascript src=./static/js/app.1fe74747bae9dd7435ab.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
web/static/css/app.43675489f5abb728a99534de4ea795a6.css


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.1fe74747bae9dd7435ab.js


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.8ef48ded3f253d82bb90.js


+ 1 - 1
web/static/js/manifest.506682e59b10e0c39445.js → web/static/js/manifest.e5bbf0cd004ae5af7526.js
View File 

@@ -1 +1 @@
 
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"6ec312a9f1e4bcc005ef",1:"8ef48ded3f253d82bb90"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
 
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"6ec312a9f1e4bcc005ef",1:"1fe74747bae9dd7435ab"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);

+ 2 - 2
web_src/src/components/admin/Index.vue
View File 

@@ -143,12 +143,12 @@ export default {
 
           var params = new URLSearchParams();
 
           that.axios.post(url, params)
 
             .then(function (response) {
 
-              if (response.data.url) {
 
+              if (response.data.data.url) {
 
                   that.$message({
 
                     showClose: true,
 
                     duration:10000,
 
                     dangerouslyUseHTMLString: true,
 
-                    message: '<a target="_blank" href="'+response.data.url+'">'+response.data.title+'</a>'
 
+                    message: '<a target="_blank" href="'+response.data.data.url+'">'+response.data.data.title+'</a>'
 
                   });
 
               };

Some files were not shown because too many files changed in this diff