From 21ff745b29d31fc4c6280b265af2827297341249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E5=BB=BA=E4=B8=9C?= <617601767@qq.com> Date: Sun, 24 Mar 2024 22:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Hadoop/ZKLT.Hadoop.API/Program.cs | 10 +++++----- .../appsettings.Development.json | 7 +++++++ Hadoop/ZKLT.Hadoop.API/appsettings.json | 9 ++++++++- Hadoop/ZKLT.Hadoop.API/docker-build.bat | 1 + .../ZKLT.Hadoop.API/docker-compose.yml | 8 +++++--- HadoopDocker.bat | 1 - ZKLT.sln | 6 ------ docker-compose/mysql.yml | 20 ------------------- 8 files changed, 26 insertions(+), 36 deletions(-) create mode 100644 Hadoop/ZKLT.Hadoop.API/docker-build.bat rename docker-compose/hadoop.yml => Hadoop/ZKLT.Hadoop.API/docker-compose.yml (78%) delete mode 100644 HadoopDocker.bat delete mode 100644 docker-compose/mysql.yml diff --git a/Hadoop/ZKLT.Hadoop.API/Program.cs b/Hadoop/ZKLT.Hadoop.API/Program.cs index d40c65c..fbc3c9e 100644 --- a/Hadoop/ZKLT.Hadoop.API/Program.cs +++ b/Hadoop/ZKLT.Hadoop.API/Program.cs @@ -52,11 +52,11 @@ namespace ZKLT.Hadoop.API app.UseHadoop((c) => { - c.Host = "172.17.0.1"; - c.Account = "root"; - c.PassWord = "Panjiandong1994"; - c.Key = "erpdb"; - c.Port = 3306; + c.Host = app.Configuration["ConnectionStrings:Host"]; + c.Account = app.Configuration["ConnectionStrings:Account"]; + c.PassWord = app.Configuration["ConnectionStrings:PassWord"]; + c.Key = app.Configuration["ConnectionStrings:Key"]; + c.Port = Convert.ToInt32(app.Configuration["ConnectionStrings:Port"]); }); //app.UseHadoop((c) => diff --git a/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json b/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json index 0c208ae..c97e6f6 100644 --- a/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json +++ b/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json @@ -4,5 +4,12 @@ "Default": "Information", "Microsoft.AspNetCore": "Warning" } + }, + "ConnectionStrings": { + "Host": "127.0.0.1", + "Account": "root", + "PassWord": "root", + "Key": "hadoopdb", + "Port": "3306" } } diff --git a/Hadoop/ZKLT.Hadoop.API/appsettings.json b/Hadoop/ZKLT.Hadoop.API/appsettings.json index 10f68b8..adbd695 100644 --- a/Hadoop/ZKLT.Hadoop.API/appsettings.json +++ b/Hadoop/ZKLT.Hadoop.API/appsettings.json @@ -5,5 +5,12 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "ConnectionStrings": { + "Host": "host.docker.internal", + "Account": "root", + "PassWord": "Panjiandong1994", + "Key": "erptestdb", + "Port": "3306" + } } diff --git a/Hadoop/ZKLT.Hadoop.API/docker-build.bat b/Hadoop/ZKLT.Hadoop.API/docker-build.bat new file mode 100644 index 0000000..5bab267 --- /dev/null +++ b/Hadoop/ZKLT.Hadoop.API/docker-build.bat @@ -0,0 +1 @@ +docker build -f ./Dockerfile -t hadoop:1.0.0 ../../. \ No newline at end of file diff --git a/docker-compose/hadoop.yml b/Hadoop/ZKLT.Hadoop.API/docker-compose.yml similarity index 78% rename from docker-compose/hadoop.yml rename to Hadoop/ZKLT.Hadoop.API/docker-compose.yml index 691059b..16cce9a 100644 --- a/docker-compose/hadoop.yml +++ b/Hadoop/ZKLT.Hadoop.API/docker-compose.yml @@ -2,9 +2,10 @@ version: '3' services: hadoop: restart: always - image: hadoop:latest + image: hadoop:1.0.0 container_name: hadoop - # volumes: + volumes: + - ./appsettings.json:/app/appsettings.json # - /apps/mysql/mydir:/mydir # - /apps/mysql/datadir:/var/lib/mysql # - /apps/mysql/conf/my.cnf:/etc/my.cnf @@ -15,4 +16,5 @@ services: ports: # 使用宿主机的3306端口映射到容器的3306端口 # 宿主机：容器 - - 5000:8080 \ No newline at end of file + - 5000:8080 + network_mode: bridge \ No newline at end of file diff --git a/HadoopDocker.bat b/HadoopDocker.bat deleted file mode 100644 index d7e9f50..0000000 --- a/HadoopDocker.bat +++ /dev/null @@ -1 +0,0 @@ -docker build -f Hadoop\ZKLT.Hadoop.API\Dockerfile -t hadoop:latest . \ No newline at end of file diff --git a/ZKLT.sln b/ZKLT.sln index 3c10bb7..d9ae477 100644 --- a/ZKLT.sln +++ b/ZKLT.sln @@ -13,12 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZKLT.Hadoop.Interface", "Ha EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZKLT.Hadoop.API", "Hadoop\ZKLT.Hadoop.API\ZKLT.Hadoop.API.csproj", "{398DF3E5-B94B-4B2E-9DC6-B6741D7CF4DB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-compose", "docker-compose", "{1E26F2C2-6BCB-4E5D-ADC5-C6AD923155F9}" - ProjectSection(SolutionItems) = preProject - docker-compose\hadoop.yml = docker-compose\hadoop.yml - docker-compose\mysql.yml = docker-compose\mysql.yml - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/docker-compose/mysql.yml b/docker-compose/mysql.yml deleted file mode 100644 index 9f2c6a0..0000000 --- a/docker-compose/mysql.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3' -services: - hadoop_mysql: - restart: always - image: mysql:8 - container_name: hadoop_mysql - # volumes: - # - /apps/mysql/mydir:/mydir - # - /apps/mysql/datadir:/var/lib/mysql - # - /apps/mysql/conf/my.cnf:/etc/my.cnf - # # 数据库还原目录 可将需要还原的sql文件放在这里 - # - /apps/mysql/source:/docker-entrypoint-initdb.d - environment: - - "MYSQL_ROOT_PASSWORD=root" - - "MYSQL_DATABASE=hadoopdb" - - "TZ=Asia/Shanghai" - ports: - # 使用宿主机的3306端口映射到容器的3306端口 - # 宿主机：容器 - - 3306:3306 \ No newline at end of file