Browse Source

update docker config

guoenzhou 1 year ago
parent
commit
2f326003f3

+ 2 - 3
docker/copy.sh

@@ -9,9 +9,8 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20210908.sql ./mysql/db
-cp ../sql/usky-cloud-20230428.sql ./mysql/db
-cp ../sql/usky_config.sql ./mysql/db
+cp ../sql/usky_cloud_20240222.sql ./mysql/db
+cp ../sql/usky_config_20240222.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

+ 10 - 9
docker/deploy.sh

@@ -45,15 +45,16 @@ rm(){
 }
 
 rm_data(){
-	rm -rf  mysql/data/
-	rm -rf  nacos/logs/
-	rm -rf	redis/data/
-	rm -rf	ruoyi/gateway/jar/gateway.jar
-	rm -rf	ruoyi/modules/file/jar/service-file.jar
-	rm -rf	ruoyi/modules/gen/jar/service-gen.jar
-	rm -rf	ruoyi/modules/job/jar/service-job.jar
-	rm -rf	ruoyi/modules/system/jar/service-system-biz.jar
-	rm -rf	ruoyi/visual/monitor/jar/monitor.jar
+ rm -rf  mysql/data
+ rm -rf  nacos/logs
+ rm -rf	redis/data
+ rm -rf nginx/logs	
+ rm -rf	ruoyi/gateway/jar/gateway.jar
+ rm -rf	ruoyi/modules/file/jar/service-file.jar
+ rm -rf	ruoyi/modules/gen/jar/service-gen.jar
+ rm -rf	ruoyi/modules/job/jar/service-job.jar
+ rm -rf	ruoyi/modules/system/jar/service-system-biz.jar
+ rm -rf	ruoyi/visual/monitor/jar/monitor.jar
 }
 
 # 根据输入参数,选择执行对应方法,不输入则执行使用说明

+ 7 - 7
docker/docker-compose.yml

@@ -5,8 +5,8 @@ services:
     image: nacos/nacos-server
     build:
       context: ./nacos
-    environment:
-      - MODE=standalone
+    #environment:
+    #  - MODE=standalone
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
@@ -15,9 +15,8 @@ services:
     ports:
       - "8848:8848"
       - "9848:9848"
-      - "9849:9849"
-    #depends_on:
-    #  - ruoyi-mysql
+    depends_on:
+      - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
     image: mysql:5.7
@@ -69,6 +68,7 @@ services:
     build:
       context: ./ruoyi/gateway
       dockerfile: dockerfile
+    network_mode: host
     ports:
       - "9150:9150"
     volumes:
@@ -77,8 +77,8 @@ services:
     depends_on:
       - ruoyi-redis
       - ruoyi-nacos
-    links:
-      - ruoyi-redis
+    #links:
+    #  - ruoyi-redis
   ruoyi-system:
     container_name: ruoyi-system
     build:

+ 0 - 7
docker/nacos/Dockerfile

@@ -1,7 +0,0 @@
-# 基础镜像
-FROM nacos/nacos-server
-# author
-MAINTAINER ruoyi
-
-# 复制conf文件到路径
-COPY ./conf/application.properties /home/nacos/conf/application.properties

+ 168 - 13
docker/nacos/conf/application.properties

@@ -1,32 +1,187 @@
+#
+# Copyright 1999-2021 Alibaba Group Holding Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#*************** Spring Boot Related Configurations ***************#
+### Default web context path:
+server.servlet.contextPath=/nacos
+### Include message field
+server.error.include-message=ALWAYS
+### Default web server port:
+server.port=8848
+#*************** Network Related Configurations ***************#
+### If prefer hostname over ip for Nacos server addresses in cluster.conf:
+# nacos.inetutils.prefer-hostname-over-ip=false
+### Specify local server's IP:
+# nacos.inetutils.ip-address=
+#*************** Config Module Related Configurations ***************#
+### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced.
+#spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:}
 spring.datasource.platform=mysql
+#spring.sql.init.platform=${SPRING_DATASOURCE_PLATFORM:}
+# nacos.plugin.datasource.log.=
+### Count of lB
 db.num=1
+### Connect URL of DB:
 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 
+db.user.0=root
+db.password.0=password
 
+### Connection pool configuration: hikariCP
+db.pool.config.connectionTimeout=30000
+db.pool.config.validationTimeout=10000
+db.pool.config.maximumPoolSize=20
+db.pool.config.minimumIdle=2
+#*************** Naming Module Related Configurations ***************#
+### Data dispatch task execution period in milliseconds:
+### If enable data warmup. If set to false, the server would accept request without local data preparation:
+# nacos.naming.data.warmup=true
+### If enable the instance auto expiration, kind like of health check of instance:
+# nacos.naming.expireInstance=true
+### will be removed and replaced by `nacos.naming.clean` properties
 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=*
-
+### Add in 2.0.0
+### The interval to clean empty service, unit: milliseconds.
+# nacos.naming.clean.empty-service.interval=60000
+### The expired time to clean empty service, unit: milliseconds.
+# nacos.naming.clean.empty-service.expired-time=60000
+### The interval to clean expired metadata, unit: milliseconds.
+# nacos.naming.clean.expired-metadata.interval=5000
+### The expired time to clean metadata, unit: milliseconds.
+# nacos.naming.clean.expired-metadata.expired-time=60000
+### The delay time before push task to execute from service changed, unit: milliseconds.
+# nacos.naming.push.pushTaskDelay=500
+### The timeout for push task execute, unit: milliseconds.
+# nacos.naming.push.pushTaskTimeout=5000
+### The delay time for retrying failed push task, unit: milliseconds.
+# nacos.naming.push.pushTaskRetryDelay=1000
+### Since 2.0.3
+### The expired time for inactive client, unit: milliseconds.
+# nacos.naming.client.expired.time=180000
+#*************** CMDB Module Related Configurations ***************#
+### The interval to dump external CMDB in seconds:
+# nacos.cmdb.dumpTaskInterval=3600
+### The interval of polling data change event in seconds:
+# nacos.cmdb.eventTaskInterval=10
+### The interval of loading labels in seconds:
+# nacos.cmdb.labelTaskInterval=300
+### If turn on data loading task:
+# nacos.cmdb.loadDataAtStart=false
+#*************** Metrics Related Configurations ***************#
+### Metrics for prometheus
+#management.endpoints.web.exposure.include=*
+### Metrics for elastic search
 management.metrics.export.elastic.enabled=false
+#management.metrics.export.elastic.host=http://localhost:9200
+### Metrics for influx
 management.metrics.export.influx.enabled=false
-
+#management.metrics.export.influx.db=springboot
+#management.metrics.export.influx.uri=http://localhost:8086
+#management.metrics.export.influx.auto-create-db=true
+#management.metrics.export.influx.consistency=one
+#management.metrics.export.influx.compressed=true
+#*************** Access Log Related Configurations ***************#
+### If turn on the access log:
 server.tomcat.accesslog.enabled=true
+### accesslog automatic cleaning time
+server.tomcat.accesslog.max-days=30
+### The access log pattern:
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
-
-server.tomcat.basedir=
-
+### The directory of access log:
+server.tomcat.basedir=file:.
+#*************** Access Control Related Configurations ***************#
+### If enable spring security, this option is deprecated in 1.2.0:
+#spring.security.enabled=false
+### The ignore urls of auth, is deprecated in 1.2.0:
 nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
-
+### The auth system to use, currently only 'nacos' and 'ldap' is supported:
 nacos.core.auth.system.type=nacos
+### If turn on auth system:
 nacos.core.auth.enabled=false
-nacos.core.auth.default.token.expire.seconds=18000
-nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+### 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=true
+### Since 1.4.1, Turn on/off white auth for user-agent: nacos-server, only for upgrade from old version.
 nacos.core.auth.enable.userAgentAuthWhite=false
+### Since 1.4.1, worked when nacos.core.auth.enabled=true and nacos.core.auth.enable.userAgentAuthWhite=false.
+### The two properties is the white list for auth and used by identity the request from other server.
 nacos.core.auth.server.identity.key=serverIdentity
 nacos.core.auth.server.identity.value=security
