diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 906db1e6f..94e0ecd17 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -183,6 +183,11 @@ server { proxy_set_header Content-Length $request_length; proxy_pass http://service/api/approve/verifyToken; } + + # OKR + location /manage/microapp/okr/ { + proxy_pass http://192.168.100.83:5566/; + } } include /etc/nginx/conf.d/conf.d/*.conf; diff --git a/resources/assets/js/pages/manage/microapp.vue b/resources/assets/js/pages/manage/microapp.vue index 2f126f5dd..57e2bec01 100644 --- a/resources/assets/js/pages/manage/microapp.vue +++ b/resources/assets/js/pages/manage/microapp.vue @@ -7,9 +7,8 @@ { this.loading = false; - this.microAppUrl = this.$route.query.url + let url = $A.apiUrl(this.$route.query.url) + if( url.indexOf('http') == -1 ){ + url = window.location.origin + url + } + this.microAppUrl =url window.eventCenterForAppNameVite = new EventCenterForMicroApp("micro-app") }) }