From ba65ab303b638c7f0b2750e810001ac4322010ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E5=8C=97?= <2958847195@qq.com> Date: Tue, 2 Dec 2025 09:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lication-local.yml => application-dev.yml} | 10 +- ...plication-prod.yml => application-prd.yml} | 10 +- .../src/main/resources/application-test.yml | 93 +++++++++++++++++++ .../src/main/resources/application.yml | 7 +- openhis-ui-vue3/.env.development | 3 + openhis-ui-vue3/.env.production | 3 + openhis-ui-vue3/.env.spug | 3 + openhis-ui-vue3/.env.staging | 3 + openhis-ui-vue3/.env.test | 11 +++ openhis-ui-vue3/src/utils/request.js | 3 +- openhis-ui-vue3/vite.config.js | 5 + 11 files changed, 141 insertions(+), 10 deletions(-) rename openhis-server-new/openhis-application/src/main/resources/{application-local.yml => application-dev.yml} (94%) rename openhis-server-new/openhis-application/src/main/resources/{application-prod.yml => application-prd.yml} (91%) create mode 100644 openhis-server-new/openhis-application/src/main/resources/application-test.yml create mode 100644 openhis-ui-vue3/.env.test diff --git a/openhis-server-new/openhis-application/src/main/resources/application-local.yml b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml similarity index 94% rename from openhis-server-new/openhis-application/src/main/resources/application-local.yml rename to openhis-server-new/openhis-application/src/main/resources/application-dev.yml index 25e5ee40..fe94317c 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application-local.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml @@ -59,6 +59,8 @@ spring: wall: config: multi-statement-allow: true + + # redis 配置 redis: # 地址 @@ -84,4 +86,10 @@ spring: # 文言 messages: basename: i18n/general_message/messages - encoding: utf-8 \ No newline at end of file + encoding: utf-8 +server: + # 服务器的HTTP端口，默认为18080 + port: 18080 + servlet: + # 应用的访问路径 + context-path: /openhis \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/application-prod.yml b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml similarity index 91% rename from openhis-server-new/openhis-application/src/main/resources/application-prod.yml rename to openhis-server-new/openhis-application/src/main/resources/application-prd.yml index 6e96ab2e..32581f8b 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application-prod.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application-prd.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8 + url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisprd&characterEncoding=UTF-8&client_encoding=UTF-8 username: postgresql password: Jchl1528 # 从库数据源 @@ -84,4 +84,10 @@ spring: # 文言 messages: basename: i18n/general_message/messages - encoding: utf-8 \ No newline at end of file + encoding: utf-8 +server: + # 服务器的HTTP端口，默认为18080 + port: 18082 + servlet: + # 应用的访问路径 + context-path: /openhis \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/application-test.yml b/openhis-server-new/openhis-application/src/main/resources/application-test.yml new file mode 100644 index 00000000..b4401162 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml @@ -0,0 +1,93 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: org.postgresql.Driver + druid: + # 主库数据源 + master: + url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest&characterEncoding=UTF-8&client_encoding=UTF-8 + username: postgresql + password: Jchl1528 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 # FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: openhis + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + # redis 配置 + redis: + # 地址 + host: 192.168.110.252 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 1 + # 密码 + password: Jchl1528 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + # 文言 + messages: + basename: i18n/general_message/messages + encoding: utf-8 +server: + # 服务器的HTTP端口，默认为18080 + port: 18081 + servlet: + # 应用的访问路径 + context-path: /openhis \ No newline at end of file diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml index 4fd26eb3..a14166e9 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application.yml @@ -15,11 +15,6 @@ core: # 开发环境配置 server: - # 服务器的HTTP端口，默认为18080 - port: 18080 - servlet: - # 应用的访问路径 - context-path: /openhis tomcat: # tomcat的URI编码 uri-encoding: UTF-8 @@ -54,7 +49,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: local #（本地）local （生产）prod (农大) + active: dev # 文件上传 servlet: multipart: diff --git a/openhis-ui-vue3/.env.development b/openhis-ui-vue3/.env.development index ed0aec06..6dbf33d5 100644 --- a/openhis-ui-vue3/.env.development +++ b/openhis-ui-vue3/.env.development @@ -6,3 +6,6 @@ VITE_APP_ENV = 'development' # OpenHIS管理系统/开发环境 VITE_APP_BASE_API = '/dev-api' + +# 租户ID配置 +VITE_APP_TENANT_ID = '1' diff --git a/openhis-ui-vue3/.env.production b/openhis-ui-vue3/.env.production index 2892b974..536ad4f9 100644 --- a/openhis-ui-vue3/.env.production +++ b/openhis-ui-vue3/.env.production @@ -7,5 +7,8 @@ VITE_APP_ENV=production # OpenHIS管理系统/生产环境 VITE_APP_BASE_API=/prod-api +# 租户ID配置 +VITE_APP_TENANT_ID=1 + # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS=gzip \ No newline at end of file diff --git a/openhis-ui-vue3/.env.spug b/openhis-ui-vue3/.env.spug index d333e353..07d67125 100644 --- a/openhis-ui-vue3/.env.spug +++ b/openhis-ui-vue3/.env.spug @@ -13,6 +13,9 @@ VITE_UPLOAD_TYPE=server # OpenHIS管理系统/SPUG环境 VITE_APP_BASE_API = '/admin-api' +# 租户ID配置 +VITE_APP_TENANT_ID=1 + # 是否删除debugger VITE_DROP_DEBUGGER=false diff --git a/openhis-ui-vue3/.env.staging b/openhis-ui-vue3/.env.staging index 7d0b0249..ec9adfb1 100644 --- a/openhis-ui-vue3/.env.staging +++ b/openhis-ui-vue3/.env.staging @@ -7,5 +7,8 @@ VITE_APP_ENV = 'staging' # OpenHIS管理系统/生产环境 VITE_APP_BASE_API = '/stage-api' +# 租户ID配置 +VITE_APP_TENANT_ID=1 + # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/openhis-ui-vue3/.env.test b/openhis-ui-vue3/.env.test new file mode 100644 index 00000000..eb26866c --- /dev/null +++ b/openhis-ui-vue3/.env.test @@ -0,0 +1,11 @@ +# 页面标题 +VITE_APP_TITLE = 医院信息管理系统 + +# 测试环境配置 +VITE_APP_ENV = 'test' + +# OpenHIS管理系统/测试环境 +VITE_APP_BASE_API = '/test-api' + +# 租户ID配置 +VITE_APP_TENANT_ID = '1' diff --git a/openhis-ui-vue3/src/utils/request.js b/openhis-ui-vue3/src/utils/request.js index 1a5a2c37..8f10b6e5 100644 --- a/openhis-ui-vue3/src/utils/request.js +++ b/openhis-ui-vue3/src/utils/request.js @@ -12,7 +12,8 @@ let downloadLoadingInstance; export let isRelogin = { show: false }; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' -axios.defaults.headers['X-Tenant-ID'] = '1' +// 从环境变量读取租户ID，如果没有则使用默认值'1' +axios.defaults.headers['X-Tenant-ID'] = import.meta.env.VITE_APP_TENANT_ID || '1' axios.defaults.headers['Request-Method-Name'] = 'login' // 创建axios实例 const service = axios.create({ diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js index 27bb418e..f0e4da22 100644 --- a/openhis-ui-vue3/vite.config.js +++ b/openhis-ui-vue3/vite.config.js @@ -57,6 +57,11 @@ export default defineConfig (({mode, command}) => { target: 'http://localhost:18080/openhis', changeOrigin: true, rewrite: p => p.replace (/^\/prod-api/, ''), + }, + '/test-api': { + target: 'http://localhost:18080/openhis', + changeOrigin: true, + rewrite: p => p.replace (/^\/test-api/, ''), } }, },