Merge branch master->3.10.x

src/backend/build.gradle

@@ -132,7 +132,7 @@ ext {
     set('cronUtilsVersion', "9.1.6")
     set('otelJdbcVersion', "1.24.0-alpha")
     set('commonsValidatorVersion', "1.6")
-    set('okHttpVersion', "4.9.1")
+    set('okHttpVersion', "4.12.0")
     set('jcommanderVersion', "1.72")
     set('kubernetesJavaClientVersion', "11.0.4")
     set('springCloudKubernetesVersion', "2.0.6")
@@ -151,6 +151,7 @@ ext {
     set('bkAuditJavaSdkVersion', "1.0.8")
     set('mockitoVersion', "4.0.0")
     set('embeddedRedisVersion', "0.6")
+    set('openai4jVersion', "0.18.0")
 }
 
 group "com.tencent.bk.job"
@@ -321,6 +322,7 @@ subprojects {
             dependency "io.opentelemetry.instrumentation:opentelemetry-jdbc:$otelJdbcVersion"
             dependency "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
             dependency "com.squareup.okhttp3:okhttp:$okHttpVersion"
+            dependency "com.squareup.okhttp3:okhttp-sse:$okHttpVersion"
             dependencySet(group: "org.jooq", version: "$jooqVersion") {
                 entry "jooq"
                 entry "jooq-codegen"
@@ -345,6 +347,7 @@ subprojects {
             dependency "com.tencent.bk.sdk:spring-boot-bk-audit-starter:$bkAuditJavaSdkVersion"
             dependency "org.mockito:mockito-inline:$mockitoVersion"
             dependency "com.github.kstyrc:embedded-redis:$embeddedRedisVersion"
+            dependency "dev.ai4j:openai4j:$openai4jVersion"
         }
     }
     dependencies {

src/frontend/src/views/script-template/local.js → src/backend/commons/ai-dev-sdk/build.gradle

@@ -6,8 +6,7 @@
  * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
  *
  * License for BK-JOB蓝鲸智云作业平台:
- *
- * ---------------------------------------------------
+ * --------------------------------------------------------------------
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
@@ -21,27 +20,23 @@
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
-*/
+ */
 
-/* eslint-disable max-len */
-export default {
-  namespace: 'scriptTemplate',
-  message: {
-    内置变量: 'Built-in vars',
-    复制成功: 'Copied',
-    保存: 'Save',
-    重置: 'Reset',
-    还原默认: 'Initialize',
-    渲染预览: 'Preview',
-    渲染结果: 'Render preview',
-    有更新: 'Update needed',
-    变量列表: 'Built-in variables',
-    变量名称: 'Var. name',
-    含义: 'Description',
-    示例: 'Example',
-    保存成功: 'The change has been saved.',
-    重置成功: 'Reset successfully',
-    还原默认成功: 'Initialize successfully',
-    '脚本模板仅对当前用户在新建脚本相关场景下有效（如快速执行脚本、新建脚本、作业脚本步骤）': 'Script template is only valid for the current user in scenarios related to new scripts (e.g. quick script execution, new scripts, new job script steps)',
-  },
-};
+dependencies {
+    api project(':commons:common')
+    api project(':commons:esb-sdk')
+    api project(':commons:common-i18n')
+    implementation 'com.fasterxml.jackson.core:jackson-core'
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations'
+    implementation 'org.apache.commons:commons-lang3'
+    implementation "net.sf.dozer:dozer"
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation 'org.apache.commons:commons-collections4'
+    implementation 'org.apache.httpcomponents:httpclient'
+    implementation 'dev.ai4j:openai4j'
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}

src/frontend/src/views/notify-manage/local.js → src/backend/commons/ai-dev-sdk/src/main/java/com/tencent/bk/job/common/aidev/IBkAIDevClient.java

@@ -6,8 +6,7 @@
  * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
  *
  * License for BK-JOB蓝鲸智云作业平台:
- *
- * ---------------------------------------------------
+ * --------------------------------------------------------------------
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
@@ -21,23 +20,16 @@
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
-*/
+ */
+
+package com.tencent.bk.job.common.aidev;
+
+import com.tencent.bk.job.common.aidev.model.common.AIDevMessage;
+
+import java.util.List;
+
+public interface IBkAIDevClient {
+
+    String getHunYuanAnswer(String token, List<AIDevMessage> messageHistoryList, String userInput);
 
-export default {
-  namespace: 'notify',
-  message: {
-    通知对象: 'Notify to',
-    请输入: 'Type the username you want to notify...',
-    角色: 'Role',
-    最近输入: 'Recently entered',
-    用户: 'User',
-    通知方式: 'Notify by',
-    状态: 'Status',
-    全选: 'All',
-    操作类型: 'Operation type',
-    保存: 'Save',
-    取消: 'Cancel',
-    保存成功: 'The changes has been saved',
-    重置: 'Reset',
-  },
-};
+}

src/backend/commons/ai-dev-sdk/src/main/java/com/tencent/bk/job/common/aidev/IBkOpenAIClient.java

@@ -0,0 +1,49 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ * --------------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.tencent.bk.job.common.aidev;
+
+import com.tencent.bk.job.common.aidev.model.common.AIDevMessage;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+public interface IBkOpenAIClient {
+
+    /**
+     * 获取混元流式回答，最终返回完整的回答结果，流式数据由partialRespConsumer接收处理
+     *
+     * @param token               用户身份凭据
+     * @param messageHistoryList  历史消息列表
+     * @param userInput           用户输入
+     * @param partialRespConsumer 分块消息处理器
+     * @return 完整的回答结果Future
+     */
+    CompletableFuture<String> getHunYuanAnswerStream(String token,
+                                                     List<AIDevMessage> messageHistoryList,
+                                                     String userInput,
+                                                     Consumer<String> partialRespConsumer);
+
+}

src/backend/commons/ai-dev-sdk/src/main/java/com/tencent/bk/job/common/aidev/config/AIDevAutoConfiguration.java

@@ -0,0 +1,58 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ * --------------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.tencent.bk.job.common.aidev.config;
+
+import com.tencent.bk.job.common.aidev.impl.BkAIDevClient;
+import com.tencent.bk.job.common.aidev.impl.BkOpenAIClient;
+import com.tencent.bk.job.common.esb.config.AppProperties;
+import com.tencent.bk.job.common.esb.config.BkApiGatewayProperties;
+import io.micrometer.core.instrument.MeterRegistry;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties({BkAIDevProperties.class, CustomPaasLoginProperties.class})
+public class AIDevAutoConfiguration {
+
+    @Bean
+    public BkAIDevClient bkAIDevClient(MeterRegistry meterRegistry,
+                                       AppProperties appProperties,
+                                       CustomPaasLoginProperties customPaasLoginProperties,
+                                       BkApiGatewayProperties bkApiGatewayProperties) {
+        return new BkAIDevClient(meterRegistry, appProperties, customPaasLoginProperties, bkApiGatewayProperties);
+    }
+
+    @Bean
+    public BkOpenAIClient bkOpenAIClient(MeterRegistry meterRegistry,
+                                         AppProperties appProperties,
+                                         CustomPaasLoginProperties customPaasLoginProperties,
+                                         BkApiGatewayProperties bkApiGatewayProperties) {
+        return new BkOpenAIClient(meterRegistry, appProperties, customPaasLoginProperties, bkApiGatewayProperties);
+    }
+
+}

src/frontend/src/views/service-state/local.js → src/backend/commons/ai-dev-sdk/src/main/java/com/tencent/bk/job/common/aidev/config/BkAIDevProperties.java

@@ -6,8 +6,7 @@
  * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
  *
  * License for BK-JOB蓝鲸智云作业平台:
- *
- * ---------------------------------------------------
+ * --------------------------------------------------------------------
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
@@ -21,36 +20,22 @@
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
-*/
+ */
+
+package com.tencent.bk.job.common.aidev.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * AI开发中心配置
+ */
+@ConfigurationProperties(prefix = "bk-ai-dev")
+@Getter
+@Setter
+public class BkAIDevProperties {
 
-export default {
-  namespace: 'service',
-  message: {
-    服务名: {
-      colHead: 'Service name',
-    },
-    版本号: {
-      colHead: 'Version',
-      label: 'Version',
-    },
-    实例状态: {
-      colHead: 'States',
-    },
+    private boolean enabled = true;
 
-    序号: {
-      colHead: 'SN.',
-    },
-    实例名: {
-      colHead: 'Node',
-    },
-    状态: {
-      colHead: 'State',
-    },
-    绑定IP: {
-      colHead: 'Bind address',
-    },
-    端口: {
-      colHead: 'Port',
-    },
-  },
-};
+}

src/backend/commons/ai-dev-sdk/src/main/java/com/tencent/bk/job/common/aidev/config/CustomPaasLoginProperties.java

@@ -0,0 +1,48 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ * --------------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.tencent.bk.job.common.aidev.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "paas.login.custom")
+@Getter
+@Setter
+@ToString
+public class CustomPaasLoginProperties {
+
+    /**
+     * 是否使用第三方登录系统
+     */
+    private boolean enabled = false;
+
+    /**
+     * 固定Token值，不提供则从Cookie中获取
+     */
+    private String token;
+
+}