修改bug

src/main/java/fcb/project/manager/base/config/RedisConfiguration.java

@@ -1,3 +1,4 @@
+
 package fcb.project.manager.base.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -12,12 +13,14 @@ import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 
+
 /**
  * 2 * @Author: Abner
  * 3 * @Date: 2021/1/11 11:44
  * 4
  */
 
+
 @Configuration
 @EnableCaching
 public class RedisConfiguration {
@@ -48,3 +51,4 @@ public class RedisConfiguration {
         return template;
     }
 }
+

src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * <p>
@@ -83,34 +84,9 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         return getBaseMapper().selectOne(lambdaQueryWrapper);
     }
 
-    public int addNewAudit(TmHouse tmHouse , TmEstate tmEstate){
-        if(null == tmHouse){
-            return -1;
-        }
-        TmAudit tmAudit = new TmAudit();
-        tmAudit.setId(SnowFlakeUUidUtils.generaUUid(null , null , "AUD00000"));
-        tmAudit.setVrTitle(tmHouse.getHouseTitle());
-        tmAudit.setVrType(tmHouse.getType());
-        if(null != tmEstate){
-            tmAudit.setBelongEstateName(tmEstate.getEstateName());
-            tmAudit.setBelongEstateId(tmEstate.getId());
-        }
-        //TODO:
-        tmAudit.setCreatorId("");
-        //TODO:
-        tmAudit.setCreatorName("");
-        tmAudit.setSumitTime(LocalDateTime.now());
-        tmAudit.setAuditStatus(AuditStatus.WAITING_AUDIT.getCode());
-        tmAudit.setVrOnline(tmHouse.getOnline());
-        tmAudit.setCreateTime(LocalDateTime.now());
-        tmAudit.setUpdateTime(LocalDateTime.now());
-        tmAudit.setIsDelete(DeleteStatus.NOT_DELETE.getCode());
-        return getBaseMapper().insert(tmAudit);
-    }
-
 
     @Transactional(rollbackFor = Exception.class)
