Merge pull request #496 from ccccccmd/master

ismcagdas · web-flow · commit 7322c03cf135 · 2019-12-27T08:48:32.000+02:00
Fix error on signalR connection
diff --git a/reactjs/src/lib/signalRAspNetCoreHelper.ts b/reactjs/src/lib/signalRAspNetCoreHelper.ts
@@ -12,7 +12,8 @@ class SignalRAspNetCoreHelper {
       connect: undefined,
       hubs: undefined,
       qs: AppConsts.authorization.encrptedAuthTokenName + '=' + encodeURIComponent(encryptedAuthToken),
-      url: AppConsts.remoteServiceBaseUrl + '/signalr',
+      remoteServiceBaseUrl: AppConsts.remoteServiceBaseUrl,
+      url: '/signalr'
     };
 
     Util.loadScript(AppConsts.appBaseUrl + '/dist/abp.signalr-client.js');
diff --git a/vue/src/lib/SignalRAspNetCoreHelper.ts b/vue/src/lib/SignalRAspNetCoreHelper.ts
@@ -9,7 +9,8 @@ class SignalRAspNetCoreHelper{
             connect: undefined,
             hubs: undefined,
             qs: AppConsts.authorization.encrptedAuthTokenName + "=" + encodeURIComponent(encryptedAuthToken),
-            url: AppConsts.remoteServiceBaseUrl + '/signalr'
+            remoteServiceBaseUrl: AppConsts.remoteServiceBaseUrl,
+            url: '/signalr'
         };
 
         Util.loadScript(AppConsts.appBaseUrl + '/dist/abp.signalr-client.js');
diff --git a/vue/src/lib/appconst.ts b/vue/src/lib/appconst.ts
@@ -10,6 +10,6 @@ const AppConsts= {
         encrptedAuthTokenName: 'enc_auth_token'
     },
     appBaseUrl: "http://localhost:8080",
-    remoteServiceBaseUrl:url
+    remoteServiceBaseUrl: url.endsWith('/') ? url.slice(0, -1) : url
 }
 export default AppConsts

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ const AppConsts= {`
`10`	`10`	`encrptedAuthTokenName: 'enc_auth_token'`
`11`	`11`	`},`
`12`	`12`	`appBaseUrl: "http://localhost:8080",`
`13`		`- remoteServiceBaseUrl:url`
	`13`	`+ remoteServiceBaseUrl: url.endsWith('/') ? url.slice(0, -1) : url`
`14`	`14`	`}`
`15`	`15`	`export default AppConsts`