diff --git a/Dockerfile b/Dockerfile
index 2abbc5fd..946d7b0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-# openjdk 8u222
-FROM openjdk:8u222-jre
+# openjdk 22
+FROM azul/zulu-openjdk:22-jre
MAINTAINER opsli.com
LABEL description=OPSLI-快速开发平台
@@ -26,4 +26,4 @@ ENTRYPOINT ["java", "-Dfile.encoding=utf-8", "-Djava.security.egd=file:/dev/./ur
CMD ["-Xmx2048m", "-Xms2048m", "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=200", "--spring.profiles.active=dev"]
# 暴露端口
-EXPOSE 7000
\ No newline at end of file
+EXPOSE 7000
diff --git a/README.md b/README.md
index 5d89eca8..d0d372df 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# OPSLI 快速开发平台 (v2.0)
+# OPSLI 快速开发平台 (v2.2)
@@ -71,7 +71,7 @@
**身份安全**:修改邮箱、手机号或忘记密码时,有独立的身份认证鉴权
-**在线文档**:通过接入Knife4j,实现在线API文档的查看与调试;
+**在线文档**:通过接入SpringDoc,实现在线API文档的查看与调试;
**业务分离**:采用前后端分离的框架设计,前端采用vue-admin-beautiful(开源版本 基于element-ui)
diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/.DS_Store b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/.DS_Store
new file mode 100644
index 00000000..5998067b
Binary files /dev/null and b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/filters/.DS_Store differ
diff --git a/opsli-starter/src/main/resources/application-dev.yaml b/opsli-starter/src/main/resources/application-dev.yaml
index 507166de..b92c61e5 100644
--- a/opsli-starter/src/main/resources/application-dev.yaml
+++ b/opsli-starter/src/main/resources/application-dev.yaml
@@ -2,15 +2,15 @@
# 端口设置
server:
- port: 10110
+ port: 7000
spring:
data:
#redis 配置
redis:
database: 8
- host: 182.43.20.249
- password: 'opsli@123456'
+ host: 127.0.0.1
+ password: '1234567'
port: 6677
# 数据库配置
@@ -34,9 +34,9 @@ spring:
#primary: master
datasource:
master:
- url: jdbc:mysql://182.43.20.249:3306/opsli-boot-dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
- username: opsli-boot-dev
- password: YkpFNZM4CRWw5y2i
+ url: jdbc:mysql://127.0.0.1:3306/opsli-boot-dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+ username: opsli-boot
+ password: 12345678
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#slave-datasource:
diff --git a/opsli-starter/src/main/resources/application-local.yaml b/opsli-starter/src/main/resources/application-local.yaml
index 53472920..7ca00acc 100644
--- a/opsli-starter/src/main/resources/application-local.yaml
+++ b/opsli-starter/src/main/resources/application-local.yaml
@@ -2,7 +2,7 @@
# 端口设置
server:
- port: 10110
+ port: 7000
spring:
data:
diff --git a/opsli-starter/src/main/resources/application.yaml b/opsli-starter/src/main/resources/application.yaml
index 2d363645..e4f97865 100644
--- a/opsli-starter/src/main/resources/application.yaml
+++ b/opsli-starter/src/main/resources/application.yaml
@@ -271,7 +271,3 @@ springdoc:
writer-with-default-pretty-printer: true # 格式化JSON输出
model-and-view-allowed: true # 允许ModelAndView作为返回类型
override-with-generic-response: true # 使用泛型响应覆盖
-
-
-pagehelper:
- bound-sql-interceptors: