dianliang/dl_site_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/utils/GoogleRankUtil.java
This commit is contained in:
menft 2025-10-24 17:06:17 +08:00
commit 81e10c7cfb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,7 +6,7 @@ spring:
druid: druid:
# # 主库数据源-成达服务器-测试库 # # 主库数据源-成达服务器-测试库
master: master:
url: jdbc:mysql://8.220.74.244:3306/dl_test_site?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/dl_test_site?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: dl_test_site username: dl_test_site
password: Aa123456. password: Aa123456.
# 主库数据源-成达服务器-生产库 # 主库数据源-成达服务器-生产库

2
dl_admin/ruoyi-admin/src/main/resources/application.yml
View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 8099 port: 8098
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /

2
dl_vue/.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 成事达管理平台
ENV = 'development' ENV = 'development'
# 成事达管理平台/生产环境 # 成事达管理平台/生产环境
VUE_APP_BASE_API = 'http://127.0.0.1:8099' VUE_APP_BASE_API = 'http://8.220.74.244:8098'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true