diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000..434a19c2
--- /dev/null
+++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,107 @@
+{
+  "properties": [
+    {
+      "name": "oss.type",
+      "type": "java.lang.String",
+      "description": "OSS 类型 (目前支持aliyun、minio)"
+    },
+    {
+      "name": "oss.minio.endpoint",
+      "type": "java.lang.String",
+      "description": "MinIO 服务 Endpoint"
+    },
+    {
+      "name": "oss.minio.access-key",
+      "type": "java.lang.String",
+      "description": "MinIO 访问凭据"
+    },
+    {
+      "name": "oss.minio.secret-key",
+      "type": "java.lang.String",
+      "description": "MinIO 凭据密钥"
+    },
+    {
+      "name": "oss.minio.bucket-name",
+      "type": "java.lang.String",
+      "description": "MinIO 存储桶名称"
+    },
+    {
+      "name": "oss.minio.custom-domain",
+      "type": "java.lang.String",
+      "description": "MinIO 自定义域名"
+    },
+    {
+      "name": "oss.aliyun.endpoint",
+      "type": "java.lang.String",
+      "description": "阿里云 OSS 服务 Endpoint"
+    },
+    {
+      "name": "oss.aliyun.access-key-id",
+      "type": "java.lang.String",
+      "description": "阿里云 OSS 访问凭据 ID"
+    },
+    {
+      "name": "oss.aliyun.access-key-secret",
+      "type": "java.lang.String",
+      "description": "阿里云 OSS 凭据密钥"
+    },
+    {
+      "name": "oss.aliyun.bucket-name",
+      "type": "java.lang.String",
+      "description": "阿里云 OSS 存储桶名称"
+    },
+
+
+    {
+      "name": "xxl.job.enabled",
+      "type": "java.lang.Boolean",
+      "description": "定时任务开关"
+    },
+    {
+      "name": "xxl.job.admin.addresses",
+      "type": "java.lang.String",
+      "description": "多个地址使用,分割"
+    },
+    {
+      "name": "xxl.job.accessToken",
+      "type": "java.lang.String",
+      "description": "访问令牌"
+    },
+    {
+      "name": "xxl.job.executor.appname",
+      "type": "java.lang.String",
+      "description": "执行器应用名称"
+    },
+    {
+      "name": "xxl.job.executor.address",
+      "type": "java.lang.String",
+      "description": "执行器地址"
+    },
+    {
+      "name": "xxl.job.executor.ip",
+      "type": "java.lang.String",
+      "description": "执行器IP"
+    },
+    {
+      "name": "xxl.job.executor.port",
+      "type": "java.lang.Integer",
+      "description": "执行器端口"
+    },
+    {
+      "name": "xxl.job.executor.logpath",
+      "type": "java.lang.String",
+      "description": "日志路径"
+    },
+    {
+      "name": "xxl.job.executor.logretentiondays",
+      "type": "java.lang.Integer",
+      "description": "日志保留天数"
+    },
+    {
+      "name": "spring.cache.enabled",
+      "type": "java.lang.Boolean",
+      "description": "缓存开关"
+    }
+
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 67e7970c..da3e480d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -90,7 +90,7 @@ oss:
     # 凭据密钥
     secret-key: minioadmin
     # 存储桶名称
-    bucket-name: default
+    bucket-name: public
     # (可选)自定义域名，如果配置了域名，生成的文件URL是域名格式，未配置则URL则是IP格式 (eg: https://oss.youlai.tech)
     custom-domain:
   # 阿里云OSS对象存储服务
diff --git a/src/main/resources/application-generator.yml b/src/main/resources/application-generator.yml
deleted file mode 100644
index 976795f1..00000000
--- a/src/main/resources/application-generator.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# 代码生成器配置
-generator:
-  # 后端项目名称
-  backendAppName: youlai-boot
-  # 前端项目名称
-  frontendAppName: vue3-element-admin
-  # 默认配置
-  defaultConfig:
-    author: youlaitech
-  # 排除数据表
-  excludeTables:
-    - gen_config
-    - gen_field_config
-  ## 模板配置
-  templateConfigs:
-    Controller:
-      templatePath: generator/controller.java.vm
-      subpackageName: controller
-    Service:
-      templatePath: generator/service.java.vm
-      subpackageName: service
-    ServiceImpl:
-      templatePath: generator/serviceImpl.java.vm
-      subpackageName: service.impl
-    Mapper:
-      templatePath: generator/mapper.java.vm
-      subpackageName: mapper
-    MapperXml:
-      templatePath: generator/mapper.xml.vm
-      subpackageName: mapper
-      extension: .xml
-    Converter:
-      templatePath: generator/converter.java.vm
-      subpackageName: converter
-    Query:
-      templatePath: generator/query.java.vm
-      subpackageName: model.query
-    Form:
-      templatePath: generator/form.java.vm
-      subpackageName: model.form
-    VO:
-      templatePath: generator/vo.java.vm
-      subpackageName: model.vo
-    Entity:
-      templatePath: generator/entity.java.vm
-      subpackageName: model.entity
-    API:
-      templatePath: generator/api.ts.vm
-      subpackageName: api
-      extension: .ts
-    VIEW:
-      templatePath: generator/index.vue.vm
-      subpackageName: views
-      extension: .vue
-
-
-
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 8883f633..2822ed7f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -88,7 +88,7 @@ oss:
     # 凭据密钥
     secret-key: minioadmin
     # 存储桶名称
-    bucket-name: default
+    bucket-name: public
     # (可选)自定义域名，如果配置了域名，生成的文件URL是域名格式，未配置则URL则是IP格式 (eg: https://oss.youlai.tech)
     custom-domain:
   # 阿里云OSS对象存储服务
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e733e2b6..2dbb4a61 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,5 +3,61 @@ spring:
     name: youlai-boot
   profiles:
     active: dev
-    include:
-      - generator
\ No newline at end of file
+
+# 代码生成器配置
+generator:
+  # 后端项目名称
+  backendAppName: youlai-boot
+  # 前端项目名称
+  frontendAppName: vue3-element-admin
+  # 默认配置
+  defaultConfig:
+    author: youlaitech
+  # 排除数据表
+  excludeTables:
+    - gen_config
+    - gen_field_config
+  ## 模板配置
+  templateConfigs:
+    Controller:
+      templatePath: generator/controller.java.vm
+      subpackageName: controller
+    Service:
+      templatePath: generator/service.java.vm
+      subpackageName: service
+    ServiceImpl:
+      templatePath: generator/serviceImpl.java.vm
+      subpackageName: service.impl
+    Mapper:
+      templatePath: generator/mapper.java.vm
+      subpackageName: mapper
+    MapperXml:
+      templatePath: generator/mapper.xml.vm
+      subpackageName: mapper
+      extension: .xml
+    Converter:
+      templatePath: generator/converter.java.vm
+      subpackageName: converter
+    Query:
+      templatePath: generator/query.java.vm
+      subpackageName: model.query
+    Form:
+      templatePath: generator/form.java.vm
+      subpackageName: model.form
+    VO:
+      templatePath: generator/vo.java.vm
+      subpackageName: model.vo
+    Entity:
+      templatePath: generator/entity.java.vm
+      subpackageName: model.entity
+    API:
+      templatePath: generator/api.ts.vm
+      subpackageName: api
+      extension: .ts
+    VIEW:
+      templatePath: generator/index.vue.vm
+      subpackageName: views
+      extension: .vue
+
+
+