fix

hantmac · hantmac · commit fa2bff2d3bca · 2020-03-31T17:21:55.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 logs/
+gin-bin
+dist/
 gin.bin
 .idea/
 
diff --git a/Dockerfile b/Dockerfile
@@ -37,7 +37,7 @@ COPY --from=frontend-build /app/frontend/dist /app/frontend/dist
 COPY --from=frontend-build /app/frontend/conf/fuckdb.conf /etc/nginx/conf.d
 # working directory
 WORKDIR /app
-
+EXPOSE 8080
 # backend port
 EXPOSE 8000
 
diff --git a/README_zh.md b/README_zh.md
@@ -22,7 +22,7 @@ type InsInfo struct {
 这是gorm对应的数据库表的struct映射，即使数据表的字段不多，如果是手动写起来也是一些重复性的工作。像MySQL这种关系型数据库，我们一般会用orm去操作数据库，于是就想，mysql的数据表能不能来自动生成golang 的struct定义。我们知道mysql有个自带的数据库`information_schema`，有一张表`COLUMNS`，它的字段包含数据库名、表名、字段名、字段类型等，我们可以利用这个表的数据，把对应的表的字段信息读取出来，然后再根据golang的语法规则，生成对应的struct。
 	调研了一下目前有一些命令行工具像 db2struct等，感觉用起来比较繁琐，在想能不能提供一个开箱即用的环境，提供web界面，我们只需要填写数据库信息，就可以一键生成对应的ORM的struct，于是就诞生了这个项目：https://github.com/hantmac/fuckdb
 
-如果你的数据库在本地，那么只需要执行 `docker-compose up -d`，访问`localhost:8088`，你就会得到下面的界面：
+如果你的数据库在本地，那么只需要执行 `docker-compose up -d`，访问`localhost:8000`，你就会得到下面的界面：
 
 ![](https://user-gold-cdn.xitu.io/2020/1/1/16f61a60169d552d?w=2459&h=1080&f=jpeg&s=136206)
 
diff --git a/docker_init.sh b/docker_init.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
+service start nginx
 # start the fuckdb server
 fuckdb
diff --git a/frontend/conf/fuckdb.conf b/frontend/conf/fuckdb.conf
@@ -10,4 +10,8 @@ server {
     listen  8080;
     root    /app/frontend/dist;
     index   index.html;
+	location /api/ {
+	    proxy_pass	http://localhost:8000/;
+    }
+
 }
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link href=https://cdn.bootcss.com/element-ui/2.13.0/theme-chalk/index.css rel=stylesheet><title>FuckDb</title><link href=/static/css/app.e2c707b8341a07abf75d4656eac667df.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e1760392c5e0827228b7.js></script><script type=text/javascript src=/static/js/vendor.985c3c4fa3016b41307b.js></script><script type=text/javascript src=/static/js/app.83383afcca1fc11c936a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link href=https://cdn.bootcss.com/element-ui/2.13.0/theme-chalk/index.css rel=stylesheet><title>FuckDb</title><link href=/static/css/app.e2c707b8341a07abf75d4656eac667df.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.00c1b1bd1c64efcb2a4d.js></script><script type=text/javascript src=/static/js/vendor.985c3c4fa3016b41307b.js></script><script type=text/javascript src=/static/js/app.83383afcca1fc11c936a.js></script></body></html>
diff --git a/frontend/dist/static/js/0.0710634dffb7b7c66bb7.js b/frontend/dist/static/js/0.0710634dffb7b7c66bb7.js
diff --git a/frontend/dist/static/js/0.0710634dffb7b7c66bb7.js.gz b/frontend/dist/static/js/0.0710634dffb7b7c66bb7.js.gz
diff --git a/frontend/dist/static/js/manifest.e1760392c5e0827228b7.js b/frontend/dist/static/js/manifest.e1760392c5e0827228b7.js

-Original file line number
+Diff line change
 logs/
 +gin-bin
 +dist/
 gin.bin
 .idea/
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@ server {`
`10`	`10`	`listen 8080;`
`11`	`11`	`root /app/frontend/dist;`
`12`	`12`	`index index.html;`
	`13`	`+ location /api/ {`
	`14`	`+ proxy_pass http://localhost:8000/;`
	`15`	`+ }`
	`16`	`+`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link href=https://cdn.bootcss.com/element-ui/2.13.0/theme-chalk/index.css rel=stylesheet><title>FuckDb</title><link href=/static/css/app.e2c707b8341a07abf75d4656eac667df.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e1760392c5e0827228b7.js></script><script type=text/javascript src=/static/js/vendor.985c3c4fa3016b41307b.js></script><script type=text/javascript src=/static/js/app.83383afcca1fc11c936a.js></script></body></html>
	`1`	+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link href=https://cdn.bootcss.com/element-ui/2.13.0/theme-chalk/index.css rel=stylesheet><title>FuckDb</title><link href=/static/css/app.e2c707b8341a07abf75d4656eac667df.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.00c1b1bd1c64efcb2a4d.js></script><script type=text/javascript src=/static/js/vendor.985c3c4fa3016b41307b.js></script><script type=text/javascript src=/static/js/app.83383afcca1fc11c936a.js></script></body></html>