update docker config

docker/copy.sh

@@ -11,6 +11,7 @@ usage() {
 echo "begin copy sql "
 cp ../sql/ry_20210908.sql ./mysql/db
 cp ../sql/usky-cloud-20230428.sql ./mysql/db
+cp ../sql/ry_config_20220114.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

docker/docker-compose.yml

@@ -10,6 +10,8 @@ services:
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/hosts:/etc/hosts
     ports:
       - "8848:8848"
       - "9848:9848"
@@ -55,7 +57,7 @@ services:
     build:
       context: ./nginx
     ports:
-      - "80:80"
+      - "13200:80"
     volumes:
       - /etc/hosts:/etc/hosts
       - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui

docker/mysql/db/ry_config_20220114.sql

@@ -1,11 +1,9 @@
-DROP DATABASE IF EXISTS `ry-config`;
-
-CREATE DATABASE  `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+DROP DATABASE IF EXISTS `CREATE DATABASE  `usky-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
-USE `ry-config`;
+USE `usky-config`;
 
 /******************************************/
 /*   表名称 = config_info   */

docker/nacos/conf/application.properties

@@ -1,49 +1,32 @@
-# spring
-server.servlet.contextPath=${SERVER_SERVLET_CONTEXTPATH:/nacos}
-server.contextPath=/nacos
-server.port=${NACOS_APPLICATION_PORT:8848}
-server.tomcat.accesslog.max-days=30
-server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
-server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false}
-server.error.include-message=ALWAYS
-# default current work dir
-server.tomcat.basedir=file:.
-#*************** Config Module Related Configurations ***************#
-### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced.
-#spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:}
-spring.sql.init.platform=${SPRING_DATASOURCE_PLATFORM:}
-nacos.cmdb.dumpTaskInterval=3600
-nacos.cmdb.eventTaskInterval=10
-nacos.cmdb.labelTaskInterval=300
-nacos.cmdb.loadDataAtStart=false
-db.num=${MYSQL_DATABASE_NUM:1}
-db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false}
-db.user.0=${MYSQL_SERVICE_USER}
-db.password.0=${MYSQL_SERVICE_PASSWORD}
-### The auth system to use, currently only 'nacos' and 'ldap' is supported:
-nacos.core.auth.system.type=${NACOS_AUTH_SYSTEM_TYPE:nacos}
-### worked when nacos.core.auth.system.type=nacos
-### The token expiration in seconds:
-nacos.core.auth.plugin.nacos.token.expire.seconds=${NACOS_AUTH_TOKEN_EXPIRE_SECONDS:18000}
-### The default token:
-nacos.core.auth.plugin.nacos.token.secret.key=${NACOS_AUTH_TOKEN:}
-### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay.
-nacos.core.auth.caching.enabled=${NACOS_AUTH_CACHE_ENABLE:false}
-nacos.core.auth.enable.userAgentAuthWhite=${NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE:false}
-nacos.core.auth.server.identity.key=${NACOS_AUTH_IDENTITY_KEY:}
-nacos.core.auth.server.identity.value=${NACOS_AUTH_IDENTITY_VALUE:}
-## spring security config
-### turn off security
-nacos.security.ignore.urls=${NACOS_SECURITY_IGNORE_URLS:/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**}
-# metrics for elastic search
+spring.datasource.platform=mysql
+db.num=1
+db.url.0=jdbc:mysql://usky-cloud-nacos:3306/usky_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
+db.user= root 
+db.password= password 
+
+nacos.naming.empty-service.auto-clean=true
+nacos.naming.empty-service.clean.initial-delay-ms=50000
+nacos.naming.empty-service.clean.period-time-ms=30000
+
+management.endpoints.web.exposure.include=*
+
 management.metrics.export.elastic.enabled=false
 management.metrics.export.influx.enabled=false
-nacos.naming.distro.taskDispatchThreadCount=10
-nacos.naming.distro.taskDispatchPeriod=200
-nacos.naming.distro.batchSyncKeyCount=1000
-nacos.naming.distro.initDataRatio=0.9
-nacos.naming.distro.syncRetryDelay=5000
-nacos.naming.data.warmup=true
 
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
+
+server.tomcat.basedir=
+
+nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
 
+nacos.core.auth.system.type=nacos
+nacos.core.auth.enabled=false
+nacos.core.auth.default.token.expire.seconds=18000
+nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+nacos.core.auth.caching.enabled=true
+nacos.core.auth.enable.userAgentAuthWhite=false
+nacos.core.auth.server.identity.key=serverIdentity
+nacos.core.auth.server.identity.value=security
 
+nacos.istio.mcp.server.enabled=false

sql/ry_config_20220114.sql

@@ -1,11 +1,9 @@
-DROP DATABASE IF EXISTS `ry-config`;
-
-CREATE DATABASE  `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+DROP DATABASE IF EXISTS `CREATE DATABASE  `usky-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
-USE `ry-config`;
+USE `usky-config`;
 
 /******************************************/
 /*   表名称 = config_info   */