Compare commits

..

No commits in common. "2766c34889e1dbf6bbf5db6ab52247cc983b0322" and "4d4d94f7d79e56ed99f1925cce97143900bc8e56" have entirely different histories.

7 changed files with 15 additions and 126 deletions

1
.gitignore vendored
View File

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

View File

@ -0,0 +1 @@
longlong

View File

@ -1,7 +1,5 @@
package org.qinan.safetyeval.start; 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.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;

View File

@ -6,45 +6,17 @@
spring: spring:
config: config:
import: import:
- optional:nacos:common.yml?refreshEnabled=true - nacos:common.yml?refreshEnabled=true
- optional:nacos:safety-eval-service.yml - nacos:safety-eval-service.yml
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 192.168.20.100:30290 server-addr: 192.168.20.100:8848
namespace: jjb-dragon namespace: public
config: config:
server-addr: 192.168.20.100:30290 server-addr: 192.168.20.100:8848
namespace: jjb-dragon namespace: public
file-extension: yml 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: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver 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 url: jdbc:mysql://192.168.20.100:33080/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
@ -64,10 +36,6 @@ spring:
max-wait: -1 max-wait: -1
dubbo: dubbo:
registry:
address: nacos://192.168.20.100:30290
parameters:
namespace: jjb-dragon
protocol: protocol:
port: 20895 port: 20895

View File

@ -6,46 +6,18 @@
spring: spring:
config: config:
import: import:
- optional:nacos:common.yml?refreshEnabled=true - nacos:common.yml?refreshEnabled=true
- optional:nacos:safety-eval-service.yml - nacos:safety-eval-service.yml
cloud: cloud:
nacos: nacos:
discovery: discovery:
enabled: true enabled: false
server-addr: 192.168.20.100:30290 server-addr: 192.168.20.100:8848
namespace: jjb-dragon namespace: public
config: config:
server-addr: 192.168.20.100:30290 server-addr: 192.168.20.100:8848
namespace: jjb-dragon namespace: public
file-extension: yml 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: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver 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 url: jdbc:mysql://192.168.20.100:33080/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
@ -65,10 +37,6 @@ spring:
max-wait: -1 max-wait: -1
dubbo: dubbo:
registry:
address: nacos://192.168.20.100:30290
parameters:
namespace: jjb-dragon
protocol: protocol:
port: 20895 port: 20895

View File

@ -14,42 +14,10 @@ spring:
discovery: discovery:
server-addr: prod-nacos:8848 server-addr: prod-nacos:8848
namespace: jjb-dragon namespace: jjb-dragon
username: nacos
password: u9Hc7tLFBY
config: config:
server-addr: prod-nacos:8848 server-addr: prod-nacos:8848
namespace: jjb-dragon namespace: jjb-dragon
username: nacos
password: u9Hc7tLFBY
file-extension: yml 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: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver 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 url: jdbc:mysql://prod-mysql:3306/jjb_saas_safety_eval?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
@ -69,10 +37,6 @@ spring:
max-wait: -1 max-wait: -1
dubbo: dubbo:
registry:
address: nacos://prod-nacos:8848
parameters:
namespace: jjb-dragon
protocol: protocol:
port: 20895 port: 20895

View File

@ -28,22 +28,14 @@ mybatis-plus:
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
# ---------- Dubbo环境无关的公共部分各profile覆盖地址/端口 ---------- # ---------- Dubbo环境无关的部分) ----------
dubbo: dubbo:
application: application:
name: safety-eval-service name: safety-eval-service
registry: registry:
timeout: 20000 address: N/A
check: false
filter: providerContextFilter
scan: scan:
base-packages: org.qinan.safetyeval base-packages: org.qinan.safetyeval
protocol:
name: dubbo
consumer:
timeout: 20000
check: false
filter: consumerContextFilter
safety-eval: safety-eval:
security: security: