From d6ce3ee855dfbd72cd79c53cc9252cfbb590be71 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 8 Oct 2024 14:03:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/.gitignore | 1 - .../main/resources/dev/application.properties | 78 +++++++++++++++++++ .../src/main/resources/.gitignore | 2 - .../java/com/huatek/busi/mapper/.gitignore | 1 - .../src/main/resources/.gitignore | 2 - .../src/main/resources/dev/.gitignore | 3 - .../main/resources/dev/application.properties | 45 +++++++++++ .../src/main/resources/.gitignore | 2 - 8 files changed, 123 insertions(+), 11 deletions(-) delete mode 100644 busi-back/busi-back-control/src/main/resources/.gitignore create mode 100644 busi-back/busi-back-control/src/main/resources/dev/application.properties delete mode 100644 busi-back/busi-back-model/src/main/resources/.gitignore delete mode 100644 busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/.gitignore delete mode 100644 busi-back/busi-back-serviceImpl/src/main/resources/.gitignore delete mode 100644 frame-base/frame-base-control/src/main/resources/dev/.gitignore create mode 100644 frame-base/frame-base-control/src/main/resources/dev/application.properties delete mode 100644 frame-base/frame-base-serviceImpl/src/main/resources/.gitignore diff --git a/busi-back/busi-back-control/src/main/resources/.gitignore b/busi-back/busi-back-control/src/main/resources/.gitignore deleted file mode 100644 index 728222e..0000000 --- a/busi-back/busi-back-control/src/main/resources/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rebel-remote.xml diff --git a/busi-back/busi-back-control/src/main/resources/dev/application.properties b/busi-back/busi-back-control/src/main/resources/dev/application.properties new file mode 100644 index 0000000..4e4a45b --- /dev/null +++ b/busi-back/busi-back-control/src/main/resources/dev/application.properties @@ -0,0 +1,78 @@ +# \u4F7F\u7528zookeeper\u6CE8\u518C\u4E2D\u5FC3\u66B4\u9732\u670D\u52A1\u5730\u5740 +#base.zookeepr=redis://127.0.0.1:6379 +base.zookeepr=zookeeper://127.0.0.1:2181 +#base.zookeepr=multicast://239.255.255.203:1012 +#\u8D85\u65F6\u65F6\u95F4 +base.timeout=1200000 +#\u5DE5\u7A0Bname +base.name=busi_consumer +#\u662F\u5426\u5F00\u542F\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 +torch.login.use=true +#\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 \u5355\u4F4D\u79D2 +#torch.login.time=1200000 +torch.login.time=72000000 + +torch.key.path=/usr/local/license/license.torch + +torch.public.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOVWoo3EZ8jI06cJ37uA8dYHAlcZakpxsvnTNgeP49DZfx457rh8+sdGDq/BYE6KwQvzSW0A5kTDVOKj/YTTE7rB0OpeTmksnK3aQe+iiJFSojgSLGiHpHOBV2wHZztDc3ME72u3dtd31ncUaRZYWUNlJq37p5OL/qBLHjqDMW8QIDAQAB +#\u6821\u9A8C\u5305\u540D +torch.vaild.package=com.huatek.frame.base.entity,com.huatek.busi.dto +#\u65E5\u5FD7\u8F93\u51FA\u8BED\u8A00 +torch.log=zh_CN +#\u6E38\u5BA2url(\u4E0D\u9700\u8981\u6821\u9A8Ctoken\u548C\u6743\u9650\u7684url) +torch.visitor.url=/busi-back-control/remote/busiTransformerRemote/findTransformerSubTree,\ + /busi-back-control/api/transformerEvaluationResults/add,\ + /busi-back-control/api/IecBaseConf/getIecBydworkParamWorks,\ + /busi-back-control/api/IecBaseConf/getIecBydworkParamWorks/**,\ + /busi-back-control/api/BusiSiteTree/tree,\ + /busi-back-control/api/equipmentNumber/selectTransformerStatus,\ + /busi-back-control/api/equipmentNumber/selectTotalGisList,\ + /busi-back-control/api/equipmentNumber/selectArresterStatu,\ + /busi-back-control/api/equipmentNumber/selectArresterStatus,\ + /busi-back-control/api/GisAssess/queryGisAssessmentResultVo,\ + /busi-back-control/api/ArresterAssess/queryArresterAssessmentResultVo +##################\u6027\u80FD\u8C03\u4F18####################### +#\u8D1F\u8F7D\u5747\u8861\u7B56\u7565\uFF0C\u53EF\u9009\u503C\uFF1Arandom,roundrobin,leastactive\uFF0C\u5206\u522B\u8868\u793A\uFF1A\u968F\u673A\uFF0C\u8F6E\u5FAA\uFF0C\u6700\u5C11\u6D3B\u8DC3\u8C03\u7528 +base.roundrobin=roundrobin +#\u8FDC\u7A0B\u670D\u52A1\u8C03\u7528\u91CD\u8BD5\u6B21\u6570\uFF0C\u4E0D\u5305\u62EC\u7B2C\u4E00\u6B21\u8C03\u7528\uFF0C\u4E0D\u9700\u8981\u91CD\u8BD5\u8BF7\u8BBE\u4E3A0 +base.retries=0 +#\u662F\u5426\u7F3A\u7701\u5F02\u6B65\u6267\u884C\uFF0C\u4E0D\u53EF\u9760\u5F02\u6B65\uFF0C\u53EA\u662F\u5FFD\u7565\u8FD4\u56DE\u503C\uFF0C\u4E0D\u963B\u585E\u6267\u884C\u7EBF\u7A0B +base.async=false +#\u6BCF\u4E2A\u670D\u52A1\u5BF9\u6BCF\u4E2A\u63D0\u4F9B\u8005\u7684\u6700\u5927\u8FDE\u63A5\u6570\uFF0Crmi\u3001http\u3001hessian\u7B49\u77ED\u8FDE\u63A5\u534F\u8BAE\u652F\u6301\u6B64\u914D\u7F6E\uFF0Cdubbo\u534F\u8BAE\u957F\u8FDE\u63A5\u4E0D\u652F\u6301\u6B64\u914D\u7F6E +base.connections=500 +#\u6BCF\u670D\u52A1\u6D88\u8D39\u8005\u6BCF\u670D\u52A1\u6BCF\u65B9\u6CD5\u6700\u5927\u5E76\u53D1\u8C03\u7528\u6570 +base.actives=10 +##################\u6027\u80FD\u8C03\u4F18####################### +#\u662F\u5426\u5F00\u542F\u9A8C\u8BC1 +base.verify=false +#\u9A8C\u8BC1\u7801\u7C7B\u578B 1 \u7EAF\u6570\u5B57 2 \u7EAF\u5B57\u6BCD 3 \u6570\u5B57\u5B57\u6BCD\u6DF7\u5408 +base.verifyType=1 +#\u7CFB\u7EDF\u65E5\u5FD7\u6570\u636E\u5E93 +log.driver=com.mysql.jdbc.Driver +log.url=jdbc:mysql://127.0.0.1:3306/jsyx0801&allowMultiQueries=true +log.username=root +log.password=123456 +log.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKvUGsGxGw0WJnveOqnULaG0uvAe3vBqcUhBGwnmWJaqWv8XVnqz8YQFJxA8ua7hwUVjtcHzGekbUeStx1BrYsECAwEAAQ== + +#\u914D\u7F6E\u5BFC\u51FA\u6A21\u677F\u8DEF\u5F84 +#tomcat.freemarktemplate.path=/usr/local/tomcat-8.0.53/webapps/freemarktemplate +#tomcat.freemarktemplate.path=/opt/xydl/tomcat-5.0.53/webapps/freemarktemplate +#tomcat.freemarktemplate.path=/opt/xydl-zgh/tomcat-8.0.53/webapps/freemarktemplate +tomcat.freemarktemplate.path=D:\\xydl\template +windows.freemarktemplate.path=D:\\workSpace\\template +myProps.titleKey=\u67D0\u67D0\u67D0\u62BD\u6C34\u84C4\u80FD\u7535\u7AD9 + +simulate.base.path = outd/simulate +warning.base.path = outd/warning + +simulate.base.directory + +#\u4E0A\u4F20\u6587\u4EF6\u5230\u6587\u4EF6\u670D\u52A1\u5668\u7684\u914D\u7F6E +#IP +ftp-centos.host=192.168.135.83 +#\u7AEF\u53E3 +ftp-centos.port=90 +ftp-centos.user=sasftp +ftp-centos.password=sasftp +ftp-centos.basePath=outd/simulate + diff --git a/busi-back/busi-back-model/src/main/resources/.gitignore b/busi-back/busi-back-model/src/main/resources/.gitignore deleted file mode 100644 index 703fc63..0000000 --- a/busi-back/busi-back-model/src/main/resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/rebel-remote.xml -/rebel.xml diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/.gitignore b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/.gitignore deleted file mode 100644 index ea1eb35..0000000 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/IecBreakerParamMapper.java diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/.gitignore b/busi-back/busi-back-serviceImpl/src/main/resources/.gitignore deleted file mode 100644 index a4b584a..0000000 --- a/busi-back/busi-back-serviceImpl/src/main/resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/rebel.xml -/rebel-remote.xml diff --git a/frame-base/frame-base-control/src/main/resources/dev/.gitignore b/frame-base/frame-base-control/src/main/resources/dev/.gitignore deleted file mode 100644 index 0f0e9a8..0000000 --- a/frame-base/frame-base-control/src/main/resources/dev/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/rebel.xml -/rebel-remote.xml -/application.properties diff --git a/frame-base/frame-base-control/src/main/resources/dev/application.properties b/frame-base/frame-base-control/src/main/resources/dev/application.properties new file mode 100644 index 0000000..17c7c34 --- /dev/null +++ b/frame-base/frame-base-control/src/main/resources/dev/application.properties @@ -0,0 +1,45 @@ +# \u4F7F\u7528zookeeper\u6CE8\u518C\u4E2D\u5FC3\u66B4\u9732\u670D\u52A1\u5730\u5740 +#base.zookeepr=redis://127.0.0.1:6379 +base.zookeepr=zookeeper://127.0.0.1:2181 +#base.zookeepr=multicast://239.255.255.203:1012 +#\u8D85\u65F6\u65F6\u95F4 +base.timeout=1200000 +#\u5DE5\u7A0Bname +base.name=base_consumer +#\u662F\u5426\u5F00\u542F\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 +torch.login.use=true +#\u7528\u6237\u4F1A\u8BDD\u4FDD\u6301\u65F6\u95F4 \u5355\u4F4D\u79D2 +#torch.login.time=1200000 +torch.login.time=72000000 +#\u52A0\u5BC6\u6587\u4EF6 +torch.key.path=/usr/local/license/license.torch +#\u516C\u94A5 +torch.public.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOVWoo3EZ8jI06cJ37uA8dYHAlcZakpxsvnTNgeP49DZfx457rh8+sdGDq/BYE6KwQvzSW0A5kTDVOKj/YTTE7rB0OpeTmksnK3aQe+iiJFSojgSLGiHpHOBV2wHZztDc3ME72u3dtd31ncUaRZYWUNlJq37p5OL/qBLHjqDMW8QIDAQAB +#\u6821\u9A8C\u5305\u540D +torch.vaild.package=com.huatek.frame.base.entity +#\u65E5\u5FD7\u8F93\u51FA\u8BED\u8A00 +torch.log=zh_CN +#\u6E38\u5BA2url(\u4E0D\u9700\u8981\u6821\u9A8Ctoken\u548C\u6743\u9650\u7684url) +torch.visitor.url=/frame-base-control/api/user/login,/frame-base-control/api/user/code,/frame-base-control/sysUserRemoter/addUser +##################\u6027\u80FD\u8C03\u4F18####################### +#\u8D1F\u8F7D\u5747\u8861\u7B56\u7565\uFF0C\u53EF\u9009\u503C\uFF1Arandom,roundrobin,leastactive\uFF0C\u5206\u522B\u8868\u793A\uFF1A\u968F\u673A\uFF0C\u8F6E\u5FAA\uFF0C\u6700\u5C11\u6D3B\u8DC3\u8C03\u7528 +base.roundrobin=roundrobin +#\u8FDC\u7A0B\u670D\u52A1\u8C03\u7528\u91CD\u8BD5\u6B21\u6570\uFF0C\u4E0D\u5305\u62EC\u7B2C\u4E00\u6B21\u8C03\u7528\uFF0C\u4E0D\u9700\u8981\u91CD\u8BD5\u8BF7\u8BBE\u4E3A0 +base.retries=0 +#\u662F\u5426\u7F3A\u7701\u5F02\u6B65\u6267\u884C\uFF0C\u4E0D\u53EF\u9760\u5F02\u6B65\uFF0C\u53EA\u662F\u5FFD\u7565\u8FD4\u56DE\u503C\uFF0C\u4E0D\u963B\u585E\u6267\u884C\u7EBF\u7A0B +base.async=false +#\u6BCF\u4E2A\u670D\u52A1\u5BF9\u6BCF\u4E2A\u63D0\u4F9B\u8005\u7684\u6700\u5927\u8FDE\u63A5\u6570\uFF0Crmi\u3001http\u3001hessian\u7B49\u77ED\u8FDE\u63A5\u534F\u8BAE\u652F\u6301\u6B64\u914D\u7F6E\uFF0Cdubbo\u534F\u8BAE\u957F\u8FDE\u63A5\u4E0D\u652F\u6301\u6B64\u914D\u7F6E +base.connections=500 +#\u6BCF\u670D\u52A1\u6D88\u8D39\u8005\u6BCF\u670D\u52A1\u6BCF\u65B9\u6CD5\u6700\u5927\u5E76\u53D1\u8C03\u7528\u6570 +base.actives=10 +##################\u6027\u80FD\u8C03\u4F18####################### +#\u662F\u5426\u5F00\u542F\u9A8C\u8BC1 +base.verify=false +#\u9A8C\u8BC1\u7801\u7C7B\u578B 1 \u7EAF\u6570\u5B57 2 \u7EAF\u5B57\u6BCD 3 \u6570\u5B57\u5B57\u6BCD\u6DF7\u5408 +base.verifyType=1 +#\u7CFB\u7EDF\u65E5\u5FD7\u6570\u636E\u5E93 +log.driver=com.mysql.jdbc.Driver +log.url=jdbc:mysql://127.0.0.1:3306/frame-base +log.username=root +log.password=pRs3MvcA/dBA0s+EtiR0DS5AcGZD8wDECSv+ru5Tmz9c3xhZePNeyhgOzgOELBgKZmqcYG7420fbIMsNtoJ/+A== +log.publickey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKvUGsGxGw0WJnveOqnULaG0uvAe3vBqcUhBGwnmWJaqWv8XVnqz8YQFJxA8ua7hwUVjtcHzGekbUeStx1BrYsECAwEAAQ== diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/.gitignore b/frame-base/frame-base-serviceImpl/src/main/resources/.gitignore deleted file mode 100644 index 703fc63..0000000 --- a/frame-base/frame-base-serviceImpl/src/main/resources/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/rebel-remote.xml -/rebel.xml