diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 67776ec58..da3d2f206 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -77,13 +77,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-config/pom.xml b/pigx-config/pom.xml index fcf059930..2ab84ba94 100644 --- a/pigx-config/pom.xml +++ b/pigx-config/pom.xml @@ -42,13 +42,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 9649e755d..1a0db6139 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -64,11 +64,6 @@ mybatis-plus: field-strategy: 1 # 默认数据库表下划线命名 table-underline: true - # 逻辑删除配置 - # 逻辑删除全局值(1表示已删除,这也是Mybatis Plus的默认配置) - logic-delete-value: 1 - # 逻辑未删除全局值(0表示未删除,这也是Mybatis Plus的默认配置) - logic-not-delete-value: 0 configuration: map-underscore-to-camel-case: true diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index d0ed9dc5c..fd0ed5553 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -23,18 +23,6 @@ spring: password: root url: jdbc:mysql://pigx-mysql:3306/pigxx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true -# swagger相关配置,覆盖全局配置 -swagger: - enabled: false - authorization: - authorization-scope-list: - - scope: 'server' - description: 'server all' - - scope: 'read' - description: 'read all' - - scope: 'write' - description: 'access all' - # 文件系统 minio: url: http://139.224.200.249:9090 diff --git a/pigx-eureka/pom.xml b/pigx-eureka/pom.xml index cdaafde83..7785a1eb9 100644 --- a/pigx-eureka/pom.xml +++ b/pigx-eureka/pom.xml @@ -52,13 +52,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index dbfeaf6cd..6d958671f 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -91,13 +91,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index bae2d0d8e..a53b4dbac 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -112,13 +112,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - com.pig4cloud diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index f519b6ca9..0282bce7b 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -59,13 +59,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml index 7018a75cd..10e04ee0b 100644 --- a/pigx-visual/pigx-daemon/pom.xml +++ b/pigx-visual/pigx-daemon/pom.xml @@ -80,13 +80,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 7a7d04253..6204ffd32 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -72,13 +72,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index f059fb294..26c79facf 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -45,13 +45,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index ca40f788f..a250b507d 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -18,13 +18,6 @@ org.springframework.boot spring-boot-starter-web - - - - spring-boot-starter-tomcat - org.springframework.boot - - diff --git a/pom.xml b/pom.xml index 5162124e4..ff900aa28 100644 --- a/pom.xml +++ b/pom.xml @@ -166,6 +166,19 @@ spring-security-oauth2-autoconfigure ${security.oauth.auto.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + + spring-boot-starter-tomcat + org.springframework.boot + + + @@ -220,6 +233,7 @@ ${maven.compiler.target} ${maven.compiler.source} UTF-8 + true