From e6db22c70c1a3ddf3c848c10baa9293ff55adec0 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Mon, 22 Jun 2026 17:49:22 +0800 Subject: [PATCH] update --- script/docker/docker-compose.yml | 17 ----------- .../src/main/resources/application.yaml | 30 ------------------- 2 files changed, 47 deletions(-) diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 967c00639..62d61168d 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -55,23 +55,6 @@ services: - mysql - redis - besure_server_inner: - container_name: besure_server_inner - image: ${IMAGE_NAME:-besure_server_inner} - restart: unless-stopped - ports: - - "48081:48081" - environment: - SPRING_PROFILES_ACTIVE: inner - JAVA_OPTS: ${JAVA_OPTS:--Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom} - ARGS: | - --spring.datasource.dynamic.datasource.master.url=${MASTER_DATASOURCE_URL:-jdbc:mysql://yudao-mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true} - --spring.datasource.dynamic.datasource.master.username=${MASTER_DATASOURCE_USERNAME:-root} - --spring.datasource.dynamic.datasource.master.password=${MASTER_DATASOURCE_PASSWORD:-123456} - --spring.redis.host=${REDIS_HOST:-yudao-redis} - depends_on: - - mysql - - redis admin: container_name: yudao-admin diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index ea134cab5..33974fb04 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -281,36 +281,6 @@ yudao: - /admin-api/iot/device/device-attribute/batchList - /admin-api/mes/energy-device/lastEnergyStatistics - /admin-api/iot/device-warinning-record/getList - - - /admin-api-inner/system/tenant/get-id-by-name # 基于名字获取租户,不许带租户编号 - - /admin-api-inner/system/tenant/get-by-website # 基于域名获取租户,不许带租户编号 - - /admin-api-inner/system/captcha/get # 获取图片验证码,和租户无关 - - /admin-api-inner/system/captcha/isEnable # 获取图片验证码,和租户无关 - - /admin-api-inner/system/captcha/check # 校验图片验证码,和租户无关 - - /admin-api-inner/infra/file/*/get/** # 获取图片,和租户无关 - - /admin-api-inner/system/sms/callback/* # 短信回调接口,无法带上租户编号 - - /admin-api-inner/pay/notify/** # 支付回调通知,不携带租户编号 - - /jmreport/* # 积木报表,无法携带租户编号 - - /admin-api-inner/mp/open/** # 微信公众号开放平台,微信回调接口,无法携带租户编号 - - /admin-api-inner/iot/mqtt-server/** - - /admin-api-inner/home/info/** - - /admin-api-inner/qrcode/record/scan/resolve-id - # 大屏查询接口,无法携带租户编号 - - /admin-api-inner/mes/plan/getProductPlans - - /admin-api-inner/mes/plan/getPlanCapacity - - /admin-api-inner/mes/plan/getWeekTrend - - /admin-api-inner/mes/plan/getLastSevenDaysCompletedCount - - /admin-api-inner/iot/device-operation-record/deviceOperationList - - /admin-api-inner/mes/plan/getLastDaysRate - - /admin-api-inner/mes/energy-type/list - - /admin-api-inner/mes/energy-device/latestSevenDaysStatistics - - /admin-api-inner/iot/device/getDeviceOperationalStatus - - /admin-api-inner/iot/device-warinning-record/getLastSevenHoursCount - - /admin-api-inner/mes/dashboard/getTaskStatistics - - /admin-api-inner/mes/dashboard/getAllTaskList - - /admin-api-inner/iot/device/device-attribute/batchList - - /admin-api-inner/mes/energy-device/lastEnergyStatistics - - /admin-api-inner/iot/device-warinning-record/getList # - /admin-api/qrcode/record/scan # 扫描二维码 ignore-tables: