1维瓦斯爆炸 pro

profiles/pro/application-pro.properties

@@ -1,6 +1,6 @@
 #==================\u8BE5\u6587\u4EF6\u914D\u7F6E \u4E3B\u8981\u4FEE\u6539 port datasource\u6570\u636E\u5E93 redis\u914D\u7F6E \u90AE\u7BB1\u914D\u7F6E================================
 #=======================Spring servlet\u914D\u7F6E================================
-server.port=8080
+server.port=8187
 
 #\u9ED8\u8BA4\u4E3Atrue ,100MB
 spring.servlet.multipart.enabled=true
@@ -8,19 +8,33 @@ spring.servlet.multipart.max-file-size=600MB
 spring.servlet.multipart.max-request-size=600MB
 
 #=======================Spring nacos\u914D\u7F6E================================
-spring.cloud.nacos.config.server-addr=192.168.0.141:8848,192.168.0.143:8848,192.168.0.250:8848
-spring.cloud.nacos.discovery.server-addr=192.168.0.141:8848,192.168.0.143:8848,192.168.0.250:8848
-spring.cloud.nacos.discovery.namespace=${mf.system.env}
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.namespace=dev
 
 spring.cloud.nacos.discovery.service=gzl.${spring.application.name}
 spring.cloud.nacos.discovery.metadata.uniqueid=${mf.minicore.uniqueid}
 
+
+#=======================Spring eureka\u914D\u7F6E(\u672A\u4F7F\u7528)================================
+eureka.client.register-with-eureka=true
+eureka.client.fetchRegistry=true
+eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
+
+eureka.instance.instance-id=${spring.application.name}-${server.port}
+eureka.instance.prefer-ip-address=true
+eureka.instance.ip-address=192.168.0.213
+
+eureka.instance.status-page-url-path=/monitor/info
+eureka.instance.health-check-url-path=/monitor/health
+
+
 #=======================datasource\u914D\u7F6E================================
 spring.datasource.druid.driver-class-name=org.postgresql.Driver
 
-spring.datasource.druid.url=jdbc:postgresql://192.168.0.140:32002/block_common_service
+spring.datasource.druid.url=jdbc:postgresql://127.0.0.1:5432/disaster
 spring.datasource.druid.username=postgres
-spring.datasource.druid.password=123456
+spring.datasource.druid.password=postgres
 
 ## \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
 spring.datasource.druid.initial-size=5
@@ -44,13 +58,14 @@ spring.datasource.druid.keep-alive=true
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
 # Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=192.168.0.140
+spring.redis.host=127.0.0.1
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=32210
+spring.redis.port=6379
 # Redis \u96C6\u7FA4\u914D\u7F6E \u6CE8\u610F\uFF1A\u4E00\u65E6\u5F00\u542F\u4E86\u96C6\u7FA4\u6A21\u5F0F\uFF0C\u90A3\u4E48\u57FA\u4E8E\u5355\u673A\u7684\u914D\u7F6E\u5C31\u4F1A\u8986\u76D6\u3002
-spring.redis.cluster.nodes=192.168.122.141:7001,192.168.122.142:7001,192.168.122.143:7001,192.168.122.250:7001
+#spring.redis.cluster.nodes=192.168.122.141:7001,192.168.122.142:7001,192.168.122.143:7001,192.168.122.250:7001
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=xitech@12345678
+#spring.redis.password=xitech@12345678
+spring.redis.password=
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=1000
 
@@ -74,22 +89,35 @@ mf.cache.expiration[MINI_USER_CACHE]=1200
 ##########\u907F\u514D\u4E0D\u540C\u7CFB\u7EDF\u4F7F\u7528\u7684cache\u5171\u4EAB\u51B2\u7A81#######################
 #\u540C\u65F6\u6307\u5B9Aprekey\u4E5F\u53EF\u4EE5\u5B9E\u73B0\u4E0D\u540C\u7CFB\u7EDF\u4E4B\u95F4\u7684cache\u5171\u4EAB
 #cache\u7684\u524D\u7F00prekey\uFF0C\u7F3A\u7701\u4E3Aminicore.properties\u7684basecode
-mf.cache.prekey[MINI_USER_CACHE]=block
+mf.cache.prekey[MINI_USER_CACHE]=${mf.system.env}-block
 
 
 #=======================\u90AE\u7BB1\u914D\u7F6E================================
-
+spring.mail.host=smtp.qq.com
+spring.mail.username=1358659014@qq.com
+spring.mail.password=kncbcslnakviijhh
+spring.mail.port=465
+spring.mail.default-encoding=utf-8
+#\u8BBE\u7F6E\u4E3ASSL\u534F\u8BAE
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+### QQ\u90AE\u7BB1\u5FC5\u987B\u52A0\u6B64\u6CE8\u89E3
+spring.mail.properties.mail.smtp.ssl.enable=true
+
+##\u81EA\u5B9A\u4E49
+mf.mail.nickname=\u670D\u52A1
 
 
 #=======================MQ\u914D\u7F6E================================
 # ip
-spring.rabbitmq.host=192.168.0.140
+spring.rabbitmq.host=127.0.0.1
 # \u7AEF\u53E3
-spring.rabbitmq.port=5677
+spring.rabbitmq.port=5672
 # \u7528\u6237\u540D
-spring.rabbitmq.username=xitech
+spring.rabbitmq.username=admin
 # \u5BC6\u7801
-spring.rabbitmq.password=xitech
+spring.rabbitmq.password=admin
 # \u914D\u7F6E\u865A\u62DF\u673A
 spring.rabbitmq.virtual-host=/
 
@@ -97,11 +125,11 @@ spring.rabbitmq.virtual-host=/
 #spring.rabbitmq.listener.direct.acknowledge-mode=manual
 spring.rabbitmq.listener.simple.acknowledge-mode=manual
 #\u6D88\u8D39\u8005\u7EBF\u7A0B\u6570\u914D\u7F6E \u6D88\u8D39\u8005\u6700\u5C0F\u6570\u91CF Minimum number of listener invoker threads.
-spring.rabbitmq.listener.simple.concurrency=1
+spring.rabbitmq.listener.simple.concurrency=20
 #\u6D88\u8D39\u8005\u7EBF\u7A0B\u6570\u914D\u7F6E \u6D88\u8D39\u8005\u6700\u5927\u6570\u91CFMaximum number of listener invoker threads.
-spring.rabbitmq.listener.simple.max-concurrency=1
+spring.rabbitmq.listener.simple.max-concurrency=30
 #\u4E00\u6B21\u53EA\u53D6\u51E0\u4E2A
-spring.rabbitmq.listener.simple.prefetch=1
+spring.rabbitmq.listener.simple.prefetch=5
 
 #\u5F00\u542F\u91CD\u8BD5
 #spring.rabbitmq.listener.direct.retry.enabled=true
@@ -118,3 +146,18 @@ mf.mq.global=
 #enable mq,\u9ED8\u8BA4\u4E3Afalse
 mf.mq.enable=true
 
+#======================================================
+#\u4F7F\u80FD aop\u65E5\u5FD7\u4E8B\u4EF6 ,\u9ED8\u8BA4\u4E3Atrue
+#mf.aoplog.enable=true
+
+#\u4F7F\u80FD \u9ED8\u8BA4controller ,\u9ED8\u8BA4\u4E3Atrue
+#mf.defcontroller.enable=true
+
+#\u4F7F\u80FD \u9ED8\u8BA4error \u5904\u7406(\u9488\u5BF9defcontroller) ,\u9ED8\u8BA4\u4E3Atrue
+#mf.deferrorhandler.enable=true
+
+#\u4F7F\u80FD \u81EA\u5B9A\u4E49\u9519\u8BEF\u9875\u9762\u5904\u7406 ,\u9ED8\u8BA4\u4E3Atrue
+#mf.errormvc.enable=true
+
+#\u4F7F\u80FD\u6D4B\u8BD5Controller,\u9ED8\u8BA4false
+mf.testcontroller.enable=true

profiles/pro/userconfig/mq.properties

@@ -1,6 +1,6 @@
-host=192.168.0.140
-port=5677
-username=xitech
-passwd=xitech
+host=192.168.0.131
+port=5672
+username=admin
+passwd=admin
 virtualost=/
 queuenamebase=bvr-1

src/main/java/com/miniframe/solverjob/DockerExe.java

@@ -20,8 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DockerExe {
-    public static final String DOCKERHOST="tcp://192.168.0.132:2375/";
-    public static final String APIVERSION="1.13.1";
+    public static  String DOCKERHOST="tcp://127.0.0.1:2375/";
+    public static  String APIVERSION="26.1.0";
+//    public static final String DOCKERHOST="tcp://192.168.0.132:2375/";
+//    public static final String APIVERSION="1.13.1";
     // 获取容器信息
     public static String getDocker(Integer aid,String stype){
         DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()

src/main/resources/templates/mashGas1Control.ftl

@@ -15,8 +15,9 @@ MashGas number:${mashgasnumber}
 tecplot : OK
 interactionstep : ${interactionstep}
 ExplosionModel:0
-1Dtotaltime: 1
+1Dtotaltime: 10
 1Doutputtime: 0.001
+stopPression: 1.5
 Number Con:${conNum}
 <#list cons as b>
 ${b.code},${b.diffcoe}

src/main/resources/templates/mashGas1Runsh.ftl

@@ -1,7 +1,7 @@
 cd /home/disaster/zhty/Program
 export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
 ./PathSearch ${gascontrol}
-./Explosion1D_IO --geopath ${midPath}/geometry2  --wampath=${midPath}/Gas_WAM.dat
+./Explosion1D_IO --geopath=${midPath}/geometry2  --wampath=${midPath}/Gas_WAM.dat
 ./Explosion1D ${midPath}/case.WAM ${midPath}
 ./1Gas ${gascontrol}
 ./calDanger ${gasescapecontrol}