修改nginx.conf,修改映射
Change-Id: I5b71f421b1177c3d421b8d27e34dbe8fdecd316c
diff --git a/nginx.conf b/nginx.conf
index 615f66d..9dac2b1 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -2,8 +2,13 @@
listen 80;
server_name team12.10813352.xyz; # 替换为你的域名
+<<<<<<< HEAD
location /api {
proxy_pass http://localhost:12138/;
+=======
+ location /api/ {
+ proxy_pass http://localhost:12138;
+>>>>>>> 0321331 (修改nginx.conf,修改映射路径)
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;