From 6b17b5995597dc9a10eccef12d8e21b4f9cb6410 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Sat, 1 May 2021 11:06:55 +0800
Subject: [PATCH] Merge branch 'master' of
 E:\workspace-nice\system-examination-signup with conflicts.

---
 pom.xml                            |  6 ++++++
 src/main/resources/application.yml | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b4ea61..5bd2c5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,12 @@
             <version>1.18.16</version>
             <scope>provided</scope>
         </dependency>
+
+        <!--<dependency>
+            <artifactId>module-building-pictures</artifactId>
+            <groupId>cn.com.tenlion</groupId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 32bc037..e92c4d6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 server:
-  port: 7009
-  url: http://127.0.0.1:7009/signup
+  port: 8089
+  url: http://192.168.0.111:8089/signup
   system-title: 考试报名系统
   system-sub-title: 考试报名系统
   servlet:
@@ -25,11 +25,11 @@ spring:
       max-request-size: 1GB
   datasource:
     druid:
-      url: jdbc:mysql://127.0.0.1:3306/db_examination_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
+      url: jdbc:mysql://49.232.216.45:3306/db_module_building_pictures?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
       db-type: mysql
       driver-class-name: com.mysql.cj.jdbc.Driver
-      username: root
-      password: root
+      username: renpengcheng
+      password: tsrenpengcheng
       initial-size: 2
       min-idle: 2
       max-active: 5