xiatian 2 년 전
부모
커밋
9c5a2d9df8
2개의 변경된 파일3개의 추가작업 그리고 23개의 파일을 삭제
  1. 1 21
      src/main/java/cn/com/qmth/mps/bean/User.java
  2. 2 2
      src/main/java/cn/com/qmth/mps/controller/AuthController.java

+ 1 - 21
src/main/java/cn/com/qmth/mps/bean/User.java

@@ -10,8 +10,6 @@ public class User implements AccessEntity{
 
     private String name;
 
-    private String account;
-
     private String sessionId;
 
     private String accessToken;
@@ -22,20 +20,11 @@ public class User implements AccessEntity{
 
     private Long schoolId;
     
-    private String markingCloudToken;
-
     public String buildKey() {
-        this.sessionId = new StringBuilder().append(role.name()).append("_").append(account).toString();
+        this.sessionId = new StringBuilder().append(role.name()).append("_").append(id).toString();
         return this.sessionId;
     }
 
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
 
     public String getName() {
         return name;
@@ -103,13 +92,4 @@ public class User implements AccessEntity{
     }
 
     
-    public String getMarkingCloudToken() {
-        return markingCloudToken;
-    }
-
-    
-    public void setMarkingCloudToken(String markingCloudToken) {
-        this.markingCloudToken = markingCloudToken;
-    }
-    
 }

+ 2 - 2
src/main/java/cn/com/qmth/mps/controller/AuthController.java

@@ -18,14 +18,14 @@ public class AuthController extends BaseController {
 
 	@ApiOperation(value = "管理端登录")
 	@PostMapping("login/admin")
-	public AdminLoginVo loginAdmin(@RequestParam Long schoolId, @RequestParam String loginName,
+	public AdminLoginVo loginAdmin(@RequestParam String schoolCode, @RequestParam String loginName,
 			@RequestParam String password) {
 		return null;
 	}
 
 	@ApiOperation(value = "微信小程序登录")
 	@PostMapping("login/wxapp")
-	public AdminLoginVo loginWxApp(@RequestParam Long schoolId, @RequestParam String phone) {
+	public AdminLoginVo loginWxApp(@RequestParam String schoolCode, @RequestParam String phone) {
 		return null;
 	}