Ver Fonte

集成星火和jenkinsfile

1811872455@163.com há 1 mês atrás
pai
commit
c7581d7e15
2 ficheiros alterados com 22 adições e 37 exclusões
  1. 14 28
      .idea/workspace.xml
  2. 8 9
      Jenkinsfile

+ 14 - 28
.idea/workspace.xml

@@ -4,32 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="2dc641fc-1465-479e-874d-97069c194ded" name="Changes" comment="ai项目">
-      <change afterPath="$PROJECT_DIR$/Jenkinsfile" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/config/properties/SparkAiProperties.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/factory/impl/SparkAiServiceFactory.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/service/impl/SparkAiService.java" afterDir="false" />
+    <list default="true" id="2dc641fc-1465-479e-874d-97069c194ded" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/controller/AiChatController.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/controller/AiChatController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/core/AiProviderType.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/core/AiProviderType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/factory/AiServiceFactoryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/factory/AiServiceFactoryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/service/AiChatService.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/service/AiChatService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/service/impl/StorleadAiService.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/service/impl/StorleadAiService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/websocket/AiChatWebSocketHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/websocket/AiChatWebSocketHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/websocket/WebSocketConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/java/com/storlead/ai/websocket/WebSocketConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/controller/AiChatController.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/controller/AiChatController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/core/AiProviderType.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/core/AiProviderType.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/factory/AiServiceFactoryManager.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/factory/AiServiceFactoryManager.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/service/AiChatService.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/service/AiChatService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/websocket/AiChatWebSocketHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/websocket/AiChatWebSocketHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/websocket/WebSocketConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/storlead-ai-api/target/classes/com/storlead/ai/websocket/WebSocketConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Jenkinsfile" beforeDir="false" afterPath="$PROJECT_DIR$/Jenkinsfile" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -139,7 +116,7 @@
       <workItem from="1758780969521" duration="11096000" />
       <workItem from="1758849538252" duration="14257000" />
       <workItem from="1759021657878" duration="17861000" />
-      <workItem from="1759109339436" duration="13889000" />
+      <workItem from="1759109339436" duration="15414000" />
     </task>
     <task id="LOCAL-00001" summary="ai项目">
       <option name="closed" value="true" />
@@ -157,7 +134,15 @@
       <option name="project" value="LOCAL" />
       <updated>1759026860684</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="集成星火和jenkinsfile">
+      <option name="closed" value="true" />
+      <created>1759130117247</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1759130117247</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -201,7 +186,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="ai项目" />
-    <option name="LAST_COMMIT_MESSAGE" value="ai项目" />
+    <MESSAGE value="集成星火和jenkinsfile" />
+    <option name="LAST_COMMIT_MESSAGE" value="集成星火和jenkinsfile" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 8 - 9
Jenkinsfile

@@ -12,14 +12,13 @@ properties([
                     sandbox: true,
                     script:
                         'return[\'Could not get Env\']'
+                ],
+                script: [
+                    classpath: [],
+                    sandbox: true,
+                    script:
+                        'return["java"]'
                 ]
-//                ,
-//                script: [
-//                    classpath: [],
-//                    sandbox: true,
-//                    script:
-//                        'return["java"]'
-//                ]
             ]
         ],
         [$class: 'CascadeChoiceParameter',
@@ -144,7 +143,7 @@ pipeline {
               }
               steps {
                   echo "编译 API 代码"
-                  sh "mvn clean package -U -am -pl ${modulePrefix}/${params.module} -P${params.profile} -Dmaven.test.skip=true"
+                  sh "mvn clean package -U -am -pl ${params.module} -P${params.profile} -Dmaven.test.skip=true"
               }
           }
 
@@ -166,7 +165,7 @@ pipeline {
                           echo '
                           FROM ${BASE_IMAGE}
 
-                          COPY ${modulePrefix}/${params.module}/target/${params.module}.jar app.jar
+                          COPY ${params.module}/target/${params.module}.jar app.jar
                           EXPOSE ${API_PORT}
                           EXPOSE ${API_REMOTE_DEBUG_PORT}
                           HEALTHCHECK --interval=1m --timeout=10s CMD curl -f http://localhost:${API_PORT}/${API_NAMESPACE_RESTFUL}/actuator