Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-10-21 d065b6ed33493aec24d3b0e974e7ef331a2261d5

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -68,12 +68,13 @@
        lazy-load-trigger-methods: ""  # 阻挡不相干的操作触发，实现懒加载
        cache-enabled: true  #打开全局缓存开关（二级环境），默认值是true
        default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
    type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler

pipIrr:
    global:
        dev: true   #是否开发阶段，true或false
        dev: true  #是否开发阶段，true或false
        dsName: ym  #开发阶段，设置临时的数据库名称
    nginx:
        webPort: 54321
    mw:
        webPort: 8070
        actutorPort: 9070
@@ -129,6 +130,162 @@
        webPort: 8089
        actutorPort: 9089
        idSuffix: 11

    file:
        idSuffix: 99
    file1:
        webPort: 8180
        actutorPort: 9180
    file2:
        webPort: 8180
        actutorPort: 9180
    file3:
        webPort: 8180
        actutorPort: 9180
    file4:
        webPort: 8180
        actutorPort: 9180
    file5:
        webPort: 8180
        actutorPort: 9180
    file6:
        webPort: 8180
        actutorPort: 9180
    file7:
        webPort: 8180
        actutorPort: 9180
    file8:
        webPort: 8180
        actutorPort: 9180
    file9:
        webPort: 8180
        actutorPort: 9180
    file10:
        webPort: 8180
        actutorPort: 9180
    file11:
        webPort: 8180
        actutorPort: 9180
    file12:
        webPort: 8180
        actutorPort: 9180


#web分布式文件系统
dy:
    photoZipWidth: 400 #缩略图尺寸
    webFile:
        fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm的web上下文 URL
        supportedFileTypes: docx,xlsx,doc,xls,pdf #支持的文档（非媒体文件，如照片、录音、录像）文件类型
        sv1:
            id: dyFile1
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pipIrr.file1.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: E:/java/nginx-1.24.0/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=
        sv3:
            id: dyFile3
            absolutePath: E:/java/nginx-1.24.0/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=
        sv4:
            id: dyFile4
            absolutePath: E:/java/nginx-1.24.0/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=
        sv5:
            id: dyFile5
            absolutePath: E:/java/nginx-1.24.0/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=
        sv6:
            id: dyFile6
            absolutePath: E:/java/nginx-1.24.0/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=
        sv7:
            id: dyFile7
            absolutePath: E:/java/nginx-1.24.0/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=
        sv8:
            id: dyFile8
            absolutePath: E:/java/nginx-1.24.0/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=
        sv9:
            id: dyFile9
            absolutePath: E:/java/nginx-1.24.0/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=
        sv10:
            id: dyFile10
            absolutePath: E:/java/nginx-1.24.0/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=
        sv11:
            id: dyFile11
            absolutePath: E:/java/nginx-1.24.0/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=
        sv12:
            id: dyFile12
            absolutePath: E:/java/nginx-1.24.0/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=

#项目编号
#projectCode:
#    ym: 100
@@ -144,14 +301,22 @@
    divisionCode: 120114403100


#通讯协议
#通讯中间件相关配置
#protocol: DYJS_2023,DYJS_2024
mw:
    #命令发送地址(中缀是机构tag，其也是数据源后缀名称)
    ym:
        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
    sp:
        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
    pj:
        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
    test:
        comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
        rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
        rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
    #监测控制模块回调地址
    rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
    #微信小程序回调地址
@@ -163,19 +328,40 @@
        - /sso/sso
        - /remote/comRes/receive
        - /wx/comRes/receive
        - /app/captcha/get
        - /file/file #web分布式文件系统

#自动统计配置，自动统计定时任务会每天定时进行
auto-statistics:
    startHour: 17 #开始小时 0
    startMinute: 19 #开始分钟 5
    startHour: 0 #开始小时 0
    startMinute: 5 #开始分钟 5

#钉钉消息推送
dingtalk:
    robot:
        url: https://oapi.dingtalk.com/robot/send
        access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
        secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
    at-all: true
    mobile: 18602657034
    ym:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send
            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    pj:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send
            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034
    test:
        enable: true #是否启用
        robot:
            url: https://oapi.dingtalk.com/robot/send
            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
        at-all: true
        mobile: 18602657034

#阀控器参数
rtu:
@@ -183,4 +369,9 @@
    signalIntensity:
        weak: 10
        ordinary: 20
#        strong: 20
#        strong: 20

#虚拟卡配置参数
vc:
    #虚拟卡最低余额报警值
    alarmValue: 10