-
+### worked when nacos.core.auth.system.type=nacos
+### The token expiration in seconds:
+nacos.core.auth.plugin.nacos.token.expire.seconds=18000
+### The default token (Base64 string):
+nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
+### worked when nacos.core.auth.system.type=ldap?{0} is Placeholder,replace login username
+#nacos.core.auth.ldap.url=ldap://localhost:389
+#nacos.core.auth.ldap.basedc=dc=example,dc=org
+#nacos.core.auth.ldap.userDn=cn=admin,${nacos.core.auth.ldap.basedc}
+#nacos.core.auth.ldap.password=admin
+#nacos.core.auth.ldap.userdn=cn={0},dc=example,dc=org
+#nacos.core.auth.ldap.filter.prefix=uid
+#nacos.core.auth.ldap.case.sensitive=true
+#*************** Istio Related Configurations ***************#
+### If turn on the MCP server:
 nacos.istio.mcp.server.enabled=false
+###*************** Add from 1.3.0 ***************###
+#*************** Core Related Configurations ***************#
+### set the WorkerID manually
+# nacos.core.snowflake.worker-id=
+### Member-MetaData
+# nacos.core.member.meta.site=
+# nacos.core.member.meta.adweight=
+# nacos.core.member.meta.weight=
+### MemberLookup
+### Addressing pattern category, If set, the priority is highest
+# nacos.core.member.lookup.type=[file,address-server]
+## Set the cluster list with a configuration file or command-line argument
+# nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809
+## for AddressServerMemberLookup
+# Maximum number of retries to query the address server upon initialization
+# nacos.core.address-server.retry=5
+## Server domain name address of [address-server] mode
+# address.server.domain=jmenv.tbsite.net
+## Server port of [address-server] mode
+# address.server.port=8080
+## Request address of [address-server] mode
+# address.server.url=/nacos/serverlist
+#*************** JRaft Related Configurations ***************#
+### Sets the Raft cluster election timeout, default value is 5 second
+# nacos.core.protocol.raft.data.election_timeout_ms=5000
+### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute
+# nacos.core.protocol.raft.data.snapshot_interval_secs=30
+### raft internal worker threads
+# nacos.core.protocol.raft.data.core_thread_num=8
+### Number of threads required for raft business request processing
+# nacos.core.protocol.raft.data.cli_service_thread_num=4
+### raft linear read strategy. Safe linear reads are used by default, that is, the Leader tenure is confirmed by heartbeat
+# nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
+### rpc request timeout, default 5 seconds
+# nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
+#*************** Distro Related Configurations ***************#
+### Distro data sync delay time, when sync task delayed, task will be merged for same data key. Default 1 second.
+# nacos.core.protocol.distro.data.sync.delayMs=1000
+### Distro data sync timeout for one sync data, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.timeoutMs=3000
+### Distro data sync retry delay time when sync data failed or timeout, same behavior with delayMs, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.retryDelayMs=3000
+### Distro data verify interval time, verify synced data whether expired for a interval. Default 5 seconds.
+# nacos.core.protocol.distro.data.verify.intervalMs=5000
+### Distro data verify timeout for one verify, default 3 seconds.
+# nacos.core.protocol.distro.data.verify.timeoutMs=3000
+### Distro data load retry delay when load snapshot data failed, default 30 seconds.
+# nacos.core.protocol.distro.data.load.retryDelayMs=30000
+### enable to support prometheus service discovery
+#nacos.prometheus.metrics.enabled=true

+ 32 - 0
docker/nacos/conf/application.properties.bak

@@ -0,0 +1,32 @@
+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
+
+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

+ 1 - 1
docker/nacos/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM nacos/nacos-server
+FROM nacos/nacos-server:v2.3.0
 # author
 MAINTAINER ruoyi
 

File diff suppressed because it is too large
+ 900 - 0
sql/usky_cloud_20240222.sql


File diff suppressed because it is too large
+ 40 - 0
sql/usky_config_20240222.sql


Some files were not shown because too many files changed in this diff