Merge branch 'master' of http://47.92.113.182:3000/cq_anquan/safety-eval-service into dev

.gitignore

@@ -40,3 +40,4 @@ build/
 /.workbuddy/
 /.idea/
 /.codebuddy/
+/.codex-run/

docs/~$s后端开发规范.docx

@@ -1 +0,0 @@
-longlong

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;

safety-eval-start/src/main/resources/application-dev.yml

@@ -6,17 +6,45 @@
 spring:
   config:
     import:
-      - nacos:common.yml?refreshEnabled=true
+      - optional:nacos:common.yml?refreshEnabled=true
-      - nacos:safety-eval-service.yml
+      - optional:nacos:safety-eval-service.yml
   cloud:
     nacos:
       discovery:
-        server-addr: 192.168.20.100:8848
+        server-addr: 192.168.20.100:30290
-        namespace: public
+        namespace: jjb-dragon
       config:
-        server-addr: 192.168.20.100:8848
+        server-addr: 192.168.20.100:30290
-        namespace: public
+        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
@@ -36,6 +64,10 @@ spring:
         max-wait: -1
 
 dubbo:
+  registry:
+    address: nacos://192.168.20.100:30290
+    parameters:
+      namespace: jjb-dragon
   protocol:
     port: 20895
 

safety-eval-start/src/main/resources/application-local.yml

@@ -6,18 +6,46 @@
 spring:
   config:
     import:
-      - nacos:common.yml?refreshEnabled=true
+      - optional:nacos:common.yml?refreshEnabled=true
-      - nacos:safety-eval-service.yml
+      - optional:nacos:safety-eval-service.yml
   cloud:
     nacos:
       discovery:
-        enabled: false
+        enabled: true
-        server-addr: 192.168.20.100:8848
+        server-addr: 192.168.20.100:30290
-        namespace: public
+        namespace: jjb-dragon
       config:
-        server-addr: 192.168.20.100:8848
+        server-addr: 192.168.20.100:30290
-        namespace: public
+        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
@@ -37,6 +65,10 @@ spring:
         max-wait: -1
 
 dubbo:
+  registry:
+    address: nacos://192.168.20.100:30290
+    parameters:
+      namespace: jjb-dragon
   protocol:
     port: 20895
 

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
 

safety-eval-start/src/main/resources/application.yml

@@ -28,14 +28,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: