浏览代码

modeling yml

lyhzzz 3 年之前
父节点
当前提交
5429f7787c

+ 2 - 4
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.ComputerUtil;
+import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.modeling.constants.RedisKey;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.fdkankan.modeling.entity.SceneFileBuild;
@@ -18,7 +19,6 @@ import com.fdkankan.modeling.service.ISceneService;
 import com.fdkankan.modeling.utils.DingDingUtils;
 import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
-import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.utils.constant.ConstantFilePath;
@@ -35,7 +35,6 @@ import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -59,7 +58,6 @@ import static com.fdkankan.modeling.push.PushMessageConfig.*;
 
 @Log4j2
 @Component
-@ConditionalOnProperty(name = "rabbitmq.queue.enable",havingValue = "true")
 public class BuildSceneReceiver implements MessageListenerConcurrently {
 
     @Autowired
@@ -87,7 +85,7 @@ public class BuildSceneReceiver implements MessageListenerConcurrently {
     @Value("${oss.type}")
     private String ossType;
 
-    @Value("${oss.url.prefix}")
+    @Value("${prefix.ali}")
     private String prefixAli;