浏览代码

优化配置

zhouhao 4 年之前
父节点
当前提交
5e8e9ccbf6

+ 2 - 2
jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/OrganizationController.java

@@ -55,7 +55,7 @@ public class OrganizationController {
 
     @PatchMapping
     @SaveAction
-    @QueryOperation(summary = "保存机构信息")
+    @Operation(summary = "保存机构信息")
     public Mono<Void> saveOrg(@RequestBody Flux<DimensionEntity> entityFlux) {
         return entityFlux
             .doOnNext(entity -> entity.setTypeId(orgDimensionTypeId))
@@ -65,7 +65,7 @@ public class OrganizationController {
 
     @DeleteMapping("/{id}")
     @DeleteAction
-    @QueryOperation(summary = "删除机构信息")
+    @Operation(summary = "删除机构信息")
     public Mono<Void> deleteOrg(@PathVariable String id) {
         return dimensionService
             .deleteById(Mono.just(id))

+ 3 - 1
jetlinks-manager/logging-manager/src/main/java/org/jetlinks/community/logging/controller/AccessLoggerController.java

@@ -1,9 +1,11 @@
 package org.jetlinks.community.logging.controller;
 
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.hswebframework.ezorm.core.param.QueryParam;
 import org.hswebframework.web.api.crud.entity.PagerResult;
 import org.hswebframework.web.api.crud.entity.QueryOperation;
+import org.hswebframework.web.api.crud.entity.QueryParamEntity;
 import org.hswebframework.web.authorization.annotation.QueryAction;
 import org.hswebframework.web.authorization.annotation.Resource;
 import org.jetlinks.community.logging.access.SerializableAccessLog;
@@ -30,7 +32,7 @@ public class AccessLoggerController {
     @GetMapping("/_query")
     @QueryAction
     @QueryOperation(summary = "查询访问日志")
-    public Mono<PagerResult<SerializableAccessLog>> getAccessLogger(QueryParam queryParam) {
+    public Mono<PagerResult<SerializableAccessLog>> getAccessLogger(@Parameter(hidden = true) QueryParamEntity queryParam) {
         return loggerService.getAccessLogger(queryParam);
     }
 

+ 3 - 1
jetlinks-manager/logging-manager/src/main/java/org/jetlinks/community/logging/controller/SystemLoggerController.java

@@ -1,9 +1,11 @@
 package org.jetlinks.community.logging.controller;
 
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.hswebframework.ezorm.core.param.QueryParam;
 import org.hswebframework.web.api.crud.entity.PagerResult;
 import org.hswebframework.web.api.crud.entity.QueryOperation;
+import org.hswebframework.web.api.crud.entity.QueryParamEntity;
 import org.hswebframework.web.authorization.annotation.QueryAction;
 import org.hswebframework.web.authorization.annotation.Resource;
 import org.jetlinks.community.logging.service.SystemLoggerService;
@@ -30,7 +32,7 @@ public class SystemLoggerController {
     @GetMapping("/_query")
     @QueryAction
     @QueryOperation(summary = "查询系统日志")
-    public Mono<PagerResult<SerializableSystemLog>> getSystemLogger(QueryParam queryParam) {
+    public Mono<PagerResult<SerializableSystemLog>> getSystemLogger(@Parameter(hidden = true) QueryParamEntity queryParam) {
         return loggerService.getSystemLogger(queryParam);
     }
 

+ 11 - 4
jetlinks-standalone/src/main/resources/application.yml

@@ -114,17 +114,24 @@ jetlinks:
 logging:
   level:
     org.jetlinks: debug
-    rule.engine: warn
+    rule.engine: debug
     org.hswebframework: debug
     org.springframework.transaction: debug
-    #    org.springframework.data.r2dbc.connectionfactory: debug
+    org.springframework.data.r2dbc.connectionfactory: warn
     io.micrometer: warn
     org.hswebframework.expands: error
     system: debug
     org.jetlinks.rule.engine: warn
-    org.jetlinks.gateway: debug
+    org.jetlinks.supports.event: warn
     org.springframework: warn
-    org.elasticsearch: error
+    org.jetlinks.community.device.message.writer: warn
+    org.jetlinks.community.elastic.search.service: trace
+    org.jetlinks.community.elastic.search.service.reactive: trace
+    org.jetlinks.community.network: warn
+    io.vertx.mqtt.impl: warn
+    #    org.springframework.data.elasticsearch.client: trace
+    #    org.elasticsearch: error
+    org.jetlinks.pro.influx: trace
   config: classpath:logback-spring.xml
 vertx:
   max-event-loop-execute-time-unit: seconds