pnoker 5 years ago
parent 5e7c5cf3cc
commit 91c0c7d245

@ -27,4 +27,5 @@ COPY ./dc3/dependencies/conf.crt/ /etc/nginx/conf.crt/
EXPOSE 80 443 EXPOSE 80 443
VOLUME /var/log/nginx VOLUME /var/log/nginx
CMD /bin/wait-for dc3-auth:8300 dc3-manager:8400 dc3-data:8500 -t 5 -- nginx -g 'daemon off;' #CMD /bin/wait-for dc3-auth:8300 dc3-manager:8400 dc3-data:8500 -t 5 -- nginx -g 'daemon off;'
CMD nginx -g 'daemon off;'

@ -1,13 +1,13 @@
server { server {
listen 80; listen 80;
rewrite ^/$ /dc3/demo permanent; rewrite ^(.*)$ https://$host$1 permanent;
include /etc/nginx/conf.d/location; include /etc/nginx/location/*.conf;
} }
server { server {
listen 443 ssl; listen 443 ssl http2;
add_header X-Xss-Protection 1; add_header X-Xss-Protection 1;
add_header X-Frame-Options DENY; add_header X-Frame-Options DENY;
@ -23,6 +23,6 @@ server {
rewrite ^/$ /dc3/demo permanent; rewrite ^/$ /dc3/demo permanent;
include /etc/nginx/conf.d/location; include /etc/nginx/location/*.conf;
} }

@ -1,9 +1,9 @@
{ {
"name": "dc3-web", "name": "dc3-web",
"version": "3.0.0", "version": "1.2.2",
"private": true, "private": true,
"author": "pnoker", "author": "pnoker",
"description": "IOT DC3 UI", "description": "IOT DC3 Demo Application UI",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",

@ -12,7 +12,7 @@
<h4 class="login-title"> <h4 class="login-title">
Demo Application Demo Application
</h4> </h4>
<p style="text-align: center;">基于 DC3 接口开发的 demo 应用仅供演示和测试用途!</p> <p style="text-align: center;">基于 DC3 1.2.2.SR 接口开发的 demo 应用<br/>仅供演示和测试用途!</p>
<el-form class="login-form" <el-form class="login-form"
status-icon status-icon
:rules="loginRules" :rules="loginRules"
@ -53,9 +53,9 @@
</div> </div>
</template> </template>
<script> <script>
import particles from "@/components/particles/particles"; import particles from "@/components/particles/particles";
export default { export default {
name: "login", name: "login",
components: {particles}, components: {particles},
data() { data() {
@ -103,9 +103,9 @@
}); });
} }
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import "~@/assets/styles/login.scss"; @import "~@/assets/styles/login.scss";
</style> </style>

Loading…
Cancel
Save