zhuyou commited on
Commit
49a4266
1 Parent(s): 86dce34
Files changed (8) hide show
  1. .idea/.gitignore +0 -8
  2. .idea/frps.iml +0 -9
  3. .idea/misc.xml +0 -6
  4. .idea/modules.xml +0 -8
  5. .idea/vcs.xml +0 -6
  6. Dockerfile +4 -0
  7. frps.toml +1 -1
  8. nginx.conf +1 -1
.idea/.gitignore DELETED
@@ -1,8 +0,0 @@
1
- # 默认忽略的文件
2
- /shelf/
3
- /workspace.xml
4
- # 基于编辑器的 HTTP 客户端请求
5
- /httpRequests/
6
- # Datasource local storage ignored files
7
- /dataSources/
8
- /dataSources.local.xml
 
 
 
 
 
 
 
 
 
.idea/frps.iml DELETED
@@ -1,9 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <module type="JAVA_MODULE" version="4">
3
- <component name="NewModuleRootManager" inherit-compiler-output="true">
4
- <exclude-output />
5
- <content url="file://$MODULE_DIR$" />
6
- <orderEntry type="inheritedJdk" />
7
- <orderEntry type="sourceFolder" forTests="false" />
8
- </component>
9
- </module>
 
 
 
 
 
 
 
 
 
 
.idea/misc.xml DELETED
@@ -1,6 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <project version="4">
3
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
4
- <output url="file://$PROJECT_DIR$/out" />
5
- </component>
6
- </project>
 
 
 
 
 
 
 
.idea/modules.xml DELETED
@@ -1,8 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <project version="4">
3
- <component name="ProjectModuleManager">
4
- <modules>
5
- <module fileurl="file://$PROJECT_DIR$/.idea/frps.iml" filepath="$PROJECT_DIR$/.idea/frps.iml" />
6
- </modules>
7
- </component>
8
- </project>
 
 
 
 
 
 
 
 
 
.idea/vcs.xml DELETED
@@ -1,6 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <project version="4">
3
- <component name="VcsDirectoryMappings">
4
- <mapping directory="" vcs="Git" />
5
- </component>
6
- </project>
 
 
 
 
 
 
 
Dockerfile CHANGED
@@ -11,6 +11,8 @@ RUN apt-get update && \
11
  nginx \
12
  && rm -rf /var/lib/apt/lists/*
13
 
 
 
14
  # 创建/app工作目录
15
  RUN mkdir /app
16
 
@@ -25,6 +27,8 @@ COPY start.sh /app/start.sh
25
  RUN chmod +x /app/start.sh
26
  RUN chmod +x /app/frps
27
 
 
 
28
  # 定义启动命令
29
  CMD ["/app/start.sh"]
30
 
 
11
  nginx \
12
  && rm -rf /var/lib/apt/lists/*
13
 
14
+ RUN apt-get install -y nginx
15
+
16
  # 创建/app工作目录
17
  RUN mkdir /app
18
 
 
27
  RUN chmod +x /app/start.sh
28
  RUN chmod +x /app/frps
29
 
30
+ COPY nginx.conf /etc/nginx/nginx.conf
31
+
32
  # 定义启动命令
33
  CMD ["/app/start.sh"]
34
 
frps.toml CHANGED
@@ -1,7 +1,7 @@
1
  [common]
2
  bind_port = 7000
3
  dashboard_addr = 0.0.0.0
4
- dashboard_port = 7860
5
  dashboard_user = zhuyou
6
  dashboard_pwd = zhuyou123
7
  auto_token = zhuyou
 
1
  [common]
2
  bind_port = 7000
3
  dashboard_addr = 0.0.0.0
4
+ dashboard_port = 7777
5
  dashboard_user = zhuyou
6
  dashboard_pwd = zhuyou123
7
  auto_token = zhuyou
nginx.conf CHANGED
@@ -20,7 +20,7 @@ http {
20
  proxy_set_header X-Real-IP $remote_addr;
21
  proxy_set_header REMOTE-HOST $remote_addr;
22
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
23
- proxy_pass http://localhost:7000/;
24
  }
25
  error_page 500 502 503 504 /50x.html;
26
  location = /50x.html {
 
20
  proxy_set_header X-Real-IP $remote_addr;
21
  proxy_set_header REMOTE-HOST $remote_addr;
22
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
23
+ proxy_pass http://localhost:7777/;
24
  }
25
  error_page 500 502 503 504 /50x.html;
26
  location = /50x.html {