From 5f6a79b1221204062f95c8c5c3b643534de98450 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 29 Aug 2024 09:11:33 +0800 Subject: [PATCH] =?UTF-8?q?71=20239=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-239.properties | 30 +++++++++++----------- .../src/main/resources/application-71.properties | 23 ++++++++++++----- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-239.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-239.properties index 7f5570d..a04fad4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-239.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-239.properties @@ -4,13 +4,13 @@ server.port=8350 impp.server.ip=localhost #impp.server.ip=192.168.0.105 #andon ip -impp.andon.url=http://10.195.88.71:8750 +impp.andon.url=http://172.28.239.240:8750 #ptl-pcn ip -impp.ptl-pcn.url=http://10.195.88.71:8750 +impp.ptl-pcn.url=http://172.28.239.240:8750 #pcn plc\u5168\u5C40\u4E1A\u52A1\u5F00\u5173 1.yfai-hnc mes.plc.callback.open=123 #console\u63A7\u5236\u53F0\u670D\u52A1\uFF08zipkin\u8FFD\u8E2A\u5168\u8DEF\u5F84\uFF09 -impp.console.ip=http://10.195.88.71:8010 +impp.console.ip=http://172.28.239.240:8010 ################ \u529F\u80FD\u914D\u7F6E1 ################ #\u5DE5\u4F5C\u533AID,\u4E0D\u540C\u670D\u52A1\u5668\u4E0D\u540CID 0 - 31 impp.snowflake.work.id=22 @@ -19,13 +19,13 @@ impp.snowflake.database.id=22 #\u82E5\u65E0\u6CD5\u8FDE\u63A5\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u662F\u5426\u9700\u8981\u4E00\u76F4\u68C0\u6D4B\u52A0\u5165 impp.cluster.fetch=false #\u670D\u52A1\u6CE8\u518C\u4E2D\u5FC3 -impp.cluster.regist.center=http://10.195.88.71:8000/eureka/ +impp.cluster.regist.center=http://172.28.239.240:8000/eureka/ #\u65E5\u5FD7\u9ED8\u8BA4\u4F7F\u7528log4j2 logging.config=classpath:log4j2-spring.xml mes.ws=ws://10.196.77.248:8300/ws/pcn-regist/ #mes-pcn.ws.path=ws://10.197.176.77:8350 mes-pcn.ws.path=ws://${impp.server.ip}:8350 -pcn.code=PCN-U7 +pcn.code=PCN001 ########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## #\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58 impp.config.redis=true @@ -52,15 +52,15 @@ impp.mq.queue.schedule=true impp.mq.queue.sweb.notice=true ################################ \u5176\u4ED6\u529F\u80FD\u8BBE\u7F6E ################################ #redisIP -redis.hostName=10.195.88.71 +redis.hostName=172.28.239.240 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 -redis.password=Admin123! +redis.password=ABCabc123!@# ##\u5176\u4ED6redis\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904 ################## rabbitMQ\u914D\u7F6E #################### spring.rabbitmq.vhost=/ -spring.rabbitmq.host=10.195.88.71 +spring.rabbitmq.host=172.28.239.240 spring.rabbitmq.port=5672 spring.rabbitmq.username=estsh spring.rabbitmq.password=estsh123 @@ -134,14 +134,14 @@ spring.sleuth.sampler.probability=1.0 # mysql impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.jdbc-url=jdbc:mysql://172.28.239.238:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.write.datasource.username=root -impp.write.datasource.password=estsh123 +impp.write.datasource.password=@E#e7@saWE!293**((367 impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.jdbc-url=jdbc:mysql://172.28.239.238:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.read.datasource.username=root -impp.read.datasource.password=estsh123 +impp.read.datasource.password=@E#e7@saWE!293**((367 # @@ -149,9 +149,9 @@ impp.read.datasource.password=estsh123 ##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## impp.schedule.open=true impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.jdbc-url=jdbc:mysql://172.28.239.238:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.schedule.datasource.username=root -impp.schedule.datasource.password=estsh123 +impp.schedule.datasource.password=@E#e7@saWE!293**((367 impp.schedule.datasource.max-connections=20 #\u5B9A\u65F6\u4EFB\u52A1\u5728\u670D\u52A1\u542F\u52A8\u540E\u591A\u5C11\u79D2\u6267\u884C impp.schedule.start.after-second=20 @@ -197,7 +197,7 @@ slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 slm.app.id=20190513 # \u811A\u672C\u5728\u7EBF\u8C03\u8BD5\u751F\u6210\u7684\u65E5\u5FD7\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84\uFF0Cclasspath:xx pcn.script.logger.path=pluginlogs -pcn.schedule.job=true +pcn.schedule.job=false server.tomcat.max-threads=300 server.tomcat.max-connections=300 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-71.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-71.properties index 9974fbc..bd5e0a1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-71.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application-71.properties @@ -25,7 +25,7 @@ logging.config=classpath:log4j2-spring.xml mes.ws=ws://10.196.77.248:8300/ws/pcn-regist/ #mes-pcn.ws.path=ws://10.197.176.77:8350 mes-pcn.ws.path=ws://${impp.server.ip}:8350 -pcn.code=PCN-U7 +pcn.code=PCN001 ########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## #\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58 impp.config.redis=true @@ -134,12 +134,12 @@ spring.sleuth.sampler.probability=1.0 # mysql impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.write.datasource.username=root impp.write.datasource.password=estsh123 impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3316/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.jdbc-url=jdbc:mysql://10.195.88.71:3306/impp_i3_mes?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.read.datasource.username=root impp.read.datasource.password=estsh123 # @@ -187,7 +187,7 @@ spring.datasource.validationQuery=SELECT 1 #ImprovedNamingStrategy / physical_naming_strategy java\u5C5E\u6027\u6620\u5C04\u5230\u6570\u636E\u5E93\u5B57\u6BB5\u65F6\u547D\u540D\u89C4\u5219 # spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl #\u8868\u5173\u7CFBcreate,create-drop,update,validate -spring.jpa.properties.hibernate.hbm2ddl.auto=update +spring.jpa.properties.hibernate.hbm2ddl.auto=none #spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy #spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl #\u662F\u5426\u663E\u793Asql @@ -197,8 +197,19 @@ slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 slm.app.id=20190513 # \u811A\u672C\u5728\u7EBF\u8C03\u8BD5\u751F\u6210\u7684\u65E5\u5FD7\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84\uFF0Cclasspath:xx pcn.script.logger.path=pluginlogs -pcn.schedule.job=true +pcn.schedule.job=false server.tomcat.max-threads=300 server.tomcat.max-connections=300 -plugin.mainPackage=cn.estsh.i3plus \ No newline at end of file +plugin.mainPackage=cn.estsh.i3plus + +mqtt.host=tcp://localhost:1883 +mqtt.userName=admin +mqtt.passWord=123456 +mqtt.qos=1 +mqtt.clientId=ClientId_local +mqtt.timeout=10 +mqtt.keepalive=30 +mqtt.clearSession=true +mqtt.topic=ABC +mqtt.topic.list=ABC,ABD,ADE \ No newline at end of file