From 8d8dbceedaa90c418d20d91f2aaf039505319882 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: Wed, 20 May 2026 17:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcementnos/controller/TestEnfDemoController.java | 6 ------ .../zdxt-efcode-nos-enterprise-app/vite-config/index.js | 4 ++-- .../vite-env/.env.enterprise-dev | 6 +++--- .../src/main/resources/application-dev-nos-ep.yml | 2 +- .../src/main/resources/application-dev.yml | 8 ++------ 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/TestEnfDemoController.java b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/TestEnfDemoController.java index 28f20d4..ad6aedd 100644 --- a/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/TestEnfDemoController.java +++ b/zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/controller/TestEnfDemoController.java @@ -39,7 +39,6 @@ public class TestEnfDemoController extends BaseController { /** * 查询enf测试单列表 */ - @SaCheckPermission("enforcementcode:enfDemo:list") @GetMapping("/list") public TableDataInfo list(TestEnfDemoBo bo, PageQuery pageQuery) { return testEnfDemoService.queryPageList(bo, pageQuery); @@ -48,7 +47,6 @@ public class TestEnfDemoController extends BaseController { /** * 导出enf测试单列表 */ - @SaCheckPermission("enforcementcode:enfDemo:export") @Log(title = "enf测试单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(TestEnfDemoBo bo, HttpServletResponse response) { @@ -61,7 +59,6 @@ public class TestEnfDemoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("enforcementcode:enfDemo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +68,6 @@ public class TestEnfDemoController extends BaseController { /** * 新增enf测试单 */ - @SaCheckPermission("enforcementcode:enfDemo:add") @Log(title = "enf测试单", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +78,6 @@ public class TestEnfDemoController extends BaseController { /** * 修改enf测试单 */ - @SaCheckPermission("enforcementcode:enfDemo:edit") @Log(title = "enf测试单", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +90,6 @@ public class TestEnfDemoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("enforcementcode:enfDemo:remove") @Log(title = "enf测试单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-config/index.js index bad6479..b21b146 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-config/index.js @@ -44,13 +44,13 @@ const baseCfg = (viteEnv = {}) => { proxy: { //直接走现场执法企业端 '/api': { - target: 'http://139.186.148.21:8080', + target: 'http://127.0.0.1:17000', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }, //走非现场执法后台 '/nosapi': { - target: 'http://127.0.0.1:8080', + target: 'http://127.0.0.1:18005', changeOrigin: true, rewrite: (path) => path.replace(/^\/nosapi/, '') } diff --git a/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-env/.env.enterprise-dev b/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-env/.env.enterprise-dev index 459ac22..1075aae 100644 --- a/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-env/.env.enterprise-dev +++ b/zdxt-web-client/zdxt-efcode-nos-enterprise-app/vite-env/.env.enterprise-dev @@ -1,10 +1,10 @@ # 企业端开发环境 VITE_PORT = 12001 # 直接访问后端端口，不通过代理 -VITE_BASE_URL = '/api' +VITE_BASE_URL = '/api/ent-ep' # 附件/图片等静态资源的后端地址（直接访问，不走 /api 代理） -VITE_FILE_URL = '/api' +VITE_FILE_URL = '/api/ent-ep' VITE_DEFAULT_LOGIN = '/enterprise/login' VITE_APP_ENV = 'dev' -VITE_NOS_BASE_URL = '/nosapi' \ No newline at end of file +VITE_NOS_BASE_URL = '/nosapi/nos-ep' \ No newline at end of file diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-nos-ep.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-nos-ep.yml index 71b1889..d9159f1 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-nos-ep.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-nos-ep.yml @@ -4,4 +4,4 @@ server: port: 18005 servlet: # 应用的访问路径 - context-path: /enf-ep + context-path: /nos-ep diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 601703b..dc2f5b4 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -110,13 +110,13 @@ spring: spring.data: redis: # 地址 - host: 139.186.148.21 + host: localhost # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # redis 密码必须配置 - password: zdxt@123 + password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl @@ -283,10 +283,6 @@ justauth: client-secret: 1f7d08**********5b7**********29e redirect-uri: ${justauth.address}/social-callback?source=gitea -security: - excludes: - - /** - #深i企对接密钥 测试环境 siq: #正式