From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001 From: 刘光辉 <347230014@qq.com> Date: 星期四, 17 九月 2026 09:24:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- config/shared/discovery.yaml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/config/shared/discovery.yaml b/config/shared/discovery.yaml new file mode 100644 index 0000000..25898f2 --- /dev/null +++ b/config/shared/discovery.yaml @@ -0,0 +1,57 @@ +# 闈欐�佹湇鍔″彂鐜帮紙琛ヤ竵 #8 鍘� Nacos锛夛細SimpleDiscoveryClient 瀹炰緥琛ㄣ�� +# 娑堣垂鏂癸細60 涓� @FeignClient 鐨� lb 瑙ｆ瀽銆佺綉鍏� lb:// 璺敱銆乲nife4j DISCOVER 鑱氬悎銆� +# 榛樿鍊� = compose 瀹瑰櫒鍚嶏紙浜や粯褰㈡�侀浂閰嶇疆锛夛紱瀹夸富 java -jar 鏍堢敱 +# config/host-override/discovery.yaml 鏁磋〃瑕嗙洊涓� 127.0.0.1銆� +# 鈿狅笍 鏂板鏈嶅姟涓夊鍚屾锛氭湰琛ㄣ�乭ost-override 琛ㄣ�乨ocker-compose.yml銆� +spring: + cloud: + discovery: + client: + simple: + instances: + jnpf-gateway: + - uri: http://cx-gateway:30000 + # 鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲 + # 浠ヤ笅 9 涓湇鍔″悕鍏ㄩ儴鏄� **cx-platform:30002 鐨勫埆鍚�**锛�2026-08-11 骞冲彴鑱氬悎锛夈�� + # 鍚嶅瓧涓�涓兘涓嶅垹锛�60 涓� @FeignClient 鐨� name 甯搁噺銆佺綉鍏� router.yaml 鐨� lb:// 璺敱銆� + # 鍥炲綊鑴氭湰鍏ㄦ寜鍚嶅瓧瑙ｆ瀽鈥斺�旂暀鍒悕 = 璋冪敤鏂逛笌鑴氭湰闆舵敼鍔紙娌跨敤 audit 骞跺叆 biz-common 鐨勫仛娉曪級銆� + # 鍥炴粴锛氭妸涓嬮潰 9 鏉℃敼鍥� cx-oauth:30001 / cx-system:30002 / cx-visualdev:30003 / + # cx-flowable:30004 / cx-file:30005 / cx-message:30008 / cx-permission:30010 / + # cx-visualdata:30011 / cx-app:30012锛屽苟 mvn -P microservice 鐢ㄦ棫闀滃儚鍚姩銆� + # 鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲 + jnpf-oauth: + - uri: http://cx-platform:30002 + jnpf-system: + - uri: http://cx-platform:30002 + jnpf-visualdev: + - uri: http://cx-platform:30002 + # 娉ㄦ剰锛歠lowable 鏈嶅姟鐨勬敞鍐屽悕鏄� jnpf-workflow锛堝鍣ㄥ師鍚� cx-flowable锛屽凡骞跺叆 cx-platform锛� + jnpf-workflow: + - uri: http://cx-platform:30002 + jnpf-file: + - uri: http://cx-platform:30002 + jnpf-message: + - uri: http://cx-platform:30002 + jnpf-permission: + - uri: http://cx-platform:30002 + jnpf-visualdata: + - uri: http://cx-platform:30002 + jnpf-app: + - uri: http://cx-platform:30002 + # 鈹�鈹� 浠ヤ笅涓嶅湪 platform 鍐咃紝淇濇寔鐙珛 鈹�鈹� + jnpf-scheduletask: + - uri: http://cx-scheduletask:30009 + jnpf-eln: + - uri: http://cx-eln:30013 + # jnpf-audit 淇濈暀涓�**鍒悕**锛氬璁″凡浜� 2026-08-11 鎼叆 jnpf-biz-common銆乧x-audit 閫�褰癸紝 + # 浣� Feign 鍚嶅父閲忥紙AuditFeignName.AUDIT_SERVER_NAME锛変笌璋冪敤鏂逛竴琛屾湭鏀光�斺�� + # 璁╄繖涓湇鍔″悕瑙ｆ瀽鍒� biz-common 鍗冲彲鍏滀綇鍏ㄩ儴璋冪敤鏂逛笌鍥炲綊鑴氭湰銆傚垹鎺夋鏉� = lims 鐨� + # 瀹¤鎶曢�掔涓�鏃堕棿 502銆� + jnpf-audit: + - uri: http://cx-biz-common:30015 + jnpf-biz-common: + - uri: http://cx-biz-common:30015 + jnpf-dms: + - uri: http://cx-dms:30016 + jnpf-lims: + - uri: http://cx-lims:30019 -- Gitblit v1.8.0