commit 206448cc41e4f8127822299fff67b3662a98a228
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
| date | 2026-02-20T04:50:36Z |
| subject | Added STATIC_DIR |
commit 206448cc41e4f8127822299fff67b3662a98a228
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2026-02-20T04:50:36Z
Added STATIC_DIR
---
Dockerfile | 2 +-
datasources/cjlookup/maps.go | 6 +++---
datasources/cjlookup/query.go | 1 -
k8s/deployments.yaml | 2 ++
utils/env.go | 20 +++++++++++---------
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6e25af2..a5fed67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM scratch
COPY --from=alpine:latest /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=build /golifehkbot /
-COPY "datasources/cjlookup/maps/*" /
+COPY "datasources/cjlookup/maps/*" /static
WORKDIR /
CMD [ "/golifehkbot" ]
diff --git a/datasources/cjlookup/maps.go b/datasources/cjlookup/maps.go
index 37333cb..1a2d90f 100644
--- a/datasources/cjlookup/maps.go
+++ b/datasources/cjlookup/maps.go
@@ -12,9 +12,9 @@ import (
"strings"
)
-var TXT_CANGJIE_KEYS string = filepath.Join(utils.WORKDIR, "cangjie.keys.txt")
-var YAML_CANGJIE5_DICT string = filepath.Join(utils.WORKDIR, "cangjie5.dict.yaml")
-var YAML_JYUTPING_CHARS string = filepath.Join(utils.WORKDIR, "jyut6ping3.chars.dict.yaml")
+var TXT_CANGJIE_KEYS string = filepath.Join(utils.STATIC_DIR, "cangjie.keys.txt")
+var YAML_CANGJIE5_DICT string = filepath.Join(utils.STATIC_DIR, "cangjie5.dict.yaml")
+var YAML_JYUTPING_CHARS string = filepath.Join(utils.STATIC_DIR, "jyut6ping3.chars.dict.yaml")
func ReadCangJieKeys() (*strings.Replacer, error) {
f, err := os.Open(TXT_CANGJIE_KEYS)
diff --git a/datasources/cjlookup/query.go b/datasources/cjlookup/query.go
index f4c4952..c422b68 100644
--- a/datasources/cjlookup/query.go
+++ b/datasources/cjlookup/query.go
@@ -13,7 +13,6 @@ func Query(lang string, message string) query.IQueryResult {
var err error
var searchables *[]query.ISearchable
- log.Printf("HNHNHNHNHNHNHNHNHNH")
qr := QueryResult{Lang: lang}
messageU := strings.ToUpper(message)
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index 5560715..6d0b1b3 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -21,6 +21,8 @@ spec:
env:
- name: GOLIFEHK_WORKDIR
value: "/workdir"
+ - name: GOLIFEHK_STATIC_DIR
+ value: "/static"
- name: TELEGRAM_API_TOKEN
valueFrom:
secretKeyRef:
diff --git a/utils/env.go b/utils/env.go
index f563748..2a0f39e 100644
--- a/utils/env.go
+++ b/utils/env.go
@@ -1,16 +1,18 @@
package utils
+
import (
- "bytes"
- "os"
- "path/filepath"
+ "bytes"
+ "os"
+ "path/filepath"
)
-var WORKDIR string = TryGetEnv( "GOLIFEHK_WORKDIR", filepath.Join( os.TempDir(), "golifehk" ) )
+var WORKDIR string = TryGetEnv("GOLIFEHK_WORKDIR", filepath.Join(os.TempDir(), "golifehk"))
+var STATIC_DIR string = TryGetEnv("GOLIFEHK_STATIC_DIR", filepath.Join(os.TempDir(), "golifehk-static"))
-var BOM string = bytes.NewBuffer([]byte{ 0xEF, 0xBB, 0xBF }).String()
+var BOM string = bytes.NewBuffer([]byte{0xEF, 0xBB, 0xBF}).String()
-var POWER_NUMBERS map[string] string = map[string] string {
- "0": "⁰", "1": "¹", "2": "²", "3": "³",
- "4": "⁴", "5": "⁵", "6": "⁶", "7": "⁷",
- "8": "⁸", "9": "⁹",
+var POWER_NUMBERS map[string]string = map[string]string{
+ "0": "⁰", "1": "¹", "2": "²", "3": "³",
+ "4": "⁴", "5": "⁵", "6": "⁶", "7": "⁷",
+ "8": "⁸", "9": "⁹",
}