Merge branch 'feature-2.0' into 'master'

Feature 2.0

See merge request crowd-2019/crowd-test-service-front!110

src/components/commons/Header2.0.vue

@@ -126,9 +126,7 @@
         },
         getAddress(){
             Http.get(Apis.USER.GET_ADDRESS).then((res) => {
-              console.log(res);
                 this.city = res.city
-              console.log(this.city);
             }).catch((error) => {
                 this.hideLoading()
                 notify('error', '获取定位失败:' + error.data)

src/pages/Homepage/LoginCard.vue

@@ -3,7 +3,7 @@
     <div class="login-welcome">
       <img :src="this.userImg==null?defaultValue.image:this.userImg" alt="welcome-img"
            class="pull-left welcome-img">
-<!--      <img v-else src="../../assets/img/logo-project.png" alt="welcome-img" class="pull-left welcome-img">-->
+      <!--      <img v-else src="../../assets/img/logo-project.png" alt="welcome-img" class="pull-left welcome-img">-->
       <div style="margin-left: 46px">
         <div class="welcome-title">
           hi，欢迎使用群智众测平台
@@ -27,7 +27,7 @@
 <script>
   import Http from '@/js/http.js'
   import Apis from '@/js/api.js'
-  import {storageGet,logout,defaultValue} from '@/js/index.js'
+  import {storageGet, logout, defaultValue} from '@/js/index.js'
 
   export default {
     name: "LoginCard",
@@ -36,7 +36,7 @@
         isLogin: false,
         user: {},
         loginUrl: process.env.LOGIN_URL,
-        userImg:require('../../assets/img/logo-project.png')
+        userImg: require('../../assets/img/logo-project.png')
       }
     },
     methods: {
@@ -53,11 +53,9 @@
         })
       },
       getUserImg() {
-        if (this.user == null) {
-          this.userImg = null
-        }else{
-          Http.get(`/api/user/image/${this.user.userVO.id}`).then((res)=>{
-            if(res.data){
+        if (this.user&&this.user.userVO&&this.user.userVO.id) {
+          Http.get(`/api/user/image/${this.user.userVO.id}`).then((res) => {
+            if (res.data) {
               this.userImg = res.data;
             }
           })

tool4deploy-test/conf.d/nginx.conf

@@ -8,6 +8,10 @@ server {
 
         location / {
             root /usr/share/nginx/html;
+            proxy_buffering on;
+            proxy_buffer_size 4k;
+            proxy_buffers 8 1M;
+            proxy_busy_buffers_size 2M;
         }
 
         location /api {
@@ -18,10 +22,6 @@ server {
             proxy_connect_timeout 1200s;
             proxy_read_timeout 1200s;
             proxy_send_timeout 1200s;
-            proxy_buffering on;
-            proxy_buffer_size 4k;
-            proxy_buffers 8 1M;
-            proxy_busy_buffers_size 2M;
 ;             proxy_buffering on;
 ;             proxy_buffer_size   128k;
 ;             proxy_buffers   32  128k;

tool4deploy/conf.d/nginx.conf

@@ -8,6 +8,10 @@ server {
 
         location / {
             root /usr/share/nginx/html;
+            proxy_buffering on;
+            proxy_buffer_size 4k;
+            proxy_buffers 8 1M;
+            proxy_busy_buffers_size 2M;
         }
 
         location /api {
@@ -18,10 +22,6 @@ server {
             proxy_connect_timeout 1200s;
             proxy_read_timeout 1200s;
             proxy_send_timeout 1200s;
-            proxy_buffering on;
-            proxy_buffer_size 4k;
-            proxy_buffers 8 1M;
-            proxy_busy_buffers_size 2M;
 ;             proxy_buffering on;
 ;             proxy_buffer_size   128k;
 ;             proxy_buffers   32  128k;