diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index a54940999..fb67b99d6 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(`ws:${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(`ws:${name}/cable`); + var cable = actioncable.createConsumer(`wss://${name}/cable`); this.canvasChannel1 = cable.subscriptions.create({ channel: `MirrorProjectChannel`, id: project && project.identifier diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index a359048a5..441975249 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -387,7 +387,7 @@ class LoginDialog extends Component { 登录密码出错已达上限,账号已被锁定;
- 请10分钟后重新登录或找回密码 @@ -580,9 +580,9 @@ class LoginDialog extends Component { - this.getloginurl("/changepassword")} + this.getloginurl("https://www.trustie.net/account/lost_password")} className="mr3 color-grey-9">找回密码 - this.getloginurl("/register")} className="color-grey-9">注册 + this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js index 786fd1356..db369458b 100644 --- a/src/modules/user/LoginRegisterComponent.js +++ b/src/modules/user/LoginRegisterComponent.js @@ -383,7 +383,7 @@ class LoginRegisterComponent extends Component { 登录密码出错已达上限,账号已被锁定;- 请10分钟后重新登录或找回密码