fix(server): 修复登录错误

server/data/src/main/java/com/qxgmat/data/relation/UserNoteRelationMapper.java

@@ -1,5 +1,6 @@
 package com.qxgmat.data.relation;
 
+import com.qxgmat.data.dao.entity.UserNoteQuestion;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -7,9 +8,9 @@ import java.util.List;
 /**
  * Created by gaojie on 2017/11/9.
  */
-public interface UserNoteRelationMapper {
+public interface UserNoteQuestionRelationMapper {
 
-    List<UserNote> list(
+    List<UserNoteQuestion> list(
             @Param("userId") Number userId,
             @Param("module") String module,
             @Param("type") String type,

server/data/src/main/java/com/qxgmat/data/relation/entity/UserNoteRelation.java

@@ -5,7 +5,7 @@ import com.qxgmat.data.dao.entity.*;
 /**
  * Created by gaojie on 2017/11/9.
  */
-public class UserNoteRelation extends UserNote {
+public class UserNoteQuestionRelation extends UserNoteQuestion {
 
     private Question question;
 

server/data/src/main/java/com/qxgmat/data/relation/mapping/UserNoteRelationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.relation.UserNoteRelationMapper">
-  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserNote">
+<mapper namespace="com.qxgmat.data.relation.UserNoteQuestionRelationMapper">
+  <resultMap id="IdMap" type="com.qxgmat.data.dao.entity.UserNoteQuestion">
     <!--
       WARNING - @mbg.generated
     -->

server/gateway-api/src/main/java/com/qxgmat/controller/api/AuthController.java

@@ -73,16 +73,16 @@ public class AuthController {
         User entity = usersService.get(user.getId());
         MyDto dto = Transform.convert(entity, MyDto.class);
         if (!entity.getMobile().isEmpty()){
-            dto.setMobile(true);
+            dto.setBindMobile(true);
         }
         if (!entity.getWechatUnionid().isEmpty()){
-            dto.setWechat(true);
+            dto.setBindWechat(true);
         }
         if (entity.getRealStatus() > 0){
-            dto.setReal(true);
+            dto.setBindReal(true);
         }
         if(!entity.getPrepareStatus().isEmpty()){
-            dto.setPrepare(true);
+            dto.setBindPrepare(true);
         }
         return ResponseHelp.success(dto);
     }
@@ -103,16 +103,16 @@ public class AuthController {
         User entity = shiroHelp.getLoginUser();
         MyDto dto = Transform.convert(entity, MyDto.class);
         if (!entity.getMobile().isEmpty()){
-            dto.setMobile(true);
+            dto.setBindMobile(true);
         }
         if (!entity.getWechatUnionid().isEmpty()){
-            dto.setWechat(true);
+            dto.setBindWechat(true);
         }
         if (entity.getRealStatus() > 0){
-            dto.setReal(true);
+            dto.setBindReal(true);
         }
         if(!entity.getPrepareStatus().isEmpty()){
-            dto.setPrepare(true);
+            dto.setBindPrepare(true);
         }
         return ResponseHelp.success(dto);
     }

server/gateway-api/src/main/java/com/qxgmat/controller/api/MyController.java

@@ -12,7 +12,7 @@ import com.qxgmat.data.constants.enums.module.QuestionModule;
 import com.qxgmat.data.constants.enums.status.DirectionStatus;
 import com.qxgmat.data.dao.entity.*;
 import com.qxgmat.data.relation.entity.UserCollectQuestionRelation;
-import com.qxgmat.data.relation.entity.UserNoteRelation;
+import com.qxgmat.data.relation.entity.UserNoteQuestionRelation;
 import com.qxgmat.dto.extend.UserReportExtendDto;
 import com.qxgmat.dto.request.*;
 import com.qxgmat.dto.request.UserNoteDto;
@@ -321,7 +321,7 @@ public class MyController {
             @RequestParam(required = false, defaultValue = "desc") String direction,
             HttpSession session)  {
         User user = (User) shiroHelp.getLoginUser();
-        PageResult<UserNoteRelation> p = userNoteQuestionService.list(page, size, user.getId(), QuestionModule.ValueOf(module), QuestionType.ValueOf(type), startTime, endTime, order, DirectionStatus.ValueOf(direction));
+        PageResult<UserNoteQuestionRelation> p = userNoteQuestionService.list(page, size, user.getId(), QuestionModule.ValueOf(module), QuestionType.ValueOf(type), startTime, endTime, order, DirectionStatus.ValueOf(direction));
         List<UserNoteDetailDto> pr = Transform.convert(p, UserNoteDetailDto.class);
 
         // todo 绑定数据

server/gateway-api/src/main/java/com/qxgmat/dto/response/MyDto.java

@@ -16,13 +16,13 @@ public class MyDto extends UserDto {
 
     private String inviteCode;
 
-    private Boolean wechat;
+    private Boolean bindWechat;
 
-    private Boolean real;
+    private Boolean bindReal;
 
-    private Boolean prepare;
+    private Boolean bindPrepare;
 
-    private Boolean mobile;
+    private Boolean bindMobile;
 
     @ApiModelProperty(value = "未读消息数", required = true)
     private int messageNum;
@@ -69,35 +69,35 @@ public class MyDto extends UserDto {
         this.inviteCode = inviteCode;
     }
 
-    public Boolean getWechat() {
-        return wechat;
+    public Boolean getBindWechat() {
+        return bindWechat;
     }
 
-    public void setWechat(Boolean wechat) {
-        this.wechat = wechat;
+    public void setBindWechat(Boolean bindWechat) {
+        this.bindWechat = bindWechat;
     }
 
-    public Boolean getReal() {
-        return real;
+    public Boolean getBindReal() {
+        return bindReal;
     }
 
-    public void setReal(Boolean real) {
-        this.real = real;
+    public void setBindReal(Boolean bindReal) {
+        this.bindReal = bindReal;
     }
 
-    public Boolean getPrepare() {
-        return prepare;
+    public Boolean getBindPrepare() {
+        return bindPrepare;
     }
 
-    public void setPrepare(Boolean prepare) {
-        this.prepare = prepare;
+    public void setBindPrepare(Boolean bindPrepare) {
+        this.bindPrepare = bindPrepare;
     }
 
-    public Boolean getMobile() {
-        return mobile;
+    public Boolean getBindMobile() {
+        return bindMobile;
     }
 
-    public void setMobile(Boolean mobile) {
-        this.mobile = mobile;
+    public void setBindMobile(Boolean bindMobile) {
+        this.bindMobile = bindMobile;
     }
 }

server/gateway-api/src/main/java/com/qxgmat/service/UserNoteQuestionService.java

@@ -15,8 +15,8 @@ import com.qxgmat.data.dao.entity.Question;
 import com.qxgmat.data.dao.entity.QuestionNo;
 import com.qxgmat.data.dao.entity.UserCollectQuestion;
 import com.qxgmat.data.dao.entity.UserNoteQuestion;
-import com.qxgmat.data.relation.UserNoteRelationMapper;
-import com.qxgmat.data.relation.entity.UserNoteRelation;
+import com.qxgmat.data.relation.UserNoteQuestionRelationMapper;
+import com.qxgmat.data.relation.entity.UserNoteQuestionRelation;
 import com.qxgmat.service.inline.QuestionNoService;
 import com.qxgmat.service.inline.QuestionService;
 import org.slf4j.Logger;
@@ -36,7 +36,7 @@ public class UserNoteQuestionService extends AbstractService {
     private UserNoteQuestionMapper userNoteQuestionMapper;
 
     @Resource
-    private UserNoteRelationMapper userNoteRelationMapper;
+    private UserNoteQuestionRelationMapper userNoteQuestionRelationMapper;
 
     @Resource
     private QuestionNoService questionNoService;
@@ -57,11 +57,11 @@ public class UserNoteQuestionService extends AbstractService {
      * @param direction
      * @return
      */
-    public PageResult<UserNoteRelation> list(int page, int size, Integer userId, QuestionModule module, QuestionType type, String startTime, String endTime, String order, DirectionStatus direction){
+    public PageResult<UserNoteQuestionRelation> list(int page, int size, Integer userId, QuestionModule module, QuestionType type, String startTime, String endTime, String order, DirectionStatus direction){
         String moduleKey = module == null ? null : module.key;
         String typeKey = type == null ? null : type.key;
         Page<UserNoteQuestion> p = page(()->{
-            userNoteRelationMapper.list(userId, moduleKey, typeKey, startTime, endTime, order, direction.key);
+            userNoteQuestionRelationMapper.list(userId, moduleKey, typeKey, startTime, endTime, order, direction.key);
         }, page, size);
 
         Collection ids = Transform.getIds(p, UserNoteQuestion.class, "id");
@@ -69,17 +69,17 @@ public class UserNoteQuestionService extends AbstractService {
         // 获取详细数据
         List<UserNoteQuestion> list = select(ids);
 
-        List<UserNoteRelation> pr = Transform.convert(list, UserNoteRelation.class);
+        List<UserNoteQuestionRelation> pr = Transform.convert(list, UserNoteQuestionRelation.class);
 
         // 获取题目信息
-        Collection questionIds = Transform.getIds(pr, UserNoteRelation.class, "questionId");
+        Collection questionIds = Transform.getIds(pr, UserNoteQuestionRelation.class, "questionId");
         List<Question> questionList = questionService.select(questionIds);
-        Transform.combine(pr, questionList, UserNoteRelation.class, "questionId", "question", Question.class, "id");
+        Transform.combine(pr, questionList, UserNoteQuestionRelation.class, "questionId", "question", Question.class, "id");
 
         // 获取题目编号信息
-        Collection questionNoIds = Transform.getIds(pr, UserNoteRelation.class, "questionNoId");
+        Collection questionNoIds = Transform.getIds(pr, UserNoteQuestionRelation.class, "questionNoId");
         List<QuestionNo> questionNoList = questionNoService.select(questionNoIds);
-        Transform.combine(pr, questionNoList, UserNoteRelation.class, "questionNoId", "questionNo", Question.class, "id");
+        Transform.combine(pr, questionNoList, UserNoteQuestionRelation.class, "questionNoId", "questionNo", Question.class, "id");
 
         return new PageResult<>(pr, p.getTotal());
     }

server/gateway-api/src/main/java/com/qxgmat/util/shiro/UserRealm.java

@@ -46,8 +46,8 @@ public class UserRealm extends AuthorizingRealm {
         String mobile = token.getUsername();
         String password = new String(token.getPassword());
 
-        if (StringUtils.isBlank(mobile) || StringUtils.isBlank(password)) {
-            throw new UnknownAccountException("手机或密码不能为空！");
+        if (StringUtils.isBlank(mobile)) {
+            throw new UnknownAccountException("手机不能为空！");
         }
         User user = usersService.getByMobile(mobile);
         if (user == null || user.getId() <= 0) {