Browse Source

chore: 大屏设计器https代理

master
wangxiang 2 years ago
parent
commit
21f9000407
  1. 2
      cloud/bigscreen-design/.env.production
  2. 5
      cloud/bigscreen-design/docker/default.conf
  3. 21
      cloud/bigscreen-design/public/config.js
  4. 4
      cloud/bigscreen-design/src/config.js
  5. 2
      cloud/bigscreen-design/src/option/components/datav.vue
  6. 17
      docker/kicc-ui.conf

2
cloud/bigscreen-design/.env.production

@ -5,7 +5,7 @@ VITE_APP_ENV = 'production' @@ -5,7 +5,7 @@ VITE_APP_ENV = 'production'
VITE_APP_API=
#页面基础路径
VITE_APP_BASE=/
VITE_APP_BASE=/bigscreen/
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip

5
cloud/bigscreen-design/docker/default.conf

@ -14,13 +14,12 @@ server { @@ -14,13 +14,12 @@ server {
proxy_send_timeout 15s;
proxy_read_timeout 15s;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto http;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# 代理访问
location / {
try_files $uri $uri/ /index.html;
error_page 405 =200 http://$host$request_uri;
try_files $uri $uri/ /index.html;
error_page 405 =200 http://$host$request_uri;
}
}

21
cloud/bigscreen-design/public/config.js

@ -4,7 +4,8 @@ window.$website = { @@ -4,7 +4,8 @@ window.$website = {
title: '康来生物数据大屏',
name: '康来生物有限公司 数据大屏',
subName: '可视化数据大屏版权所有 © 长沙康来生物科技有限公司',
url: 'http://kicc.kanglailab.com:9999/system_proxy/bigscreen',
url: 'http://192.168.3.10:9999/system_proxy/bigscreen',
//url: 'https://kicc.kanglailab.com/prod-api/system_proxy/bigscreen',
autoSave: false,
autoSaveTime: 60000,
tabsList: [0, 1, 2, 3, 4, 5, 6],
@ -214,23 +215,23 @@ window.$website = { @@ -214,23 +215,23 @@ window.$website = {
data: [{
name: "苹果",
value: 1000879,
url: "http://www.baidu.com"
url: "https://www.baidu.com"
}, {
name: "三星",
value: 3400879,
url: "http://www.baidu.com"
url: "https://www.baidu.com"
}, {
name: "小米",
value: 2300879,
url: "http://www.baidu.com"
url: "https://www.baidu.com"
}, {
name: "oppo",
value: 5400879,
url: "http://www.baidu.com"
url: "https://www.baidu.com"
}, {
name: "大疆",
value: 3000,
url: "http://www.baidu.com"
url: "https://www.baidu.com"
}],
dataType: 0,
dataFormatter: "",
@ -541,7 +542,7 @@ window.$website = { @@ -541,7 +542,7 @@ window.$website = {
empAreaColor: "rgba(35, 183, 229, 0.42)",
empColor: "rgba(217, 38, 10, 1)",
index: "894edc1d-d2f0-4616-962c-8e61083ada71",
mapData: 'http://192.168.3.10:9999/system_proxy/bigscreen/map/detail?id=1678230621244157953',
mapData: '/system_proxy/bigscreen/map/detail?id=1678230621244157953',
color: "rgba(13, 255, 255, 1)",
}
}
@ -801,7 +802,7 @@ window.$website = { @@ -801,7 +802,7 @@ window.$website = {
},
option: {
link: true,
linkHref: 'http://avue.top',
linkHref: 'https://avue.top',
linkTarget: '_self',
textAlign: "center",
fontSize: 26,
@ -899,7 +900,7 @@ window.$website = { @@ -899,7 +900,7 @@ window.$website = {
}, {
value: 'https://img.alicdn.com/tfs/TB1uevcCrj1gK0jSZFuXXcrHpXa-1880-640.jpg',
}, {
value: 'http://www.w3school.com.cn/i/movie.ogg'
value: 'https://www.w3school.com.cn/i/movie.ogg'
}],
dataFormatter: "",
dataQuery: "",
@ -958,7 +959,7 @@ window.$website = { @@ -958,7 +959,7 @@ window.$website = {
left: 0,
dataType: 0,
data: {
value: 'http://www.w3school.com.cn/i/movie.ogg'
value: 'https://www.w3school.com.cn/i/movie.ogg'
},
option: {
autoplay: false,

4
cloud/bigscreen-design/src/config.js

@ -67,11 +67,11 @@ export const tip = ` @@ -67,11 +67,11 @@ export const tip = `
[{
"name": "PC",
"value": 97,
"url": "http://www.baidu.com"
"url": "https://www.baidu.com"
},{
"name": "PC",
"value": 97,
"url": "http://www.baidu.com"
"url": "https://www.baidu.com"
}]
#象型图数据格式

2
cloud/bigscreen-design/src/option/components/datav.vue

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<template>
<div>
<el-form-item label="在线文档">
<a href="http://datav.jiaminghi.com/guide/"
<a href="https://datav.jiaminghi.com/guide/"
target="_blank">点击查看</a>
</el-form-item>
<el-form-item label="模块名称">

17
docker/kicc-ui.conf

@ -36,19 +36,24 @@ server { @@ -36,19 +36,24 @@ server {
# 代理访问后端微服务网关地址
location ^~/prod-api/ {
rewrite ^/prod-api/(.*)$ /$1 break;
proxy_pass http://kicc-gateway:9999;
rewrite ^/prod-api/(.*)$ /$1 break;
proxy_pass http://kicc-gateway:9999;
}
# 代理访问后端上传地址
location ^~/prod-upload {
rewrite ^/prod-upload(.*)$ /system_proxy/system/file/upload break;
proxy_pass http://kicc-gateway:9999;
rewrite ^/prod-upload(.*)$ /system_proxy/system/file/upload break;
proxy_pass http://kicc-gateway:9999;
}
# 代理访问后端微服务报地址,绕过https不能内嵌http
# 代理访问后端微服务报地址,绕过https不能内嵌http
location ^~/ureport/ {
proxy_pass http://kicc-gateway:9999/report_proxy/ureport/;
proxy_pass http://kicc-gateway:9999/report_proxy/ureport/;
}
# 代理访问后端微服务大屏设计器地址
location ^~/bigscreen/ {
proxy_pass http://kicc.kanglailab.com:8085/;
}
}

Loading…
Cancel
Save