Merge pull request #164 from terwer/v4.x

fix:fix database
terwer · Jun 19, 2022 · e52cc35 · e52cc35
2 parents c8f4326 + 7805c45
commit e52cc35
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ docker-compose.prod.yml
 /data/
 src/main/resources/static/
 src/main/resources/templates/
+jvue-server-log/
diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
@@ -53,8 +53,8 @@ services:
       - "TZ=CST-8"
       - "MYSQL_ROOT_PASSWORD=123456"
       - "MYSQL_ROOT_HOST=%"
-      - "MYSQL_DATABASE=testbugucms"
-      - "MYSQL_USER=test"
+      - "MYSQL_DATABASE=bugucms"
+      - "MYSQL_USER=terwer"
       - "MYSQL_PASSWORD=123456"
     volumes:
       - ./data/mysql/db:/var/db

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,8 +53,8 @@ services:
       - "TZ=CST-8"
       - "MYSQL_ROOT_PASSWORD=123456"
       - "MYSQL_ROOT_HOST=%"
-      - "MYSQL_DATABASE=testbugucms"
-      - "MYSQL_USER=test"
+      - "MYSQL_DATABASE=bugucms"
+      - "MYSQL_USER=terwer"
       - "MYSQL_PASSWORD=123456"
     volumes:
       - ./jvue-mysql/init:/docker-entrypoint-initdb.d/

diff --git a/jvue-server/src/main/resources/application-dev.properties b/jvue-server/src/main/resources/application-dev.properties
@@ -1,17 +1,17 @@
 # ================================================
-#                   项目基本配置
+#                   \u9879\u76ee\u57fa\u672c\u914d\u7f6e
 # ================================================
 server.port=8081
 
 # ================================================
-#                  DataSource配置
+#                  DataSource\u914d\u7f6e
 # ================================================
 # MyBatis
 mybatis.mapper-locations=classpath:mappers/*.xml
 # MySQL
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:MySQL://localhost:3306/testbugucms?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.username=root
+spring.datasource.url=jdbc:MySQL://localhost:3306/bugucms?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.username=terwer
 spring.datasource.password=123456
 # PageHelper
 pagehelper.helperDialect=mysql

diff --git a/jvue-server/src/main/resources/application-docker.properties b/jvue-server/src/main/resources/application-docker.properties
@@ -1,17 +1,17 @@
 # ================================================
-#                   项目基本配置
+#                   \u9879\u76ee\u57fa\u672c\u914d\u7f6e
 # ================================================
 server.port=8081
 
 # ================================================
-#                  DataSource配置
+#                  DataSource\u914d\u7f6e
 # ================================================
 # MyBatis
 mybatis.mapper-locations=classpath:mappers/*.xml
 # MySQL
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:MySQL://39.104.66.135:3306/testbugucms?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.username=test
+spring.datasource.url=jdbc:MySQL://localhost:3306/bugucms?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.username=terwer
 spring.datasource.password=123456
 # PageHelper
 pagehelper.helperDialect=mysql

diff --git a/jvue-server/src/main/resources/logback-spring.xml b/jvue-server/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
         <property name="logFilePath" value="${catalina.base}/logs" />
     </springProfile>
     <springProfile name="docker">
-        <property name="logFilePath" value="jvue-server/logs" />
+        <property name="logFilePath" value="jvue-server-log/logs" />
     </springProfile>
 
     <property name="log.context.name" value="JVueApplication" />