From 5faf6aa301013c6e9078ca53922d678619d22929 Mon Sep 17 00:00:00 2001
From: hawk <317642196@qq.com>
Date: Fri, 23 Sep 2022 09:36:26 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a70c5f6fc3675b259197dc82e8a4355cd61d727c.
---
 .gitignore                                    |  6 +----
 admin/.env.development                        |  2 +-
 .../resources/application-pro-example.yml     | 24 +++++++++++++++++++
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/log4j2-spring.xml      |  2 +-
 5 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 server/like-admin/src/main/resources/application-pro-example.yml

diff --git a/.gitignore b/.gitignore
index 8f45c815..e1f1d407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,4 @@ application-dev.yml
 application-pro.yml
 application-dem.yml
 application-prod.yml
-application-test.yml
-.env.development
-application-pro-example.yml
-application-remote.yml
-application.yml
+application-test.yml
\ No newline at end of file
diff --git a/admin/.env.development b/admin/.env.development
index 20369441..ee70684f 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,4 +1,4 @@
 NODE_ENV = 'development'
 
 # 请求域名
-VITE_APP_BASE_URL='http://localhost:8082'
+VITE_APP_BASE_URL='https://likeadmin-java.yixiangonline.com'
\ No newline at end of file
diff --git a/server/like-admin/src/main/resources/application-pro-example.yml b/server/like-admin/src/main/resources/application-pro-example.yml
new file mode 100644
index 00000000..f036cf79
--- /dev/null
+++ b/server/like-admin/src/main/resources/application-pro-example.yml
@@ -0,0 +1,24 @@
+# 项目配置
+like:
+  upload-directory: /www/uploads/likeadmin-java/ # 上传目录
+
+# 框架配置
+spring:
+  # 数据源配置
+  datasource:
+    url: jdbc:mysql://localhost:3306/【库名称】?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+    type: com.zaxxer.hikari.HikariDataSource # 数据源类型
+    driver-class-name: com.mysql.jdbc.Driver # MySql的驱动
+    username: root # 数据库账号
+    password: root # 数据库密码
+  # Redis配置
+  redis:
+    host: localhost   # Redis服务地址
+    port: 6379        # Redis端口
+    password:         # Redis密码
+    database: 0       # 数据库索引
+
+# Mybatis-plus配置 【是否开启SQL日志输出】
+#mybatis-plus:
+#    configuration:
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml
index a0a09065..2c5b311b 100644
--- a/server/like-admin/src/main/resources/application.yml
+++ b/server/like-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ server:
 # 框架配置
 spring:
   profiles:
-    active: pro
+    active: dev
   mvc:
     static-path-pattern: /api/static/**
   # 数据源配置
diff --git a/server/like-admin/src/main/resources/log4j2-spring.xml b/server/like-admin/src/main/resources/log4j2-spring.xml
index 7b86706f..afe77105 100644
--- a/server/like-admin/src/main/resources/log4j2-spring.xml
+++ b/server/like-admin/src/main/resources/log4j2-spring.xml
@@ -6,7 +6,7 @@
     <!-- 变量配置 -->
     <Properties>
         <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
-        <property name="FILE_PATH" value="/Users/zhangchangshun/Desktop/workspace/gitee/likeadmin_java/admin" />
+        <property name="FILE_PATH" value="/www/logs/likeadmin-java/admin" />
         <property name="FILE_NAME" value="admin-log4j2" />
     </Properties>