lyhzzz 2 vuotta sitten
vanhempi
commit
4dab9b5fed

+ 1 - 22
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -40,12 +40,6 @@ public class TestController {
     @Autowired
     ICameraDetailService cameraDetailService;
     @Autowired
-    IndexService indexService;
-    @Autowired
-    QueryDataService queryDataService;
-    @Autowired
-    DocumentService documentService;
-    @Autowired
     IFolderSceneService folderSceneService;
     @Autowired
     IFolderService folderService;
@@ -55,23 +49,8 @@ public class TestController {
                            @RequestParam(required = false)String newSnCode,
                            @RequestParam(required = false)String dataSource) throws Exception {
 
-//        RestStatus restStatus = documentService.addDocument("abc-test1", null, "1", "{\n" +
-//                "    \"appId\": \"7b5958d5-1ae6-4ad5-8a87-5fc8a4b92999\",\n" +
-//                "    \"module\": \"module\",\n" +
-//                "    \"userId\": null,\n" +
-//                "    \"time\": 1662519289298,\n" +
-//                "    \"url\": \"/#/roam\",\n" +
-//                "    \"urlParam\": null,\n" +
-//                "    \"requestData\": {\n" +
-//                "      \"screen\": \"1920x1080\",\n" +
-//                "      \"click\": \"filter\",\n" +
-//                "      \"user\": \"\",\n" +
-//                "      \"version\": \"1\"\n" +
-//                "    }}");
-//        log.info("{}",restStatus);
-        List<String> strings = queryDataService.boolQuery("abc-test1", String.class);
 
-        return ResultData.ok(JSONObject.toJSONString(strings));
+        return ResultData.ok();
     }
 
     /**

+ 4 - 0
src/main/resources/bootstrap-dev.yml

@@ -47,6 +47,10 @@ spring:
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: elasticsearch-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

+ 4 - 0
src/main/resources/bootstrap-prod-eur.yml

@@ -39,6 +39,10 @@ spring:
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: elasticsearch-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

+ 4 - 0
src/main/resources/bootstrap-prod.yml

@@ -39,6 +39,10 @@ spring:
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: elasticsearch-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

+ 4 - 0
src/main/resources/bootstrap-test-eur.yml

@@ -43,6 +43,10 @@ spring:
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: elasticsearch-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}