pipIrr-SV.git - Gitblit

parent: 80fddedb | 补丁 | 提交 | ignore whitespace

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

wuzeyu

2024-12-23 9c8ab5d5d8670e524c02b8dcbb9f6876cbe6bc3c

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

4个文件已修改

	pipIrr-platform/pipIrr-global/src/main/resources/application-global(sp沙盘系统).yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(spÉ³ÅÌÏµÍ³).yml

@@ -363,6 +363,14 @@
            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
    sp:
        enable: true #æ¯å¦å¯ç¨
        robot:

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(test²âÊÔÏµÍ³).yml

@@ -363,6 +363,14 @@
            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
    sp:
        enable: true #æ¯å¦å¯ç¨
        robot:

 pipIrr-platform/pipIrr-global/src/main/resources/application-global(ymÔªÄ±ÏµÍ³).yml

@@ -363,6 +363,14 @@
            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
    sp:
        enable: true #æ¯å¦å¯ç¨
        robot:

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -31,7 +31,7 @@
                <item2 item_name="lat" item_value="25.673963608371185" remarks="çº¬åº¦"/>
                <item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
                <item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
                <item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
                <item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
            </settings>
            <waterTypes>
                <item1 typeName="çæºç¨æ°´"/>
@@ -94,7 +94,7 @@
                <item2 item_name="lat" item_value="27" remarks="çº¬åº¦"/>
                <item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
                <item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
                <item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
                <item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
            </settings>
            <waterTypes>
                <item1 typeName="çæºç¨æ°´"/>
@@ -157,7 +157,7 @@
                <item2 item_name="lat" item_value="25.70424" remarks="çº¬åº¦"/>
                <item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
                <item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
                <item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
                <item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
            </settings>
            <waterTypes>
                <item1 typeName="çæºç¨æ°´"/>
@@ -220,7 +220,7 @@
                <item2 item_name="lat" item_value="25.70424" remarks="çº¬åº¦"/>
                <item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
                <item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
                <item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
                <item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
            </settings>
            <waterTypes>
                <item1 typeName="çæºç¨æ°´"/>

			@@ -363,6 +363,14 @@
			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
			sp:
			enable: true #æ¯å¦å¯ç¨
			robot:

			@@ -31,7 +31,7 @@
			<item2 item_name="lat" item_value="25.673963608371185" remarks="çº¬åº¦"/>
			<item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
			<item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
			<item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
			<item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
			</settings>
			<waterTypes>
			<item1 typeName="çæºç¨æ°´"/>
			@@ -94,7 +94,7 @@
			<item2 item_name="lat" item_value="27" remarks="çº¬åº¦"/>
			<item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
			<item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
			<item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
			<item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
			</settings>
			<waterTypes>
			<item1 typeName="çæºç¨æ°´"/>
			@@ -157,7 +157,7 @@
			<item2 item_name="lat" item_value="25.70424" remarks="çº¬åº¦"/>
			<item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
			<item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
			<item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
			<item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
			</settings>
			<waterTypes>
			<item1 typeName="çæºç¨æ°´"/>
			@@ -220,7 +220,7 @@
			<item2 item_name="lat" item_value="25.70424" remarks="çº¬åº¦"/>
			<item3 item_name="zoomMp" item_value="12" remarks="ææºå°å¾ç¼©æ¾çº§å«"/>
			<item4 item_name="zoomPc" item_value="19" remarks="PCæºå°å¾ç¼©æ¾çº§å«"/>
			<item5 item_name="projectName" item_value="ç®¡çç³»ç»åé«ææºæ§å¾®çäºæå¡ç®¡çå¹³å°è½¯ä»¶ç³»ç»" remarks="é¡¹ç®åç§°"/>
			<item5 item_name="projectName" item_value="é«ææºæ§ç®¡çå¾®çäºæå¡ç®¡çå¹³å°" remarks="é¡¹ç®åç§°"/>
			</settings>
			<waterTypes>
			<item1 typeName="çæºç¨æ°´"/>