OpenAIService支持配置baseUrl

Author: MartinDai

README.md

@@ -31,10 +31,11 @@ _Tips:1.2版本开始使用Vert.x替换SpringBoot_
 1. 使用之前需要有微信公众号的帐号，没有的请戳[微信公众号申请](https://mp.weixin.qq.com/cgi-bin/readtemplate?t=register/step1_tmpl&lang=zh_CN)
 2. 如果需要使用图灵机器人的回复内容则需要[注册图灵机器人帐号](http://tuling123.com/register/email.jhtml)获取相应的ApiKey并配置在启动参数或者环境变量中
 3. 如果需要使用ChatGPT的回复内容则需要[创建OpenAI的API Key](https://platform.openai.com/account/api-keys)并配置在启动参数或者环境变量中
-4. 可以通过配置启动参数或者环境变量`OPENAI_BASE_DOMAIN`更换访问OpenAI的域名
-5. 可以通过配置启动参数或者环境变量`OPENAI_PROXY`使用代理服务访问OpenAI
-6. 内容响应来源的优先级`自定义关键 > ChatGPT > 图灵机器人`
-7. 在微信公众号后台配置回调URL为<https://wechatrobot.doodl6.com/weChat/receiveMessage>，其中`wechatrobot.doodl6.com`是你自己的域名，token与`config.yml`里面配置的保持一致即可
+4. 可以通过配置启动参数或者环境变量`OPENAI_SERVER_URL`更换访问OpenAI的baseUrl
+5. 可以通过配置启动参数或者环境变量`OPENAI_BASE_DOMAIN`更换访问OpenAI的域名
+6. 可以通过配置启动参数或者环境变量`OPENAI_PROXY`使用代理服务访问OpenAI
+7. 内容响应来源的优先级`自定义关键 > ChatGPT > 图灵机器人`
+8. 在微信公众号后台配置回调URL为<https://wechatrobot.doodl6.com/weChat/receiveMessage>，其中`wechatrobot.doodl6.com`是你自己的域名，token与`config.yml`里面配置的保持一致即可
 
 ## 开发部署
 

robot-web/src/main/java/com/doodl6/wechatrobot/processor/TextMessageProcessor.java

@@ -5,7 +5,7 @@
 import com.doodl6.wechatrobot.enums.WeChatMsgType;
 import com.doodl6.wechatrobot.response.BaseMessage;
 import com.doodl6.wechatrobot.response.TextMessage;
-import com.doodl6.wechatrobot.service.ChatGptService;
+import com.doodl6.wechatrobot.service.OpenAIService;
 import com.doodl6.wechatrobot.service.KeywordService;
 import com.doodl6.wechatrobot.service.TulingService;
 import com.doodl6.wechatrobot.util.LogUtil;
@@ -22,13 +22,13 @@ public class TextMessageProcessor implements WeChatMessageProcessor {
 
     private final KeywordService keywordService;
 
-    private final ChatGptService chatGptService;
+    private final OpenAIService openAIService;
 
     private final TulingService tulingService;
 
     public TextMessageProcessor(Vertx vertx, KeywordConfig keywordConfig) {
         this.keywordService = new KeywordService(vertx, keywordConfig);
-        this.chatGptService = new ChatGptService();
+        this.openAIService = new OpenAIService();
         this.tulingService = new TulingService();
     }
 
@@ -51,7 +51,7 @@ public BaseMessage processMessage(WeChatMessage weChatMessage) {
 
         //再尝试从GPT获取响应
         if (message == null) {
-            message = chatGptService.getResponse(content);
+            message = openAIService.getResponse(content);
         }
 
         //再尝试从图灵机器人获取响应

robot-web/src/main/java/com/doodl6/wechatrobot/service/ChatGptService.java renamed to robot-web/src/main/java/com/doodl6/wechatrobot/service/OpenAIService.java

@@ -20,19 +20,21 @@
 import java.util.Collections;
 import java.util.List;
 
-public class ChatGptService {
+public class OpenAIService {
 
     private static final String OPENAI_API_KEY = "OPENAI_API_KEY";
 
     private static final String OPENAI_BASE_DOMAIN = "OPENAI_BASE_DOMAIN";
 
+    private static final String OPENAI_SERVER_URL = "OPENAI_SERVER_URL";
+
     private static final String OPENAI_PROXY = "OPENAI_PROXY";
 
     private static final String MODEL = "gpt-3.5-turbo";
 
     private static OpenAiService openAiService;
 
-    public ChatGptService() {
+    public OpenAIService() {
         String apiKey = PropertyUtil.getProperty(OPENAI_API_KEY);
         if (StringUtils.isBlank(apiKey)) {
             return;
@@ -55,14 +57,19 @@ public ChatGptService() {
         ObjectMapper mapper = OpenAiService.defaultObjectMapper();
         Retrofit.Builder retrofitBuilder = OpenAiService.defaultRetrofit(client, mapper).newBuilder();
 
-        String baseDomain = PropertyUtil.getProperty(OPENAI_BASE_DOMAIN);
-        if (StringUtils.isNotBlank(baseDomain)) {
-            boolean valid = AddressUtil.validateAddress(baseDomain);
-            if (!valid) {
-                throw new RuntimeException("OPENAI_BASE_DOMAIN is not valid, value:" + baseDomain);
+        String serverUrl = PropertyUtil.getProperty(OPENAI_SERVER_URL);
+        if (StringUtils.isNotBlank(serverUrl)) {
+            retrofitBuilder.baseUrl(serverUrl);
+        } else {
+            String baseDomain = PropertyUtil.getProperty(OPENAI_BASE_DOMAIN);
+            if (StringUtils.isNotBlank(baseDomain)) {
+                boolean valid = AddressUtil.validateAddress(baseDomain);
+                if (!valid) {
+                    throw new RuntimeException("OPENAI_BASE_DOMAIN is not valid, value:" + baseDomain);
+                }
+
+                retrofitBuilder.baseUrl("https://" + baseDomain + "/");
             }
-
-            retrofitBuilder.baseUrl("https://" + baseDomain + "/");
         }
 
         Retrofit retrofit = retrofitBuilder.build();

robot-web/src/main/resources/reflect.json

@@ -19,5 +19,4 @@
     "allPublicMethods" : true,
     "allDeclaredConstructors" : true
   }
-
 ]