Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/F2cRealm.java
#	frontend/src/api/user-token.js
#	frontend/src/store/modules/user-token.js

frontend/src/api/user.js

@@ -0,0 +1,21 @@
+/* 前后端分离的登录方式 */
+import {get, post, put} from "@/plugins/request"
+
+export function login(data) {
+  return post("/login", data)
+}
+
+export function logout() {
+  return post("/logout")
+}
+
+export function getCurrentUser() {
+  return get("/info")
+}
+
+export function updateInfo(data) {
+  return put("/update", data)
+}
+
+
+