From fa0f2897c51da581aa23652d18f28ada7d50c262 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 26 Apr 2025 17:08:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=8D=A2=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 88 ++++++++++++---------- admin-hanhai-vue/.env.development | 2 +- admin-hanhai-vue/.env.production | 2 +- .../src/main/resources/application-dev.yml | 18 ++--- 4 files changed, 58 insertions(+), 52 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ad2baac..eb2f72c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,13 +3,8 @@ - - - - - - + - + @@ -292,7 +295,9 @@ - + + @@ -312,7 +317,8 @@ - @@ -331,74 +337,74 @@ - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index ae6a99b..5aad27b 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://adminmassage.augcl.com/massage-admin/ +VUE_APP_API_BASE_URL=https://www.yurangongfang.com/massage-admin/ //VUE_APP_API_BASE_URL=http://localhost:8000/massage-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 9581ba3..b32f4db 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://adminmassage.augcl.com/massage-admin/ +VUE_APP_API_BASE_URL=https://www.yurangongfang.com/massage-admin/ //VUE_APP_API_BASE_URL=http://localhost:8000/massage-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file 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 85b36a3..50a22a8 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/massage?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://124.223.100.7:3306/massage?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: Abc.123456 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: 124.223.100.7 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: LTAI5tQSs47izVy8DLVdwUU9 - secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: hanhaiimage - staticDomain: https://image.hhlm1688.com/ + accessKey: LTAI5tQj3DzgwcgF5DnKtXpy + secretKey: x8dqo1vIyXTLkPSnIC3E8evWzojjuD + endpoint: oss-cn-beijing.aliyuncs.com + bucketName: yurangongfang + staticDomain: https://img.yurangongfang.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES