From 47e04190ca34431a2ec64d6a735e0bdccd789953 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 2 Jul 2020 17:03:28 +0800
Subject: [PATCH 1/3] wss

---
 src/forge/Main/Detail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index a5494099..32b50161 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -197,10 +197,10 @@ class Detail extends Component {
   }
   canvasChannel = () => {
     const name = window.location.hostname === "localhost" ? "http://testforgeplus.trustie.net":window.location.hostname;
-    console.log(`ws:${name}/cable`);
+    console.log(`wss:${name}/cable`);
     const actioncable = require("actioncable")
     var project = this.state.project
-    var cable = actioncable.createConsumer(`ws:${name}/cable`);
+    var cable = actioncable.createConsumer(`wss:${name}/cable`);
     this.canvasChannel1 = cable.subscriptions.create({
       channel: `MirrorProjectChannel`,
       id: project && project.identifier

From a03782090598298a2103f0bb36d40ba75824edf6 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Jul 2020 17:09:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/login/LoginDialog.js           | 6 +++---
 src/modules/user/LoginRegisterComponent.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index a359048a..44197524 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -387,7 +387,7 @@ class LoginDialog extends Component {
                 登录密码出错已达上限，账号已被锁定；
                       </p>
               <p className="mt10">
-                请10分钟后重新登录或<a href={'/changepassword'} style={{
+                请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{
                   textDecoration: "underline",
                   color: "#4CACFF",
                 }}>找回密码</a>
@@ -580,9 +580,9 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a onClick={(url) => this.getloginurl("/changepassword")}
+                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/account/lost_password")}
                         className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                      <a onClick={(url) => this.getloginurl("/register")} className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>
                     </span>
                   </p>
 
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index 786fd135..db369458 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -383,7 +383,7 @@ class LoginRegisterComponent extends Component {
                               登录密码出错已达上限，账号已被锁定；
                           </p>
                           <p className="mt10">
-                              请10分钟后重新登录或<a href={'/changepassword'} style={{
+                              请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{
                               textDecoration: "underline",
                               color: "#4CACFF",
                           }}>找回密码</a>

From 3f117cddfa4ea7f5d7c2b39aa40692cbb6b83c5e Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Thu, 2 Jul 2020 18:22:54 +0800
Subject: [PATCH 3/3] FIX websocket wss location bug

---
 src/forge/Main/Detail.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 32b50161..fb67b99d 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -196,11 +196,11 @@ class Detail extends Component {
     })
   }
   canvasChannel = () => {
-    const name = window.location.hostname === "localhost" ? "http://testforgeplus.trustie.net":window.location.hostname;
-    console.log(`wss:${name}/cable`);
+    const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net":window.location.hostname;
+    console.log(`wss://${name}/cable`);
     const actioncable = require("actioncable")
     var project = this.state.project
-    var cable = actioncable.createConsumer(`wss:${name}/cable`);
+    var cable = actioncable.createConsumer(`wss://${name}/cable`);
     this.canvasChannel1 = cable.subscriptions.create({
       channel: `MirrorProjectChannel`,
       id: project && project.identifier