willliamguo 4 gadi atpakaļ
vecāks
revīzija
8f274436b6
2 mainītis faili ar 16 papildinājumiem un 6 dzēšanām
  1. 14 4
      .idea/workspace.xml
  2. 2 2
      business/nginx/sites-enabled/default

+ 14 - 4
.idea/workspace.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="增加init-all.sh">
+    <list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="update">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/business/docker-compose-multi-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/business/docker-compose-multi-local.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/nginx/sites-enabled/default" beforeDir="false" afterPath="$PROJECT_DIR$/business/nginx/sites-enabled/default" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -197,6 +197,8 @@
       <workItem from="1622984867310" duration="356000" />
       <workItem from="1622989478363" duration="7000" />
       <workItem from="1622991477479" duration="198000" />
+      <workItem from="1623998667982" duration="414000" />
+      <workItem from="1625585924303" duration="400000" />
     </task>
     <task id="LOCAL-00001" summary="增加大图的配置">
       <created>1622720201192</created>
@@ -254,7 +256,14 @@
       <option name="project" value="LOCAL" />
       <updated>1623051901073</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="update">
+      <created>1623142561807</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1623142561807</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -283,7 +292,8 @@
     <MESSAGE value="修改nginx为本地配置" />
     <MESSAGE value="修改main-site配置" />
     <MESSAGE value="增加init-all.sh" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加init-all.sh" />
+    <MESSAGE value="update" />
+    <option name="LAST_COMMIT_MESSAGE" value="update" />
   </component>
   <component name="masterDetails">
     <states>

+ 2 - 2
business/nginx/sites-enabled/default

@@ -1,7 +1,7 @@
 server {
 
     listen		80;
-    server_name	172.16.100.98; #改成对应的HOST
+    server_name	121.196.124.158; #改成对应的HOST
 
     location / {
         root   /usr/share/nginx/html;
@@ -24,7 +24,7 @@ server {
     }
 
     location /QC {
-        proxy_pass http://172.16.100.98:8080;
+        proxy_pass http://121.196.124.158:8080;
     }
 
     location /var {