Merge pull request #44 from zenuo/rust-server

Rust server

Author: zenuo

README.md

@@ -5,6 +5,7 @@
 > 强烈感谢[webbillion](https://github.com/webbillion)同学的域名服务🤗🎉
 
 - [gogo.webbillion.cn](https://gogo.webbillion.cn/)
+- [176.122.157.231:5002](https://176.122.157.231:5002)
 
 ## 如何使用
 
@@ -14,11 +15,11 @@
 
 首页截图：
 
-![6c44f17c7e035221816e7530.png](image/6c44f17c7e035221816e7530.png)
+![home.png](image/home.png)
 
 搜索页面截图：
 
-![e5c1b9df30645ffb8059ca72.png](image/e5c1b9df30645ffb8059ca72.png)
+![search.png](image/search.png)
 
 ### 2 命令行
 
@@ -30,20 +31,16 @@ $ gogo-cli github 1
 
 截图如下：
 
-![639ad4d3863e52f90a16cbe5.png](image/639ad4d3863e52f90a16cbe5.png)
+![cli.png](image/cli.png)
 
 ### 3 API
 
 #### 搜索
 
 ```bash
-$ curl -X GET -k "https://176.122.157.231:5000/api/search?q=github&p=1"
+$ curl -X GET -k "http://localhost:4998/api/search?q=github&p=1"
 {
-  "key": "github",
-  "page": 1,
-  "amount": 223000000,
-  "elapsed": 0.43,
-  "entries": [
+  "result": [
     {
       "name": "The world's leading software development platform · GitHub",
       "url": "https://github.com/",
@@ -57,10 +54,9 @@ $ curl -X GET -k "https://176.122.157.231:5000/api/search?q=github&p=1"
 #### 关键词提示
 
 ```bash
-$ curl -X GET -k "https://176.122.157.231:5000/api/lint?q=github"
+$ curl -X GET -k "http://localhost:4998/api/lint?q=github"
 {
-  "key": "github",
-  "lints": [
+  "result": [
     "github",
     "github<b> desktop</b>",
     "github<b> stock</b>",
@@ -86,7 +82,7 @@ $ docker pull zenuo/gogo
 # 创建容器
 $ docker create -p 4999:4999 --name gogo zenuo/gogo
 # 复制配置文件到容器（可选）
-$ docker cp application.yml gogo:/opt/gogo/application.yml
+$ docker cp config.json gogo:/opt/gogo/application.json
 # 运行镜像
 $ docker start gogo
 # 查看日志（可选）
@@ -98,7 +94,6 @@ $ docker logs -f gogo
 ```
 $ git clone https://github.com/zenuo/gogo.git
 $ cd gogo/gogo-server
-$ mvn -DskipTests=true clean package
-$ mv target/gogo.jar .
-$ sh ./gogo-server.sh
+$ cargo build -rv
+$ ./target/release/gogo-server config
 ```

gogo-cli/main.go

@@ -14,9 +14,9 @@ import (
 )
 
 const executableName string = "gogo-cli"
-const version string = "0.21"
+const version string = "2.0.0"
 const host string = "176.122.157.231"
-const port int = 5000
+const port int = 5002
 
 // Entry 条目
 type Entry struct {
@@ -27,11 +27,7 @@ type Entry struct {
 
 // SearchResponse 搜索响应
 type SearchResponse struct {
-	Key     string  `json:"key"`
-	Page    uint64  `json:"page"`
-	Amount  uint64  `json:"amount"`
-	Elapsed float64 `json:"elapsed"`
-	Entries []Entry `json:"entries"`
+	Entries []Entry `json:"result"`
 	Error   string  `json:"error"`
 }
 

gogo-server/.cargo/config.toml

@@ -0,0 +1,3 @@
+[target.x86_64-unknown-linux-musl]
+rustflags = ["-Ctarget-feature=-crt-static"]
+

gogo-server/.gitignore

@@ -0,0 +1,4 @@
+/target
+.vscode
+Cargo.lock
+.DS_Store

gogo-server/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "gogo-server"
+version = "2.0.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+pretty_env_logger = "0.4"
+log = "0.4"
+html5ever = "0.26.0"
+tokio = { version = "1", features = ["full"] }
+warp = "0.3"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+reqwest = { version = "0.11", features = ["socks", "native-tls"] }
+url = "2.3.1"
+kuchiki = "0.8.1"
+once_cell = "1.16.0"
+clap = { version = "4.0", features = ["derive"] }
+
+[profile.dev]
+opt-level = 0
+
+[profile.release]
+opt-level = 3
+

gogo-server/Dockerfile

@@ -0,0 +1,19 @@
+{
+    "listen_address": "127.0.0.1:4998",
+    "google_base_url": "https://google.com",
+    "static_path": "gogo-web/",
+    "http_client_pool_max_idle_per_host": 20,
+    "http_client_connect_timeout_millis": 60000,
+    "danger_accept_invalid_certs": false,
+    "user_agents": [
+        "Lynx/2.8.5rel.2 libwww-FM",
+        "Lynx/2.7.5rel.1 libwww-FM",
+        "Lynx/1.9.5rel.9 libwww-FM",
+        "Lynx/1.8.1rel.3 libwww-FM"
+    ],
+    "headers": {
+        "accept-language": "en-US,en;q=0.9",
+        "cache-control": "no-cache"
+    },
+    "proxy": "socks5://localhost:9050"
+}