Browse Source

🧬与macbook-air-m2继承测试完毕

master
wangxiang 3 years ago
parent
commit
b757a292f7
  1. 2
      docker-cloud/docker-compose.yml
  2. 3
      kicc-auth/src/main/resources/bootstrap.yml
  3. 3
      kicc-gateway/src/main/resources/bootstrap.yml
  4. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile
  5. 5
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
  6. 3
      kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml
  7. 3
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
  8. 4
      kicc-register/src/main/resources/bootstrap.yml
  9. 6
      pom.xml

2
docker-cloud/docker-compose.yml

@ -76,7 +76,7 @@ services:
hostname: kicc-common hostname: kicc-common
restart: always restart: always
ports: ports:
- 5000:5000 - 8000:8000
# 新建业务工程docker-compose模板 # 新建业务工程docker-compose模板
# 注释命名规范:【xxx-biz】 # 注释命名规范:【xxx-biz】

3
kicc-auth/src/main/resources/bootstrap.yml

@ -7,8 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

3
kicc-gateway/src/main/resources/bootstrap.yml

@ -7,8 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

2
kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile

@ -8,7 +8,7 @@ ARG JAR_FILE=target/kicc-common-biz.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
EXPOSE 5000 EXPOSE 8000
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"

5
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml

@ -1,5 +1,5 @@
server: server:
port: 5000 port: 8000
spring: spring:
application: application:
@ -7,8 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

3
kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml

@ -7,8 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

3
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml

@ -7,8 +7,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
#server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

4
kicc-register/src/main/resources/bootstrap.yml

@ -5,10 +5,10 @@ server:
db: db:
num: 1 num: 1
user: ${MYSQL_USER:root} user: ${MYSQL_USER:root}
password: ${MYSQL_PWD:kanglai@2022} password: ${MYSQL_PWD:root}
#password: ${MYSQL_PWD:kanglai@2022} #password: ${MYSQL_PWD:kanglai@2022}
url: url:
0: jdbc:mysql://${MYSQL_HOST:192.168.3.8}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true 0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true #0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
nacos: nacos:

6
pom.xml

@ -89,6 +89,12 @@
<artifactId>velocity-engine-core</artifactId> <artifactId>velocity-engine-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--添加 MacBook-Air-M2 DNS解析器,由于netty内部没有支持AppleM2芯片mac的本地DN解析器,nacos服务连接会出错-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId>
<classifier>osx-aarch_64</classifier>
</dependency>
</dependencies> </dependencies>
<modules> <modules>

Loading…
Cancel
Save