自定义开启https、自定义端口号和证书位置

wichitgmail · Mar 9, 2023 · 60568ee · 60568ee
1 parent 4d4cfa8
commit 60568ee
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ docker.md
 # Mac OS
 .DS_Store
 **/.DS_Store
+*.pem
diff --git a/Dockerfile b/Dockerfile
@@ -18,5 +18,5 @@ COPY --from=golang /build/config.example.yaml /dist/config.yaml
 COPY --from=golang /build/feishu_chatgpt /dist
 ADD entrypoint.sh /dist/entrypoint.sh
 
-EXPOSE 9001
+EXPOSE 9000
 CMD /dist/entrypoint.sh
diff --git a/code/config.example.yaml b/code/config.example.yaml
@@ -18,3 +18,10 @@ OPENAI_KEY:
 - sk-xxx
 - sk-xxx
 
+# 服务器配置
+HTTP_PORT: 9000
+HTTPS_PORT: 9001
+USE_HTTPS: false
+CERT_FILE: /cert.pem
+KEY_FILE: /key.pem
+
diff --git a/code/handlers/common.go b/code/handlers/common.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-//func sendCard
+// func sendCard
 func msgFilter(msg string) string {
 	//replace @到下一个非空的字段 为 ''
 	regex := regexp.MustCompile(`@[^ ]*`)
@@ -50,14 +50,14 @@ func processQuote(msg string) string {
 	return strings.Replace(msg, "\\\"", "\"", -1)
 }
 
-//将字符中 \u003c 替换为 <  等等
+// 将字符中 \u003c 替换为 <  等等
 func processUnicode(msg string) string {
 	regex := regexp.MustCompile(`\\u[0-9a-fA-F]{4}`)
 	return regex.ReplaceAllStringFunc(msg, func(s string) string {
 		r, _ := regexp.Compile(`\\u`)
 		s = r.ReplaceAllString(s, "")
 		i, _ := strconv.ParseInt(s, 16, 32)
-		return string(i)
+		return strconv.Itoa(int(i))
 	})
 }
 

diff --git a/code/handlers/handler.go b/code/handlers/handler.go
@@ -13,7 +13,7 @@ import (
 	larkim "github.com/larksuite/oapi-sdk-go/v3/service/im/v1"
 )
 
-//责任链
+// 责任链
 func chain(data *ActionInfo, actions ...Action) bool {
 	for _, v := range actions {
 		if !v.Execute(data) {
@@ -26,7 +26,7 @@ func chain(data *ActionInfo, actions ...Action) bool {
 type MessageHandler struct {
 	sessionCache services.SessionServiceCacheInterface
 	msgCache     services.MsgCacheInterface
-	gpt          services.ChatGPT
+	gpt          *services.ChatGPT
 	config       initialization.Config
 }
 
@@ -153,7 +153,7 @@ func (m MessageHandler) msgReceivedHandler(ctx context.Context, event *larkim.P2
 
 var _ MessageHandlerInterface = (*MessageHandler)(nil)
 
-func NewMessageHandler(gpt services.ChatGPT,
+func NewMessageHandler(gpt *services.ChatGPT,
 	config initialization.Config) MessageHandlerInterface {
 	return &MessageHandler{
 		sessionCache: services.GetSessionCache(),

diff --git a/code/handlers/init.go b/code/handlers/init.go
@@ -25,7 +25,7 @@ const (
 // handlers 所有消息类型类型的处理器
 var handlers MessageHandlerInterface
 
-func InitHandlers(gpt services.ChatGPT, config initialization.Config) {
+func InitHandlers(gpt *services.ChatGPT, config initialization.Config) {
 	handlers = NewMessageHandler(gpt, config)
 }
 

diff --git a/code/initialization/config.go b/code/initialization/config.go
@@ -2,6 +2,8 @@ package initialization
 
 import (
 	"fmt"
+	"os"
+	"strconv"
 
 	"github.com/spf13/viper"
 )
@@ -13,36 +15,100 @@ type Config struct {
 	FeishuAppVerificationToken string
 	FeishuBotName              string
 	OpenaiApiKeys              []string
+	HttpPort                   int
+	HttpsPort                  int
+	UseHttps                   bool
+	CertFile                   string
+	KeyFile                    string
 }
 
 func LoadConfig(cfg string) *Config {
 	viper.SetConfigFile(cfg)
 	viper.ReadInConfig()
 	viper.AutomaticEnv()
 
+	httpPort := getViperIntValue("HTTP_PORT", 9000)
+	httpsPort := getViperIntValue("HTTPS_PORT", 9001)
+	useHttps := getViperBoolValue("USE_HTTPS", false)
+	certFile := getViperStringValue("CERT_FILE", "cert.pem")
+	keyFile := getViperStringValue("KEY_FILE", "key.pem")
+
 	return &Config{
-		FeishuAppId:                getViperStringValue("APP_ID"),
-		FeishuAppSecret:            getViperStringValue("APP_SECRET"),
-		FeishuAppEncryptKey:        getViperStringValue("APP_ENCRYPT_KEY"),
-		FeishuAppVerificationToken: getViperStringValue("APP_VERIFICATION_TOKEN"),
-		FeishuBotName:              getViperStringValue("BOT_NAME"),
-		OpenaiApiKeys:              getViperStringValueTable("OPENAI_KEY"),
+		FeishuAppId:                getViperStringValue("APP_ID", ""),
+		FeishuAppSecret:            getViperStringValue("APP_SECRET", ""),
+		FeishuAppEncryptKey:        getViperStringValue("APP_ENCRYPT_KEY", ""),
+		FeishuAppVerificationToken: getViperStringValue("APP_VERIFICATION_TOKEN", ""),
+		FeishuBotName:              getViperStringValue("BOT_NAME", ""),
+		OpenaiApiKeys:              getViperStringValueTable("OPENAI_KEY", nil),
+		HttpPort:                   httpPort,
+		HttpsPort:                  httpsPort,
+		UseHttps:                   useHttps,
+		CertFile:                   certFile,
+		KeyFile:                    keyFile,
 	}
 
 }
 
-func getViperStringValue(key string) string {
+func getViperStringValue(key string, defaultValue string) string {
 	value := viper.GetString(key)
 	if value == "" {
-		panic(fmt.Errorf("%s MUST be provided in environment or config.yaml file", key))
+		return defaultValue
 	}
 	return value
 }
 
-func getViperStringValueTable(key string) []string {
+func getViperStringValueTable(key string, defaultValue []string) []string {
 	value := viper.GetStringSlice(key)
 	if len(value) == 0 {
-		panic(fmt.Errorf("%s MUST be provided in environment or config.yaml file", key))
+		return defaultValue
 	}
 	return value
 }
+
+func getViperIntValue(key string, defaultValue int) int {
+	value := viper.GetString(key)
+	if value == "" {
+		return defaultValue
+	}
+	intValue, err := strconv.Atoi(value)
+	if err != nil {
+		fmt.Printf("Invalid value for %s, using default value %d\n", key, defaultValue)
+		return defaultValue
+	}
+	return intValue
+}
+
+func getViperBoolValue(key string, defaultValue bool) bool {
+	value := viper.GetString(key)
+	if value == "" {
+		return defaultValue
+	}
+	boolValue, err := strconv.ParseBool(value)
+	if err != nil {
+		fmt.Printf("Invalid value for %s, using default value %v\n", key, defaultValue)
+		return defaultValue
+	}
+	return boolValue
+}
+
+func (config *Config) GetCertFile() string {
+	if config.CertFile == "" {
+		return "cert.pem"
+	}
+	if _, err := os.Stat(config.CertFile); err != nil {
+		fmt.Printf("Certificate file %s does not exist, using default file cert.pem\n", config.CertFile)
+		return "cert.pem"
+	}
+	return config.CertFile
+}
+
+func (config *Config) GetKeyFile() string {
+	if config.KeyFile == "" {
+		return "key.pem"
+	}
+	if _, err := os.Stat(config.KeyFile); err != nil {
+		fmt.Printf("Key file %s does not exist, using default file key.pem\n", config.KeyFile)
+		return "key.pem"
+	}
+	return config.KeyFile
+}
diff --git a/code/main.go b/code/main.go
@@ -32,7 +32,7 @@ func main() {
 
 	gpt := &services.ChatGPT{ApiKeys: config.OpenaiApiKeys}
 	gpt.StartApiKeyAvailabilityCheck()
-	handlers.InitHandlers(*gpt, *config)
+	handlers.InitHandlers(gpt, *config)
 
 	eventHandler := dispatcher.NewEventDispatcher(
 		config.FeishuAppVerificationToken, config.FeishuAppEncryptKey).
@@ -57,25 +57,33 @@ func main() {
 		sdkginext.NewCardActionHandlerFunc(
 			cardHandler))
 
-	// 加载证书和密钥文件
-	cert, err := tls.LoadX509KeyPair("cert.pem", "key.pem")
-	if err != nil {
-		panic(err)
-	}
+	if config.UseHttps {
+		certFile := config.GetCertFile()
+		keyFile := config.GetKeyFile()
 
-	// 创建HTTPS服务器
-	server := &http.Server{
-		Addr:    ":9001",
-		Handler: r,
-		TLSConfig: &tls.Config{
-			Certificates: []tls.Certificate{cert},
-		},
-	}
+		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+		if err != nil {
+			panic(err)
+		}
+
+		server := &http.Server{
+			Addr:    fmt.Sprintf(":%d", config.HttpsPort),
+			Handler: r,
+			TLSConfig: &tls.Config{
+				Certificates: []tls.Certificate{cert},
+			},
+		}
 
-	// 启动HTTPS服务器
-	fmt.Println("https server started", "https://localhost:9001/webhook/event")
-	err = server.ListenAndServeTLS("", "")
-	if err != nil {
-		panic(err)
+		fmt.Printf("https server started: https://localhost:%d/webhook/event\n", config.HttpsPort)
+		err = server.ListenAndServeTLS("", "")
+		if err != nil {
+			panic(err)
+		}
+	} else {
+		fmt.Printf("http server started: http://localhost:%d/webhook/event\n", config.HttpPort)
+		err := r.Run(fmt.Sprintf(":%d", config.HttpPort))
+		if err != nil {
+			panic(err)
+		}
 	}
 }
diff --git a/code/services/gpt3.go b/code/services/gpt3.go
@@ -55,7 +55,7 @@ type ChatGPT struct {
 	currentApiKeyIndex int
 	apiKeyUsage        map[string]int
 	apiKeyWeights      []int
-	apiKeyUsageMutex   sync.Mutex
+	apiKeyUsageMutex   sync.RWMutex
 }
 
 func (gpt *ChatGPT) Completions(msg []Messages) (resp Messages, err error) {

diff --git a/readme.md b/readme.md
@@ -81,10 +81,10 @@ mv config.example.yaml config.yaml
 
 //测试部署
 go run main.go
-cpolar http 9001
+cpolar http 9000
 
 //正式部署
-nohup cpolar http 9001 -log=stdout &
+nohup cpolar http 9000 -log=stdout &
 
 //查看服务器状态
 https://dashboard.cpolar.com/status
@@ -200,7 +200,7 @@ s deploy
 
 ```bash
 docker build -t feishu-chatgpt:latest .
-docker run -d --name feishu-chatgpt -p 9001:9001 \
+docker run -d --name feishu-chatgpt -p 9000:9000 \
 --env APP_ID=xxx \
 --env APP_SECRET=xxx \
 --env APP_ENCRYPT_KEY=xxx \
@@ -217,7 +217,7 @@ feishu-chatgpt:latest
 - docker 地址: https://hub.docker.com/r/leizhenpeng/feishu-chatgpt
 
 ```bash
-docker run -d --restart=always --name feishu-chatgpt2 -p 9001:9001 -v /etc/localtime:/etc/localtim:ro  \
+docker run -d --restart=always --name feishu-chatgpt2 -p 9000:9000 -v /etc/localtime:/etc/localtim:ro  \
 --env APP_ID=xxx \
 --env APP_SECRET=xxx \
 --env APP_ENCRYPT_KEY=xxx \
@@ -227,8 +227,8 @@ docker run -d --restart=always --name feishu-chatgpt2 -p 9001:9001 -v /etc/local
 dockerproxy.com/leizhenpeng/feishu-chatgpt:latest
 ```
 
-事件回调地址: http://IP:9001/webhook/event
-卡片回调地址: http://IP:9001/webhook/card
+事件回调地址: http://IP:9000/webhook/event
+卡片回调地址: http://IP:9000/webhook/card
 
 把它填入飞书后台
 <br>
@@ -243,8 +243,8 @@ dockerproxy.com/leizhenpeng/feishu-chatgpt:latest
 2. 解压安装包,修改 config.example.yml 中配置信息,另存为 config.yml
 3. 运行程序入口文件 `feishu-chatgpt`
 
-事件回调地址: http://IP:9001/webhook/event
-卡片回调地址: http://IP:9001/webhook/card
+事件回调地址: http://IP:9000/webhook/event
+卡片回调地址: http://IP:9000/webhook/card
 
 </details>
 

diff --git a/s.yaml b/s.yaml
@@ -28,7 +28,7 @@ services:
         name: "feishu-chatgpt"
         description: 'a simple feishubot by serverless devs'
         codeUri: './code'
-        cAPort: 9001
+        cAPort: 9000
         customRuntimeConfig:
           command:
             - ./target/main