From 3bed64ffa26b5f53bd3cf1149e9b54e4969f6be4 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 5 Mar 2025 11:29:51 +0800
Subject: [PATCH] 1

---
 src/main/resources/application-dev.yml  |  4 +-
 src/main/resources/application-prod.yml | 52 -------------------------
 src/main/resources/application.yml      |  2 +-
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 src/main/resources/application-prod.yml

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e1e2d20..31e1975 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -66,10 +66,8 @@ xxl:
       #[选填]执行器IP ：默认为空表示自动获取IP（即springboot容器的ip和端口，可以自动获取，也可以指定），多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"，
       ip:
       # [选填]执行器端口号：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口；
-      port: 9992
+      port: 9998
       #执行器日志文件存储路径，需要对该路径拥有读写权限；为空则使用默认路径
       logpath: ./data/logs/xxl-job/executor
       #执行器日志保存天数
       logretentiondays: 30
-#server:
-  #port: 8114
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
deleted file mode 100644
index 592724d..0000000
--- a/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-#本地和内网配置
-mybatis:
-  configuration:
-    #开启控制台打印sql
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # mybatis 下划线转驼峰配置,两者都可以
-    map-underscore-to-camel-case: true
-  #配置扫描
-  mapper-locations: classpath:mapper/*.xml
-  #配置xml的结果别名
-  type-aliases-package: com.hxjt.dataupload.model.entity
-spring:
-  autoconfigure:
-    #去除durid配置
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  #druid多数据源配置（纯粹多库）
-  datasource:
-    dynamic:
-      datasource:
-        syncplant:
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-          password: Syncp1@nt
-          #url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant;encrypt=true;trustServerCertificate=true
-          url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant
-          username: sa
-      #数据源基础配置
-      druid:
-        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-        connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        filters: stat,wall
-        initial-size: 5
-        max-active: 20
-        #指定每个连接上PSCache的大小
-        max-pool-prepared-statement-per-connection-size: 20
-        # 配置获取连接等待超时的时间
-        max-wait: 6000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        min-evictable-idle-time-millis: 300000
-        min-idle: 5
-        # 打开PSCache
-        pool-prepared-statements: true
-        test-on-borrow: false
-        test-on-return: false
-        test-while-idle: true
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        time-between-eviction-runs-millis: 60000
-        validation-query: 'SELECT 1'
-      #指定默认数据源(必须配置)
-      primary: syncplant
-      #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
-      strict: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 750a6e2..eb49595 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   profiles:
     active: dev
 server:
-  port: 8112
\ No newline at end of file
+  port: 8118
\ No newline at end of file