From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 52 ------------
server/system_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_service/src/main/resources/application-dev.yml | 7 -
server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 6
server/visits/admin_timer/src/main/resources/bootstrap-test.yml | 6
server/system_gateway/src/main/resources/bootstrap-dev.yml | 4
server/system_gateway/src/main/resources/application-dev.yml | 4
server/system_gateway/src/main/resources/bootstrap-self.yml | 4
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 3
server/system_timer/src/main/resources/bootstrap-test.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 14 +++
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/admin_timer/src/main/resources/bootstrap-self.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 15 +++
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 2
pda/package.json | 5 +
server/doc/月台自动加号数据库变动脚本.md | 23 +++++
server/system_gateway/src/main/resources/bootstrap-test.yml | 4
server/system_timer/src/main/resources/bootstrap-self.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 6
29 files changed, 113 insertions(+), 102 deletions(-)
diff --git a/pda/package.json b/pda/package.json
new file mode 100644
index 0000000..8155ec5
--- /dev/null
+++ b/pda/package.json
@@ -0,0 +1,5 @@
+{
+ "dependencies": {
+ "dayjs": "^1.11.13"
+ }
+}
diff --git "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md" "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
new file mode 100644
index 0000000..acae40f
--- /dev/null
+++ "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
@@ -0,0 +1,23 @@
+
+ALTER TABLE `antaiwuliu`.`platform_group`
+MODIFY COLUMN `START_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '宸ヤ綔寮�濮嬫椂闂达紙HH:mm锛�' AFTER `SORTNUM`,
+MODIFY COLUMN `END_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '宸ヤ綔缁撴潫鏃堕棿锛圚H:mm锛�' AFTER `START_TIME`,
+ADD COLUMN `AUTO_CALL` int NULL COMMENT '鏄惁鑷姩鍙彿 0鍚� 1鏄�' AFTER `WAIT_CALL_TIME`,
+ADD COLUMN `IS_VIRTUAL` int NULL COMMENT '鏄惁铏氭嫙鏈堝彴 0鍚� 1鏄�' AFTER `AUTO_CALL`,
+ADD COLUMN `AUTO_CALL_START_TIME` varchar(100) NULL COMMENT '鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�' AFTER `IS_VIRTUAL`,
+ADD COLUMN `AUTO_CALL_END_TIME` varchar(100) NULL COMMENT '鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�' AFTER `AUTO_CALL_START_TIME`;
+
+ALTER TABLE `antaiwuliu`.`platform`
+ADD COLUMN `TYPE` int NULL COMMENT '绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢' AFTER `LED_CONTENT`;
+
+
+ALTER TABLE `antaiwuliu`.`platform_job`
+ADD COLUMN `TAG_VIRTUAL` int NULL COMMENT '鏄惁鏍囪铏氭嫙鏈堝彴缁� 0鍚� 1鏄�' AFTER `ORIGIN`,
+ADD COLUMN `TAG_VIRTUAL_TIME` datetime NULL COMMENT '鏍囪铏氭嫙鏈堝彴缁勬椂闂�' AFTER `TAG_VIRTUAL`,
+ADD COLUMN `TAG_VIRTUAL_USER` int NULL COMMENT '鏍囪铏氭嫙鏈堝彴缁勪汉鍛樼紪鐮�' AFTER `TAG_VIRTUAL_TIME`,
+ADD COLUMN `CALL_WAY` int NULL COMMENT '鍙彿鏂瑰紡 0鎵嬪姩鍙彿 1鑷姩鍙彿' AFTER `TAG_VIRTUAL_USER`,
+ADD COLUMN `URGE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '鍔犳�ユ椂闂�' AFTER `CALL_WAY`,
+ADD COLUMN `URGE_USER` int NULL DEFAULT NULL COMMENT '鍔犳�ヤ汉鍛樼紪鐮�' AFTER `URGE_TIME`;
+
+update platform_group set IS_VIRTUAL=0;
+update platform_job set CALL_WAY=0 where CALL_DATE is not null;
\ No newline at end of file
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index 8223992..b96ac17 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
namespace: dmvisit
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
index f639437..d0061b0 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: Atwl@2024
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
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 64c4ffa..7da4e9c 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
namespace: dmvisit_dev
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
index 421b74e..6271653 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
username: nacos
password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
username: nacos
password: nacos
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index c3107fb..46004fe 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@
# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
# username: doumee
# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
- password: Atwl@2024
+ password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index 87a1d83..76eb38a 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: dmvisit_dev
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-self.yml b/server/system_gateway/src/main/resources/bootstrap-self.yml
index 87a1d83..76eb38a 100644
--- a/server/system_gateway/src/main/resources/bootstrap-self.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-self.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: dmvisit_dev
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-test.yml b/server/system_gateway/src/main/resources/bootstrap-test.yml
index 409373d..dfd384a 100644
--- a/server/system_gateway/src/main/resources/bootstrap-test.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
# namespace: dev_renkang
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 099da4a..8ecd0a5 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index 30882e7..910d2f9 100644
--- a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -229,7 +229,7 @@
try {
String userInfo = (String) redisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY+token);
claims = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),LoginUserInfo.class);
- refreshToken(token);
+ refreshTokenTime(token);
} catch (Exception e) {
claims = null;
}
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index e92bb4a..83ecb0f 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -12,11 +12,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -24,7 +24,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index 9ed6b72..a0a53df 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -16,7 +16,7 @@
username: nacos
password: Atwl@2024
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/system_timer/src/main/resources/bootstrap-self.yml b/server/system_timer/src/main/resources/bootstrap-self.yml
index 93754ac..f8f89f6 100644
--- a/server/system_timer/src/main/resources/bootstrap-self.yml
+++ b/server/system_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-test.yml b/server/system_timer/src/main/resources/bootstrap-test.yml
index 6a95c65..1f3f44c 100644
--- a/server/system_timer/src/main/resources/bootstrap-test.yml
+++ b/server/system_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
index 47fd25c..e6d644d 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
index 18ae845..b0d86b7 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: Atwl@2024
# config:
- # server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
index 47fd25c..e6d644d 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
index 480609e..65f3ae7 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index e752bff..4847601 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -10,19 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
-# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
-# namespace: dmvisit
-# username: nacos
-# password: nacos
-# file-extension: yaml
-# group: dev
-# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: dmvisit_dev
username: nacos
@@ -32,42 +24,4 @@
basic:
enable: true
username: admin
- password: 111111
-# swagger閰嶇疆
-#knife4j:
-# # 寮�鍚寮洪厤缃�
-# enable: true
-# # 寮�鍚敓浜х幆澧冨睆钄�
-# # production: true
-# setting:
-# language: zh_cn
-# # 璐︽埛瀵嗙爜
-# basic:
-# enable: true
-# username: abc
-# password: abc
-#
-## Api鏂囨。淇℃伅
-## springdoc-openapi 椤圭洰閰嶇疆
-#springdoc:
-# swagger-ui:
-# path: /doc.html
-# tags-sorter: alpha
-# operations-sorter: alpha
-# api-docs:
-# path: /v3/api-docs
-# group-configs:
-# - group: 'default'
-# paths-to-match: '/**'
-# info:
-# title: ${spring.application.name} - API
-# version: 3.0.0
-# description: 鎺ュ彛鏂囨。
-# contact:
-# name: 1
-# url: 1
-# email: 1
-# license:
-# name: Apache 2.0
-# url: https://www.apache.org/licenses/LICENSE-2.0.html
-
+ password: 111111
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
index 74b6f39..dfd8c91 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: Atwl@2024
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
index e752bff..c0eee46 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: dmvisit_dev
username: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
index ddcb96f..8f33e90 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index b52fa8d..ade110e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -71,6 +71,9 @@
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢")
+ private Integer type;
@ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬", example = "1")
@ExcelColumn(name="鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬")
private Integer platformStatus;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index d186c96..9b08277 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -79,6 +79,19 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
+ @ApiModelProperty(value = "鏄惁鑷姩鍙彿 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鑷姩鍙彿 0鍚� 1鏄�")
+ private Integer autoCall;
+
+ @ApiModelProperty(value = "鏄惁铏氭嫙鏈堝彴 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁铏氭嫙鏈堝彴 0鍚� 1鏄�")
+ private Integer isVirtual;
+ @ApiModelProperty(value = "鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�", example = "1")
+ @ExcelColumn(name="鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�")
+ private String autoCallStartTime;
+ @ApiModelProperty(value = "鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�", example = "1")
+ @ExcelColumn(name="鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�")
+ private String autoCallEndTime;
@ApiModelProperty(value = "鏈堝彴缁勪笅鐨勬湀鍙�")
@TableField(exist = false)
private List<Platform> platformList;
@@ -89,6 +102,8 @@
@ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇￠�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊")
private String unFinishNoticeUsers;
+
+
@ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
@TableField(exist = false)
private List<PlatformJob> workJobList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 4483e88..0acfd9a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -245,6 +245,20 @@
@ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
private Integer signNum;
+ @ApiModelProperty(value = "鏄惁鏍囪铏氭嫙鏈堝彴缁� 0鍚� 1鏄�", example = "1")
+ private Integer tagVirtual;
+ @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勬椂闂�", example = "1")
+ private Date tagVirtualTime;
+ @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勪汉鍛樼紪鐮�", example = "1")
+ private Integer tagVirtualUser;
+ @ApiModelProperty(value = "鍙彿鏂瑰紡 0鎵嬪姩鍙彿 1鑷姩鍙彿", example = "1")
+ private Integer callWay;
+ @ApiModelProperty(value = "鍔犳�ユ椂闂�", example = "1")
+ private Date urgeTime;
+ @ApiModelProperty(value = "鍔犳�ヤ汉鍛樼紪鐮�", example = "1")
+ private Integer urgeUser;
+
+
@ApiModelProperty(value = "鏈�鏂板彨鍙锋椂闂�")
@TableField(exist = false)
private Date newCallDate;
diff --git a/server/visits/dmvisit_service/src/main/resources/application-dev.yml b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
index 0221f4a..db41960 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-dev.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
@@ -1,12 +1,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: doumee
-# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
- password: Atwl@2024
+ password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
--
Gitblit v1.9.3