From 047241d466c7611f187b6915fe9c8aedf553cba2 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 30 Sep 2021 22:21:44 +0800 Subject: [PATCH 1/4] updated format of excel exporters --- myems-api/excelexporters/shopfloorbatch.py | 23 ++++++++--------- myems-api/excelexporters/shopfloorcost.py | 24 ++++++++---------- .../excelexporters/shopfloorenergycategory.py | 25 ++++++++----------- .../excelexporters/shopfloorenergyitem.py | 25 ++++++++----------- myems-api/excelexporters/shopfloorload.py | 23 ++++++++--------- myems-api/excelexporters/shopfloorsaving.py | 25 ++++++++----------- .../excelexporters/shopfloorstatistics.py | 23 ++++++++--------- 7 files changed, 77 insertions(+), 91 deletions(-) diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index 82096371..f0b408b3 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 6a27fe9a..5ab44930 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -120,31 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 75d3caf8..d2a0eb81 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -120,32 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local[:10] + "__" + reporting_end_datetime_local[:10] - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 48f6271b..a9f98b29 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -117,32 +117,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 4f8c710f..7e36567b 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -118,30 +118,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 1c481c1b..552bccbb 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -120,32 +120,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws['G3'].border = b_border - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 70b18aa1..4694256d 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -118,30 +118,29 @@ def generate_excel(report, ws.add_image(img, 'A1') # Title - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Name:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = name - ws['D3'].font = name_font ws['D3'].alignment = b_r_alignment ws['D3'] = 'Period:' ws['E3'].border = b_border ws['E3'].alignment = b_c_alignment - ws['E3'].font = name_font ws['E3'] = period_type - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['D4'].alignment = b_r_alignment + ws['D4'] = 'Reporting End Datetime:' + ws['E4'].border = b_border + ws['E4'].alignment = b_c_alignment + ws['E4'] = reporting_end_datetime_local if "reporting_period" not in report.keys() or \ "names" not in report['reporting_period'].keys() or len(report['reporting_period']['names']) == 0: From e1da419a2f7b6cbb3894ca19d6adb5a9ff277186 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 30 Sep 2021 22:39:29 +0800 Subject: [PATCH 2/4] updated format of excel exporters --- .../excelexporters/combinedequipmentbatch.py | 23 +++++++++---------- myems-api/excelexporters/equipmentbatch.py | 23 +++++++++---------- myems-api/excelexporters/meterbatch.py | 23 +++++++++---------- myems-api/excelexporters/storebatch.py | 23 +++++++++---------- myems-api/excelexporters/tenantbatch.py | 19 ++++++++------- 5 files changed, 55 insertions(+), 56 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py index 6e858316..d031bf47 100644 --- a/myems-api/excelexporters/combinedequipmentbatch.py +++ b/myems-api/excelexporters/combinedequipmentbatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Date:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py index cc52baa1..b3df74e7 100644 --- a/myems-api/excelexporters/equipmentbatch.py +++ b/myems-api/excelexporters/equipmentbatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/meterbatch.py b/myems-api/excelexporters/meterbatch.py index d1b39257..404b5ac4 100644 --- a/myems-api/excelexporters/meterbatch.py +++ b/myems-api/excelexporters/meterbatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/storebatch.py b/myems-api/excelexporters/storebatch.py index 40bf0ed8..985ebd3e 100644 --- a/myems-api/excelexporters/storebatch.py +++ b/myems-api/excelexporters/storebatch.py @@ -110,24 +110,23 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws.add_image(img, 'A1') # Title - ws.row_dimensions[3].height = 60 - - ws['B3'].font = name_font ws['B3'].alignment = b_r_alignment ws['B3'] = 'Space:' ws['C3'].border = b_border ws['C3'].alignment = b_c_alignment - ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border diff --git a/myems-api/excelexporters/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py index f8eb09ee..00ee0027 100644 --- a/myems-api/excelexporters/tenantbatch.py +++ b/myems-api/excelexporters/tenantbatch.py @@ -120,14 +120,17 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting ws['C3'].font = name_font ws['C3'] = space_name - ws['F3'].font = name_font - ws['F3'].alignment = b_r_alignment - ws['F3'] = 'Datetime:' - ws['G3'].border = b_border - ws['G3'].alignment = b_c_alignment - ws['G3'].font = name_font - ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local - ws.merge_cells("G3:H3") + ws['B4'].alignment = b_r_alignment + ws['B4'] = 'Reporting Start Datetime:' + ws['C4'].border = b_border + ws['C4'].alignment = b_c_alignment + ws['C4'] = reporting_start_datetime_local + + ws['B5'].alignment = b_r_alignment + ws['B5'] = 'Reporting End Datetime:' + ws['C5'].border = b_border + ws['C5'].alignment = b_c_alignment + ws['C5'] = reporting_end_datetime_local # Title ws['B6'].border = f_border From 672d3ded108d5cf127ea190b474879463b864965 Mon Sep 17 00:00:00 2001 From: hyh123a Date: Fri, 1 Oct 2021 11:49:42 +0800 Subject: [PATCH 3/4] modify the README.md --- README.md | 5 +++-- README_DE.md | 4 ++-- README_EN.md | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 926d7307..a2649548 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py -# host: '127.0.0.1' => 'host': '192.168.2.2' +# host: '127.0.0.1' 将这行代码修改为: 'host': '192.168.2.2' ``` 修改web和admin文件夹下nginx.conf中的location '/api' @@ -122,9 +122,10 @@ sudo nano myems-normalization/config.py ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; => proxy_pass http://192.168.2.3:8000/; +# proxy_pass http://127.0.0.1:8000/; 将这行代码修改为: proxy_pass http://192.168.2.3:8000/; ``` + 将Web打包生成产品文件 ``` cd myems/web diff --git a/README_DE.md b/README_DE.md index 51d6e0ac..ff9c647f 100644 --- a/README_DE.md +++ b/README_DE.md @@ -115,7 +115,7 @@ sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py -# host: '127.0.0.1' => 'host': '192.168.2.2' +# host: '127.0.0.1' Ändern: 'host': '192.168.2.2' ``` Ändern Sie den location '/api' von nginx.conf in web und admin @@ -123,7 +123,7 @@ Angenommen, die Host-IP lautet 192.168.2.3 ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; => proxy_pass http://192.168.2.3:8000/; +# proxy_pass http://127.0.0.1:8000/; Ändern: proxy_pass http://192.168.2.3:8000/; ``` Verpacken Sie das web, um Produktdateien zu generieren diff --git a/README_EN.md b/README_EN.md index 5b4aa9d1..79d4f9ad 100644 --- a/README_EN.md +++ b/README_EN.md @@ -114,14 +114,14 @@ sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py -# host: '127.0.0.1' => 'host': '192.168.2.2' +# host: '127.0.0.1' modify to:'host': '192.168.2.2' ``` Modify location '/api' in nginx.conf of web and admin Assume the Host IP is 192.168.2.3 ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; => proxy_pass http://192.168.2.3:8000/; +# proxy_pass http://127.0.0.1:8000/; modify to: proxy_pass http://192.168.2.3:8000/; ``` Build web for production From 4a2f2ba9c5e59eb5ed305d81817e7b3ce8ae8234 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 1 Oct 2021 13:17:36 +0800 Subject: [PATCH 4/4] updated Docker section in README --- README.md | 13 ++++++++----- README_DE.md | 14 +++++++++----- README_EN.md | 15 ++++++++++----- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a2649548..7a238908 100644 --- a/README.md +++ b/README.md @@ -106,24 +106,27 @@ git clone https://gitee.com/myems/myems.git ``` 修改以下文件中的数据库IP -假定数据库IP为: 192.168.2.2 +假定数据库IP为: 192.168.0.1 ``` sudo nano myems-api/config.py sudo nano myems-aggregation/config.py sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py - -# host: '127.0.0.1' 将这行代码修改为: 'host': '192.168.2.2' ``` +~~'host': '127.0.0.1'~~ + +'host': '192.168.0.1' 修改web和admin文件夹下nginx.conf中的location '/api' -假定本机IP为: 192.168.2.3 +假定本机IP为: 192.168.0.2 ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; 将这行代码修改为: proxy_pass http://192.168.2.3:8000/; ``` +~~proxy_pass http://127.0.0.1:8000/;~~ + +proxy_pass http://192.168.0.2:8000/; 将Web打包生成产品文件 diff --git a/README_DE.md b/README_DE.md index ff9c647f..d7463bc2 100644 --- a/README_DE.md +++ b/README_DE.md @@ -107,24 +107,28 @@ git clone https://gitee.com/myems/myems.git ``` Ändern Sie die Datenbankkonfiguration in den folgenden Dateien -Angenommen, die Datenbank-IP lautet 192.168.2.2 +Angenommen, die Datenbank-IP lautet 192.168.0.1 ``` sudo nano myems-api/config.py sudo nano myems-aggregation/config.py sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py - -# host: '127.0.0.1' Ändern: 'host': '192.168.2.2' ``` +~~'host': '127.0.0.1'~~ + +'host': '192.168.0.1' + Ändern Sie den location '/api' von nginx.conf in web und admin -Angenommen, die Host-IP lautet 192.168.2.3 +Angenommen, die Host-IP lautet 192.168.0.2 ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; Ändern: proxy_pass http://192.168.2.3:8000/; ``` +~~proxy_pass http://127.0.0.1:8000/;~~ + +proxy_pass http://192.168.0.2:8000/; Verpacken Sie das web, um Produktdateien zu generieren ``` diff --git a/README_EN.md b/README_EN.md index 79d4f9ad..97ed3c0e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -106,23 +106,28 @@ git clone https://gitee.com/myems/myems.git ``` Modify Database IP in the following files -Assume the Database IP is 192.168.2.2 +Assume the Database IP is 192.168.0.1 ``` sudo nano myems-api/config.py sudo nano myems-aggregation/config.py sudo nano myems-cleaning/config.py sudo nano myems-modbus-tcp/config.py sudo nano myems-normalization/config.py - -# host: '127.0.0.1' modify to:'host': '192.168.2.2' ``` + +~~'host': '127.0.0.1'~~ + +'host': '192.168.0.1' + Modify location '/api' in nginx.conf of web and admin -Assume the Host IP is 192.168.2.3 +Assume the Host IP is 192.168.0.2 ``` sudo nano admin/nginx.conf sudo nano web/nginx.conf -# proxy_pass http://127.0.0.1:8000/; modify to: proxy_pass http://192.168.2.3:8000/; ``` +~~proxy_pass http://127.0.0.1:8000/;~~ + +proxy_pass http://192.168.0.2:8000/; Build web for production ```