-    public  TmAudit addNewAuditWithRespon(TmHouse tmHouse , TmEstate tmEstate){
+    public  TmAudit addNewAuditWithRespon(TmHouse tmHouse , TmEstate tmEstate , Map<String , Object> token){
         if(null == tmHouse){
             return null;
         }
@@ -123,10 +99,12 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
             tmAudit.setBelongEstateName(tmEstate.getEstateName());
             tmAudit.setBelongEstateId(tmEstate.getId());
         }
-        //TODO:
-        tmAudit.setCreatorId("");
-        //TODO:
-        tmAudit.setCreatorName("");
+        String userId = (String) token.get("id");
+        String userName = (String) token.get("userName");
+        tmAudit.setCreatorId(userId);
+        tmAudit.setCreatorName(userName);
+        tmAudit.setBelongCompanyId(tmEstate.getBelongCompanyId());
+        tmAudit.setBelongCompanyName(tmEstate.getBelongCompanyName());
         tmAudit.setSumitTime(LocalDateTime.now());
         tmAudit.setAuditStatus(AuditStatus.WAITING_AUDIT.getCode());
         tmAudit.setVrOnline(tmHouse.getOnline());

src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -33,7 +33,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
                                                  Long pageNum , Long pageSize){
         LambdaQueryWrapper<TmEstate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(belongCompany)){
-            lambdaQueryWrapper.like(TmEstate::getBelongCompanyName , belongCompany);
+            lambdaQueryWrapper.eq(TmEstate::getBelongCompanyId , belongCompany);
         }
         if(StringUtils.isNotBlank(estateName)){
             lambdaQueryWrapper.like(TmEstate::getEstateName , estateName);

src/main/java/fcb/project/manager/base/utils/FcbUtils.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -20,7 +21,8 @@ import java.util.Map;
 public class FcbUtils {
 
 
-    public static Result<Object> getFcbSign(Map<String , Object> params , String fcbClientSecret){
+    public static Result<Object> getFcbSign(Map<String , Object> params
+            , String fcbClientSecret , String fcbClientCode){
 
         if(CollectionUtils.isEmpty(params)){
             return Result.failure("入参不能为空");
@@ -32,13 +34,22 @@ public class FcbUtils {
             }
         }
         //2、新增房车宝的client_secret作为噪点
+        long timeStamp = Instant.now().getEpochSecond();
         params.put("client_secret" , fcbClientSecret);
+        params.put("client_code" , fcbClientCode);
+        params.put("req_time" , timeStamp);
         params = DataUtils.sortMapByKey(params);
+        StringBuilder stringBuilder = new StringBuilder();
+
+        for ( Map.Entry entry : params.entrySet()) {
+            stringBuilder.append(entry.getValue());
+        }
+
         //3、生成MD5密文，然后转成小写字母
-        String md5EncryptionStr = DataUtils.md5Encryption(JSON.toJSONString(params));
+        String md5EncryptionStr = DataUtils.md5Encryption(stringBuilder.toString());
         Map<String , Object> resultMap = new HashMap<>();
         resultMap.put("authcode" , md5EncryptionStr);
-        resultMap.put("timeStamp" , System.currentTimeMillis());
+        resultMap.put("timeStamp" , timeStamp);
         return Result.success(resultMap);
 
     }

src/main/java/fcb/project/manager/base/utils/RedisServiceUtils.java

@@ -1,3 +1,4 @@
+/*
 package fcb.project.manager.base.utils;
 
 import lombok.extern.log4j.Log4j2;
@@ -10,24 +11,28 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+*/
 /**
  * 2 * @Author: Abner
  * 3 * @Date: 2021/1/11 11:45
  * 4
- */
+ *//*
+
 @Service
 @Log4j2
 public class RedisServiceUtils {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
-    /**
+    */
+/**
      * 指定缓存失效时间
      *
      * @param key 键
      * @param time 时间(秒)
      * @return
-     */
+     *//*
+
     public boolean expire(String key, long time) {
         try {
             if (time > 0) {
@@ -40,22 +45,26 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 根据key获取过期时间
      *
      * @param key 键 不能为null
      * @return 时间(秒) 返回0代表为永久有效
-     */
+     *//*
+
     public long getExpire(String key) {
         return redisTemplate.getExpire(key, TimeUnit.SECONDS);
     }
 
-    /**
+    */
+/**
      * 判断key是否存在
      *
      * @param key  键
      * @return true 存在 false不存在
-     */
+     *//*
+
     public boolean hasKey(String key) {
         try {
             return redisTemplate.hasKey(key);
@@ -65,11 +74,13 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 删除缓存
      *
      * @param key 可以传一个值 或多个
-     */
+     *//*
+
     @SuppressWarnings("unchecked")
     public void del(String... key) {
         if (key != null && key.length > 0) {
@@ -81,23 +92,27 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 普通缓存获取
      *
      * @param key 键
      * @return 值
-     */
+     *//*
+
     public Object get(String key) {
         return key == null ? null : redisTemplate.opsForValue().get(key);
     }
 
-    /**
+    */
+/**
      * 普通缓存放入
      *
      * @param key 键
      * @param value 值
      * @return true成功 false失败
-     */
+     *//*
+
     public boolean set(String key, Object value) {
         try {
             redisTemplate.opsForValue().set(key, value);
@@ -109,14 +124,16 @@ public class RedisServiceUtils {
 
     }
 
-    /**
+    */
+/**
      * 普通缓存放入并设置时间
      *
      * @param key 键
      * @param value 值
      * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
      * @return true成功 false 失败
-     */
+     *//*
+
     public boolean set(String key, Object value, long time) {
         try {
             if (time > 0) {
@@ -131,13 +148,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 递增
      *
      * @param key 键
      * @param delta 要增加几(大于0)
      * @return
-     */
+     *//*
+
     public long incr(String key, long delta) {
         if (delta <= 0) {
             throw new RuntimeException("递增因子必须大于0");
@@ -145,13 +164,15 @@ public class RedisServiceUtils {
         return redisTemplate.opsForValue().increment(key, delta);
     }
 
-    /**
+    */
+/**
      * 递减
      *
      * @param key 键
      * @param delta 要减少几(小于0)
      * @return
-     */
+     *//*
+
     public long decr(String key, long delta) {
         if (delta <= 0) {
             throw new RuntimeException("递减因子必须大于0");
@@ -159,34 +180,40 @@ public class RedisServiceUtils {
         return redisTemplate.opsForValue().increment(key, -delta);
     }
 
-    /**
+    */
+/**
      * HashGet
      *
      * @param key  键 不能为null
      * @param item 项 不能为null
      * @return 值
-     */
+     *//*
+
     public Object hget(String key, String item) {
         return redisTemplate.opsForHash().get(key, item);
     }
 
-    /**
+    */
+/**
      * 获取hashKey对应的所有键值
      *
      * @param key 键
      * @return 对应的多个键值
-     */
+     *//*
+
     public Map<Object, Object> hmget(String key) {
         return redisTemplate.opsForHash().entries(key);
     }
 
-    /**
+    */
+/**
      * HashSet
      *
      * @param key 键
      * @param map 对应多个键值
      * @return true 成功 false 失败
-     */
+     *//*
+
     public boolean hmset(String key, Map<String, Object> map) {
         try {
             redisTemplate.opsForHash().putAll(key, map);
@@ -197,14 +224,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * HashSet 并设置时间
      *
      * @param key 键
      * @param map 对应多个键值
      * @param time 时间(秒)
      * @return true成功 false失败
-     */
+     *//*
+
     public boolean hmset(String key, Map<String, Object> map, long time) {
         try {
             redisTemplate.opsForHash().putAll(key, map);
@@ -218,14 +247,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 向一张hash表中放入数据,如果不存在将创建
      *
      * @param key 键
      * @param item 项
      * @param value 值
      * @return true 成功 false失败
-     */
+     *//*
+
     public boolean hset(String key, String item, Object value) {
         try {
             redisTemplate.opsForHash().put(key, item, value);
@@ -236,7 +267,8 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 向一张hash表中放入数据,如果不存在将创建
      *
      * @param key 键
@@ -244,7 +276,8 @@ public class RedisServiceUtils {
      * @param value 值
      * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
      * @return true 成功 false失败
-     */
+     *//*
+
     public boolean hset(String key, String item, Object value, long time) {
         try {
             redisTemplate.opsForHash().put(key, item, value);
@@ -258,57 +291,67 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 删除hash表中的值
      *
      * @param key 键 不能为null
      * @param item 项 可以使多个 不能为null
-     */
+     *//*
+
     public void hdel(String key, Object... item) {
         redisTemplate.opsForHash().delete(key, item);
     }
 
-    /**
+    */
+/**
      * 判断hash表中是否有该项的值
      *
      * @param key 键 不能为null
      * @param item 项 不能为null
      * @return true 存在 false不存在
-     */
+     *//*
+
     public boolean hHasKey(String key, String item) {
         return redisTemplate.opsForHash().hasKey(key, item);
     }
 
-    /**
+    */
+/**
      * hash递增 如果不存在,就会创建一个 并把新增后的值返回
      *
      * @param key 键
      * @param item 项
      * @param by 要增加几(大于0)
      * @return
-     */
+     *//*
+
     public double hincr(String key, String item, double by) {
         return redisTemplate.opsForHash().increment(key, item, by);
     }
 
-    /**
+    */
+/**
      * hash递减
      *
      * @param key 键
      * @param item 项
      * @param by 要减少记(小于0)
      * @return
-     */
+     *//*
+
     public double hdecr(String key, String item, double by) {
         return redisTemplate.opsForHash().increment(key, item, -by);
     }
 
-    /**
+    */
+/**
      * 根据key获取Set中的所有值
      *
      * @param key 键
      * @return
-     */
+     *//*
+
     public Set<Object> sGet(String key) {
         try {
             return redisTemplate.opsForSet().members(key);
@@ -317,13 +360,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 根据value从一个set中查询,是否存在
      *
      * @param key  键
      * @param value 值
      * @return true 存在 false不存在
-     */
+     *//*
+
     public boolean sHasKey(String key, Object value) {
         try {
             return redisTemplate.opsForSet().isMember(key, value);
@@ -332,13 +377,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将数据放入set缓存
      *
      * @param key  键
      * @param values 值 可以是多个
      * @return 成功个数
-     */
+     *//*
+
     public long sSet(String key, Object... values) {
         try {
             return redisTemplate.opsForSet().add(key, values);
@@ -347,14 +394,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将set数据放入缓存
      *
      * @param key   键
      * @param time  时间(秒)
      * @param values 值 可以是多个
      * @return 成功个数
-     */
+     *//*
+
     public long sSetAndTime(String key, long time, Object... values) {
         try {
             Long count = redisTemplate.opsForSet().add(key, values);
@@ -366,12 +415,14 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 获取set缓存的长度
      *
      * @param key   键
      * @return
-     */
+     *//*
+
     public long sGetSetSize(String key) {
         try {
             return redisTemplate.opsForSet().size(key);
@@ -380,13 +431,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 移除值为value的
      *
      * @param key   键
      * @param values   值 可以是多个
      * @return 移除的个数
-     */
+     *//*
+
     public long setRemove(String key, Object... values) {
         try {
             Long count = redisTemplate.opsForSet().remove(key, values);
@@ -396,14 +449,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 获取list缓存的内容
      *
      * @param key  键
      * @param start   开始
      * @param end   结束 0 到 -1代表所有值
      * @return
-     */
+     *//*
+
     public List<Object> lGet(String key, long start, long end) {
         try {
             return redisTemplate.opsForList().range(key, start, end);
@@ -412,12 +467,14 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 获取list缓存的长度
      *
      * @param key  键
      * @return
-     */
+     *//*
+
     public long lGetListSize(String key) {
         try {
             return redisTemplate.opsForList().size(key);
@@ -426,13 +483,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 通过索引 获取list中的值
      *
      * @param key  键
      * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
      * @return
-     */
+     *//*
+
     public Object lGetIndex(String key, long index) {
         try {
             return redisTemplate.opsForList().index(key, index);
@@ -441,13 +500,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将list放入缓存
      *
      * @param key   键
      * @param value  值
      * @return
-     */
+     *//*
+
     public boolean lSet(String key, Object value) {
         try {
             redisTemplate.opsForList().rightPush(key, value);
@@ -457,14 +518,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将list放入缓存
      *
      * @param key   键
      * @param value  值
      * @param time  时间(秒)
      * @return
-     */
+     *//*
+
     public boolean lSet(String key, Object value, long time) {
         try {
             redisTemplate.opsForList().rightPush(key, value);
@@ -476,13 +539,15 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将list放入缓存
      *
      * @param key  键
      * @param value  值
      * @return
-     */
+     *//*
+
     public boolean lSet(String key, List<Object> value) {
         try {
             redisTemplate.opsForList().rightPushAll(key, value);
@@ -492,14 +557,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 将list放入缓存
      *
      * @param key  键
      * @param value 值
      * @param time  时间(秒)
      * @return
-     */
+     *//*
+
     public boolean lSet(String key, List<Object> value, long time) {
         try {
             redisTemplate.opsForList().rightPushAll(key, value);
@@ -511,14 +578,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 根据索引修改list中的某条数据
      *
      * @param key  键
      * @param index 索引
      * @param value 值
      * @return
-     */
+     *//*
+
     public boolean lUpdateIndex(String key, long index, Object value) {
         try {
             redisTemplate.opsForList().set(key, index, value);
@@ -529,14 +598,16 @@ public class RedisServiceUtils {
         }
     }
 
-    /**
+    */
+/**
      * 移除N个值为value
      *
      * @param key 键
      * @param count 移除多少个
      * @param value 值
      * @return 移除的个数
-     */
+     *//*
+
     public long lRemove(String key, long count, Object value) {
         try {
             Long remove = redisTemplate.opsForList().remove(key, count, value);
@@ -546,3 +617,4 @@ public class RedisServiceUtils {
         }
     }
 }
+*/

src/main/java/fcb/project/manager/core/controller/ApiFormatHouseController.java

@@ -1,193 +0,0 @@
-package fcb.project.manager.core.controller;
-
-import com.alibaba.fastjson.JSON;
-import fcb.project.manager.base.entity.TmApiHouseInfo;
-import fcb.project.manager.base.enums.TerminalType;
-import fcb.project.manager.base.enums.UuidPreEnum;
-import fcb.project.manager.base.utils.RedisServiceUtils;
-import fdage.back.sdk.base.entity.Result;
-import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.rocketmq.client.exception.MQBrokerException;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.remoting.common.RemotingHelper;
-import org.apache.rocketmq.remoting.exception.RemotingException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.UnsupportedEncodingException;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 2 * @Author: Abner
- * 3 * @Date: 2021/1/11 10:09
- * 4
- */
-@Api(tags = "API格式化房源信息相关接口")
-@RestController
-@RequestMapping("fcb/project/api/vrhouse")
-@Log4j2
-public class ApiFormatHouseController {
-
-    @Value("${4dkankan.host.url}")
-    private String redirectVrUrl;
-
-    @Value("${rocketmq.consumer.group}")
-    private String rocketMqGroup;
-
-    @Value("${rocketmq.consumer.topic}")
-    private String rocketTopic;
-
-    @Value("${rocketmq.name-server}")
-    private String rocketNameServer;
-
-    @Autowired
-    private RedisServiceUtils redisServiceUtils;
-
-    @PostMapping("/format")
-    @ApiOperation(value = "房源格式化接口")
-    public Result<Object> formatHouse(@RequestBody TmApiHouseInfo tmApiHouseInfo){
-        if(!StringUtils.isNoneBlank(tmApiHouseInfo.getSceneNum() , tmApiHouseInfo.getHouseId())){
-            return Result.failure("场景码或者房源ID不能为空");
-        }
-        //认为是修改已有的数据，理论上，不会有这个操作
-        String oldRedisKey = this.getClass().getName() + "::" + tmApiHouseInfo.getSceneNum() + "::"
-                + tmApiHouseInfo.getHouseId();
-        boolean isDelete = false;
-        if(StringUtils.isBlank(tmApiHouseInfo.getCommunicateRoomId())){
-            if(StringUtils.isNoneBlank(tmApiHouseInfo.getRequestId())){
-                return Result.failure("参数RequestId非法");
-            }
-            //没有房间号，默认是新增
-            //生成roomId
-            String roomId = SnowFlakeUUidUtils.generaUUid(null , null , UuidPreEnum.API_ROOM_ID_PRE.getPre());
-            oldRedisKey += "::" + roomId;
-            if(redisServiceUtils.hasKey(oldRedisKey)){
-                //有缓存，则先删除，理论上不存在
-                redisServiceUtils.del(oldRedisKey);
-            }
-            tmApiHouseInfo.setEnable(1);
-            tmApiHouseInfo.setCommunicateRoomId(roomId);
-            tmApiHouseInfo.setRequestId(SnowFlakeUUidUtils.generaUUid(null , null , UuidPreEnum.API_REQUEST_ID_PRE.getPre()));
-            tmApiHouseInfo.setCreateTime(LocalDateTime.now());
-            tmApiHouseInfo.setLastModifyDatetime(LocalDateTime.now());
-        }else{
-            //存量数据，认为是修改数据
-            if(StringUtils.isBlank(tmApiHouseInfo.getRequestId())){
-                return Result.failure("缺失请求ID");
-            }
-            if(null == tmApiHouseInfo.getEnable()){
-                return Result.failure("缺失房源的是状态字段:enable");
-            }
-            oldRedisKey += "::" + tmApiHouseInfo.getCommunicateRoomId();
-            if(redisServiceUtils.hasKey(oldRedisKey)){
-                //有缓存，则先删除，理论上不存在
-                redisServiceUtils.del(oldRedisKey);
-            }
-            tmApiHouseInfo.setLastModifyDatetime(LocalDateTime.now());
-            if(tmApiHouseInfo.getEnable().compareTo(0) == 0){
-                isDelete = true;
-                //删除操作，需要删除推荐房源(可不删除推荐房源)，删除缓存，更新db
-                redisServiceUtils.del(oldRedisKey);
-            }
-        }
-        Map<String, Object> resultMap = new HashMap<>();
-        //非删除操作，则更新缓存
-        if(!isDelete){
-            //将最新的数据先存入缓存，暂时缓存3个小时
-            redisServiceUtils.set(oldRedisKey , JSON.toJSONString(tmApiHouseInfo) , 10800);
-            String redirectUrl = genVrLink(tmApiHouseInfo);
-            resultMap.put("vrLink", redirectUrl);
-            resultMap.put("roomId", tmApiHouseInfo.getCommunicateRoomId());
-        }
-
-        //写入mq，异步落库 todo:这里要改成线程安全
-        enqueueMq(tmApiHouseInfo);
-
-        if(!CollectionUtils.isEmpty(resultMap)){
-            return Result.success(resultMap);
-        }
-
-        return Result.success("成功提交");
-    }
-
-    public void enqueueMq(TmApiHouseInfo tmApiHouseInfo){
-        if(null == tmApiHouseInfo){
-            return;
-        }
-        DefaultMQProducer producer = new DefaultMQProducer(rocketMqGroup);
-        // Specify name server addresses.
-        producer.setNamesrvAddr(rocketNameServer);
-        Message message = null;
-        try {
-            message = new Message(rocketTopic , "TagA" , JSON.toJSONString(tmApiHouseInfo).getBytes(RemotingHelper.DEFAULT_CHARSET));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        if(null != message){
-            try {
-                SendResult sendResult = producer.send(message, 5000);
-                log.info("mq发送消息[{}]完成，结果为:{}" , message.getKeys() , sendResult);
-            } catch (MQClientException e) {
-                e.printStackTrace();
-            } catch (RemotingException e) {
-                e.printStackTrace();
-            } catch (MQBrokerException e) {
-                e.printStackTrace();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            producer.shutdown();
-        }
-
-    }
-
-    private String genVrLink(TmApiHouseInfo houseInfo) {
-        String terminalTypeStr = houseInfo.getTerminalType();
-        String userId = "";
-        TerminalType terminalType = TerminalType.getByType(terminalTypeStr);
-        if (null != terminalType && terminalType.equals(TerminalType.CUSTOMER)) {
-            //用户端
-            userId = houseInfo.getUserId();
-        } else if (null != terminalType && terminalType.equals(TerminalType.AGENT)) {
-            //经纪人端
-            userId = houseInfo.getAgencyId();
-        } else {
-//            throw new CommonBaseException(ResultCodeEnum.D3010);
-            //给默认取值
-            userId = "";
-            terminalType  = TerminalType.CUSTOMER;
-        }
-        /**
-         * 样例:
-         * vrHouse.html?m=t-XtYfLCO&appname=vrhouse&role=customer&room_id=F8Q1&user_id=456
-         * vrHouse.html?m=t-XtYfLCO&appname=vrhouse&role=agent&room_id=F8Q1&user_id=456
-         * */
-        String redirectUrl = redirectVrUrl + houseInfo.getSceneNum() //场景码
-                + "&appname=vrhouse&role=" + terminalType.getType(); //角色名
-
-        if(StringUtils.isNotBlank(houseInfo.getCommunicateRoomId())){
-            redirectUrl +=  "&room_id=" + houseInfo.getCommunicateRoomId();//roomId
-        }
-        if(StringUtils.isNotBlank(userId)){
-            redirectUrl += "&user_id=" + userId; //userId
-        }
-        log.info("生成的vr链接为:{}", redirectUrl);
-        return redirectUrl;
-    }
-
-
-}

src/main/java/fcb/project/manager/core/controller/ApiQueryHouseController.java

@@ -1,38 +1,16 @@
 package fcb.project.manager.core.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import fcb.project.manager.base.constant.CommonConstant;
-import fcb.project.manager.base.entity.TmApiHouseInfo;
-import fcb.project.manager.base.entity.TmApiHouseRecommend;
-import fcb.project.manager.base.entity.TmFcbHouseInfo;
-import fcb.project.manager.base.entity.TmHouse;
-import fcb.project.manager.base.service.impl.TmApiHouseInfoServiceImpl;
-import fcb.project.manager.base.service.impl.TmApiHouseRecommendServiceImpl;
-import fcb.project.manager.base.service.impl.TmHouseServiceImpl;
 import fcb.project.manager.base.utils.FcbUtils;
-import fcb.project.manager.base.utils.RedisServiceUtils;
 import fdage.back.sdk.base.entity.Result;
-import fdage.back.sdk.base.enums.ResultCodeEnum;
-import fdage.back.sdk.base.exception.CommonBaseException;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,94 +24,19 @@ import java.util.Map;
 @RequestMapping("fcb/project/api/query")
 public class ApiQueryHouseController {
 
-    @Autowired
-    private TmApiHouseInfoServiceImpl tmApiHouseInfoService;
-
-    @Autowired
-    private TmApiHouseRecommendServiceImpl tmApiHouseRecommendService;
-
-    @Autowired
-    private RedisServiceUtils redisServiceUtils;
-
-    @Autowired
-    private TmHouseServiceImpl tmHouseService;
 
     @Value("${fcb.client.secret}")
     private String fcbClientSecret;
 
+    @Value("${fcb.client.code}")
+    private String fcbClientCode;
+
 
     @ApiOperation(value = "获取房车宝的签名")
     @PostMapping("/authCode")
-    public Result<Object> getFcbSign(@RequestBody Map<String , Object> params) {
-        return FcbUtils.getFcbSign(params , fcbClientSecret);
-    }
-
-    @ApiOperation(value = "H5页面请求房源信息")
-    @GetMapping(value = "/getHouseInfo")
-    @Transactional(rollbackFor = Exception.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "sceneNum", value = "场景码", paramType = "query", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "projectId", value = "楼盘ID", paramType = "query", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "houseId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
-    })
-    public Result getHouseInfo(@RequestParam(value = "sceneNum") String sceneNum,
-                               @RequestParam(value = "projectId") String projectId,
-                               @RequestParam(value = "houseId") String houseId) {
-
-        if (!StringUtils.isNoneBlank(sceneNum , projectId , houseId)) {
-            throw new CommonBaseException(ResultCodeEnum.D3001);
-        }
-
-        String redisKey = this.getClass().getName() + CommonConstant.REDIS_KEY_SEPERATER +
-                projectId + CommonConstant.REDIS_KEY_SEPERATER + houseId + CommonConstant.REDIS_KEY_SEPERATER +
-                sceneNum;
-        TmFcbHouseInfo fcbHouseInfo = null;
-        if(redisServiceUtils.hasKey(redisKey)){
-            String fcbHouseInfoStr = (String) redisServiceUtils.get(redisKey);
-            if(StringUtils.isNotBlank(fcbHouseInfoStr)){
-                fcbHouseInfo = JSON.parseObject(fcbHouseInfoStr , TmFcbHouseInfo.class);
-                return Result.success(fcbHouseInfo);
-            }
-        }
-        //缓中没有，则去库中获取 todo:考虑下，到底值是去库中获取还是直接取房车宝获取
-        TmHouse tmHouse = tmHouseService.getBySceneNumAndHouseId(sceneNum , projectId , houseId);
-        if(null == tmHouse){
-            return Result.failure("房源不存在");
-        }
-        if(StringUtils.isBlank(tmHouse.getHouseInfo())){
-            //TODO:去房车宝接口获取
-
-        }else{
-            //缓存一天
-            redisServiceUtils.set(redisKey , tmHouse.getHouseInfo() , 86400);
-            fcbHouseInfo = JSON.parseObject(tmHouse.getHouseInfo() , TmFcbHouseInfo.class);
-        }
-        return Result.success(fcbHouseInfo);
-    }
-
-
-
-
-    @ApiOperation(value = "测试获取fcbhouseInfo的json")
-    @GetMapping(value = "/justTest")
-    public void justTest(@RequestBody TmFcbHouseInfo tmFcbHouseInfo){
-
+    public Result<Object> getFcbSign(@RequestBody Map<String, Object> params) {
+        return FcbUtils.getFcbSign(params, fcbClientSecret, fcbClientCode);
     }
 
-    private List<TmApiHouseInfo> getRecommends(TmApiHouseInfo houseInfo) {
-        List<TmApiHouseInfo> houseInfoList = new ArrayList<>();
-        if (null != houseInfo) {
-            List<TmApiHouseRecommend> houseRecommendList = tmApiHouseRecommendService.getRecommendList(houseInfo.getSceneNum() , houseInfo.getCommunicateRoomId());
-            if (!CollectionUtils.isEmpty(houseRecommendList)) {
-                for (TmApiHouseRecommend recommend : houseRecommendList) {
-                    TmApiHouseInfo tmHouseInfo = tmApiHouseInfoService.getHouseBySceneAndRoomId(recommend.getSceneNum() , recommend.getCommunicateRoomId());
-                    if (null != tmHouseInfo) {
-                        houseInfoList.add(tmHouseInfo);
-                    }
-                }
-            }
-        }
-        return houseInfoList;
-    }
 
 }

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -1,5 +1,6 @@
 package fcb.project.manager.core.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import fcb.project.manager.base.entity.TmAudit;
 import fcb.project.manager.base.entity.TmHouse;
@@ -17,9 +18,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,6 +45,9 @@ public class AuditController {
     @Autowired
     private TmHouseServiceImpl tmHouseService;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     @GetMapping("/queryOrSearchList")
     @ApiOperation(value = "根据条件拉取所有审批记录")
     @ApiImplicitParams({
@@ -73,7 +79,7 @@ public class AuditController {
             @ApiImplicitParam(name = "auditRemark", value = "审核备注", paramType = "query", required = true, dataType = "String"),
     })
     @Transactional(rollbackFor = Exception.class)
-    public Result<Object> audit(String id , Integer auditStatus , String auditRemark){
+    public Result<Object> audit(String id , Integer auditStatus , String auditRemark , HttpServletRequest request){
 
         if(StringUtils.isBlank(id) || null == auditStatus){
             return Result.failure("审核记录ID或者审核结果不能为空");
@@ -88,6 +94,19 @@ public class AuditController {
         if(StringUtils.isBlank(tmAudit.getVrId())){
             return Result.failure("该审核记录未绑定房源，无需处理");
         }
+        String token = request.getHeader("token");
+        if(StringUtils.isBlank(token)){
+            return Result.failure("token缺失");
+        }
+        String tokenValueStr = (String) redisTemplate.opsForValue().get(token);
+        if(StringUtils.isBlank(tokenValueStr)){
+            return Result.failure("登录失效，需要重新登录");
+        }
+        Map<String , Object> tokenMap = JSON.parseObject(tokenValueStr);
+        if(null == tokenMap){
+            return Result.failure("解析token失败");
+        }
+
         //这里要先锁定当前审核记录
         tmAudit = null;
         tmAudit = tmAuditService.selectForUpdate(id);
@@ -109,8 +128,10 @@ public class AuditController {
         dbHouse.setStatus(HouseStatus.AUDITED.getCode());
         dbHouse.setAuditId(tmAudit.getId());
         dbHouse.setAuditTime(LocalDateTime.now());
-        //TODO:这里需要增加更新审核人
-        dbHouse.setAuditorName("");
+        String userId = (String) tokenMap.get("id");
+        String userName = (String) tokenMap.get("userName");
+        dbHouse.setAuditorName(userName);
+        dbHouse.setAuditorId(userId);
         if(!tmHouseService.updateHouse(dbHouse)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "更新房源记录失败");
         }
@@ -140,6 +161,8 @@ public class AuditController {
         tmAudit.setVrOnline(online);
         int update = tmAuditService.updateAudit(tmAudit);
         if(update == 1){
+            //TODO:去调四维看看/720，告知四维看看更新场景
+
             return Result.success();
         }else{
             return Result.failure("操作失败");

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -1,10 +1,10 @@
 package fcb.project.manager.core.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import fcb.project.manager.base.entity.TmAudit;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
-import fcb.project.manager.base.enums.DeleteStatus;
 import fcb.project.manager.base.enums.HouseStatus;
 import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
 import fcb.project.manager.base.service.impl.TmEstateServiceImpl;
@@ -21,14 +21,15 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
@@ -71,6 +72,9 @@ public class HouseManagerController {
     @Autowired
     private AlibabaOssHelper alibabaOssHelper;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     @GetMapping("/queryOrSearchList")
     @ApiOperation(value = "根据条件拉取所有楼盘")
     @ApiImplicitParams({
@@ -219,13 +223,34 @@ public class HouseManagerController {
 
     @PostMapping("/addHouse")
     @ApiOperation(value = "创建默认房源")
-    public Result<Object> addNewHouse(@RequestParam String estateId){
+    public Result<Object> addNewHouse(HttpServletRequest request , @RequestParam String estateId){
 
         if(StringUtils.isBlank(estateId)){
             throw new CommonBaseException(ResultCodeEnum.D101 , "楼盘ID不能为空");
         }
+        String token = request.getHeader("token");
+        if(StringUtils.isBlank(token)){
+            return Result.failure("token缺失");
+        }
+        String tokenValueStr = (String) redisTemplate.opsForValue().get(token);
+        if(StringUtils.isBlank(tokenValueStr)){
+            return Result.failure("登录失效，需要重新登录");
+        }
+        Map<String , Object> tokenMap = JSON.parseObject(tokenValueStr);
+        if(null == tokenMap){
+            return Result.failure("解析token失败");
+        }
+        TmEstate tmEstate = tmEstateService.getById(estateId);
+        if(null == tmEstate){
+            return Result.failure("楼盘项目不存在");
+        }
+
         TmHouse tmHouse = new TmHouse();
         tmHouse.setEstateId(estateId);
+        String userId = (String) tokenMap.get("id");
+        String userName = (String) tokenMap.get("userName");
+        tmHouse.setCreateById(userId);
+        tmHouse.setCreateByName(userName);
         tmHouse.setStatus(0);
         TmHouse latestHouse = tmHouseService.insertNewWithRsp(tmHouse);
         if(null != latestHouse){
@@ -312,7 +337,7 @@ public class HouseManagerController {
             @ApiImplicitParam(name = "houseId", value = "房源ID", paramType = "query", required = true, dataType = "String"),
     })
     @Transactional(rollbackFor = Exception.class)
-    public Result<Object> addNewAudit(@RequestParam String houseId){
+    public Result<Object> addNewAudit(HttpServletRequest request ,  @RequestParam String houseId){
 
         if(StringUtils.isBlank(houseId)){
             return Result.failure("房源ID不能为空");
@@ -329,12 +354,24 @@ public class HouseManagerController {
         if(StringUtils.isBlank(dbHouse.getEstateId())){
             return Result.failure("房源未分配所属的楼盘不存在");
         }
+        String token = request.getHeader("token");
+        if(StringUtils.isBlank(token)){
+            return Result.failure("token缺失");
+        }
+        String tokenValueStr = (String) redisTemplate.opsForValue().get(token);
+        if(StringUtils.isBlank(tokenValueStr)){
+            return Result.failure("登录失效，需要重新登录");
+        }
+        Map<String , Object> tokenMap = JSON.parseObject(tokenValueStr);
+        if(null == tokenMap){
+            return Result.failure("解析token失败");
+        }
         TmEstate tmEstate = tmEstateService.getById(dbHouse.getEstateId());
         if(null == tmEstate){
             return Result.failure("房源所属的楼盘不存在");
         }
 
-        TmAudit tmAudit = tmAuditService.addNewAuditWithRespon(dbHouse , tmEstate);
+        TmAudit tmAudit = tmAuditService.addNewAuditWithRespon(dbHouse , tmEstate , tokenMap);
         if(tmAudit != null){
             dbHouse = tmHouseService.selectForUpdate(dbHouse.getId());
             if(null == dbHouse){

src/main/resources/application-dev.properties

@@ -1,7 +1,8 @@
 
 server.port=8285
 
-
+#注册中心
+spring.cloud.nacos.discovery.server-addr=10.71.5.163:8848
 
 #spring.datasource.url=jdbc:mysql://8.135.107.23:31306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 #spring.datasource.username=root

src/main/resources/application-prod.properties

@@ -1,17 +1,14 @@
 
 server.port=8285
 
+#注册中心
+spring.cloud.nacos.discovery.server-addr=10.71.5.163:8848
 
-
-#spring.datasource.url=jdbc:mysql://8.135.107.23:31306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.username=root
-#spring.datasource.password=4DAGE168!a
-spring.datasource.url=jdbc:mysql://120.25.146.52:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.username=root
-spring.datasource.password=4dkk2020test%
+spring.datasource.url=jdbc:mysql://10.71.184.146:3306/vr4_nacos?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=vr4_nacos_rw
+spring.datasource.password=rh8DWVcVlbO7CGnC16Xm
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 
-
 swagger.page.title=房车宝管理后台楼盘管理相关接口
 swagger.page.version=1.0
 swagger.page.desc=设计到房源api、楼盘项目管理、审核流程业务逻辑的接口
@@ -19,26 +16,26 @@ swagger.page.packagePath=fcb.project.manager
 
 
 spring.redis.cluster.max-redirects=3
-spring.redis.cluster.nodes=127.0.0.1:6379
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
 spring.redis.timeout=5000ms
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=0
 
+
 4dkankan.host.url=https://4dkankan.com/vrHouse.html?m=
 
 fcb.client.code=zxd9WS2twZ3J4DuhJ2r3y6qz1OZ2hMbr
 fcb.client.secret=UyUaWPJuLw1xfN9wXusgiZxJ7vu9cre9
 
-oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.point=fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com
 oss.key=LTAIUrvuHqj8pvry
-oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=4d-tjw
-
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
 
 share.logo.oss.path=domain/4dhouse/
-oss.query.url=https://houseoss.4dkankan.com/
+oss.query.url=http://fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com/
 image.local.path=/image/
 vr.scene.host=https://fcb.test.4dkankan.com
-vr.scene.link=/vrscene/show.html?m=
+vr.scene.link=/vrscene/show.html?m=

src/main/resources/application-test.properties

@@ -1,11 +1,14 @@
 
 server.port=8285
 
+#注册中心
+#spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
+#spring.datasource.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.username=user_4dkankan_rw
+#spring.datasource.password=y2b9a42wRwGNKkJjCm1o
 
-#spring.datasource.url=jdbc:mysql://8.135.107.23:31306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.username=root
-#spring.datasource.password=4DAGE168!a
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.username=root
 spring.datasource.password=4DAGE168!a
@@ -17,14 +20,15 @@ swagger.page.version=1.0
 swagger.page.desc=设计到房源api、楼盘项目管理、审核流程业务逻辑的接口
 swagger.page.packagePath=fcb.project.manager
 
-
-spring.redis.cluster.max-redirects=3
-spring.redis.cluster.nodes=127.0.0.1:6379
-spring.redis.timeout=5000ms
-spring.redis.jedis.pool.max-active=8
-spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
-spring.redis.jedis.pool.min-idle=0
+#spring.redis.database=0
+#spring.redis.password=
+#spring.redis.cluster.max-redirects=3
+#spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+#spring.redis.timeout=5000ms
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.min-idle=0
 
 
 4dkankan.host.url=https://test.4dkankan.com/vrHouse.html?m=
@@ -33,13 +37,13 @@ fcb.client.code=zxd9WS2twZ3J4DuhJ2r3y6qz1OZ2hMbr
 fcb.client.secret=UyUaWPJuLw1xfN9wXusgiZxJ7vu9cre9
 
 
-oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.point=fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com
 oss.key=LTAIUrvuHqj8pvry
-oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=4d-tjw
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
 
 share.logo.oss.path=domain/4dhouse/
-oss.query.url=https://houseoss.4dkankan.com/
+oss.query.url=http://fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com/
 image.local.path=/image/
 vr.scene.host=https://fcb.test.4dkankan.com
 vr.scene.link=/vrscene/show.html?m=

src/main/resources/application.properties

@@ -7,8 +7,7 @@ spring.profiles.active=test
 #应用名
 spring.application.name=fbc-project-manager
 
-#注册中心
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+
 #nacos.config.server-addr=127.0.0.1:8848
 
 

src/main/resources/log4j2.xml

@@ -3,7 +3,7 @@
     <!--全局参数-->
     <Properties>
         <Property name="pattern">%d{yyyy-MM-dd HH:mm:ss,SSS} [%thread]  |-%-5level   %c{1}:%L - %m%n</Property>
-        <property name="LOG_HOME">log/fcb/project-manager/</property>
+        <property name="LOG_HOME">var/logs/fcb-project-manager/</property>
         <property name="REQUEST_FILE_NAME">request</property>
         <property name="INFO_FILE_NAME">log_info</property>
     </Properties>