diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index ccc7aec9fec72b4383d334dbfd74464154da7a6c..6a8b74ef9ecf814c5b5741d3e6e0f78a2863500a 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -64,7 +64,19 @@ docker-maven-plugin ${docker.plugin.version} - true + ${docker.registry.url}/blade/${project.artifactId}:${project.version} + ${project.basedir} + ${docker.registry.host} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + ${docker.registry.url} + ${docker.registry.url} + true diff --git a/doc/nacos/blade-k8s.yaml b/doc/nacos/blade-k8s.yaml new file mode 100644 index 0000000000000000000000000000000000000000..4e697c2227f3f2c8e928cb96d3be3f1cab19d8fd --- /dev/null +++ b/doc/nacos/blade-k8s.yaml @@ -0,0 +1,22 @@ +#spring配置 +spring: + redis: + ##redis 单机环境配置 + host: redis + port: 6379 + password: + database: 0 + ssl: false + ##redis 集群环境配置 + #cluster: + # nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003 + # commandTimeout: 5000 + +#项目模块集中配置 +blade: + #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) + datasource: + test: + url: jdbc:mysql://saber-db-0.saber-db:3306/blade?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 + username: root + password: root diff --git a/doc/sql/Dockerfile b/doc/sql/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..a1bea84cd2fb6b3e2ee1da7b7e37d6f87c2bd14f --- /dev/null +++ b/doc/sql/Dockerfile @@ -0,0 +1,8 @@ +FROM mysql:5.7.26 +ADD my.cnf /etc/mysql/conf.d/my.cnf +COPY blade/blade-saber-mysql.sql /docker-entrypoint-initdb.d/blade-saber-mysql.sql +# COPY blade/blade-sword-mysql.sql /docker-entrypoint-initdb.d/blade-sword-mysql.sql +# COPY seata/seata_order.sql /docker-entrypoint-initdb.d/seata_order.sql +# COPY seata/seata_storage.sql /docker-entrypoint-initdb.d/seata_storage.sql +# COPY seata/seata.sql /docker-entrypoint-initdb.d/seata.sql +EXPOSE 3306 diff --git a/doc/sql/blade/blade-saber-mysql.sql b/doc/sql/blade/blade-saber-mysql.sql index 3a0c6b1f3e99d02f1ce42479b617872c32c988d4..2b1f9453c6db85ae070d833f4b9823a2872342d1 100644 --- a/doc/sql/blade/blade-saber-mysql.sql +++ b/doc/sql/blade/blade-saber-mysql.sql @@ -17,6 +17,9 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; +CREATE SCHEMA IF NOT EXISTS `blade` DEFAULT CHARACTER SET utf8mb4 ; +USE `blade` ; + -- ---------------------------- -- Table structure for blade_client -- ---------------------------- diff --git a/doc/sql/my.cnf b/doc/sql/my.cnf new file mode 100644 index 0000000000000000000000000000000000000000..7d8e75f9830a25f935d127702b4f09997e89d5fc --- /dev/null +++ b/doc/sql/my.cnf @@ -0,0 +1,7 @@ +[mysqld] + +init_connect='SET collation_connection = utf8_unicode_ci' +init_connect='SET NAMES utf8' +character-set-server=utf8 +collation-server=utf8_unicode_ci +skip-character-set-client-handshake