rev: 去掉swagger

2024-01-16 20:17:22 +08:00
parent b647c81219
commit d2476700fa
128 changed files with 1485 additions and 1669 deletions
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -105,10 +105,6 @@ login:
 generator:
  enabled: true

-#是否开启 swagger-ui
-swagger:
-  enabled: true
-
 # IP 本地解析
 ip:
  local-parsing: true
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
@@ -117,18 +117,6 @@ ip:
 #是否允许生成代码，生产环境设置为false
 generator:
  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
-
-#是否开启 swagger-ui
-swagger:
-  enabled: false
-
 # 文件存储路径
 file:
  mac:
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml
@@ -116,18 +116,6 @@ ip:
 #是否允许生成代码，生产环境设置为false
 generator:
  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
-
-#是否开启 swagger-ui
-swagger:
-  enabled: false
-
 # 文件存储路径
 file:
  mac:
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -1,3 +1,7 @@
+server:
+  tomcat:
+    relaxed-query-chars: [ '|','{','}','[',']' ]  #字符问题：https://blog.csdn.net/CanYue_Yi/article/details/109182577
+    relaxed-path-chars: [ '|','{','}','[',']' ]  #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118
 spring:
  freemarker:
    check-template-location: false
@@ -19,6 +23,45 @@ spring:
      hibernate:
        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
        enable_lazy_load_no_trans: true
+  dynamic:
+    tp:
+      enabled: false                               # 是否启用 dynamictp，默认true
+      enabledBanner: false                        # 是否启用 控制台banner，默认true
+      enabledCollect: true                        # 是否开启监控指标采集，默认true
+      collectorTypes: logging,test_collect          # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
+      logPath: C:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
+      monitorInterval: 8
+      tomcatTp: # tomcat webserver 线程池配置
+        threadPoolAliasName: tomcat 线程池          # 线程池别名，可选
+        corePoolSize: 100
+        maximumPoolSize: 200
+        keepAliveTime: 60
+        runTimeout: 10000
+        queueTimeout: 100
+        notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警）
+          - type: change
+            enabled: true
+
+          - type: capacity               # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类
+            enabled: true
+            threshold: 80                # 报警阈值，默认70，意思是队列使用率达到70%告警
+            interval: 120                # 报警间隔（单位：s），默认120
+
+          - type: liveness               # 线程池活性
+            enabled: true
+            threshold: 80                # 报警阈值，默认 70，意思是活性达到70%告警
+
+          - type: reject                 # 触发任务拒绝告警
+            enabled: true
+            threshold: 100               # 默认阈值10
+
+          - type: run_timeout            # 任务执行超时告警
+            enabled: true
+            threshold: 100               # 默认阈值10
+
+          - type: queue_timeout          # 任务排队超时告警
+            enabled: true
+            threshold: 100               # 默认阈值10
 task:
  pool:
    # 核心线程池大小
@@ -55,9 +98,6 @@ security:
    - /auth/code
    - /auth/logout
    - /sys-user-do/**
-    # swagger
-    - /swagger-ui.html
-    - /swagger-resources/**
    - /webjars/**
    - /file/**
    - /webSocket/**
@@ -66,10 +106,6 @@ security:
    - /**/*.html
    - /**/*.css
    - /**/*.js
-    # swagger 文档配置
-    - /favicon.ico
-    - /*/api-docs
-    - /*/api-docs/**
    # druid 监控配置
    - /druid/**
    # actuator 监控配置
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl
@@ -1,7 +1,7 @@
 package ${package}.controller;

-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.base.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
@@ -22,7 +22,7 @@ import java.util.Set;
 **/
@Slf4j
@RestController
-@Api(tags = "${apiAlias}管理")
+
@RequestMapping("/api/${changeClassName}")
 public class ${className}Controller {

@@ -31,7 +31,7 @@ public class ${className}Controller {

    @GetMapping
    @Log("查询${apiAlias}")
-    @ApiOperation("查询${apiAlias}")
+
    //@SaCheckPermission("@el.check('${changeClassName}:list')")
    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
        return new ResponseEntity<>(TableDataInfo.build(${changeClassName}Service.queryAll(whereJson,page)),HttpStatus.OK);
@@ -39,7 +39,7 @@ public class ${className}Controller {

    @PostMapping
    @Log("新增${apiAlias}")
-    @ApiOperation("新增${apiAlias}")
+
    //@SaCheckPermission("@el.check('${changeClassName}:add')")
    public ResponseEntity<Object> create(@Validated @RequestBody ${className} entity){
        ${changeClassName}Service.create(entity);
@@ -48,7 +48,7 @@ public class ${className}Controller {

    @PutMapping
    @Log("修改${apiAlias}")
-    @ApiOperation("修改${apiAlias}")
+
    //@SaCheckPermission("@el.check('${changeClassName}:edit')")
    public ResponseEntity<Object> update(@Validated @RequestBody ${className} entity){
        ${changeClassName}Service.update(entity);
@@ -56,7 +56,7 @@ public class ${className}Controller {
    }

    @Log("删除${apiAlias}")
-    @ApiOperation("删除${apiAlias}")
+
    //@SaCheckPermission("@el.check('${changeClassName}:del')")
    @DeleteMapping
    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 </#if>
-import io.swagger.annotations.ApiModelProperty;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -35,9 +35,9 @@ public class ${className} implements Serializable {
    @TableId(value = "${column.columnName}", type = <#if auto>IdType.AUTO<#else>IdType.NONE</#if>)
 </#if>
 <#if column.remark != ''>
-    @ApiModelProperty(value = "${column.remark}")
+
 <#else>
-    @ApiModelProperty(value = "${column.changeColumnName}")
+
 </#if>
    private ${column.columnType} ${column.changeColumnName};