Quellcode durchsuchen

Jenkinsfile 配置

183207892172 vor 1 Monat
Ursprung
Commit
2273d8d3a1

+ 7 - 7
Jenkinsfile

@@ -40,10 +40,10 @@ properties([
                                  sandbox: true,
                                  script:
                                          ''' if (modulePrefix.equals("java")){
-                                return["storlead-centre-api"]
+                                return["storlead-api"]
                             }
                             else if(modulePrefix.equals("ui")){
-                                return["sp-user-center"]
+                                return["smarttrade-platform","sp-user-center"]
                             }
                         '''
                          ]
@@ -133,9 +133,9 @@ pipeline {
 
                         echo "处理MODULE_NAMESPACE_RESTFUL"
                         //把 module 名 从 sp-xxx 变成 xxx 也就是 项目 的 namespace
-                        if (API_NAMESPACE_RESTFUL == "storlead-centre-api") {
-                            API_NAMESPACE_RESTFUL = "api"
-                        }
+//                         if (API_NAMESPACE_RESTFUL == "storlead-centre-api") {
+//                             API_NAMESPACE_RESTFUL = "api"
+//                         }
                         echo "处理镜像推送"
                     }
                 }
@@ -177,7 +177,7 @@ pipeline {
                             remote.user = usernameHW
                             remote.password = passwordHW
                         }
-                        if(params.module == 'sp-user-mobile-center') {
+//                         if(params.module == 'sp-user-mobile-center') {
                            sh """cd ${params.modulePrefix}/${params.module} && npm install  && npm run build:${params.profile}"""
                         } else {
                            sh """cd ${params.modulePrefix}/${params.module} && npm install  && npm run ${params.profile}"""
@@ -190,7 +190,7 @@ pipeline {
                         sshCommand remote: remote, command: "rm -rf /app/sp/ui/app-centre/${params.profile}/${params.module}/dist/*"
 
 
-                        echo "/app/sp/ui/sales/${params.profile}/${params.module}/*"
+                        echo "/app/sp/ui/app-centre/${params.profile}/${params.module}/*"
 
                         sshPut remote: remote, from: "${params.modulePrefix}/${params.module}/dist/", into: "/app/sp/ui/app-centre/${params.profile}/${params.module}/"
 

+ 4 - 2
java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/ChunkController.java

@@ -121,7 +121,8 @@ public class ChunkController {
                 if (dataObj instanceof List) {
                     List<?> dataList = (List<?>) dataObj;
                     for (Object item : dataList) {
-                        if (item instanceof Map<?, ?> datasetMap) {
+                        if (item instanceof Map ) {
+                            Map<?, ?> datasetMap = (Map<?, ?>) item;
                             String datasets_id = datasetMap.get("id").toString();
                             if (dataset_id != null && !datasets_id.equals(dataset_id)) {
                                 continue;
@@ -184,7 +185,8 @@ public class ChunkController {
                 if (dataObj1 instanceof List) {
                     List<?> dataList1 = (List<?>) dataObj1;
                     for (Object item1 : dataList1) {
-                        if (item1 instanceof Map<?, ?> datasetMap1) {
+                        if (item1 instanceof Map) {
+                            Map<?, ?> datasetMap1 = (Map<?, ?>) item1;
                             String document_id = datasetMap1.get("id").toString();
                             String url2 = difyProperties.getBaseUrl() + "datasets/" + dataset_id + "/documents/" + document_id+"/segments";
                             int page = 1 ;