Merge branch 'master' of http://47.105.106.177:66/root/sup-server

.gitignore

+################################################################################
+# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+################################################################################
+
+/dsk-srm-server/.vs

dsk-srm-server/src/api/login.js

@@ -55,19 +55,22 @@ export const getCategoryList = (data) => network({
     data
 });
 
-export const uploadFile = (data) => network({
-    url: "/file/uploadFile",
-    method: "post",
-    data
-});
 
 export const register = (data) => network({
     url: "/register",
     method: "post",
+    data
 });
-
 export const updatePassApi = (data) => network({
     url: "/system/userInfo/resetPwd",
     method: "post",
     data
 });
+export const uploadFile = (data) => network({
+    url: "/file/uploadFile",
+    method: "post",
+    data,
+    headers: {
+        'Content-Type': 'multipart/form-data'
+    },
+});

src/main/java/com/supServer/project/controller/UserController.java

@@ -174,8 +174,9 @@ public class UserController {
      *@return:
      */
     @GetMapping("/logOut")
-    public void logOut(){
+    public AjaxResult logOut(){
         tokenService.resetPwd(getLoginUser().getUserId());
+        return AjaxResult.success();
     }