From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 ManagementIGOTravel/guns-admin/src/main/resources/application.yml |  126 -----------------------------------------
 1 files changed, 1 insertions(+), 125 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
index d5e2a26..62b85a4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
@@ -1,127 +1,3 @@
-server:
-  port: 8010
-
-guns:
-  swagger-open: false              #是否开启swagger (true/false)
-  kaptcha-open: false             #是否开启登录时验证码 (true/false)
-  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
-  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
-  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
-#  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
-#  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
-  file-upload-path: C:\Users\Administrator\Desktop\apache-tomcat-8.0.33\webapps\ROOT\upload\ #文件上传目录(不配置的话为java.io.tmpdir目录)
-  picture-server-address: http://139.9.249.67:8080/upload/  #图片服务器地址
-  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径
-
 spring:
   profiles:
-    active: @spring.active@
-  mvc:
-    static-path-pattern: /static/**
-    view:
-      prefix: /WEB-INF/view
-  devtools:
-    restart:
-      enabled: false
-      additional-paths: src/main/java
-      exclude: static/**,WEB-INF/view/**
-  servlet:
-    multipart:
-      max-request-size: 100MB
-      max-file-size: 100MB
-
-mybatis-plus:
-  type-aliases-package: com.stylefeng.guns.modular.system.model
-  global-config:
-    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: false
-  configuration:
-    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则(camel case)映射
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql,如需打印Sql注释该配置
-
-
----
-
-spring:
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
-    username: root
-    password: HjKbXilb9zajmXbl
-    db-name: guns #用来搜集数据库的所有表
-    filters: wall,mergeStat
-
-################# 测试环境 ###################
-#spring:
-#  datasource:
-#    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: 123456
-#    db-name: igotravel #用来搜集数据库的所有表
-#    filters: wall,mergeStat
-
-
-#多数据源情况的配置
-guns:
-  muti-datasource:
-    open: false
-    url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: Root2020!
-    dataSourceNames:
-      - dataSourceGuns
-      - dataSourceBiz
-
-
----
-
-filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
-#filePath: d:/orderPostionFile/  #存储订单轨迹文件路径
-
-#quartz配置
-spring:
-  quartz:
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: MyDefaultQuartzScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: qrtz_
-            isClustered: false
-            clusterCheckinInterval: 10000
-            useProperties: false
-          threadPool:
-              class: org.quartz.simpl.SimpleThreadPool
-              threadCount: 10
-              threadPriority: 5
-              threadsInheritContextClassLoaderOfInitializingThread: true
-      job-store-type: jdbc
-
----
-
-spring:
-  mail:
-    host: smtp.gmail.com # 配置 smtp 服务器地址
-    port: 465 # smtp 服务器的端口
-    username: i-gotech@i-go.group # 配置邮箱用户名(你的邮箱地址)
-    password: mhizkqkhuknbitps # 配置申请到的授权码(刚让复制的授权码)
-    default-encoding: UTF-8 # 配置邮件编码
-    properties:
-      mail:
-        smtp:
-          socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂
-        debug: true
-    from: i-gotech@i-go.group # 发送方邮件,配在yml中可方便更改
-    template-path: /usr/local/nginx/html/mailbox/
-
----
-#支付回调地址
-#正式环境
-#callbackPath: https://okyueche.com:443/user
-#测试环境
-callbackPath: http://182.160.16.251:8010
-
----
\ No newline at end of file
+    active: @spring.active@
\ No newline at end of file

--
Gitblit v1.7.1