From 06c705e2b52ef06c357450a5a90fd14283a75aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 11:35:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ng/14/nginx.conf | 2 +- ng/15/nginx.conf | 3 ++ .../service/impl/SysRoleServiceImpl.java | 17 +++++++- .../vite-config/index.js | 39 +++++++++++-------- .../vite-env/.env.enterprise-dev-wmy | 2 +- 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/ng/14/nginx.conf b/ng/14/nginx.conf index 929987f0..af85d616 100644 --- a/ng/14/nginx.conf +++ b/ng/14/nginx.conf @@ -28,7 +28,7 @@ http { types_hash_max_size 4096; # 限制请求体大小 - client_max_body_size 100m; + client_max_body_size 50m; include /etc/nginx/mime.types; default_type application/octet-stream; diff --git a/ng/15/nginx.conf b/ng/15/nginx.conf index f1a852e4..1c335c5d 100644 --- a/ng/15/nginx.conf +++ b/ng/15/nginx.conf @@ -27,6 +27,9 @@ http { keepalive_timeout 65; types_hash_max_size 4096; + # 限制请求体大小 + client_max_body_size 50m; + include /etc/nginx/mime.types; default_type application/octet-stream; diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index 0d5d0d9e..61b86203 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.system.service.impl; +import cn.dev33.satoken.exception.ApiDisabledException; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; @@ -544,7 +545,13 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { if (num == 0) { return; } - List keys = StpUtil.searchTokenValue("", 0, -1, false); + List keys; + try { + keys = StpUtil.searchTokenValue("", 0, -1, false); + } catch (ApiDisabledException e) { + // JWT模式下不支持searchTokenValue，跳过在线用户清理 + return; + } if (CollUtil.isEmpty(keys)) { return; } @@ -586,7 +593,13 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { */ @Override public void cleanOnlineUser(List userIds) { - List keys = StpUtil.searchTokenValue("", 0, -1, false); + List keys; + try { + keys = StpUtil.searchTokenValue("", 0, -1, false); + } catch (ApiDisabledException e) { + // JWT模式下不支持searchTokenValue，跳过在线用户清理 + return; + } if (CollUtil.isEmpty(keys)) { return; } diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js index edb48e4d..96a4a69c 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js @@ -42,22 +42,22 @@ const baseCfg = (viteEnv = {}) => { open: false, cors: true, proxy: { - '/efcode20-ent-app/api/ent-ep': { - target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/efcode20-ent-app\/api\/ent-ep/, ''), - configure: (proxy) => { - proxy.on('proxyReq', (proxyReq, req) => { - console.log(`[Proxy] ${req.method} ${req.url} → ${proxyReq.protocol}//${proxyReq.host}${proxyReq.path}`); - }); - proxy.on('proxyRes', (proxyRes, req) => { - console.log(`[Proxy] ${proxyRes.statusCode} ← ${req.method} ${req.url}`); - }); - proxy.on('error', (err, req) => { - console.error(`[Proxy Error] ${req.method} ${req.url}`, err.message); - }); - } - }, + // '/efcode20-ent-app/api/ent-ep': { + // target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/efcode20-ent-app\/api\/ent-ep/, ''), + // configure: (proxy) => { + // proxy.on('proxyReq', (proxyReq, req) => { + // console.log(`[Proxy] ${req.method} ${req.url} → ${proxyReq.protocol}//${proxyReq.host}${proxyReq.path}`); + // }); + // proxy.on('proxyRes', (proxyRes, req) => { + // console.log(`[Proxy] ${proxyRes.statusCode} ← ${req.method} ${req.url}`); + // }); + // proxy.on('error', (err, req) => { + // console.error(`[Proxy Error] ${req.method} ${req.url}`, err.message); + // }); + // } + // }, '/efcode20-ent-app/api': { target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080', changeOrigin: true, @@ -76,7 +76,12 @@ const baseCfg = (viteEnv = {}) => { }, '/profile': { target: VITE_PROXY_TARGET || 'http://139.186.148.21:8080', - rewrite: (path) => path.replace(/^\/profile/, '/ent-ep/profile'), + rewrite: (path) => { + if (VITE_BASE_URL.includes('ent-ep')) { + return path.replace(/^\/profile/, '/ent-ep/profile'); + } + return path.replace(/^\/profile/, '/profile') + }, changeOrigin: true, } } diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy index 1e52cd79..d78299bc 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy @@ -1,7 +1,7 @@ # 企业端开发环境 VITE_PORT = 12001 VITE_PROXY_TARGET = 'http://139.186.148.21:8080' -VITE_BASE_URL = '/efcode20-ent-app/api/ent-ep' +VITE_BASE_URL = '/efcode20-ent-app/api' VITE_CONTEXT_PATH = '/efcode20-ent-app/' VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword' VITE_FILE_URL = '' From b4a9b1d13a972cc09fd2edf9259091237525c3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Thu, 25 Jun 2026 11:38:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vite-config/index.js | 17 +++++++++++------ .../vite-env/.env.enforcement-dev-wmy | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js index c30de1dc..32f981c7 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js @@ -43,11 +43,11 @@ const baseCfg = (viteEnv = {}) => { cors: true, proxy: { //适配外网的测试环境临时使用 - '/efcode20-enf-app/api/enf-ep': { - target: VITE_PROXY_TARGET || 'http://localhost:17000', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/efcode20-enf-app\/api\/enf-ep/, ''), - }, + // '/efcode20-enf-app/api/enf-ep': { + // target: VITE_PROXY_TARGET || 'http://localhost:17000', + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/efcode20-enf-app\/api\/enf-ep/, ''), + // }, '/efcode20-enf-app/api': { target: VITE_PROXY_TARGET || 'http://localhost:17000', changeOrigin: true, @@ -55,7 +55,12 @@ const baseCfg = (viteEnv = {}) => { }, '/profile': { target: VITE_PROXY_TARGET || 'http://139.186.148.21:8080', - rewrite: (path) => path.replace(/^\/profile/, '/ent-ep/profile'), + rewrite: (path) => { + if (VITE_BASE_URL.includes('enf-ep')) { + return path.replace(/^\/profile/, '/enf-ep/profile'); + } + return path.replace(/^\/profile/, '/profile') + }, changeOrigin: true, } } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy index 1b909320..da35e03e 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy @@ -1,6 +1,6 @@ # 执法端测试环境 VITE_PORT = 12002 -VITE_BASE_URL = '/efcode20-enf-app/api/enf-ep' +VITE_BASE_URL = '/efcode20-enf-app/api' VITE_CONTEXT_PATH = '/efcode20-enf-app/' VITE_PROXY_TARGET = 'http://139.186.148.21:8080' VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword' From ca05387928850ac123a9b96e8a2ec04740302445 Mon Sep 17 00:00:00 2001 From: ganhao Date: Thu, 25 Jun 2026 11:44:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=89=A7=E6=B3=95=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppComprehensiveAnalysisController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java index 99bdd9b9..f1fa6cbf 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java @@ -39,6 +39,7 @@ public class AppComprehensiveAnalysisController extends BaseController { @ResponseBody public R whole(ComprehensiveAnalysisBo comprehensiveAnalysis){ if("user".equals(comprehensiveAnalysis.getSearchType())){ + comprehensiveAnalysis.setUserId(LoginHelper.getUserId()); return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis)); } else if ("bureauDept".equals(comprehensiveAnalysis.getSearchType())) { String deptId = LoginHelper.getDeptId(); From eaec214832dbeffe1ab7ecf18f5d410229836593 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 25 Jun 2026 11:50:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=A8=E6=98=AF=E6=9C=AC=E5=8D=95=E4=BD=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnforcementRegistrationController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java index abaaee95..3780d5b6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java @@ -122,7 +122,7 @@ public class AppEnforcementRegistrationController extends BaseController { } if (pageQuery.getPageSize() == null || pageQuery.getPageSize() <= 0) { - pageQuery.setPageSize(50); + pageQuery.setPageSize(10); } if (pageQuery.getPageNum() == null || pageQuery.getPageNum() <= 0) { pageQuery.setPageNum(1); @@ -132,6 +132,7 @@ public class AppEnforcementRegistrationController extends BaseController { if (StringUtils.isBlank(bo.getDateSearch()) && bo.getDateType() == null && StringUtils.isBlank(bo.getBeginTime()) && StringUtils.isBlank(bo.getEndTime())) { bo.setDateType(3); + bo.setEnterpriseNumber(null); log.warn("查询全市数据时未指定时间范围，默认限制为本年数据"); }