From 6c080c985112dad669abd3706f4c156241322fcb Mon Sep 17 00:00:00 2001 From: huwei <3313749341@qq.com> Date: Tue, 23 Jun 2026 14:30:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=93=BE=E6=8E=A5=E6=B3=A8=E5=86=8Cdubbo=E3=80=81naco?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + docs/~$s后端开发规范.docx | Bin 162 -> 0 bytes .../src/main/resources/application-dev.yml | 16 ++++++++++------ .../src/main/resources/application-local.yml | 18 +++++++++++------- 4 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 docs/~$s后端开发规范.docx diff --git a/.gitignore b/.gitignore index 9bbac4e..e136839 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ build/ /.workbuddy/ /.idea/ /.codebuddy/ +/.codex-run/ diff --git a/docs/~$s后端开发规范.docx b/docs/~$s后端开发规范.docx deleted file mode 100644 index 3df95b9dbe8ddd5410edde090984eb398319c461..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 dcmZR{$ Date: Wed, 24 Jun 2026 15:44:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../start/SafetyEvalApplication.java | 2 ++ .../src/main/resources/application-dev.yml | 28 +++++++++++++++ .../src/main/resources/application-local.yml | 28 +++++++++++++++ .../src/main/resources/application-prod.yml | 36 +++++++++++++++++++ .../src/main/resources/application.yml | 12 +++++-- 5 files changed, 104 insertions(+), 2 deletions(-) diff --git a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java index 030c88e..de49b66 100644 --- a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java +++ b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java @@ -1,5 +1,7 @@ package org.qinan.safetyeval.start; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.SpringApplication; diff --git a/safety-eval-start/src/main/resources/application-dev.yml b/safety-eval-start/src/main/resources/application-dev.yml index e94aed7..9a0c59c 100644 --- a/safety-eval-start/src/main/resources/application-dev.yml +++ b/safety-eval-start/src/main/resources/application-dev.yml @@ -17,6 +17,34 @@ spring: server-addr: 192.168.20.100:30290 namespace: jjb-dragon file-extension: yml + shared-configs: + - data-id: config-spring.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-actuator.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-cache.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk-server.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-log.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-job.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-mq.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-flyway.yml + group: DEFAULT_GROUP + refresh: false datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.20.100:33080/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true diff --git a/safety-eval-start/src/main/resources/application-local.yml b/safety-eval-start/src/main/resources/application-local.yml index 4d58efc..d728b71 100644 --- a/safety-eval-start/src/main/resources/application-local.yml +++ b/safety-eval-start/src/main/resources/application-local.yml @@ -18,6 +18,34 @@ spring: server-addr: 192.168.20.100:30290 namespace: jjb-dragon file-extension: yml + shared-configs: + - data-id: config-spring.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-actuator.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-cache.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk-server.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-log.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-job.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-mq.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-flyway.yml + group: DEFAULT_GROUP + refresh: false datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.20.100:33080/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true diff --git a/safety-eval-start/src/main/resources/application-prod.yml b/safety-eval-start/src/main/resources/application-prod.yml index b83f509..43f5142 100644 --- a/safety-eval-start/src/main/resources/application-prod.yml +++ b/safety-eval-start/src/main/resources/application-prod.yml @@ -14,10 +14,42 @@ spring: discovery: server-addr: prod-nacos:8848 namespace: jjb-dragon + username: nacos + password: u9Hc7tLFBY config: server-addr: prod-nacos:8848 namespace: jjb-dragon + username: nacos + password: u9Hc7tLFBY file-extension: yml + shared-configs: + - data-id: config-spring.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-actuator.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-cache.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-sdk-server.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-log.yml + group: DEFAULT_GROUP + refresh: true + - data-id: config-job.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-mq.yml + group: DEFAULT_GROUP + refresh: false + - data-id: config-flyway.yml + group: DEFAULT_GROUP + refresh: false datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://prod-mysql:3306/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true @@ -37,6 +69,10 @@ spring: max-wait: -1 dubbo: + registry: + address: nacos://prod-nacos:8848 + parameters: + namespace: jjb-dragon protocol: port: 20895 diff --git a/safety-eval-start/src/main/resources/application.yml b/safety-eval-start/src/main/resources/application.yml index 1279445..7d32dfb 100644 --- a/safety-eval-start/src/main/resources/application.yml +++ b/safety-eval-start/src/main/resources/application.yml @@ -27,14 +27,22 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true -# ---------- Dubbo（环境无关的部分） ---------- +# ---------- Dubbo（环境无关的公共部分，各profile覆盖地址/端口） ---------- dubbo: application: name: safety-eval-service registry: - address: N/A + timeout: 20000 + check: false + filter: providerContextFilter scan: base-packages: org.qinan.safetyeval + protocol: + name: dubbo + consumer: + timeout: 20000 + check: false + filter: consumerContextFilter safety-eval: security: