luoyangwei 1 年之前
父节点
当前提交
43c74724c8
共有 4 个文件被更改,包括 72 次插入38 次删除
  1. 19 19
      Makefile
  2. 27 19
      etc/websocket.release.yaml
  3. 13 0
      locales/en.json
  4. 13 0
      locales/zh.json

+ 19 - 19
Makefile

@@ -1,23 +1,23 @@
-all: deploy
+all: websocket
 
-deploy:
-	@git pull
-	@chmod 755 ./builder.sh
-	@./builder.sh websocket
-	docker-compose build websocket
-	docker-compose up -d websocket
-	# @docker system prune -f
-	docker-compose logs -f websocket
+.PHONY: websocket
+websocket:
+	cp -rf locales /usr/share
+	go mod tidy
+	go build -o ./websocket .
+	pmon2 run ./websocket --args "-p 10082 -i 1004 -f ./etc/websocket.release.yaml" --user root
 	
-network:
-	docker network create --driver=bridge sikey_backend_network
+srv=
 
-reset:
-	@git pull
-	@chmod 755 ./builder.sh
-	./builder.sh websocket
+.PHONY: reload
+reload:
+	pmon2 reload --sig HUP $(srv)
 
-	docker-compose build
-	docker-compose up -d 
-	@docker system prune -f
-	docker-compose logs -f 
+.PHONY: stop
+	pmon2 stop --sig HUP $(srv)
+
+swag:
+	swag init -g main.go
+
+fmt:
+	swag fmt

+ 27 - 19
etc/websocket.release.yaml

@@ -1,5 +1,5 @@
+environment: release
 
-environment: debug
 websocket:
     connect_size: 1024
     heartbeat_wait: 360
@@ -10,33 +10,41 @@ websocket:
     write_wait: 10
     nats_url: "nats://10.29.40.221:4333"
 
+auth:
+    server_auth_secret: "a4176e95ad5d4d05b012b81dd5833b40"
+
+logger:
+    filename: "/var/log/sikey/servers.log" #  日志文件路径
+    max_size: 500 #  每个日志文件的最大大小(以MB为单位)
+    max_backups: 3 #  保留的旧日志文件的最大数量
+    max_age: 28 #  最多保留的天数
+    compress: true #  是否压缩旧日志文件
+
+# mysql connection config
 mysql:
     dsn: "root:7QJARDvYLkkYZGnw@tcp(10.29.113.11:3306)/w303b?charset=utf8mb4&parseTime=true&loc=Local"
-    skip_default_transaction: true
-    slow_threshold: 600
-    ignore_record_not_found_error: true
-    max_idle_conns: 10
+    ignore_record_not_found_error: true # Ignore ErrRecordNotFound error for logger
+    max_idle_conns: 1000 # 设置空闲连接池中连接的最大数量
+    skip_default_transaction: true # Ignore ErrRecordNotFound error for logger
+    slow_threshold: 600 # Slow SQL threshold
+    # 设置连接的有效时长 当 <= 0 时,连接永久保存,默认值时 0 。如果设置了 maxLifetime 会开启连接自动清理,
+    # 清理的代码在 connectionCleaner 中, 它开启一个定时器,定时检查空闲连接池中的连接,超期的关闭连接。
     max_lifetime: -1
-    max_open_conns: 100
+    max_open_conns: 100 # 设置打开数据库连接的最大数量。
+    ssh: false
 
+# redis connection config
 redis:
     addr: "10.29.40.221:6379"
-    channel: "message"
+    # REDIS_CHANNEL: 'message'
     connect_key: "connects"
     db: 0
     password: "sikey!Q@W#E456"
 
-log:
-    path: "/var/logs/sikey/websocket"
-
-auth:
-    secret: "15330b13e194429b9c4f1c4a19937357"
-
-sls:
+# 阿里云认证 Key
+aliyun:
     access_key_id: "LTAI5tMWjYSHsq3S57pyu2JX"
     access_key_secret: "08aBmJYTtW1VJX1sffUmFwSNvJnN58"
-    endpoint: "eu-central-1.log.aliyuncs.com"
-    log_store_name: "w303b"
-    project_name: "w303b-release"
-    source_ip: "10.29.40.221"
-    topic: "websocket"
+    oss: # 阿里云 OSS 文件服务
+        oss_bucket: "eu-files"
+        oss_endpoint: "oss-eu-central-1.aliyuncs.com"

+ 13 - 0
locales/en.json

@@ -0,0 +1,13 @@
+{
+    "session": {
+        "familyName": "{{.Name}} Family Group"
+    },
+    "entrance": {
+        "mail": {
+            "title": "Your verification code email"
+        }
+    },
+    "device": {
+        "unbound": "Unbound device"
+    }
+}

+ 13 - 0
locales/zh.json

@@ -0,0 +1,13 @@
+{
+    "session": {
+        "familyName": "{{.Name}} 的家庭群"
+    },
+    "entrance": {
+        "mail": {
+            "title": "您的验证码邮件"
+        }
+    },
+    "device": {
+        "unbound": "未绑定设备"
+    }
+}