减少account返回的字段

修改查询实例时个人喜爱的实例无法表示的问题（example_id改为String类型即可）

Author: WxrLZQ

springboot-dubbo-api/src/main/java/com/lzq/api/dto/ExampleAccount.java

@@ -56,7 +56,7 @@ public class ExampleAccount implements Serializable {
      */
     @TableId(value = "example_id")
     @JsonProperty("exampleId")
-    private Long exampleId;
+    private String exampleId;
     /**
      * 实列名称
      */

springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java

@@ -158,6 +158,7 @@ public class Account implements Serializable, UserDetails {
 
 
 
+    @JsonIgnore
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         List<SimpleGrantedAuthority> list = new ArrayList();
@@ -166,22 +167,22 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
     }
 
 
-
+    @JsonIgnore
     @Override
     public boolean isAccountNonExpired() {
         return true;
     }
-
+    @JsonIgnore
     @Override
     public boolean isAccountNonLocked() {
         return true;
     }
-
+    @JsonIgnore
     @Override
     public boolean isCredentialsNonExpired() {
         return true;
     }
-
+    @JsonIgnore
     @Override
     public boolean isEnabled() {
         return true;

springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml

@@ -2,10 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.ExampleAccountMapper">
     <sql id="Thebasic">
-        a
-        .
-        example_id
-        , example_name, ispublic, label, img, file_name, favorites, a.username
+        a.example_id, example_name, ispublic, label, img, file_name, favorites, a.username
     </sql>
 
     <select id="queryByExampleName" resultType="com.lzq.api.dto.ExampleAccount">

springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java

@@ -1,7 +1,5 @@
 package com.lzq.web.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.lzq.api.pojo.*;

springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java

@@ -11,6 +11,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -92,9 +93,10 @@ public Map<String, Object> queryByUsername(HttpSession session, String username)
     public Map<String, Object> getFollowList(HttpServletRequest request, AccountResult result, @RequestParam(defaultValue = "1") Integer currentPage) {
         String username = null;
         PageInfo<AccountResult> list = null;
+        String token = request.getHeader("token");
         //判断用户是否登录
-        if (request.getHeader("token") != null) {
-            username = JWTUtils.verify(request.getHeader("token"))
+        if (StringUtils.isNotBlank(token)){
+            username = JWTUtils.verify(token)
                     .getClaim("username").asString();
         }
         //登录的情况
@@ -238,7 +240,7 @@ public Map<String, Object> queryByExampleName(HttpServletRequest request, String
      */
     @GetMapping("/getExample")
     @ApiOperation("查询个人全部实例")
-    public Map<String, Object> getExample(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage) {
+    public Map<String, Object> getExample(HttpServletRequest request, Account account, @RequestParam(defaultValue = "1") Integer currentPage,@RequestParam(defaultValue = "0") Integer orderCondition) {
         String username = null;
         PageInfo<Example> list;
         if (request.getHeader("token") != null) {
@@ -307,19 +309,22 @@ public Map<String, Object> getFavorites(HttpServletRequest request, Account acco
                 list.setList(exampleList);
             } else {
                 //获取缓存中用户的喜爱实例id
-                List<Integer> favoritesList = redisTemplate.opsForList().range(username + "fav", 0, -1);
+                List<String> favoritesList = redisTemplate.opsForList().range(username + "fav", 0, -1);
+                log.info("查询到的个人喜爱列表"+favoritesList);
                 //获取缓存中用户的关注用户名
                 List<String> followList = redisTemplate.opsForList().range(username, 0, -1);
                 list = exampleAccountService.queryPersonFavorites(account.getUsername(), currentPage, orderCondition);
                 List<ExampleAccount> exampleList = list.getList();
                 for (ExampleAccount exampleAccount : exampleList) {
+                    log.info("遍历实例id:"+exampleAccount.getExampleId());
                     //判断该用户是否被关注，该用户是否是自己
                     if (followList.contains(exampleAccount.getUsername())) {
                         exampleAccount.setMyFollow(true);
                     } else if (username.equals(exampleAccount.getUsername())) {
                         exampleAccount.setMyFollow(null);
                     }
                     if (favoritesList.contains(exampleAccount.getExampleId())) {
+                        log.info("我匹配正确了"+exampleAccount.getExampleId());
                         exampleAccount.setMyFavorites(true);
                     }
                 }

springboot-dubbo-web/src/main/java/com/lzq/web/controller/UserController.java

@@ -155,6 +155,7 @@ public Map<String, Object> deleteAccount(Account account) {
     @PutMapping("/updateEmail")
     @ApiOperation("更新注册邮箱")
     public Map<String, Object> updatEmail(Account account) {
+        //更新邮箱添加redis
         try {
             Boolean bol = accountService.update(account);
             return ResultMapUtils.ResultMapWithToken(bol, 0, null, null);