diff --git a/docker-cloud/seata/conf/nacos/seataServer.properties b/docker-cloud/seata/conf/nacos/seataServer.properties index b2e7b1ca..2b9c2797 100644 --- a/docker-cloud/seata/conf/nacos/seataServer.properties +++ b/docker-cloud/seata/conf/nacos/seataServer.properties @@ -90,7 +90,7 @@ store.db.datasource=druid # 如果为DB模式需要配置数据库,数据库默认数据库为mysql store.db.dbType=mysql store.db.driverClassName=com.mysql.jdbc.Driver -store.db.url=jdbc:mysql://120.26.168.56:8052/kicc_seata?useUnicode=true&rewriteBatchedStatements=true +store.db.url=jdbc:mysql://192.168.3.10:8052/kicc_seata?useUnicode=true&rewriteBatchedStatements=true store.db.user=root store.db.password=kanglai@2022 store.db.minConn=5 diff --git a/docker-cloud/seata/conf/registry.conf b/docker-cloud/seata/conf/registry.conf index ba82d9e1..749416c9 100644 --- a/docker-cloud/seata/conf/registry.conf +++ b/docker-cloud/seata/conf/registry.conf @@ -6,7 +6,7 @@ registry { nacos { application = "seata-server" - serverAddr = "101.42.231.100:8848" + serverAddr = "192.168.3.10:8848" group = "SEATA_GROUP" namespace = "kicc-seata" cluster = "default" @@ -62,7 +62,7 @@ config { type = "nacos" nacos { - serverAddr = "101.42.231.100:8848" + serverAddr = "192.168.3.10:8848" namespace = "kicc-seata" group = "SEATA_GROUP" # nacos内网使用没配安全权限,可以不写 diff --git a/docker-cloud/seata/docker-compose.yml b/docker-cloud/seata/docker-compose.yml index d2ca9e47..c7622812 100644 --- a/docker-cloud/seata/docker-compose.yml +++ b/docker-cloud/seata/docker-compose.yml @@ -20,7 +20,7 @@ services: # https://seata.io/zh-cn/docs/ops/deploy-by-docker.html # 注册到nacos上的ip。客户端将通过该ip访问seata服务。 # 注意公网ip和内网ip的差异。 - - SEATA_IP=101.42.231.100 + - SEATA_IP=192.168.3.10 # 指定seata服务启动端口 - SEATA_PORT=8091 # 存储模式 diff --git a/kicc-auth/Dockerfile b/kicc-auth/Dockerfile index 6736e2d6..9e980d38 100644 --- a/kicc-auth/Dockerfile +++ b/kicc-auth/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 3000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/resources/bootstrap.yml b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/resources/bootstrap.yml index d1f5260d..3c8f4532 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/resources/bootstrap.yml +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:101.42.231.100}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} namespace: ${seata.registry.nacos.namespace} group: ${seata.registry.nacos.group} datasource: diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/resources/bootstrap.yml b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/resources/bootstrap.yml index 379e4629..9f8b8178 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/resources/bootstrap.yml +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:101.42.231.100}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} namespace: ${seata.registry.nacos.namespace} group: ${seata.registry.nacos.group} datasource: diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/resources/bootstrap.yml b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/resources/bootstrap.yml index 9475af2b..91920580 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/resources/bootstrap.yml +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:101.42.231.100}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} namespace: ${seata.registry.nacos.namespace} group: ${seata.registry.nacos.group} sentinel: diff --git a/kicc-gateway/Dockerfile b/kicc-gateway/Dockerfile index d9057d56..503efe0f 100644 --- a/kicc-gateway/Dockerfile +++ b/kicc-gateway/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 9999 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile index 5b5e2890..0a577f69 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile index 6c9f2aea..b4e33fb9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 6000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-system-biz/Dockerfile index cf293a4d..81ea6573 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/Dockerfile +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 4000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile index 41f26dfb..515cc911 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 4000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-register/Dockerfile b/kicc-register/Dockerfile index 2790c8d3..45e9830d 100644 --- a/kicc-register/Dockerfile +++ b/kicc-register/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8848 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 40; nohup java -jar app.jar $JAVA_OPTS +CMD sleep 40; nohup java $JAVA_OPTS -jar app.jar diff --git a/kicc-visual/kicc-rocketmq-dashboard/Dockerfile b/kicc-visual/kicc-rocketmq-dashboard/Dockerfile index 65704e24..5c4d041f 100644 --- a/kicc-visual/kicc-rocketmq-dashboard/Dockerfile +++ b/kicc-visual/kicc-rocketmq-dashboard/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8058 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-visual/kicc-sentinel-dashboard/Dockerfile b/kicc-visual/kicc-sentinel-dashboard/Dockerfile index 3c0c1814..3296662a 100644 --- a/kicc-visual/kicc-sentinel-dashboard/Dockerfile +++ b/kicc-visual/kicc-sentinel-dashboard/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8056 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-visual/kicc-spring-dashboard/Dockerfile b/kicc-visual/kicc-spring-dashboard/Dockerfile index fedebb04..d1c16e68 100644 --- a/kicc-visual/kicc-spring-dashboard/Dockerfile +++ b/kicc-visual/kicc-spring-dashboard/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8061 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-visual/kicc-xxl-job-admin/Dockerfile b/kicc-visual/kicc-xxl-job-admin/Dockerfile index b03d7e69..90f46782 100644 --- a/kicc-visual/kicc-xxl-job-admin/Dockerfile +++ b/kicc-visual/kicc-xxl-job-admin/Dockerfile @@ -12,4 +12,4 @@ EXPOSE 8057 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -CMD sleep 60; java -jar app.jar $JAVA_OPTS +CMD sleep 60; java $JAVA_OPTS -jar app.jar