Merge branch 'feature-2.0' into 'master'

Feature 2.0

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

config/prod.env.js

@@ -1,8 +1,16 @@
 'use strict'
+// module.exports = {
+//   NODE_ENV: '"production"',
+//   ENV_CONFIG: "'prod'",
+//   API_ROOT: '"//www.cofortest.com"',
+//   LOGIN_URL:'"http://user.cofortest.com/page/login?redirect=http%3a%2f%2fwww.cofortest.com%2f%23%2fhome"',
+//   REGISTER_URL: '"http://user.cofortest.com/page/register"'
+// }
+
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: "'prod'",
-  API_ROOT: '"//www.cofortest.com"',
-  LOGIN_URL:'"http://user.cofortest.com/page/login?redirect=http%3a%2f%2fwww.cofortest.com%2f%23%2fhome"',
-  REGISTER_URL: '"http://user.cofortest.com/page/register"'
+  API_ROOT: '"//59.42.10.53"',
+  LOGIN_URL:'"http://59.42.10.53:8081/page/login?redirect=http%3a%2f%2f59.42.10.53%2f%23%2fhome"',
+  REGISTER_URL: '"http://59.42.10.53:8081/page/register"'
 }

src/components/task/Task.vue

@@ -817,8 +817,8 @@
           "createTime": this.task.createTime,
           "datetime": this.task.datetime
         };
-        Http.post('/recommendationtest/querywithparam',task).then((res)=>{
-          window.open('http://59.42.10.54:7477/userinformation.html');
+        Http.post('/recommendationtest/query',task).then((res)=>{
+          window.open('http://8.134.39.104:7477/userinformation.html');
         })
       },
 

tool4deploy/conf.d/nginx.conf

@@ -1,6 +1,50 @@
+; server {
+;         listen       80;
+;         server_name  www.cofortest.com;
+;         root /usr/share/nginx/html;
+;         #charset koi8-r;
+;         client_max_body_size 100m;
+;         #access_log  logs/host.access.log  main;
+;
+;         # 开启代理缓冲区
+;         proxy_buffering on;
+;         # 响应头的缓冲区
+;         proxy_buffer_size 128k;
+;         # 网页内容缓冲区的个数为4，单个大小为1M
+;         proxy_buffers 8 1M;
+;         proxy_busy_buffers_size 2M;
+;
+;         location / {
+;             root /usr/share/nginx/html;
+;         }
+;
+;         location /api {
+;             proxy_set_header Host                          $host;
+;             proxy_set_header X-Real-IP                  $remote_addr;
+;             proxy_set_header X-Forwarded-For      $proxy_add_x_forwarded_for;
+;             proxy_pass http://backend:8080;
+;             proxy_connect_timeout 1200s;
+;             proxy_read_timeout 1200s;
+;             proxy_send_timeout 1200s;
+;         }
+;
+;         location /recommendationtest {
+;             proxy_pass http://taskRecommend:7477;
+;         }
+;
+;         #error_page  404              /404.html;
+;
+;         # redirect server error pages to the static page /50x.html
+;         #
+;         error_page   500 502 503 504  /50x.html;
+;         location = /50x.html {
+;             root   html;
+;         }
+;  }
+
 server {
         listen       80;
-        server_name  www.cofortest.com;
+        server_name  8.134.32.27;
         root /usr/share/nginx/html;
         #charset koi8-r;
         client_max_body_size 100m;
@@ -41,3 +85,4 @@ server {
             root   html;
         }
  }
+