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 3df95b9..0000000 --- a/docs/~$s后端开发规范.docx +++ /dev/null @@ -1 +0,0 @@ -longlong \ No newline at end of file diff --git a/safety-eval-start/src/main/resources/application-dev.yml b/safety-eval-start/src/main/resources/application-dev.yml index c14e4e8..e94aed7 100644 --- a/safety-eval-start/src/main/resources/application-dev.yml +++ b/safety-eval-start/src/main/resources/application-dev.yml @@ -6,16 +6,16 @@ spring: config: import: - - nacos:common.yml?refreshEnabled=true - - nacos:safety-eval-service.yml + - optional:nacos:common.yml?refreshEnabled=true + - optional:nacos:safety-eval-service.yml cloud: nacos: discovery: - server-addr: 192.168.20.100:8848 - namespace: public + server-addr: 192.168.20.100:30290 + namespace: jjb-dragon config: - server-addr: 192.168.20.100:8848 - namespace: public + server-addr: 192.168.20.100:30290 + namespace: jjb-dragon file-extension: yml datasource: driver-class-name: com.mysql.cj.jdbc.Driver @@ -36,6 +36,10 @@ spring: max-wait: -1 dubbo: + registry: + address: nacos://192.168.20.100:30290 + parameters: + namespace: jjb-dragon protocol: port: 20895 diff --git a/safety-eval-start/src/main/resources/application-local.yml b/safety-eval-start/src/main/resources/application-local.yml index b3abfa2..4d58efc 100644 --- a/safety-eval-start/src/main/resources/application-local.yml +++ b/safety-eval-start/src/main/resources/application-local.yml @@ -6,17 +6,17 @@ spring: config: import: - - nacos:common.yml?refreshEnabled=true - - nacos:safety-eval-service.yml + - optional:nacos:common.yml?refreshEnabled=true + - optional:nacos:safety-eval-service.yml cloud: nacos: discovery: - enabled: false - server-addr: 192.168.20.100:8848 - namespace: public + enabled: true + server-addr: 192.168.20.100:30290 + namespace: jjb-dragon config: - server-addr: 192.168.20.100:8848 - namespace: public + server-addr: 192.168.20.100:30290 + namespace: jjb-dragon file-extension: yml datasource: driver-class-name: com.mysql.cj.jdbc.Driver @@ -37,6 +37,10 @@ spring: max-wait: -1 dubbo: + registry: + address: nacos://192.168.20.100:30290 + parameters: + namespace: jjb-dragon protocol: port: 20895