From 3985ade129f298efc200a043d77e87f0de1542e6 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, 15 Apr 2026 07:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E6=8E=A5=E5=8F=A3=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + cmd/ep-package.bat | 16 ++ cmd/ep-package.ps1 | 90 ++++++ .../enterprise => fordelete}/register.vue | 0 .../src/views/enterprise/enterpriseHome.vue | 10 +- ...rcement.yml => application-dev-enf-ep.yml} | 0 ...erprise.yml => application-dev-ent-ep.yml} | 0 ...rvision.yml => application-dev-sup-ep.yml} | 0 .../resources/application-prod-enf-ep.yml | 7 + .../resources/application-prod-ent-ep.yml | 7 + .../resources/application-prod-enterprise.yml | 272 ------------------ .../resources/application-prod-sup-ep.yml | 7 + .../application-prod-supervision.yml | 272 ------------------ ...d-enforcement.yml => application-prod.yml} | 80 +++--- 14 files changed, 177 insertions(+), 587 deletions(-) create mode 100644 cmd/ep-package.bat create mode 100644 cmd/ep-package.ps1 rename zdxt-web-client/zdxt-enforcement-code-app/{src/views/enterprise => fordelete}/register.vue (100%) rename zdxt-web-server/zdxt-admin-web-server/src/main/resources/{application-dev-enforcement.yml => application-dev-enf-ep.yml} (100%) rename zdxt-web-server/zdxt-admin-web-server/src/main/resources/{application-dev-enterprise.yml => application-dev-ent-ep.yml} (100%) rename zdxt-web-server/zdxt-admin-web-server/src/main/resources/{application-dev-supervision.yml => application-dev-sup-ep.yml} (100%) create mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml create mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml delete mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enterprise.yml create mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml delete mode 100644 zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-supervision.yml rename zdxt-web-server/zdxt-admin-web-server/src/main/resources/{application-prod-enforcement.yml => application-prod.yml} (80%) diff --git a/.gitignore b/.gitignore index 423c7e8..722c1e9 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ node_modules .flattened-pom.xml .$EnforcementCode.drawio.bkp + +### Deploy output ### +/dist/ diff --git a/cmd/ep-package.bat b/cmd/ep-package.bat new file mode 100644 index 0000000..fbc41c2 --- /dev/null +++ b/cmd/ep-package.bat @@ -0,0 +1,16 @@ +@echo off +echo. +echo ====== ZDXT Server Package ====== +echo. + +set "ENV=dev" +if not "%~1"=="" set "ENV=%~1" + +echo Env: %ENV% +echo Output: dist\server\ +echo. + +powershell -ExecutionPolicy Bypass -File "%~dp0ep-package.ps1" -BuildEnv %ENV% + +echo. +pause diff --git a/cmd/ep-package.ps1 b/cmd/ep-package.ps1 new file mode 100644 index 0000000..0f8b4d4 --- /dev/null +++ b/cmd/ep-package.ps1 @@ -0,0 +1,90 @@ +# ep-package.ps1 +# 一键打包脚本：构建 zdxt-admin-web-server (3个端点) + zdxt-gateway-web-server +# 输出到 /dist/{timestamp}/ 目录 +# +# 用法： +# .\ep-package.ps1 # 默认 dev 环境 +# .\ep-package.ps1 -BuildEnv prod # prod 环境 + +param( + [ValidateSet("dev", "prod")] + [string]$BuildEnv = "dev" +) + +$ErrorActionPreference = "Stop" +$projectRoot = (Get-Item $PSScriptRoot).Parent.FullName +# Windows 文件名不支持冒号(:), 使用 yyyy-MM-dd_HH-mm-ss 格式 +$timestamp = Get-Date -Format "yyyy-MM-dd_HH-mm-ss" +$folderName = "{0}_{1}" -f $timestamp, $BuildEnv +$deployDir = Join-Path $projectRoot "dist\$folderName" + +$endpoints = @("enf-ep", "ent-ep", "sup-ep") + +Write-Host "" +Write-Host "============================================" -ForegroundColor Cyan +Write-Host " ZDXT Server Package Script" -ForegroundColor Cyan +Write-Host (" Env: {0} | Timestamp: {1}" -f $BuildEnv, $timestamp) -ForegroundColor Cyan +Write-Host (" Output: dist\{0}" -f $folderName) -ForegroundColor Cyan +Write-Host "============================================" -ForegroundColor Cyan +Write-Host "" + +# ============ 1. Maven Build ============ +Write-Host "[1/3] Maven Build admin-web-server + gateway-web-server ..." -ForegroundColor Yellow +Set-Location $projectRoot + +$modules = "zdxt-web-server/zdxt-admin-web-server,zdxt-web-server/zdxt-gateway-web-server" +mvn clean package -P $BuildEnv -pl $modules -am -DskipTests + +if ($LASTEXITCODE -ne 0) { + Write-Host "" + Write-Host "Maven Build Failed!" -ForegroundColor Red + exit 1 +} +Write-Host "[1/3] Maven Build Success" -ForegroundColor Green + +# ============ 2. Prepare Output Dir ============ +Write-Host "" +Write-Host ("[2/3] Prepare Dir: {0}" -f $deployDir) -ForegroundColor Yellow +New-Item -ItemType Directory -Force -Path $deployDir | Out-Null + +# ============ 3. Copy Artifacts ============ +Write-Host "" +Write-Host "[3/3] Copy Artifacts ..." -ForegroundColor Yellow + +# --- admin-web-server (3 endpoints) --- +$adminSource = Join-Path $projectRoot "zdxt-web-server\zdxt-admin-web-server\target\zdxt-admin-web-server.jar" +if (-not (Test-Path $adminSource)) { + Write-Host (" Admin artifact not found: {0}" -f $adminSource) -ForegroundColor Red + exit 1 +} +foreach ($ep in $endpoints) { + $targetName = "zdxt-{0}.jar" -f $ep + Copy-Item $adminSource (Join-Path $deployDir $targetName) -Force + Write-Host (" [admin] {0}" -f $targetName) -ForegroundColor Green +} + +# --- gateway-web-server --- +$gatewaySource = Join-Path $projectRoot "zdxt-web-server\zdxt-gateway-web-server\target\zdxt-gateway-web-server.jar" +if (-not (Test-Path $gatewaySource)) { + Write-Host (" Gateway artifact not found: {0}" -f $gatewaySource) -ForegroundColor Red + exit 1 +} +$gatewayTargetName = "zdxt-gateway-web-server.jar" +Copy-Item $gatewaySource (Join-Path $deployDir $gatewayTargetName) -Force +Write-Host (" [gateway] {0}" -f $gatewayTargetName) -ForegroundColor Green + +# ============ Done ============ +$totalCount = $endpoints.Count + 1 +Write-Host "" +Write-Host "============================================" -ForegroundColor Cyan +Write-Host (" Done! {0} jars" -f $totalCount) -ForegroundColor Cyan +Write-Host (" Output: {0}" -f $deployDir) -ForegroundColor Cyan +Write-Host "============================================" -ForegroundColor Cyan +Write-Host "" +Write-Host "Startup examples:" -ForegroundColor Yellow +foreach ($ep in $endpoints) { + $jarName = "zdxt-{0}.jar" -f $ep + Write-Host (" java -jar {0} --spring.profiles.include={1}-{2}" -f $jarName, $BuildEnv, $ep) -ForegroundColor Gray +} +Write-Host (" java -jar {0}" -f $gatewayTargetName) -ForegroundColor Gray +Write-Host "" diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/register.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/register.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/register.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/register.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue index 03b6fc7..b7d7073 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue @@ -18,7 +18,7 @@
-
+
执法监督码
@@ -76,17 +76,17 @@ const getCarousel = async () => { const boutiqueGoods = async () => { }; -const toRegisterView = async () => { - if (useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == "") { +const showEnterpriseQRCode = async () => { + /*if (useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == "") { router.push({path: "/enterprise/register"}); - } else { + } else {*/ router.push({ path: "/enterprise/qrCode", query: { enterpriseNumber: useCommon.enterpriseNumber, } }); - } + //} }; const toRegistrationListView = async () => { diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enf-ep.yml similarity index 100% rename from zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml rename to zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enf-ep.yml diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-ent-ep.yml similarity index 100% rename from zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml rename to zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-ent-ep.yml diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-sup-ep.yml similarity index 100% rename from zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml rename to zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-sup-ep.yml diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml new file mode 100644 index 0000000..f815739 --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18002 + servlet: + # 应用的访问路径 + context-path: /enf-ep diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml new file mode 100644 index 0000000..88c17fd --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18000 + servlet: + # 应用的访问路径 + context-path: /ent-ep diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enterprise.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enterprise.yml deleted file mode 100644 index c8997ea..0000000 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enterprise.yml +++ /dev/null @@ -1,272 +0,0 @@ ---- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp - ---- # 监控中心配置 -spring.boot.admin.client: - # 增加客户端开关 - enabled: false - url: http://localhost:9090/admin - instance: - service-host-type: IP - metadata: - username: ${spring.boot.admin.client.username} - userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ - ---- # snail-job 配置 -snail-job: - enabled: false - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 17888 - # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 - namespace: ${spring.profiles.active} - # 随主应用端口漂移 - port: 2${server.port} - # 客户端ip指定 - host: - ---- # 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content - dynamic: - # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false - # 设置默认的数据源或者数据源组,默认值即为 master - primary: master - # 严格模式 匹配不到数据源则报错 - strict: true - datasource: - # 主库数据源 - master: - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root -# # 从库数据源 -# slave: -# lazy: true -# type: ${spring.datasource.type} -# driverClassName: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true -# username: -# password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root - hikari: - # 最大连接池数量 - maxPoolSize: 20 - # 最小空闲线程数量 - minIdle: 10 - # 配置获取连接等待超时的时间 - connectionTimeout: 30000 - # 校验超时时间 - validationTimeout: 5000 - # 空闲连接存活最大时间，默认10分钟 - idleTimeout: 600000 - # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 - maxLifetime: 1800000 - # 多久检查一次连接的活性 - keepaliveTime: 30000 - ---- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) -spring.data: - redis: - # 地址 - host: localhost - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # redis 密码必须配置 - password: ruoyi123 - # 连接超时时间 - timeout: 10s - # 是否开启ssl - ssl.enabled: false - -# redisson 配置 -redisson: - # redis key前缀 - keyPrefix: - # 线程池数量 - threads: 16 - # Netty线程池数量 - nettyThreads: 32 - # 单节点配置 - singleServerConfig: - # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus - # 最小空闲连接数 - connectionMinimumIdleSize: 32 - # 连接池大小 - connectionPoolSize: 64 - # 连接空闲超时，单位：毫秒 - idleConnectionTimeout: 10000 - # 命令等待超时，单位：毫秒 - timeout: 3000 - # 发布和订阅连接池大小 - subscriptionConnectionPoolSize: 50 - ---- # mail 邮件发送 -mail: - enabled: false - host: smtp.163.com - port: 465 - # 是否需要用户名密码验证 - auth: true - # 发送方，遵循RFC-822标准 - from: xxx@163.com - # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） - user: xxx@163.com - # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） - pass: xxxxxxxxxx - # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 - starttlsEnable: true - # 使用SSL安全连接 - sslEnable: true - # SMTP超时时长，单位毫秒，缺省值不超时 - timeout: 0 - # Socket连接超时值，单位毫秒，缺省值不超时 - connectionTimeout: 0 - ---- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 -# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 -sms: - # 配置源类型用于标定配置来源(interface,yaml) - config-type: yaml - # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 - restricted: true - # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 - minute-max: 1 - # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 - account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 - blends: - # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 - # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 - config1: - # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: alibaba - # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 - access-key-id: 您的accessKey - # 称为accessSecret有些称之为apiSecret - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - config2: - # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: tencent - access-key-id: 您的accessKey - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - ---- # 三方授权 -justauth: - # 前端外网访问地址 - address: http://localhost:80 - type: - maxkey: - # maxkey 服务器地址 - # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 - server-url: http://sso.maxkey.top - client-id: 876892492581044224 - client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 - redirect-uri: ${justauth.address}/social-callback?source=maxkey - topiam: - # topiam 服务器地址 - server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol - client-id: 449c4*********937************759 - client-secret: ac7***********1e0************28d - redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [ openid, email, phone, profile ] - qq: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=qq - union-id: false - weibo: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=weibo - gitee: - client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 - client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac - redirect-uri: ${justauth.address}/social-callback?source=gitee - dingtalk: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=dingtalk - baidu: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=baidu - csdn: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=csdn - coding: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=coding - coding-group-name: xx - oschina: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=oschina - alipay_wallet: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet - alipay-public-key: MIIB**************DAQAB - wechat_open: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_open - wechat_mp: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_mp - wechat_enterprise: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise - agent-id: 1000002 - gitlab: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitlab - gitea: - # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204 - # gitea 服务器地址 - server-url: https://demo.gitea.com - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitea diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml new file mode 100644 index 0000000..36ee25b --- /dev/null +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml @@ -0,0 +1,7 @@ +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 18001 + servlet: + # 应用的访问路径 + context-path: /sup-ep diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-supervision.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-supervision.yml deleted file mode 100644 index c8997ea..0000000 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-supervision.yml +++ /dev/null @@ -1,272 +0,0 @@ ---- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp - ---- # 监控中心配置 -spring.boot.admin.client: - # 增加客户端开关 - enabled: false - url: http://localhost:9090/admin - instance: - service-host-type: IP - metadata: - username: ${spring.boot.admin.client.username} - userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ - ---- # snail-job 配置 -snail-job: - enabled: false - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 17888 - # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 - namespace: ${spring.profiles.active} - # 随主应用端口漂移 - port: 2${server.port} - # 客户端ip指定 - host: - ---- # 数据源配置 -spring: - datasource: - type: com.zaxxer.hikari.HikariDataSource - # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content - dynamic: - # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false - # 设置默认的数据源或者数据源组,默认值即为 master - primary: master - # 严格模式 匹配不到数据源则报错 - strict: true - datasource: - # 主库数据源 - master: - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root -# # 从库数据源 -# slave: -# lazy: true -# type: ${spring.datasource.type} -# driverClassName: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true -# username: -# password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root - hikari: - # 最大连接池数量 - maxPoolSize: 20 - # 最小空闲线程数量 - minIdle: 10 - # 配置获取连接等待超时的时间 - connectionTimeout: 30000 - # 校验超时时间 - validationTimeout: 5000 - # 空闲连接存活最大时间，默认10分钟 - idleTimeout: 600000 - # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 - maxLifetime: 1800000 - # 多久检查一次连接的活性 - keepaliveTime: 30000 - ---- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) -spring.data: - redis: - # 地址 - host: localhost - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # redis 密码必须配置 - password: ruoyi123 - # 连接超时时间 - timeout: 10s - # 是否开启ssl - ssl.enabled: false - -# redisson 配置 -redisson: - # redis key前缀 - keyPrefix: - # 线程池数量 - threads: 16 - # Netty线程池数量 - nettyThreads: 32 - # 单节点配置 - singleServerConfig: - # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus - # 最小空闲连接数 - connectionMinimumIdleSize: 32 - # 连接池大小 - connectionPoolSize: 64 - # 连接空闲超时，单位：毫秒 - idleConnectionTimeout: 10000 - # 命令等待超时，单位：毫秒 - timeout: 3000 - # 发布和订阅连接池大小 - subscriptionConnectionPoolSize: 50 - ---- # mail 邮件发送 -mail: - enabled: false - host: smtp.163.com - port: 465 - # 是否需要用户名密码验证 - auth: true - # 发送方，遵循RFC-822标准 - from: xxx@163.com - # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） - user: xxx@163.com - # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） - pass: xxxxxxxxxx - # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 - starttlsEnable: true - # 使用SSL安全连接 - sslEnable: true - # SMTP超时时长，单位毫秒，缺省值不超时 - timeout: 0 - # Socket连接超时值，单位毫秒，缺省值不超时 - connectionTimeout: 0 - ---- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 -# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用 -sms: - # 配置源类型用于标定配置来源(interface,yaml) - config-type: yaml - # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制 - restricted: true - # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效 - minute-max: 1 - # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 - account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 - blends: - # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 - # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 - config1: - # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: alibaba - # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 - access-key-id: 您的accessKey - # 称为accessSecret有些称之为apiSecret - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - config2: - # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: tencent - access-key-id: 您的accessKey - access-key-secret: 您的accessKeySecret - signature: 您的短信签名 - sdk-app-id: 您的sdkAppId - ---- # 三方授权 -justauth: - # 前端外网访问地址 - address: http://localhost:80 - type: - maxkey: - # maxkey 服务器地址 - # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 - server-url: http://sso.maxkey.top - client-id: 876892492581044224 - client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 - redirect-uri: ${justauth.address}/social-callback?source=maxkey - topiam: - # topiam 服务器地址 - server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol - client-id: 449c4*********937************759 - client-secret: ac7***********1e0************28d - redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [ openid, email, phone, profile ] - qq: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=qq - union-id: false - weibo: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=weibo - gitee: - client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 - client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac - redirect-uri: ${justauth.address}/social-callback?source=gitee - dingtalk: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=dingtalk - baidu: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=baidu - csdn: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=csdn - coding: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=coding - coding-group-name: xx - oschina: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=oschina - alipay_wallet: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet - alipay-public-key: MIIB**************DAQAB - wechat_open: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_open - wechat_mp: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_mp - wechat_enterprise: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise - agent-id: 1000002 - gitlab: - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitlab - gitea: - # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204 - # gitea 服务器地址 - server-url: https://demo.gitea.com - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e - redirect-uri: ${justauth.address}/social-callback?source=gitea diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enforcement.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml similarity index 80% rename from zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enforcement.yml rename to zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml index c8997ea..7f03656 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enforcement.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml @@ -1,6 +1,3 @@ ---- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp - --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 @@ -19,7 +16,7 @@ snail-job: enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 + # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" server: host: 127.0.0.1 @@ -31,6 +28,12 @@ snail-job: # 客户端ip指定 host: +--- # Quartz 定时任务配置 +spring: + quartz: + # 是否自动启动调度器，设为false则禁用全部定时任务 + auto-startup: true + --- # 数据源配置 spring: datasource: @@ -38,7 +41,7 @@ spring: # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false + p6spy: true # 设置默认的数据源或者数据源组,默认值即为 master primary: master # 严格模式 匹配不到数据源则报错 @@ -50,35 +53,35 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3309/zfjd-refactoring-v3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root password: root -# # 从库数据源 -# slave: -# lazy: true -# type: ${spring.datasource.type} -# driverClassName: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true -# username: -# password: -# oracle: -# type: ${spring.datasource.type} -# driverClassName: oracle.jdbc.OracleDriver -# url: jdbc:oracle:thin:@//localhost:1521/XE -# username: ROOT -# password: root -# postgres: -# type: ${spring.datasource.type} -# driverClassName: org.postgresql.Driver -# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true -# username: root -# password: root -# sqlserver: -# type: ${spring.datasource.type} -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true -# username: SA -# password: root + # # 从库数据源 + # slave: + # lazy: true + # type: ${spring.datasource.type} + # driverClassName: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + # username: + # password: + # oracle: + # type: ${spring.datasource.type} + # driverClassName: oracle.jdbc.OracleDriver + # url: jdbc:oracle:thin:@//localhost:1521/XE + # username: ROOT + # password: root + # postgres: + # type: ${spring.datasource.type} + # driverClassName: org.postgresql.Driver + # url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + # username: root + # password: root + # sqlserver: + # type: ${spring.datasource.type} + # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true + # username: SA + # password: root hikari: # 最大连接池数量 maxPoolSize: 20 @@ -116,17 +119,17 @@ redisson: # redis key前缀 keyPrefix: # 线程池数量 - threads: 16 + threads: 4 # Netty线程池数量 - nettyThreads: 32 + nettyThreads: 8 # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 clientName: RuoYi-Vue-Plus # 最小空闲连接数 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 连接池大小 - connectionPoolSize: 64 + connectionPoolSize: 32 # 连接空闲超时，单位：毫秒 idleConnectionTimeout: 10000 # 命令等待超时，单位：毫秒 @@ -188,6 +191,7 @@ sms: signature: 您的短信签名 sdk-app-id: 您的sdkAppId + --- # 三方授权 justauth: # 前端外网访问地址 @@ -202,11 +206,11 @@ justauth: redirect-uri: ${justauth.address}/social-callback?source=maxkey topiam: # topiam 服务器地址 - server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol + server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol client-id: 449c4*********937************759 client-secret: ac7***********1e0************28d redirect-uri: ${justauth.address}/social-callback?source=topiam - scopes: [ openid, email, phone, profile ] + scopes: [openid, email, phone, profile] qq: client-id: 10**********6 client-secret: 1f7d08**********5b7**********29e