Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

dsBaseWeb/ds-base/html/basicManage.html

@@ -162,7 +162,18 @@
             $("#loginout").click(function () {
                 sessionStorage.clear();
                 sessionStorage.removeItem('menu');
-                window.location.href = '/dsBase/logout';
+
+                $.ajax({
+                    type: "GET",
+                    dataType: "json",
+                    url: "/dsBase/loginPerson/logout",
+                    async: false,
+                    success: function (result) {
+                        console.log(result);
+                        window.location.href = '/ds-base/html/login.html';
+                    }
+                });
+
             })
             $("#changePwd").click(function () {
                 WeAdminShow('修改密码', './pages/changePwd/changePwd.html', 700, 350);

dsRes/dsRes.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>