From 595c414a15c5a7f036bba6b6a0de046364a93934 Mon Sep 17 00:00:00 2001
From: Aokiso <1010390029@qq.com>
Date: Sat, 19 Jan 2019 20:30:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                   | 5 ++++-
 .idea/encodings.xml                                  | 3 ++-
 .idea/misc.xml                                       | 1 +
 .idea/modules.xml                                    | 1 +
 backGround/src/main/resources/application.properties | 9 +++++++++
 demo/src/main/resources/static/css/SYSFrame1.css     | 2 +-
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9ea6e96..ff9ee19 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,16 +6,19 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="backGround" />
         <module name="demo" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
+      <module name="backGround" target="1.8" />
       <module name="demo" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="demo" options="" />
+      <module name="backGround" options="-parameters" />
+      <module name="demo" options="-parameters" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c0f880b..c38e1c8 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+    <file url="file://$PROJECT_DIR$/backGround" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/demo" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e9a5dc9..5b14a2b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,7 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/demo/pom.xml" />
+        <option value="$PROJECT_DIR$/backGround/pom.xml" />
       </list>
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 56359f1..8426856 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/backGround/backGround.iml" filepath="$PROJECT_DIR$/backGround/backGround.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo/demo.iml" filepath="$PROJECT_DIR$/demo/demo.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/firstproject.iml" filepath="$PROJECT_DIR$/.idea/firstproject.iml" />
     </modules>
diff --git a/backGround/src/main/resources/application.properties b/backGround/src/main/resources/application.properties
index e69de29..c3208d2 100644
--- a/backGround/src/main/resources/application.properties
+++ b/backGround/src/main/resources/application.properties
@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/soft?serverTimezone=GMT%2B8
+spring.datasource.username=root
+spring.datasource.password=123456789
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.max-idle=10
+#spring.datasource.max-wait=10000
+#spring.datasource.min-idle=5
+#spring.datasource.initial-size=5
+
diff --git a/demo/src/main/resources/static/css/SYSFrame1.css b/demo/src/main/resources/static/css/SYSFrame1.css
index 02e1e7f..c93fa3e 100644
--- a/demo/src/main/resources/static/css/SYSFrame1.css
+++ b/demo/src/main/resources/static/css/SYSFrame1.css
@@ -623,7 +623,7 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 	border-color: #438EB9
 }
 .hover-deep-gray:hover, .bg-deep-gray{
-	color: #33333;
+	color:#6C7B8B;
     background: #DDDDDD!important;
 	border-color: #DEDEDE
 }