From 8e1272e56d5c1b7023a41a6ebac215ce143ff9b2 Mon Sep 17 00:00:00 2001 From: isam2016 Date: Tue, 6 Nov 2018 10:52:59 +0800 Subject: [PATCH 1/2] docker --- .gitignore | 2 ++ readme.md | 35 +++++++++++++++++++++++++++++++---- sql/Dockerfile | 6 ++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 sql/Dockerfile diff --git a/.gitignore b/.gitignore index be96b25..8a8c0c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ node_modules .DS_STORE yarn* +.idea +.idea/ package-lock* dist/ \ No newline at end of file diff --git a/readme.md b/readme.md index 099c5e0..df7c84f 100644 --- a/readme.md +++ b/readme.md @@ -69,17 +69,44 @@ classnames - 类名解析 ### 开发配置 -``` + # 安装依赖 yarn # 生成建表语句 node service/lib/db/createdb.js -# 安装mysql然后创建数据库 -# 按照 sql目录下文件字典顺序执行sql，比如先执行 0000001.sql -cat sql/000001.sql | mysql -uuser -p +# 安装 mysql 然后创建数据库 + +> 注意端口不要和本地已有的 mysql 重复 + +1. [docker 安装](http://www.runoob.com/docker/ubuntu-docker-install.html) + +2. [docker 改源](https://www.jianshu.com/p/34d3b4568059) + +3. 下载 mysql 镜像 + +``` +docker pull mysql:5.7(开发使用 5.7,8 有点坑) +``` + +4. 制作镜像 + - 可以根据建表语句自动创建表，保证数据统一 + + * **数据的备份和恢复 暂时做不到，关机数据库数据可能会丢失** + + - 进入 sql 目录，执行命令 + +``` + docker image build -t code_exam_db . +``` + +5. 启动 mysql 容器 + +``` + docker run -d -p 3306:3306 -e MYSQL_ROOT_PASSWORD=以上数据库密码 --name=db1 code_exam_db +``` # /etc/hosts 127.0.0.1 www.weavinghorse.test diff --git a/sql/Dockerfile b/sql/Dockerfile new file mode 100644 index 0000000..1611006 --- /dev/null +++ b/sql/Dockerfile @@ -0,0 +1,6 @@ +FROM mysql:5.7 + +MAINTAINER isam2016(isam2016@126.com) + +# 拷贝建表语句 +COPY 000001.sql /docker-entrypoint-initdb.d From 20db8adfcd523fbce8d7a8b99e51916981994720 Mon Sep 17 00:00:00 2001 From: isam2016 Date: Wed, 7 Nov 2018 22:27:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 16 ++++++++++++++++ app/exam/Supportm.js | 11 +++++++++++ app/exam/index.html | 1 + app/exam/index.js | 2 ++ app/exam/styl/index.styl | 4 +++- readme.md | 35 ++++------------------------------- scripts/lib/util/checkua.js | 19 +++++++++++++++++++ scripts/server/runner.js | 10 +++++++--- service/god/index.js | 13 +++++++++++++ service/server/index.js | 2 +- 10 files changed, 77 insertions(+), 36 deletions(-) create mode 100644 .editorconfig create mode 100644 app/exam/Supportm.js create mode 100644 scripts/lib/util/checkua.js create mode 100644 service/god/index.js diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..7e3649a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# http://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[Makefile] +indent_style = tab diff --git a/app/exam/Supportm.js b/app/exam/Supportm.js new file mode 100644 index 0000000..261bec2 --- /dev/null +++ b/app/exam/Supportm.js @@ -0,0 +1,11 @@ +import React, {Component} from 'react' + +export default class Supportm extends Component { + + render(){ + return
+

目前算法训练只支持PC版，请使用桌面浏览器登入

+ +
+ } +} diff --git a/app/exam/index.html b/app/exam/index.html index bccdbf4..189aa44 100644 --- a/app/exam/index.html +++ b/app/exam/index.html @@ -4,6 +4,7 @@ <%= htmlWebpackPlugin.options.title %> +