Merge RoundSquisheen: CONDUCTOR_ORIGIN follows location.protocol
This commit is contained in:
commit
c66e2d1ea1
2 files changed
+2
-2
No files matched your search
@@ -11,7 +11,7 @@ const BRIDGE_PORT = 14168;
|
||||
const CONDUCTOR_PORT = 8900;
|
||||
const BRIDGE_ORIGIN = `${location.protocol}//${location.hostname}:${BRIDGE_PORT}`;
|
||||
const BRIDGE_WS_ORIGIN = `${location.protocol === 'https:' ? 'wss:' : 'ws:'}//${location.hostname}:${BRIDGE_PORT}`;
|
||||
const CONDUCTOR_ORIGIN = `http://${location.hostname}:${CONDUCTOR_PORT}`;
|
||||
const CONDUCTOR_ORIGIN = `${location.protocol}//${location.hostname}:${CONDUCTOR_PORT}`;
|
||||
const CONDUCTOR_WS_ORIGIN = `${location.protocol === 'https:' ? 'wss:' : 'ws:'}//${location.hostname}:${CONDUCTOR_PORT}`;
|
||||
|
||||
/* ═══════════════ 进程状态 store ═══════════════ */
|
||||
|
||||
@@ -569,6 +569,6 @@
|
||||
<!-- highlight.js -->
|
||||
<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/highlight.min.js" crossorigin="anonymous"></script>
|
||||
<script src="phosphor-icons.js"></script>
|
||||
<script src="app.js?v=84"></script>
|
||||
<script src="app.js?v=86"></script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user