Explorar el Código

Merge branch 'master' into dev_duxiangyu

duxiangyu hace 3 años
padre
commit
0588b6b577
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      src/controller/userController.ts

+ 3 - 3
src/controller/userController.ts

@@ -16,7 +16,7 @@ export class userController {
    */
   static async login(userName: string, userPass: string) {
     var httpUrl = (window as any).__systemConf.loginServiceUrl;
-    httpUrl = toolUtils.getBaseHttpUrl(httpUrl, 'auth/login/loginInfo');
+    httpUrl = toolUtils.getBaseHttpUrl(httpUrl, 'auth/account/login');
 
     let requestMethod = "post";
 
@@ -43,8 +43,8 @@ export class userController {
     var loginConfig = (window as any).__systemConf.loginConfig;
     let userToken = sessionStore.userToken;
 
-    var httpUrl = (window as any).__systemConf.baseServiceUrl;
-    httpUrl = (httpUrl.lastIndexOf('/') == httpUrl.length - 1 ? httpUrl : httpUrl + '/') + this.urlPathPrefix + 'auth/login/loginInfo';
+    var httpUrl = (window as any).__systemConf.loginServiceUrl;
+    httpUrl = toolUtils.getBaseHttpUrl(httpUrl, 'auth/login/loginInfo');
 
     let requestHeaders = {
       "Content-Type": "application/x-www-form-urlencoded",