微信登录

gis_admin/src/main/java/com/gis/admin/controller/WxLoginController.java

@@ -115,6 +115,7 @@ public class WxLoginController {
     private WxUserEntity getWxUser(String openId){
         WxUserEntity entity = wxUserService.cacheByOpenId(openId);
         if (entity == null){
+            log.info("需要添加新用户");
             entity = new WxUserEntity();
             entity.setOpenId(openId);
             wxUserService.save(entity);

gis_admin/src/main/java/com/gis/admin/service/impl/WxUserServiceImpl.java

@@ -56,7 +56,7 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUserEntity> i
         } else {
             userEntity = this.findByOpenId(openId);
             // 1小时有效
-            redisUtil.setCacheObject(wxUserKey, userEntity, 1, TimeUnit.HOURS);
+            redisUtil.setCacheObject(wxUserKey, userEntity, 5, TimeUnit.MINUTES);
         }
         return userEntity;
     }

gis_cms/src/main/java/com/gis/cms/service/impl/RoomServiceImpl.java

@@ -124,11 +124,6 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
 
     @Override
     public Result join(String code, Long roomId) {
-//        RoomEntity roomEntity = baseMapper.findByCode(code, creatorId);
-//        if (roomEntity==null){
-//            log.error("该房间号不存在： {}", code);
-//            return Result.failure("该房间不存在: " + code );
-//        }
 
         RoomEntity roomEntity = this.getById(roomId);
         BaseRuntimeException.isNull(roomEntity, ErrorEnum.FAILURE_SYS_2001);
@@ -188,9 +183,9 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
         // 同一房间下的头像
         List<String> roomImg;
         for (RoomEntity room : rooms) {
-            roomImg = new ArrayList<>();
             List<RoomVo> roomVos = roomMap.get(room.getId());
             if (CollectionUtil.isNotEmpty(roomVos)){
+                roomImg = new ArrayList<>();
                 for (RoomVo roomVo : roomVos) {
                     roomImg.add(roomVo.getAvatarUrl());
                 }
@@ -208,15 +203,12 @@ public class RoomServiceImpl extends ServiceImpl<RoomMapper, RoomEntity> impleme
      * @return
      */
     private List<RoomVo> getAvatarUrlByRoomId(List<Long> roomIds){
-
-        System.out.println("11111: " + roomIds.toArray());
         String roomIdsStr = CollectionUtil.join(roomIds, ",");
         StringBuffer sql = new StringBuffer();
         sql.append("select b.avatar_url, a.room_id, b.id as userId from tb_game_log a left join wx_user b on b.id=a.creator_id where a.is_delete=0 and  a.type='activity' ");
         sql.append(" and a.room_id in (").append(roomIdsStr).append(")");
         // 该房间的用户头像
-        List<RoomVo> avatarUrls = baseMapper.selectVoList(sql.toString());
-        return avatarUrls;
+        return baseMapper.selectVoList(sql.toString());
 
     }
 

gis_common/src/main/java/com/gis/common/config/MyRedisConfig.java

@@ -1,57 +0,0 @@
-//package com.gis.common.config;
-//
-//import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer;
-//import com.fasterxml.jackson.annotation.JsonAutoDetect;
-//import com.fasterxml.jackson.annotation.PropertyAccessor;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.connection.RedisConnectionFactory;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-//import org.springframework.data.redis.serializer.StringRedisSerializer;
-//
-//import java.net.UnknownHostException;
-//
-///**
-// * Created by owen on 2021/7/16 0016 17:21
-// *
-// * redis 全局序列化
-// * redis管理界面可以看到参数
-// * 对象序列化有字段泛型字段值不丢失
-// */
-//
-//@Configuration
-//public class MyRedisConfig {
-//
-//
-//
-//        @Bean
-//        public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-//            RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-//            redisTemplate.setConnectionFactory(connectionFactory);
-//
-//            // 使用Jackson2JsonRedisSerialize替换默认序列化
-//            Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-//
-//            ObjectMapper objectMapper = new ObjectMapper();
-//            objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-//            objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-//
-//            jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
-//
-//            // 设置key和value的序列化规则
-//            redisTemplate.setKeySerializer(new StringRedisSerializer());
-////            redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
-//            redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-//            redisTemplate.setHashValueSerializer(new StringRedisSerializer());
-//            redisTemplate.setValueSerializer(new FastJsonRedisSerializer<>(Object.class));
-//
-//            redisTemplate.afterPropertiesSet();
-//
-//            return redisTemplate;
-//
-//        }
-//
-//
-//}