Remove leaked secrets from working tree

Author: itwanger

paicoding-web/src/main/java/com/github/paicoding/forum/web/javabetter/top/copydown/OSSUtil.java

@@ -32,12 +32,12 @@ public class OSSUtil {
 
     private static AliOssWrapper initOss() throws Exception {
         // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
-        String endpoint = "oss-cn-beijing.aliyuncs.com";
+        String endpoint = requireEnv("PAICODING_OSS_ENDPOINT");
         // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
-        String accessKeyId = "REDACTED_OSS_AK";
-        String accessKeySecret = "REDACTED_OSS_SK";
-        String bucketName = "itwanger-oss";
-        String host = "https://cdn.tobebetterjavaer.com/";
+        String accessKeyId = requireEnv("PAICODING_OSS_AK");
+        String accessKeySecret = requireEnv("PAICODING_OSS_SK");
+        String bucketName = requireEnv("PAICODING_OSS_BUCKET");
+        String host = requireEnv("PAICODING_OSS_HOST");
 
         AliOssWrapper aliOss = new AliOssWrapper();
         ImageProperties properties = new ImageProperties();
@@ -55,6 +55,14 @@ private static AliOssWrapper initOss() throws Exception {
         return aliOss;
     }
 
+    private static String requireEnv(String name) {
+        String value = System.getenv(name);
+        if (value == null || value.trim().isEmpty()) {
+            throw new IllegalStateException("Missing required environment variable: " + name);
+        }
+        return value;
+    }
+
     public static boolean needUploadOss(String imageUrl) {
         boolean flag = true;
         for (String url : Constants.ossOrCdnUrls) {

paicoding-web/src/main/resources-env/dev/application-ai.yml

@@ -30,7 +30,7 @@ ali:
 
 # 智谱 AI
 zhipu:
-  apiSecretKey: REDACTED_ZHIPU_SECRET
+  apiSecretKey: ${PAICODING_ZHIPU_API_SECRET_KEY:}
   requestIdTemplate: "paicoding-%d"
   # 调整模型 glm-4-alltools
   model: glm-4-air-0111
@@ -41,7 +41,7 @@ chatgpt:
   conf:
     CHAT_GPT_3_5:
       keys:
-        - REDACTED_OPENAI_KEY # 这里输入你的key
+        - ${PAICODING_OPENAI_API_KEY:} # 这里输入你的key
       proxy: true # 表示走上面的代理进行访问
       apiHost: https://api.openai.com/
       timeOut: 900
@@ -64,22 +64,21 @@ chatgpt:
 xunfei:
   hostUrl: http://spark-api.xf-yun.com/v1/x1
   domain: "x1"
-  appId: f740451b
-  apiKey: REDACTED_XUNFEI_API_KEY
-  apiSecret: REDACTED_XUNFEI_API_SECRET
-  APIPassword: REDACTED_XUNFEI_API_PASSWORD
+  appId: ${PAICODING_XUNFEI_APP_ID:}
+  apiKey: ${PAICODING_XUNFEI_API_KEY:}
+  apiSecret: ${PAICODING_XUNFEI_API_SECRET:}
+  APIPassword: ${PAICODING_XUNFEI_API_PASSWORD:}
 
 deepseek:
   apiHost: https://api.deepseek.com
-  apiKey: REDACTED_DEEPSEEK_KEY # 使用自己的密钥进行替换
+  apiKey: ${PAICODING_DEEPSEEK_API_KEY:} # 使用自己的密钥进行替换
   timeout: 900 # 超时时间，单位秒
 
 doubao:
-  api-key: REDACTED_DOUBAO_KEY # 使用自己的密钥进行替换
+  api-key: ${PAICODING_DOUBAO_API_KEY:} # 使用自己的密钥进行替换
   api-host: https://ark.cn-beijing.volces.com/api/v3
-  end-point: REDACTED_DOUBAO_ENDPOINT # 使用自己创建的接入点进行替换
+  end-point: ${PAICODING_DOUBAO_ENDPOINT:} # 使用自己创建的接入点进行替换
 
 logging:
   level:
     com.github.paicoding.forum.service.chatai.service.impl.deepseek.DeepSeekChatServiceImpl: DEBUG # 本地启动时，开启debug日志
-

paicoding-web/src/main/resources-env/dev/application-dal.yml

@@ -3,7 +3,7 @@ spring:
     url: jdbc:mysql://localhost:3306/${database.name}?useUnicode=true&allowPublicKeyRetrieval=true&autoReconnect=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     # fixme 注意：本地启动时，数据库用户名 + 密码，更新这里的配置
     username: root
-    password: 123456
+    password: ${PAICODING_DB_PASSWORD:}
   dynamic: # 动态数据源
    # primary: master # 这个表示默认的数据源，如果是注释状态，则表明使用上面的单数据源模式
     datasource:
@@ -55,4 +55,4 @@ elasticsearch:
 #
 #mybatis-plus:
 #  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志

paicoding-web/src/main/resources-env/dev/application-image.yml

@@ -7,8 +7,8 @@ image:
     type: ali # ali 为阿里云oss，local 为本地存储
     prefix: paicoding/
     endpoint: oss-cn-beijing.aliyuncs.com
-    ak: REDACTED_OSS_AK
-    sk: REDACTED_OSS_SK
+    ak: ${PAICODING_OSS_AK:}
+    sk: ${PAICODING_OSS_SK:}
     bucket: itwanger-oss
     host:
 

paicoding-web/src/main/resources-env/dev/application-login.yml

@@ -10,7 +10,7 @@ paicoding:
     wx:
       loginQrType: SUBSCRIPTION_ACCOUNT # SUBSCRIPTION_ACCOUNT 表示普通的公众号登录  SERVICE_ACCOUNT 表示服务号关注登录
       appId: wx594fbfe62b74ffb8
-      appSecret: REDACTED_WX_APP_SECRET
+      appSecret: ${PAICODING_WX_APP_SECRET:}
       qrCodeImg: ${view.site.contactMeWxQrCode}
       qrCodeLogo: ${view.site.websiteLogoUrl}
-      securityCheckToken: # 为空，表示不对微信回调的接口进行校验
+      securityCheckToken: # 为空，表示不对微信回调的接口进行校验

paicoding-web/src/test/java/com/github/paicoding/forum/test/ai/ConsoleChatGPT.java

@@ -45,7 +45,10 @@ public static void main(String[] args) {
 
         System.out.println();
 //        System.out.println("Please enter APIKEY, press Enter twice to submit:");
-        String key = "REDACTED_OPENAI_KEY";
+        String key = System.getenv("OPENAI_API_KEY");
+        if (key == null || key.trim().isEmpty()) {
+            throw new IllegalStateException("Please set OPENAI_API_KEY before running ConsoleChatGPT");
+        }
         check(key);
 
         String useProxy = "y";

paicoding-web/src/test/java/com/github/paicoding/forum/test/ai/TestChatGPT.java

@@ -13,10 +13,13 @@ public static void main(String[] args) {
 //        Proxy proxy = Proxys.http("10.3.4.136", 7890);
         //socks5 代理
         // Proxy proxy = Proxys.socks5("127.0.0.1", 1080);
+        String apiKey = System.getenv("OPENAI_API_KEY");
+        if (apiKey == null || apiKey.trim().isEmpty()) {
+            throw new IllegalStateException("Please set OPENAI_API_KEY before running TestChatGPT");
+        }
 
         ChatGPT chatGPT = ChatGPT.builder()
-//                .apiKey("REDACTED_OPENAI_KEY")
-                .apiKey("REDACTED_OPENAI_KEY")
+                .apiKey(apiKey)
 //                .proxy(proxy)
                 .apiHost("https://api.openai.com/") //反向代理地址
                 .build()