From 7986f367ca4e7613006a1e37587b60d52dcf4a5d Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 12 Dec 2023 15:10:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96nginx=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEserver=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 优化lodash-es

* fix: 优化nginx配置server_name
---
 docker-entrypoint.sh                          |  7 ++++++
 nginx.conf                                    |  2 +-
 src/components/Layout/SinglePage.vue          |  2 +-
 src/utils/tree.ts                             |  2 +-
 .../Diagnose/Status/DiagnosticAdvice.tsx      |  4 ++--
 .../Instance/Detail/Diagnose/Status/index.tsx |  6 ++---
 src/views/iframe/index.vue                    | 24 ++++++++++++++-----
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c57efdd4..917ccab7 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,14 +1,21 @@
 #!/usr/bin/env bash
 
 API_BASE_PATH=$API_BASE_PATH;
+SERVER_NAME=$SERVER_NAME
 NAMESERVERS=$(cat /etc/resolv.conf | grep "nameserver" | awk '{print $2}' | tr '\n' ' ')
 if [ -z "$API_BASE_PATH" ]; then
     API_BASE_PATH="http://jetlinks:8844/";
 fi
 
+if [ -z "$SERVER_NAME" ]; then
+    SERVER_NAME="localhost";
+fi
+
 apiUrl="proxy_pass  $API_BASE_PATH\$1;"
 resolver="resolver $NAMESERVERS ipv6=off;"
+serverName="server_name $SERVER_NAME;"
 
+sed -i '4c '"$serverName"'' /etc/nginx/conf.d/default.conf
 sed -i '11c '"$resolver"'' /etc/nginx/conf.d/default.conf
 sed -i '20c '"$apiUrl"'' /etc/nginx/conf.d/default.conf
 
diff --git a/nginx.conf b/nginx.conf
index 92401367..47e6d6e0 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,7 +1,7 @@
 server {
     listen 80;
     listen [::]:80;
-    # gzip config
+    server_name _;
     gzip on;
     gzip_min_length 1k;
     gzip_comp_level 9;
diff --git a/src/components/Layout/SinglePage.vue b/src/components/Layout/SinglePage.vue
index c2f0fd49..f65e69e3 100644
--- a/src/components/Layout/SinglePage.vue
+++ b/src/components/Layout/SinglePage.vue
@@ -25,7 +25,7 @@
         <UserInfo />
       </div>
     </template>
-    <Iframe :key="route.path" />
+    <Iframe :key="route.path" noMargin />
   </j-pro-layout>
 </template>
 
diff --git a/src/utils/tree.ts b/src/utils/tree.ts
index caf51f4e..cca938e9 100644
--- a/src/utils/tree.ts
+++ b/src/utils/tree.ts
@@ -7,7 +7,7 @@
  根据visible标识对数据进行递归过滤，得到最后的数据
  */
 
-import _ from 'lodash';
+import _ from 'lodash-es';
 
 export type TreeNode = {
   id: string;
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/DiagnosticAdvice.tsx b/src/views/device/Instance/Detail/Diagnose/Status/DiagnosticAdvice.tsx
index 8cbb1d45..8aa16c14 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/DiagnosticAdvice.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/DiagnosticAdvice.tsx
@@ -1,7 +1,7 @@
 import { Badge, Descriptions, Modal, Tooltip, AIcon, DescriptionsItem } from "jetlinks-ui-components"
 import TitleComponent from '@/components/TitleComponent/index.vue'
 import styles from './index.module.less'
-import _ from "lodash";
+import _ from "lodash-es";
 
 const DiagnosticAdvice = defineComponent({
     props: {
@@ -97,4 +97,4 @@ const DiagnosticAdvice = defineComponent({
     }
 })
 
-export default DiagnosticAdvice
\ No newline at end of file
+export default DiagnosticAdvice
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index 0e0a4ba4..dee5a549 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -7,7 +7,7 @@ import { useInstanceStore } from "@/store/instance"
 import { startNetwork, startGateway, getGatewayDetail, queryGatewayState, queryProtocolDetail, detail, queryProductState, queryProductConfig, queryDeviceConfig, _deploy } from '@/api/device/instance'
 import { PropType, VNode } from "vue"
 import { _deploy as _deployProduct } from "@/api/device/product"
-import _ from "lodash"
+import _ from "lodash-es"
 import DiagnosticAdvice from './DiagnosticAdvice'
 import ManualInspection from './ManualInspection'
 import { deployDevice } from "@/api/initHome"
@@ -1380,7 +1380,7 @@ const Status = defineComponent({
                                                 >
                                                     设备接入配置
                                                 </Button>
-                                                中{urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据 
+                                                中{urlMap.get(unref(device)?.accessProvider) || ''}信息，任意上报一条数据
                                             </span>
                                         }
                                     />,
@@ -1392,7 +1392,7 @@ const Status = defineComponent({
                                         text={
                                             <span>
                                                 请联系管理员提供{urlMap.get(unref(device)?.accessProvider) || ''}
-                                                信息，并根据URL信息任意上报一条数据 
+                                                信息，并根据URL信息任意上报一条数据
                                             </span>
                                         }
                                     />,
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index 11a2bb5a..deb6ec53 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <page-container>
+    <page-container class="iframe-warp">
       <full-page>
         <iframe
             v-if="loading"
@@ -26,6 +26,21 @@ import { TokenLose} from "@/utils/request";
 const iframeUrl = ref<string>('');
 const route = useRoute()
 const loading = ref(false)
+
+const props = defineProps({
+  noMargin: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const className = computed(() => {
+  return {
+    'iframe-warp': true,
+    'margin-full': props.hasOwnProperty('noMargin') && props.noMargin !== false
+  }
+})
+
 const handle = async (appId: string, url: string) => {
     const res = await getAppInfo_api(appId);
     let menuUrl: any = url;
@@ -63,7 +78,7 @@ const handle = async (appId: string, url: string) => {
             iframeUrl.value = urlOther;
         }
     }
-};
+}
 
 const lowCode = () => {
   lowCodeUrl().then(res => {
@@ -78,7 +93,6 @@ const lowCode = () => {
 }
 
 const onMessage = (msg: any) => {
-  console.log('onMessage',msg)
   if (msg?.data?.token === 'LOSE') {
     TokenLose()
     setTimeout(() => {
@@ -115,7 +129,5 @@ watchEffect(() => {
 </script>
 
 <style lang='less' scoped>
-:deep(.children-full-height) {
-  margin: 0 !important;
-}
+
 </style>