登录

app/router/main/webapp/controller/BaseController.js

@@ -287,35 +287,14 @@ sap.ui.define(
         // initDict(){},
         getBaseUrl() {
           let that = this;
-          if(location.host === 'localhost:8089'){
-            // that.getSessionStorage().put('baseUrlCache', '');
-          }
-
           let baseUrlCache = this.getSessionStorage().get('baseUrlCache');
           if (this.isEmpty(baseUrlCache)) {
-            jQuery.ajax(sap.ui.require.toUrl("sap/ui/demo/mock/config.json"), {
-              dataType: "json",
-              async: false,
-              success: function (oData) {
-                baseUrlCache = oData.Config.baseUrl
-
-                let currentEnvironment = that.getSessionStorage().get('currentEnvironment')
-                if(currentEnvironment){
-                  baseUrlCache = oData.Config[currentEnvironment]
-                }
-
-                if (!oData.Config.isServerConfig) {
-                  let str = ""
-                  if (oData.Config.port.trim()) {
-                    str = ":" + oData.Config.port + "/"
-                  }
-                  baseUrlCache = window.location.protocol + '//' + window.location.hostname + (str ? str : '/')
-                }
+            var protocol = window.location.protocol;
+            var hostname = window.location.hostname;
+            var port = window.location.port ? ':' + window.location.port : ''; // 如果端口号不是默认，则添加':'和端口号
+            baseUrlCache = protocol + '//' + hostname + port + "/";
+            console.log("[baseUrlCache]", baseUrlCache);
             that.getSessionStorage().put('baseUrlCache', baseUrlCache);
-              },
-              error: function () {
-              }
-            });
           }
           return baseUrlCache;
         },

app/router/main/webapp/controller/Login.controller.js

@@ -123,19 +123,6 @@ sap.ui.define([
 			// return !!(sap.ui.Device.os.android || sap.ui.Device.os.ios || sap.ui.Device.os.windows.phone || sap.ui.Device.os.blackberry);
 			return !!(sap.ui.Device.os.android || sap.ui.Device.os.ios || sap.ui.Device.os.blackberry);
 		},
-		//获取cookie
-		getCookie: function(name) {
-			let matches = document.cookie.match(new RegExp(
-				"(?:^|; )" + name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, '\\$1') + "=([^;]*)"
-			));
-			return matches ? decodeURIComponent(matches[1]) : undefined;
-		},
-		//设置cookie
-		setCookie: function(name, value, expireHours) {
-			var cookieExp = new Date();
-			cookieExp.setHours(cookieExp.getHours() + expireHours);
-			document.cookie = name + "=" + encodeURIComponent(value) + "; path=/; expires=" + cookieExp.toUTCString();
-		},
 		// 登录
 		onLogin: function(oEvent) {
 			// this.getRouter().navTo("menu", {}, true);
@@ -150,21 +137,17 @@ sap.ui.define([
 				MessageBox.warning(this.i18n("Msg_input_username_password"));
 				return;
 			}
-			console.log("JSESSIONID=", this.getCookie('JSESSIONID'));
+			console.log("onLoginUrl=", that.baseUrl+"login/login");
 
 			let busyDialog = new sap.m.BusyDialog();
             busyDialog.open();
 			jQuery.ajax({
 				method: "POST",
 				data: JSON.stringify(param),
-				// url: "/login",
 				url: that.baseUrl+"login/login",
-				// url: "http://localhost:8080/login/login",
 				contentType: 'application/json',
-				authorization: 'Basic c2FiaW5lOnBhc3Nfc2FiaW5l',
 				dataType: 'json',
 				success: function(data){
-					// console.log('data',data)
 					// 关闭进度条
 					busyDialog.close();
 					// if(data.flag){

app/router/main/webapp/mockdata/config.json

@@ -5,6 +5,6 @@
     "baseUrl_pre": "https://lianchuangjie-pre.unibetter-ic.com/",
     "baseUrl_pro": "https://sap.unibetter-ic.com/",
     "isServerConfig":false,
-    "port": "8080"
+    "port": ""
   }
 }

app/router/xs-app.json

 {
-  "welcomeFile": "app/index.html",
+  "welcomeFile": "/main/webapp/index.html",
   "routes": [
     {
       "source": "^/odata/(.*)",
@@ -7,7 +7,7 @@
       "destination": "srv-api"
     },
     {
-      "source": "^/app/(.*)",
+      "source": "^/main/(.*)",
       "target": "/$1",
       "localDir": "./main",
       "cacheControl": "no-cache, no-store, must-revalidate"

srv/src/main/java/customer/lianchuangjie/common/filter/OperateAuthFilter.java

@@ -95,19 +95,19 @@ public class OperateAuthFilter implements Filter {
             Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();//权限的集合
             Object credentials = authentication.getCredentials();//获取凭证
             Object details = authentication.getDetails();//获取详细信息
-            org.springframework.security.core.userdetails.User principal = (org.springframework.security.core.userdetails.User) authentication.getPrincipal();//获取主体信息
+            org.springframework.security.core.userdetails.User principal = (org.springframework.security.core.userdetails.User)authentication.getPrincipal();//获取主体信息
             //Collection<GrantedAuthority> authorities0 = principal.getAuthorities();
             boolean isAuthenticated = authentication.isAuthenticated();//判断是否已认证
-            log.info("用户名：{}", name);
-            log.info("返回一个包含授予权限的集合：{}", authorities);//Granted Authorities=[ROLE_ANONYMOUS]
-            log.info("获取凭证：{}", credentials);//登录密码 Credentials=[PROTECTED],
-            log.info("获取详细信息：{}", details);//Details=WebAuthenticationDetails [RemoteIpAddress=127.0.0.1, SessionId=null],
-            log.info("判断是否已认证：{}", isAuthenticated);//Authenticated=true,
-            log.info("获取主体信息：{}", principal);//登录账号 Principal=anonymousUser,
+            //log.info("用户名：{}", name);
+            //log.info("返回一个包含授予权限的集合：{}", authorities);//Granted Authorities=[ROLE_ANONYMOUS]
+            //log.info("获取凭证：{}", credentials);//登录密码 Credentials=[PROTECTED],
+            //log.info("获取详细信息：{}", details);//Details=WebAuthenticationDetails [RemoteIpAddress=127.0.0.1, SessionId=null],
+            //log.info("判断是否已认证：{}", isAuthenticated);//Authenticated=true,
+            //log.info("获取主体信息：{}", principal);//登录账号 Principal=anonymousUser,
+            //log.info("获取主体信息getPassword：{}", principal.get("password"));
+            //log.info("获取主体信息isEnabled：{}", principal.isEnabled());
             log.info("获取主体信息getUsername：{}", principal.getUsername());
-            log.info("获取主体信息getPassword：{}", principal.getPassword());
             log.info("获取主体信息getAuthorities：{}", principal.getAuthorities());
-            log.info("获取主体信息isEnabled：{}", principal.isEnabled());
 
 
             /*