Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/utils/GoogleRankUtil.java

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

@@ -6,7 +6,7 @@ spring:
         druid:
 #            # 主库数据源-成达服务器-测试库
             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
                 password: Aa123456.
 #             主库数据源-成达服务器-生产库

dl_admin/ruoyi-admin/src/main/resources/application.yml

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

dl_vue/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 成事达管理平台
 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