fix: 修复自定义SSO自动升级版本出错的问题

chinaguojian · Mar 8, 2022 · a3d950e · a3d950e
1 parent e1c8063
commit a3d950e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/electron/build.js b/electron/build.js
@@ -45,6 +45,7 @@ function startBuild(data, publish) {
         title: data.name,
         version: config.version,
         origin: "./",
+        homeUrl:  utils.formatUrl(data.url),
         apiUrl:  utils.formatUrl(data.url) + "api/",
     }
     // drawio

diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue
@@ -185,7 +185,7 @@ export default {
         },
 
         chackReleases() {
-            let hostName = $A.getDomain(window.systemInfo.apiUrl);
+            let hostName = $A.getDomain(window.systemInfo.homeUrl || window.systemInfo.apiUrl);
             if (hostName == "" || $A.leftExists(hostName, '127.0.0.1')) {
                 hostName = "public"
             }

diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php
@@ -17,7 +17,7 @@
     <script src="{{ asset_main('js/scroll-into-view.min.js') }}"></script>
     <script>
         window.csrfToken = { csrfToken : "{{ csrf_token() }}" };
-        window.systemInfo = { title: "{{config('app.name', 'WebPage')}}", version : "{{ $version }}", origin: window.location.origin + "/", apiUrl: null };
+        window.systemInfo = { title: "{{config('app.name', 'WebPage')}}", version : "{{ $version }}", origin: window.location.origin + "/", homeUrl: null, apiUrl: null };
     </script>
 </head>
 <body>