diff --git a/docker-compose.yml b/docker-compose.yml index a6677f96..3dcf6984 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,15 +9,15 @@ services: restart: always container_name: pig-mysql image: pig-mysql -# ports: -# - 3306:3306 + ports: + - 33306:3306 networks: - spring_cloud_default pig-redis: image: redis:7.2.4 -# ports: -# - 6379:6379 + ports: + - 36379:6379 restart: always container_name: pig-redis hostname: pig-redis diff --git a/pig-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java similarity index 94% rename from pig-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java rename to pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java index f801c337..eaef4fb9 100644 --- a/pig-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java +++ b/pig-register/src/main/java/com/alibaba/nacos/PigNacosApplication.java @@ -30,11 +30,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; @Slf4j @EnableScheduling @SpringBootApplication -public class PigxNacosApplication { +public class PigNacosApplication { public static void main(String[] args) { if (initEnv()) { - SpringApplication.run(PigxNacosApplication.class, args); + SpringApplication.run(PigNacosApplication.class, args); } } diff --git a/pig-register/src/main/resources/application.yml b/pig-register/src/main/resources/application.yml index ce290237..397489d3 100644 --- a/pig-register/src/main/resources/application.yml +++ b/pig-register/src/main/resources/application.yml @@ -9,7 +9,7 @@ db: user: ${MYSQL_USER:root} password: ${MYSQL_PWD:root} url: - 0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + 0: jdbc:mysql://${MYSQL_HOST:pig-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pig_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true pool: config: connectionTimeout: 30000 @@ -36,7 +36,7 @@ spring: boot: # 接入 spring boot admin admin: client: - url: http://pigx-monitor:5001 + url: http://pig-monitor:5001 username: pig password: pig instance: