diff --git a/admin-hanhai-vue/public/logo.png b/admin-hanhai-vue/public/logo.png index a4b790c..9a5488a 100644 Binary files a/admin-hanhai-vue/public/logo.png and b/admin-hanhai-vue/public/logo.png differ diff --git a/admin-hanhai-vue/src/assets/logo.png b/admin-hanhai-vue/src/assets/logo.png index a4b790c..9a5488a 100644 Binary files a/admin-hanhai-vue/src/assets/logo.png and b/admin-hanhai-vue/src/assets/logo.png differ diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 360d939..81d0621 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://8.138.162.67:3306/demo?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://106.52.44.223:3306/studytour?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: Fk4q*h@V + password: cn$wLXG# driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 0 - host: 8.138.162.67 + host: 106.52.44.223 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'gmmGMM@2024' + password: 'Abc.123456' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tPfZo39q2r9Sr5mW84u - secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r - endpoint: oss-cn-guangzhou.aliyuncs.com - bucketName: augcl - staticDomain: https://img.augcl.com + accessKey: LTAI5tPYypiDWE1oxh86j5gr + secretKey: xUs9WvptKTNlZ2XKk9aBaWibqKjCZ5 + endpoint: oss-cn-beijing.aliyuncs.com + bucketName: hongyujiaoyu + staticDomain: https://image.hongyujiaoyu.com/ # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES