diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml index 9b50d14c..b9efe7d4 100644 --- a/modules/cms/pom.xml +++ b/modules/cms/pom.xml @@ -27,16 +27,7 @@ jeesite-module-core ${project.parent.version} - - - - - - - - + diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index c3a3314e..f97437cc 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 1676 - 0 + 2149 + 2154 128 128 @@ -1735,6 +1735,22 @@ gen_base_dir nvarchar(n) + + 6c2473c9a63d2ad405655d7adff7591d6d6c532c + null + null + false + null + false + false + false + + false + + 最后心跳时间 + heart_time + datetime + 869fc70cf3a4e92e8056b40814df8e03f9f9efde 64 @@ -2183,6 +2199,22 @@ leader varchar(n) + + 7eedb24c45d73dd56887eefd7e438528fbf4cf10 + 10 + null + false + null + false + false + false + + false + 社区版、标准版、专业版 + 系统许可版本 + lic_version + nvarchar(n) + b6a52f87ba533a819eb169768b846266226d641c 100 @@ -3495,6 +3527,38 @@ server_addr varchar(n) + + a08bfaf64f7f083d4150eb89f91545da11aea32c + 50 + null + false + null + false + false + false + + false + + 系统节点名称 + server_name + nvarchar(n) + + + 471884a5e2033e41803feef5822bdd0fe52abe3c + 500 + null + false + null + false + false + false + + false + + 系统节点地址 + server_url + nvarchar(n) + b63e72d00089330f9932863eeb972e87d94cabce 1 @@ -3543,6 +3607,22 @@ sign nvarchar(n) + + cae139cc445b5d645601b0ef865245c1a57ac0cb + 1 + null + false + null + false + false + false + + false + 在线、在线许可不正确、离线 + 服务状态 + state + character(n) + cf949a5f8d12902f0a8384fa68c72f55e6136812 1 @@ -3687,6 +3767,22 @@ table_name varchar(n) + + cac7cfc71f4053cb77cde93a010175137825a041 + 10 + null + false + null + false + false + false + + false + + 超时时间 + timeout + decimal(p) + 3c113dc08971de6b9b524afdcb41a1562f130081 200 @@ -5452,13 +5548,13 @@ - 9a24f55cce41188c96925b41c04dea4517029ac7 + 319e4091b704702c77deaf7621a231f6cdd5a814282313Segoe UI9 - 2253 - 2376 + 1972 + 2453 128 128 @@ -5466,9 +5562,9 @@ - aa21ba33f34dbb59868943fca6ad9b6d49d47dea - 0e0b69bca5b900242c3bb577c9757564e9a942f8 - 9a24f55cce41188c96925b41c04dea4517029ac7 + f6fe4091f16d65b5cd4e05129fd4970d48b70a90 + 525b18e0d2c940bf132733cfaba411fb84ddf255 + 319e4091b704702c77deaf7621a231f6cdd5a814 -1 -1 -1 @@ -5531,7 +5627,7 @@ 6d5f3e5ef4d28e57966c33c4b4ef424f1dc42b7b 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - aa21ba33f34dbb59868943fca6ad9b6d49d47dea + f6fe4091f16d65b5cd4e05129fd4970d48b70a90 @@ -5565,7 +5661,7 @@ 91110163a8a31ee61a4153360707026b5498dd65 443772d4627c23aef484c324c8e431121b921a44 - aa21ba33f34dbb59868943fca6ad9b6d49d47dea + f6fe4091f16d65b5cd4e05129fd4970d48b70a90 @@ -9220,914 +9316,13 @@
- 0e0b69bca5b900242c3bb577c9757564e9a942f8 - 412 - 426 - Segoe UI - 9 - 1608 - 2328 - - 128 - 128 - 192 - - - - js_sys_job - 作业调度表 - - - - - - - 70abca97f16eab0d562a2104ec1a0ede326b1c46 - 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2fe17467ad48944f125de4abf28e973234a9bcb4 - 443772d4627c23aef484c324c8e431121b921a44 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 - 225e6d868b8d45320dc7f79db6296db64985b308 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2663716e6af40682333d3e8495a04bceff16647 - c5abf897611d8a927582d1dcb3deceef5c164614 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 - d8ece7f15423d813de0dc100fa1c67e047ca4a08 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 44ce4edd5ad45896934d6f90f14af5884b98ba5b - 7041a843a37e89ce935ad9309fa1a3b2548920e5 - - - - - decimal(p) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261aca14bc2dd0bef97fa78a1256a95b5cb94171 - 91c2e73c20940e4a715ffb02148e2f3a1bb72334 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f - 599b9798d287db98af97bda02a378aa97b0c62c4 - - - - - varchar(n) - - JeeSiteScheduler - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 481c1a6225e0f2a86dbf4f752e9455afac57f897 - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_job_status - - - - - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - false - - - - - - - - - -
- - 142facbb53e6fb5057b7494465a2eb51dfd10d16 - 542 - 563 - Segoe UI - 9 - 2736 - 2208 - - 128 - 128 - 192 - - - - js_sys_msg_inner - 内部消息 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - a304841afc9968e7c8768979fe2ba3f2f315db78 - cbbb279fbb0f0ea5d67536332ce7d9a8b3d70e36 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a654ac8de54e8c19cfdba4bcf6d636ab760799b9 - 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 31410c3d884588423ca2a5803e78d0934412f458 - 10a8ef0d67bd3c9a90e9c67dc86953fefb8f8755 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 98eb079aebd2f56c461cb92d97ab4d56f603b840 - 48bf7c9cb90d62b9cba0283d51bf94980e9fea92 - - - - - clob - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 0fa4e2d76aa9a87670cb1345202c5fbc44183cfe - 5b256d59f963bf2a76cf35c847634b1188154874 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5797ae3ca5da40a8a45dfd0071f3589585c2517f - fe9b7e3236d284db50cb1d4cda9a77d1d8de40d2 - - - - - clob - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 86b915810d6436eb5c60062abbe4f8910c86f89c - b21a2db1cf685edc44c2bf252785aabc4cfb0794 - - - - - clob - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - c5364fcf3327275d038d229e22f80ce97c28d402 - b0959f0c2f737aa49188e57cc71afb3242e9e97b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 949f48cec7229094875af06d5c3ee4e7efbba1e0 - 8d09d0b4b174964fb858b7ccb77ed9e14767de65 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5e197b7f106763a6952e72203fcc902cea793853 - d492c41633035ed8c33c89c5c704ef2dd5d7d32c - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - da74a37a1025119cd79a05644781c76b606352d3 - 0390e069a393fa7b2f2de0531b12470c299317f8 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 81e89a36c985a9f69710177677cd7be6ed6ea089 - fd262e1d867fb854931a86728233eec74fc0099b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 20092a8f08bbf1304383014693172e4fc863277d - 6d885df5f4956aeb6b228e769b8d037459d7a7d7 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_msg_inner_cb - - - - - e5355faba5ec3c9128507dd4c48ea9230631cf83 - false - - - - - false - true - idx_sys_msg_inner_status - - - - - 6d885df5f4956aeb6b228e769b8d037459d7a7d7 - false - - - - - false - true - idx_sys_msg_inner_cl - - - - - 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe - false - - - - - false - true - idx_sys_msg_inner_sc - - - - - b0959f0c2f737aa49188e57cc71afb3242e9e97b - false - - - - - false - true - idx_sys_msg_inner_sd - - - - - d492c41633035ed8c33c89c5c704ef2dd5d7d32c - false - - - - - - - - - -
- - 55e8b1dd9f749fa0002f3382d8e2cbcfc0a718c5 + 1d26bde59434d0fd95f797d3387dc564038d192c230467Segoe UI9 - 3504 - 2328 + 3660 + 2359 128 128 @@ -10135,9 +9330,9 @@ - 49fa3ab54de9d9519c2ddf895925b7fec46fc714 - 142facbb53e6fb5057b7494465a2eb51dfd10d16 - 55e8b1dd9f749fa0002f3382d8e2cbcfc0a718c5 + 3fa95dcb5efff46a79aa5f99a24a551899857fd1 + 5fc45ff72e5a63eee633a54948970a8c9e0d17fb + 1d26bde59434d0fd95f797d3387dc564038d192c -1 -1 -1 @@ -10200,7 +9395,7 @@ f385f23b1163beb8b239a67f5a262c83fb46cae6 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 - 49fa3ab54de9d9519c2ddf895925b7fec46fc714 + 3fa95dcb5efff46a79aa5f99a24a551899857fd1 所属消息 所属消息 @@ -16844,6 +16039,1170 @@
+ + 6e311fe2f6304c9e7fbc7e734d9b6e2dbe0144d2 + 386 + 383 + Segoe UI + 9 + 2424 + 2414 + + 128 + 128 + 192 + + + + js_sys_health_check + 系统健康检查 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 903225e50be8c13dd9607b80b238e5689ecf425c + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + a08bfaf64f7f083d4150eb89f91545da11aea32c + b651f63db113013221940195d72f8742c6aa080e + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 471884a5e2033e41803feef5822bdd0fe52abe3c + 13be59535841c33bdf1402552eb15a4f40dbf8d4 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7eedb24c45d73dd56887eefd7e438528fbf4cf10 + 9ea3d2ee0c298406c51bc1452f706153ae4b005a + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6c2473c9a63d2ad405655d7adff7591d6d6c532c + e36b0b6edc64bd0f397c41372a501c3e1426f65c + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cac7cfc71f4053cb77cde93a010175137825a041 + 0fcf0332920224c88dec71a0ffecaf688b60e48e + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cae139cc445b5d645601b0ef865245c1a57ac0cb + 3cfa7de8639e8f7f1ddf28638698ff90818bb0fc + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + + + + + +
+ + 525b18e0d2c940bf132733cfaba411fb84ddf255 + 412 + 426 + Segoe UI + 9 + 1320 + 2388 + + 128 + 128 + 192 + + + + js_sys_job + 作业调度表 + + + + + + + 70abca97f16eab0d562a2104ec1a0ede326b1c46 + 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fe17467ad48944f125de4abf28e973234a9bcb4 + 443772d4627c23aef484c324c8e431121b921a44 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 + 225e6d868b8d45320dc7f79db6296db64985b308 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2663716e6af40682333d3e8495a04bceff16647 + c5abf897611d8a927582d1dcb3deceef5c164614 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 + d8ece7f15423d813de0dc100fa1c67e047ca4a08 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 44ce4edd5ad45896934d6f90f14af5884b98ba5b + 7041a843a37e89ce935ad9309fa1a3b2548920e5 + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261aca14bc2dd0bef97fa78a1256a95b5cb94171 + 91c2e73c20940e4a715ffb02148e2f3a1bb72334 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f69037f9c9f1c4e8dd771b537b5cf3bc26d7ac3f + 599b9798d287db98af97bda02a378aa97b0c62c4 + + + + + varchar(n) + + JeeSiteScheduler + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 481c1a6225e0f2a86dbf4f752e9455afac57f897 + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_job_status + + + + + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + false + + + + + + + + + +
+ + 5fc45ff72e5a63eee633a54948970a8c9e0d17fb + 542 + 563 + Segoe UI + 9 + 2940 + 2316 + + 128 + 128 + 192 + + + + js_sys_msg_inner + 内部消息 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + a304841afc9968e7c8768979fe2ba3f2f315db78 + cbbb279fbb0f0ea5d67536332ce7d9a8b3d70e36 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a654ac8de54e8c19cfdba4bcf6d636ab760799b9 + 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 31410c3d884588423ca2a5803e78d0934412f458 + 10a8ef0d67bd3c9a90e9c67dc86953fefb8f8755 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 98eb079aebd2f56c461cb92d97ab4d56f603b840 + 48bf7c9cb90d62b9cba0283d51bf94980e9fea92 + + + + + clob + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 0fa4e2d76aa9a87670cb1345202c5fbc44183cfe + 5b256d59f963bf2a76cf35c847634b1188154874 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5797ae3ca5da40a8a45dfd0071f3589585c2517f + fe9b7e3236d284db50cb1d4cda9a77d1d8de40d2 + + + + + clob + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 86b915810d6436eb5c60062abbe4f8910c86f89c + b21a2db1cf685edc44c2bf252785aabc4cfb0794 + + + + + clob + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c5364fcf3327275d038d229e22f80ce97c28d402 + b0959f0c2f737aa49188e57cc71afb3242e9e97b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 949f48cec7229094875af06d5c3ee4e7efbba1e0 + 8d09d0b4b174964fb858b7ccb77ed9e14767de65 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5e197b7f106763a6952e72203fcc902cea793853 + d492c41633035ed8c33c89c5c704ef2dd5d7d32c + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + da74a37a1025119cd79a05644781c76b606352d3 + 0390e069a393fa7b2f2de0531b12470c299317f8 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 81e89a36c985a9f69710177677cd7be6ed6ea089 + fd262e1d867fb854931a86728233eec74fc0099b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 20092a8f08bbf1304383014693172e4fc863277d + 6d885df5f4956aeb6b228e769b8d037459d7a7d7 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_msg_inner_cb + + + + + e5355faba5ec3c9128507dd4c48ea9230631cf83 + false + + + + + false + true + idx_sys_msg_inner_status + + + + + 6d885df5f4956aeb6b228e769b8d037459d7a7d7 + false + + + + + false + true + idx_sys_msg_inner_cl + + + + + 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe + false + + + + + false + true + idx_sys_msg_inner_sc + + + + + b0959f0c2f737aa49188e57cc71afb3242e9e97b + false + + + + + false + true + idx_sys_msg_inner_sd + + + + + d492c41633035ed8c33c89c5c704ef2dd5d7d32c + false + + + + + + + + + +
diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index 77f61455..e99b21f2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -16,12 +16,9 @@ import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.apache.shiro.web.filter.InvalidRequestFilter; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; -import org.springframework.core.annotation.Order; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.config.Global; @@ -52,19 +49,6 @@ import com.jeesite.common.shiro.web.WebSecurityManager; @Configuration(proxyBeanMethods = false) public class ShiroConfig { - /** - * Apache Shiro Filter - */ - @Bean - @Order(3000) - @ConditionalOnMissingBean(name="shiroFilterProxy") - public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { - FilterRegistrationBean bean = new FilterRegistrationBean<>(); - bean.setFilter((Filter) shiroFilter.getInstance()); - bean.addUrlPatterns("/*"); - return bean; - } - /** * 内部系统访问过滤器 */ diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/send/EmailSendService.java b/modules/core/src/main/java/com/jeesite/modules/msg/send/EmailSendService.java index 657b0c84..7676ce20 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/send/EmailSendService.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/send/EmailSendService.java @@ -13,7 +13,6 @@ import com.jeesite.common.lang.StringUtils; import com.jeesite.common.service.BaseService; import com.jeesite.modules.msg.entity.MsgPush; import com.jeesite.modules.msg.entity.content.EmailMsgContent; -import com.jeesite.modules.msg.send.MsgSendService; /** * 电子邮件发送服务实现 diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 1e2d0c42..f5f3a5ec 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -424,6 +424,7 @@ shiro: /userfiles/** = anon /validCode = anon /static/** = anon + /oauth2/authorize = user /druid/** = perms[sys:state:druid] /bpm/modeler/** = perms[bpm:modeler] ${adminPath}/login-cas = cas