Skip to content

Commit

Permalink
Feature: FlyFish-2.0.0发布!
Browse files Browse the repository at this point in the history
  • Loading branch information
arvin.wang committed Apr 18, 2022
1 parent 446a6f5 commit f647a11
Show file tree
Hide file tree
Showing 4,390 changed files with 42,069 additions and 6,535,665 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 6 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# Created by .ignore support plugin
.DS_Store
# Created by .ignore support plugin (hsz.mobi)
.idea
node_modules
!code-server/**/node_modules
www/webApiDoc
www/static/visual_component_platform/*
www/index.html
www/static/solution_platform_web/platform/*
webapp/
yarn.lock
yarn-error.log
package-lock.json
.vscode
./package-lock.json
.DS_Store
.history
9 changes: 0 additions & 9 deletions .npmrc

This file was deleted.

19 changes: 0 additions & 19 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.
108 changes: 9 additions & 99 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

# 飞鱼(FlyFish)

<div align="left">
<a href="https://github.com/CloudWise-OpenSource/FlyFish/pulls"><img src="https://badgen.net/github/prs/CloudWise-OpenSource/FlyFish" /></a>
<a href="https://github.com/CloudWise-OpenSource/FlyFish/blob/main/LICENSE"><img src="https://badgen.net/github/license/CloudWise-OpenSource/FlyFish" /></a>
<a href="https://github.com/CloudWise-OpenSource/FlyFish/releases"><img src="https://badgen.net/github/release/CloudWise-OpenSource/FlyFish" /></a>
</div>
[![img](https://camo.githubusercontent.com/b90fbf522edfb28cd12154150fae08fd89d4be956e644f327f369df43ef33bf0/68747470733a2f2f62616467656e2e6e65742f6769746875622f7072732f436c6f7564576973652d4f70656e536f757263652f466c7946697368)](https://github.com/CloudWise-OpenSource/FlyFish/pulls) [![img](https://camo.githubusercontent.com/4bf17723fd9a7438e40dda0d0f05c3ff85df8450605fbec58cf4643bb044ca49/68747470733a2f2f62616467656e2e6e65742f6769746875622f6c6963656e73652f436c6f7564576973652d4f70656e536f757263652f466c7946697368)](https://github.com/CloudWise-OpenSource/FlyFish/blob/main/LICENSE) [![img](https://camo.githubusercontent.com/1fb3e7fec903937186ee550f90f558bdf63575dc171251276c3335ff863d13cc/68747470733a2f2f62616467656e2e6e65742f6769746875622f72656c656173652f436c6f7564576973652d4f70656e536f757263652f466c7946697368)](https://github.com/CloudWise-OpenSource/FlyFish/releases)

## 见码如面

Expand Down Expand Up @@ -56,121 +52,35 @@

### 部署流程

> 持续更新中……
> 推荐使用 doc 目录内 flyfish 部署文档,后续有关部署流程、学习资料、FAQ 等统一放置 doc 目录中管理。
**推荐**

- [基础环境准备篇](./doc/基础环境准备篇.md)
- [基础环境准备篇.md](./doc/基础环境准备篇.md)
- [code_server 部署篇](./doc/code_server部署篇.md)
- [应用平台部署篇 v1.0](./doc/应用平台部署篇v1.0.md)
- [应用平台部署篇 v2.0](./doc/应用平台部署篇v2.0.md)
- [组件开发平台部署篇](./doc/组件开发平台部署篇.md)

**不推荐**

> :heavy_exclamation_mark:以下部署流程已废弃,doc 中已更新标准版部署流程,但未包含 Docker 部署、以及本地部署。因此以下部署流程暂作保留,提供参考。推荐您使用 doc 中部署流程。
> 以下部署流程已废弃,doc 中已更新标准版部署流程,但未包含 Docker 部署、以及本地部署。因此以下部署流程暂作保留,提供参考。推荐您使用 doc 中部署流程。
- [内网部署文档](http://docs.aiops.cloudwise.com/zh/flyfish/deploy.html)

模式一:Docker 中运行所有服务

- 优势:操作便捷,只依赖 Docker 服务
- 缺点:运行速度慢(包含源码拷贝、软件包安装时间),不方便调试

```
# 5、编译并启动 docker
$ docker build --tag flyfish --file Dockerfile .
$ docker run -itd --name flyfish -p 8364:8364 -p 3306:3306 -p 6379:6379 -p 8081:8081 flyfish
# 6、浏览器访问
# http://127.0.0.1:8364
# 7、进入docker操作
# 根据开发需要【非必操作项】
$ docker exec -it flyfish /bin/bash
```

模式二:Docker 中运行仅数据库服务,代码在本机运行

- 优势:运行速度较快(只有软件包安装时间),方便本地调试
- 缺点:本地需要安装、配置 NodeJS 环境

```
# 5、编译并启动 docker
$ docker build --tag flyfish_database --file scripts/macos/Database-Dockerfile .
$ docker run -itd --name flyfish_database -p 3306:3306 -p 6379:6379 flyfish_database
# 6、编译代码
$ bash scripts/flyfish-startup.sh
# 7、浏览器访问
# #http://127.0.0.1:8364
# 8、进入docker操作
# #根据开发需要【非必操作项】
$ docker exec -it flyfish_database /bin/bash
```

模式三:所有服务都在本地运行

- 优势:浸入式参与全程编译、运行
- 缺点:安装软件及配置项啰嗦

```
# 0、系统版本
$ sw_vers
ProductName: macOS
ProductVersion: 12.0.1
BuildVersion: 21A559
# 1、启动 MySQL 服务
$ mysql.server start
$ mysql --version
mysql Ver 14.14 Distrib 5.7.34, for osx10.16 (x86_64) using EditLine wrapper
# 2、创建数据库 flyfish
$ mysql -h127.0.0.1 -uroot -p<root密码> -e "create database IF NOT EXISTS flyfish;"
# 3、创建用户 Rootmaster
$ mysql -h127.0.0.1 -uroot -p<root密码> -e "create user Rootmaster@% identified by '<见配置档>';"
$ mysql -h127.0.0.1 -uroot -p<root密码> -e "grant all privileges on *.* to 'Rootmaster'@'%' identified by '<见配置档>';"
$ mysql -h127.0.0.1 -uroot -p<root密码> -e "flush privileges;"
# 4、初始化数据
$ npm run init_database_dev
# 5、启动 Redis 服务
$ brew services start redis
# 6、确认服务运行状态(端口)
$ lsof -i:3306,6379
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
mysqld 5768 jaden.li 27u IPv4 0x2b28571b878724bf 0t0 TCP localhost:mysql (LISTEN)
redis-ser 12319 jaden.li 6u IPv4 0x2b28571b87871a0f 0t0 TCP localhost:6379 (LISTEN)
redis-ser 12319 jaden.li 7u IPv6 0x2b28571b77d81b87 0t0 TCP localhost:6379 (LISTEN)
# 7、启动本地前后端服务
$ bash scripts/flyfish-startup.sh
# 8、浏览器访问
# #http://127.0.0.1:8364
```

## 升级流程

```
# 1、更新代码
$ git checkout main
$ git checkout master
$ git pull
# 2、停止并删除容器
$ docker container stop flyfish
$ docker container rm flyfish
$ pm2 restart ${id}
# 3、更新并启动容器
# 重复【部署流程】步骤
```

## 欢迎加入

_获取更多关于 FlyFish 的技术资料,或加入 FlyFish 开发者交流群,可扫描下方二维码咨询。_

<img src="./doc/images/Susie.png" width="460px">
<img src="https://gitee.com/CloudWise/fly-fish/raw/main/doc/images/Susie.png" width="550px"/>
9 changes: 0 additions & 9 deletions code-server/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
## code-server
online web editor

## 配置

此编辑器如果勇于iframe嵌入,需要修改poseMessage配置解决寡欲问题,修改如下:
- mac
vi linux-amd64/dist/pages/vscode.js
host: 修改为iframe所在域域名
- linux
vi macos/dist/pages/vscode.js
host: 修改为iframe所在域域名
## 部署

- mac
Expand Down
2 changes: 1 addition & 1 deletion code-server/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bind-addr: 0.0.0.0:8081
bind-addr: 0.0.0.0:8080
auth: none
password: 123456
cert: false
89 changes: 89 additions & 0 deletions code-server/linux/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# code-server

[!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/cdr/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://cdr.co/join-community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq) [![codecov](https://codecov.io/gh/cdr/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/cdr/code-server) [![See v3.11.1 docs](https://img.shields.io/static/v1?label=Docs&message=see%20v3.11.1%20&color=blue)](https://github.com/cdr/code-server/tree/v3.11.1/docs)

Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and
access it in the browser.

![Screenshot](./assets/screenshot.png)

## Highlights

- Code on any device with a consistent development environment
- Use cloud servers to speed up tests, compilations, downloads, and more
- Preserve battery life when you're on the go; all intensive tasks run on your
server

## Requirements

See [requirements](requirements.md) for minimum specs, as well as instructions
on how to set up a Google VM on which you can install code-server.

**TL;DR:** Linux machine with WebSockets enabled, 1 GB RAM, and 2 CPUs

## Getting started

There are three ways to get started:

1. Using the [install
script](https://github.com/cdr/code-server/blob/main/install.sh), which
automates most of the process. The script uses the system package manager if
possible.
2. Manually [installing
code-server](https://coder.com/docs/code-server/v3.11.1/install)
3. Using our one-click buttons and guides to [deploy code-server to a cloud
provider](https://github.com/cdr/deploy-code-server)

If you use the install script, you can preview what occurs during the install
process:

```bash
curl -fsSL https://code-server.dev/install.sh | sh -s -- --dry-run
```

To install, run:

```bash
curl -fsSL https://code-server.dev/install.sh | sh
```

When done, the install script prints out instructions for running and starting
code-server.

We also have an in-depth [setup and
configuration](https://coder.com/docs/code-server/v3.11.1/guide) guide.

### code-server --link

We're working on a cloud platform that makes deploying and managing code-server
easier. Consider running code-server with the beta flag `--link` if you don't
want to worry about:

- TLS
- Authentication
- Port forwarding

```bash
$ code-server --link
Proxying code-server, you can access your IDE at https://example.cdr.co
```

## Questions?

See answers to [frequently asked
questions](https://coder.com/docs/code-server/v3.11.1/FAQ).

## Want to help?

See [Contributing](https://coder.com/docs/code-server/v3.11.1/CONTRIBUTING) for
details.

## Hiring

Interested in [working at Coder](https://coder.com/careers)? Check out [our open
positions](https://coder.com/careers#openings)!

## For Organizations

Want remote development for your organization or enterprise? Visit [our
website](https://coder.com) to learn more about Coder.
Binary file removed code-server/linux/lib/coder-cloud-agent
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f647a11

Please sign in to comment.