From b0c4a1ff9d2df09c137807e9c38c43bf9a097237 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 一月 2025 09:16:21 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 6 ++++++
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 2 +-
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 2 +-
server/meeting/meeting_admin/src/main/resources/application.yml | 8 --------
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index 1a1a785..aca7641 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -57,14 +57,6 @@
doumeemes.dao: debug
-swagger:
- host:
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
-
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
compression:
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
index 8223992..64c4ffa 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -25,7 +25,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
- namespace: dmvisit
+ namespace: dmvisit_dev
username: nacos
password: nacos
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index 3407346..db21389 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: self
application:
name: meetingAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index a4fdea4..cf32481 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -515,6 +515,12 @@
String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
for(RuleEventSearchDataResponse r :rlist){
+ try {
+ if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
+ continue;
+ }
+ }catch (Exception e){
+ }
WaningEventDataListVO data = new WaningEventDataListVO();
data.setAddr(r.getSrc_name());
data.setImg(r.getImage_url());
--
Gitblit v1.9.3