From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 24 十二月 2021 11:36:02 +0800 Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework --- ruoyi-admin/src/main/resources/application-dev.yml | 101 ++++++++++++++++++++++---------------------------- 1 files changed, 44 insertions(+), 57 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6729b5f..c9b246b 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,4 +1,43 @@ -# 鏁版嵁婧愰厤缃� +--- # 鐩戞帶閰嶇疆 +spring: + boot: + admin: + # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆 + client: + # 澧炲姞瀹㈡埛绔紑鍏� + enabled: true + # 璁剧疆 Spring Boot Admin Server 鍦板潃 + url: http://localhost:9090/admin + instance: + prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP + username: ruoyi + password: 123456 + +--- # xxl-job 閰嶇疆 +xxl: + job: + # 鎵ц鍣ㄥ紑鍏� + enabled: true + # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆� + admin-addresses: http://localhost:9100/xxl-job-admin + # 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤 + access-token: xxl-job + # 鎵ц鍣ㄩ厤缃� + executor: + # 鎵ц鍣ˋppName锛氭墽琛屽櫒蹇冭烦娉ㄥ唽鍒嗙粍渚濇嵁锛涗负绌哄垯鍏抽棴鑷姩娉ㄥ唽 + appname: xxl-job-executor + # 鎵ц鍣ㄧ鍙e彿 鎵ц鍣ㄤ粠9101寮�濮嬪線鍚庡啓 + port: 9101 + # 鎵ц鍣ㄦ敞鍐岋細榛樿IP:PORT + address: + # 鎵ц鍣↖P锛氶粯璁よ嚜鍔ㄨ幏鍙朓P + ip: + # 鎵ц鍣ㄨ繍琛屾棩蹇楁枃浠跺瓨鍌ㄧ鐩樿矾寰� + logpath: ./logs/xxl-job + # 鎵ц鍣ㄦ棩蹇楁枃浠朵繚瀛樺ぉ鏁帮細澶т簬3鐢熸晥 + logretentiondays: 30 + +--- # 鏁版嵁婧愰厤缃� spring: datasource: type: com.alibaba.druid.pool.DruidDataSource @@ -12,7 +51,9 @@ # 涓诲簱鏁版嵁婧� master: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + # jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂) + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: root password: root # 浠庡簱鏁版嵁婧� @@ -70,7 +111,7 @@ config: multi-statement-allow: true ---- # redis 閰嶇疆 +--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀) spring: redis: # 鍦板潃 @@ -117,57 +158,3 @@ subscriptionsPerConnection: 5 # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 dnsMonitoringInterval: 5000 - ---- # 鐩戞帶閰嶇疆 -spring: - boot: - admin: - # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆 - client: - # 澧炲姞瀹㈡埛绔紑鍏� - enabled: true - # 璁剧疆 Spring Boot Admin Server 鍦板潃 - url: http://localhost:9090/admin - instance: - prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP - username: ruoyi - password: 123456 - ---- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�) -cloud-storage: - # minio閰嶇疆 - minio: - endpoint: http://localhost:9000 - accessKey: ruoyi - secretKey: ruoyi123 - bucketName: ruoyi - # 涓冪墰浜戦厤缃� - qiniu: - domain: http://XXX.XXXX.com - prefix: - accessKey: XXXXXXXXXXXXXXX - secretKey: XXXXXXXXXXXXXXX - bucketName: ruoyi - isHttps: false - # z0 鍗庝笢 z1 鍗庡寳 z2 鍗庡崡 na0 鍖楃編 as0 涓滃崡浜� - # 涓嶅~涓鸿嚜鍔ㄨ幏鍙�(鎬ц兘浣� 鏄撳嚭闂) - region: z0 - # 闃块噷浜戦厤缃� - aliyun: - endpoint: http://oss-cn-beijing.aliyuncs.com - prefix: - accessKeyId: XXXXXXXXXXXXXXX - accessKeySecret: XXXXXXXXXXXXXXX - bucketName: ruoyi - # 鑵捐浜戦厤缃� - qcloud: - endpoint: http://cos.ap-beijing.myqcloud.com - prefix: - secretId: XXXXXXXXXXXXXXX - secretKey: XXXXXXXXXXXXXXX - # 鑵捐浜慴ucket鍚嶈鍒� 鏍煎紡涓� BucketName-APPID 姝ゅ濉啓鐨勫瓨鍌ㄦ《鍚嶇О蹇呴』涓烘鏍煎紡 - bucketName: ruoyi-1250000000 - isHttps: false - # 鍦板煙鍚嶅弬鑰冨畼鏂规枃妗� - # https://cloud.tencent.com/document/product/436/6224 - region: ap-beijing -- Gitblit v1.9.3