From cb22da4996e6600593d96703420d6a474632201d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 12 二月 2025 17:28:08 +0800 Subject: [PATCH] 修改各个回调注释内容 --- pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 108 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 66 insertions(+), 42 deletions(-) diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" index 5526373..c6509d1 100644 --- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" +++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" @@ -66,7 +66,7 @@ configuration: #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織 #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃� - print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞� + print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞� #寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name #2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name #map-underscore-to-camel-case: true @@ -81,7 +81,9 @@ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О nginx: + root: D:/apps/pipIrr/nginx-1.27.0 webPort: 54321 + webFilePort: 64321 mw: webPort: 8072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� actutorPort: 9072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢� @@ -192,112 +194,112 @@ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷 sv1: id: dyFile1 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile1 hashStart: 0 hashEnd: 5461 restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� - webDownloadPath: http://127.0.0.1:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv2: id: dyFile2 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile2 hashStart: 5462 hashEnd: 10923 restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file2.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv3: id: dyFile3 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile3 hashStart: 10924 hashEnd: 16385 restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file3.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv4: id: dyFile4 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile4 hashStart: 16386 hashEnd: 21847 restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file4.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv5: id: dyFile5 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile5 hashStart: 21848 hashEnd: 27309 restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file5.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv6: id: dyFile6 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile6 hashStart: 27310 hashEnd: 32767 restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file6.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv7: id: dyFile7 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile7 hashStart: 32768 hashEnd: 38229 restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file7.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv8: id: dyFile8 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile8 hashStart: 38230 hashEnd: 43691 restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file8.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv9: id: dyFile9 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile9 hashStart: 43692 hashEnd: 49153 restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file9.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv10: id: dyFile10 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile10 hashStart: 49154 hashEnd: 54615 restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file10.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv11: id: dyFile11 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile11 hashStart: 54616 hashEnd: 60077 restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file11.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� sv12: id: dyFile12 - absolutePath: E:/java/nginx-1.24.0/html/webfiles/ + absolutePath: ${pipIrr.nginx.root}/html/webfiles/ relativePath: webFile12 hashStart: 60078 hashEnd: 65535 restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file - webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ - webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id= + webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� + webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚� #椤圭洰缂栧彿 #projectCode: @@ -321,17 +323,23 @@ ym: url: "http://127.0.0.1:8070" comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send" + mj: + url: "http://127.0.0.1:8071" + comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send" + mq: + url: "http://127.0.0.1:8100" + comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send" sp: url: "http://127.0.0.1:8073" comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send" test: url: "http://127.0.0.1:8072" comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send" - #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃 + #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃 rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive" - #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃 + #rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧� ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive" - #寰俊灏忕▼搴忓洖璋冨湴鍧� + #寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃 rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive" #涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓 @@ -340,6 +348,7 @@ - /sso/sso - /remote/comRes/receive - /remote/rtuUpgradeStateReceiver/receive + - /remote/websocket - /wx/comRes/receive - /app/captcha/get - /file/file #web鍒嗗竷寮忔枃浠剁郴缁� @@ -347,12 +356,28 @@ #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜 auto-statistics: - startHour: 0 #寮�濮嬪皬鏃� 0 + startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0 startMinute: 5 #寮�濮嬪垎閽� 5 #閽夐拤娑堟伅鎺ㄩ�� dingtalk: ym: + enable: true #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + mj: + enable: true #鏄惁鍚敤 + robot: + url: https://oapi.dingtalk.com/robot/send + access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f + secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 + at-all: true + mobile: 18602657034 + mq: enable: true #鏄惁鍚敤 robot: url: https://oapi.dingtalk.com/robot/send @@ -379,7 +404,6 @@ #闃�鎺у櫒鍙傛暟 rtu: - batteryVolt: 17 signalIntensity: weak: 10 ordinary: 20 -- Gitblit v1.8.0