update conf

This commit is contained in:
jiangyuwei666
2019-08-19 16:31:30 +08:00
parent 355dc55751
commit 718d7316a0
22 changed files with 909 additions and 77 deletions

View File

@@ -2,16 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/logback.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/spring/spring-service.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/spring/spring-web.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/sql/test.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/BaseTest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -20,55 +20,110 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/sql/test.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="26" column="16" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
<state relative-caret-position="108">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#446#447#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#516#517#0" expanded="true" />
<element signature="e#552#553#0" expanded="true" />
<element signature="e#587#588#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
<element signature="e#666#667#0" expanded="true" />
<element signature="e#706#707#0" expanded="true" />
<element signature="e#745#746#0" expanded="true" />
<element signature="e#780#781#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#884#885#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-825">
<caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-service.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<state relative-caret-position="161">
<caret line="16" column="19" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="32" column="49" lean-forward="true" selection-start-line="32" selection-start-column="49" selection-end-line="32" selection-end-column="49" />
<state relative-caret-position="198">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Interface" />
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/resources/spring/spring-service.xml" />
<option value="$PROJECT_DIR$/src/main/resources/spring/spring-web.xml" />
<option value="$PROJECT_DIR$/src/main/sql/test.sql" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/BaseTest.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml" />
</list>
</option>
</component>
@@ -92,6 +147,7 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -115,19 +171,56 @@
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mapper" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566184623496" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566201050389" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Facets" />
@@ -153,6 +246,61 @@
</list>
</option>
</component>
<component name="RunManager" selected="JUnit.RoomDaoTest">
<configuration name="RoomDaoTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.dao.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.RoomDaoTest" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="RoomDaoTest.testFindAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.dao.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.RoomDaoTest" />
<option name="METHOD_NAME" value="testFindAll" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="RoomDaoTest.testFindById" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.dao.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.RoomDaoTest" />
<option name="METHOD_NAME" value="testFindById" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.RoomDaoTest" />
<item itemvalue="JUnit.RoomDaoTest.testFindById" />
<item itemvalue="JUnit.RoomDaoTest.testFindAll" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
@@ -164,78 +312,233 @@
<option name="presentableId" value="Default" />
<updated>1566183440564</updated>
<workItem from="1566183447115" duration="1019000" />
<workItem from="1566188910490" duration="8703000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 20m 08s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 20m 57s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 21m 25s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 21m 56s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindAll - 2019.08.19 at 15h 25m 13s.xml">
<configuration name="RoomDaoTest.testFindAll" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 27m 37s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 27m 56s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 30m 56s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest_testFindById - 2019.08.19 at 15h 32m 42s.xml">
<configuration name="RoomDaoTest.testFindById" configurationId="JUnit" />
</history-entry>
<history-entry file="RoomDaoTest - 2019.08.19 at 15h 33m 25s.xml">
<configuration name="RoomDaoTest" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1019000" />
<option name="totallyTimeSpent" value="9722000" />
</component>
<component name="ToolWindowManager">
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Designer" />
<window_info id="Image Layers" />
<window_info id="UI Designer" />
<window_info id="Favorites" side_tool="true" />
<window_info id="Capture Tool" />
<window_info id="Web" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2533512" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Spring" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Java Enterprise" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Messages" visible="true" weight="0.33002833" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
<window_info id="Capture Tool" order="4" />
<window_info id="UI Designer" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.49291784" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Maven" />
<window_info anchor="right" id="Palette" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="Palette&#9;" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="bottom" id="Spring" order="7" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="10" weight="0.33002833" />
<window_info anchor="bottom" id="Java Enterprise" order="11" />
<window_info anchor="bottom" id="Database Changes" order="12" />
<window_info anchor="bottom" id="Terminal" order="13" weight="0.3286119" />
<window_info anchor="bottom" id="Version Control" order="14" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Maven" order="3" />
<window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Capture Analysis" order="5" />
<window_info anchor="right" id="Database" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Theme Preview" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/sql/test.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="26" column="16" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/BaseTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="11" column="25" lean-forward="true" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-825">
<caret line="8" column="35" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-service.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<state relative-caret-position="165">
<caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="32" column="49" lean-forward="true" selection-start-line="32" selection-start-column="49" selection-end-line="32" selection-end-column="49" />
<state relative-caret-position="858">
<caret line="26" column="68" lean-forward="true" selection-start-line="26" selection-start-column="68" selection-end-line="26" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-service.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="17" column="63" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-dao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1471">
<caret line="47" column="51" lean-forward="true" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4305">
<caret line="135" column="59" selection-start-line="135" selection-start-column="59" selection-end-line="135" selection-end-column="59" />
<folding>
<element signature="e#1238#1239#0" expanded="true" />
<element signature="e#1269#1270#0" expanded="true" />
<element signature="e#1315#1316#0" expanded="true" />
<element signature="e#1355#1356#0" expanded="true" />
<element signature="e#1392#1393#0" expanded="true" />
<element signature="e#1427#1428#0" expanded="true" />
<element signature="e#1481#1482#0" expanded="true" />
<element signature="e#1529#1530#0" expanded="true" />
<element signature="e#1566#1567#0" expanded="true" />
<element signature="e#1599#1600#0" expanded="true" />
<element signature="e#1651#1652#0" expanded="true" />
<element signature="e#1695#1696#0" expanded="true" />
<element signature="e#1731#1732#0" expanded="true" />
<element signature="e#1763#1764#0" expanded="true" />
<element signature="e#1813#1814#0" expanded="true" />
<element signature="e#1855#1856#0" expanded="true" />
<element signature="e#1895#1896#0" expanded="true" />
<element signature="e#1931#1932#0" expanded="true" />
<element signature="e#1989#1990#0" expanded="true" />
<element signature="e#2039#2040#0" expanded="true" />
<element signature="e#2080#2081#0" expanded="true" />
<element signature="e#2117#2118#0" expanded="true" />
<element signature="e#2177#2178#0" expanded="true" />
<element signature="e#2229#2230#0" expanded="true" />
<element signature="e#2268#2269#0" expanded="true" />
<element signature="e#2303#2304#0" expanded="true" />
<element signature="e#2359#2360#0" expanded="true" />
<element signature="e#2407#2408#0" expanded="true" />
<element signature="e#2446#2447#0" expanded="true" />
<element signature="e#2481#2482#0" expanded="true" />
<element signature="e#2537#2538#0" expanded="true" />
<element signature="e#2585#2586#0" expanded="true" />
<element signature="e#2621#2622#0" expanded="true" />
<element signature="e#2655#2656#0" expanded="true" />
<element signature="e#2707#2708#0" expanded="true" />
<element signature="e#2753#2754#0" expanded="true" />
<element signature="e#2789#2790#0" expanded="true" />
<element signature="e#2823#2824#0" expanded="true" />
<element signature="e#2875#2876#0" expanded="true" />
<element signature="e#2921#2922#0" expanded="true" />
<element signature="e#2957#2958#0" expanded="true" />
<element signature="e#2992#2993#0" expanded="true" />
<element signature="e#3045#3046#0" expanded="true" />
<element signature="e#3093#3094#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#446#447#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#516#517#0" expanded="true" />
<element signature="e#552#553#0" expanded="true" />
<element signature="e#587#588#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
<element signature="e#666#667#0" expanded="true" />
<element signature="e#706#707#0" expanded="true" />
<element signature="e#745#746#0" expanded="true" />
<element signature="e#780#781#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#884#885#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="16" column="19" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
</state>
</provider>
</entry>

View File

@@ -24,7 +24,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- 1.日志 -->

View File

@@ -0,0 +1,21 @@
package com.oldpeoplehome.dao;
import com.oldpeoplehome.entity.Room;
import java.util.List;
/**
* Created By Jiangyuwei on 2019/8/19 14:28
* Description:
*/
public interface RoomDao {
//通过id查房间
Room findById(int roomId);
//查所有房间
List<Room> findAll();
//添加房间
Room insertRoom(Room room);
}

View File

@@ -0,0 +1,144 @@
package com.oldpeoplehome.entity;
import java.sql.Date;
/**
* Created By Jiangyuwei on 2019/8/19 14:18
* Description:
*/
public class Parent {
private long parentId;
private long parentLongId;
private String parentName;
private String parentSex;
private String parentAccount;
private String parentPassword;
private double parentHeight;
private double parentWeight;
private Date parentBirth;
private long parentPhone;
private int parentRoomId;
public Parent() {
}
public Parent(long parentId, long parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, double parentHeight, double parentWeight, Date parentBirth, long parentPhone, int parentRoomId) {
this.parentId = parentId;
this.parentLongId = parentLongId;
this.parentName = parentName;
this.parentSex = parentSex;
this.parentAccount = parentAccount;
this.parentPassword = parentPassword;
this.parentHeight = parentHeight;
this.parentWeight = parentWeight;
this.parentBirth = parentBirth;
this.parentPhone = parentPhone;
this.parentRoomId = parentRoomId;
}
public long getParentId() {
return parentId;
}
public void setParentId(long parentId) {
this.parentId = parentId;
}
public long getParentLongId() {
return parentLongId;
}
public void setParentLongId(long parentLongId) {
this.parentLongId = parentLongId;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
public String getParentSex() {
return parentSex;
}
public void setParentSex(String parentSex) {
this.parentSex = parentSex;
}
public String getParentAccount() {
return parentAccount;
}
public void setParentAccount(String parentAccount) {
this.parentAccount = parentAccount;
}
public String getParentPassword() {
return parentPassword;
}
public void setParentPassword(String parentPassword) {
this.parentPassword = parentPassword;
}
public double getParentHeight() {
return parentHeight;
}
public void setParentHeight(double parentHeight) {
this.parentHeight = parentHeight;
}
public double getParentWeight() {
return parentWeight;
}
public void setParentWeight(double parentWeight) {
this.parentWeight = parentWeight;
}
public Date getParentBirth() {
return parentBirth;
}
public void setParentBirth(Date parentBirth) {
this.parentBirth = parentBirth;
}
public long getParentPhone() {
return parentPhone;
}
public void setParentPhone(long parentPhone) {
this.parentPhone = parentPhone;
}
public int getParentRoomId() {
return parentRoomId;
}
public void setParentRoomId(int parentRoomId) {
this.parentRoomId = parentRoomId;
}
@Override
public String toString() {
return "Parent{" +
"parentId=" + parentId +
", parentLongId=" + parentLongId +
", parentName='" + parentName + '\'' +
", parentSex='" + parentSex + '\'' +
", parentAccount='" + parentAccount + '\'' +
", parentPassword='" + parentPassword + '\'' +
", parentHeight=" + parentHeight +
", parentWeight=" + parentWeight +
", parentBirth=" + parentBirth +
", parentPhone=" + parentPhone +
", parentRoomId=" + parentRoomId +
'}';
}
}

View File

@@ -0,0 +1,54 @@
package com.oldpeoplehome.entity;
/**
* Created By Jiangyuwei on 2019/8/19 14:16
* Description:
*/
public class Room {
private int roomId;
private String roomLocation;
private String roomName;
public Room() {
}
public Room(int roomId, String roomLocation, String roomName) {
this.roomId = roomId;
this.roomName = roomName;
this.roomLocation = roomLocation;
}
public int getRoomId() {
return roomId;
}
public void setRoomId(int roomId) {
this.roomId = roomId;
}
public String getRoomName() {
return roomName;
}
public void setRoomName(String roomName) {
this.roomName = roomName;
}
public String getRoomLocation() {
return roomLocation;
}
public void setRoomLocation(String roomLocation) {
this.roomLocation = roomLocation;
}
@Override
public String toString() {
return "Room{" +
"roomId=" + roomId +
", roomName='" + roomName + '\'' +
", roomLocation='" + roomLocation + '\'' +
'}';
}
}

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
<id column="id" property="roomId" jdbcType="INTEGER"/>
<result column="location" property="roomLocation" jdbcType="VARCHAR"/>
<result column="name" property="roomName" jdbcType="VARCHAR"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="int">
select * from room where id = #{roomId}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from room
</select>
<insert id="insertRoom">
</insert>
</mapper>

View File

@@ -35,7 +35,7 @@
<!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
<property name="configLocation" value="classpath:mybatis-config.xml"/>
<!-- 扫描entity包 使用别名 -->
<property name="typeAliasesPackage" value="com.test.entity"/>
<property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
<!-- 扫描sql配置文件:mapper需要的xml文件 -->
<property name="mapperLocations" value="classpath:mapper/*.xml"/>
</bean>
@@ -45,7 +45,7 @@
<!-- 注入sqlSessionFactory -->
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
<!-- 给出需要扫描Dao接口包 -->
<property name="basePackage" value="com.test.dao"/>
<property name="basePackage" value="com.oldpeoplehome.dao"/>
</bean>
</beans>

View File

@@ -0,0 +1,64 @@
/*
Navicat Premium Data Transfer
Source Server : localhost
Source Server Type : MySQL
Source Server Version : 80013
Source Host : localhost:3306
Source Schema : ssmtest
Target Server Type : MySQL
Target Server Version : 80013
File Encoding : 65001
Date: 19/08/2019 14:07:35
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for room
-- ----------------------------
DROP TABLE IF EXISTS `room`;
CREATE TABLE `room` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '房间id',
`location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间位置',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间名称(房间号)',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of room
-- ----------------------------
INSERT INTO `room` VALUES (1, '中北大学9#', '146');
SET FOREIGN_KEY_CHECKS = 1;
-- ----------------------------
-- Table structure for parent
-- ----------------------------
DROP TABLE IF EXISTS `parent`;
CREATE TABLE `parent` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '老人id',
`longid` bigint(18) NOT NULL COMMENT '老人身份证',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '姓名',
`sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '性别',
`account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '账号',
`password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
`height` double NULL DEFAULT NULL COMMENT '身高',
`weight` double NULL DEFAULT NULL COMMENT '体重',
`birth` date NOT NULL COMMENT '生日',
`phone` bigint(11) NULL DEFAULT NULL COMMENT '电话号码',
`room` int(11) NULL DEFAULT NULL COMMENT 'room id',
PRIMARY KEY (`id`) USING BTREE,
INDEX `rid`(`room`) USING BTREE,
CONSTRAINT `rid` FOREIGN KEY (`room`) REFERENCES `room` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of parent
-- ----------------------------
INSERT INTO `parent` VALUES (1, 510703199706330018, 'jiang', '', 'jiang', '123', 170, 63, '1997-06-23', 19935324869, 1);
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -0,0 +1,19 @@
package com.oldpeoplehome;
/**
* Created By Jiangyuwei on 2019/8/19 15:00
* Description:
*/
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* 配置spring和junit整合junit启动时加载springIOC容器 spring-test,junit
*/
@RunWith(SpringJUnit4ClassRunner.class)
// 告诉junit spring配置文件
@ContextConfiguration({ "classpath:spring/spring-dao.xml", "classpath:spring/spring-service.xml" })
public class BaseTest {
}

View File

@@ -0,0 +1,32 @@
package com.oldpeoplehome.dao;
import com.oldpeoplehome.BaseTest;
import com.oldpeoplehome.entity.Room;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/**
* Created By Jiangyuwei on 2019/8/19 15:01
* Description:
*/
public class RoomDaoTest extends BaseTest {
@Autowired
private RoomDao roomDao;
@Test
public void testFindById() throws Exception{
int roomId = 1;
Room room = roomDao.findById(roomId);
System.out.println(room);
}
@Test
public void testFindAll(){
List<Room> s = roomDao.findAll();
System.out.println(s);
}
}

View File

@@ -0,0 +1,4 @@
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.username=root
jdbc.password=root

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="STDOUT" />
</root>
</configuration>

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
<id column="id" property="roomId" jdbcType="INTEGER"/>
<result column="location" property="roomLocation" jdbcType="VARCHAR"/>
<result column="name" property="roomName" jdbcType="VARCHAR"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="int">
select * from room where id = #{roomId}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from room
</select>
</mapper>

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<!-- 配置全局属性 -->
<settings>
<!-- 使用jdbc的getGeneratedKeys获取数据库自增主键值 -->
<setting name="useGeneratedKeys" value="true" />
<!-- 使用列别名替换列名 默认:true -->
<setting name="useColumnLabel" value="true" />
<!-- 开启驼峰命名转换:Table{create_time} -> Entity{createTime} -->
<setting name="mapUnderscoreToCamelCase" value="true" />
</settings>
</configuration>

View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<!--配置数据库相关参数 -->
<context:property-placeholder location="classpath:jdbc.properties"/>
<!-- 2.数据库连接池 -->
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
<!-- 配置连接池属性 -->
<property name="driverClass" value="${jdbc.driver}"/>
<property name="jdbcUrl" value="${jdbc.url}"/>
<property name="user" value="${jdbc.username}"/>
<property name="password" value="${jdbc.password}"/>
<!-- c3p0连接池的私有属性 -->
<property name="maxPoolSize" value="30"/>
<property name="minPoolSize" value="10"/>
<!-- 关闭连接后不自动commit -->
<property name="autoCommitOnClose" value="false"/>
<!-- 获取连接超时时间 -->
<property name="checkoutTimeout" value="10000"/>
<!-- 当获取连接失败重试次数 -->
<property name="acquireRetryAttempts" value="2"/>
</bean>
<!-- 3.配置SqlSessionFactory对象 -->
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<!-- 注入数据库连接池 -->
<property name="dataSource" ref="dataSource"/>
<!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
<property name="configLocation" value="classpath:mybatis-config.xml"/>
<!-- 扫描entity包 使用别名 -->
<property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
<!-- 扫描sql配置文件:mapper需要的xml文件 -->
<property name="mapperLocations" value="classpath:mapper/*.xml"/>
</bean>
<!-- 4.配置扫描Dao接口包动态实现Dao接口注入到spring容器中 -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<!-- 注入sqlSessionFactory -->
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
<!-- 给出需要扫描Dao接口包 -->
<property name="basePackage" value="com.oldpeoplehome.dao"/>
</bean>
</beans>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd">
<!-- 扫描service包下所有使用注解的类型 -->
<context:component-scan base-package="com.oldpeoplehome.service" />
<!-- 配置事务管理器 -->
<bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<!-- 注入数据库连接池 -->
<property name="dataSource" ref="dataSource" />
</bean>
<!-- 配置基于注解的声明式事务 -->
<tx:annotation-driven transaction-manager="transactionManager" />
</beans>

View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<!-- 配置SpringMVC -->
<!-- 1.开启SpringMVC注解模式 -->
<!-- 简化配置:
(1)自动注册DefaultAnootationHandlerMapping,AnotationMethodHandlerAdapter
(2)提供一些列数据绑定数字和日期的format @NumberFormat, @DateTimeFormat, xml,json默认读写支持
-->
<mvc:annotation-driven />
<!-- 2.静态资源默认servlet配置
(1)加入对静态资源的处理js,gif,png
(2)允许使用"/"做整体映射
-->
<mvc:default-servlet-handler/>
<!-- 3.配置jsp 显示ViewResolver -->
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
<property name="prefix" value="/WEB-INF/jsp/" />
<property name="suffix" value=".jsp" />
</bean>
<!-- 4.扫描web相关的bean -->
<context:component-scan base-package="com.oldpeoplehome.web" />
<context:component-scan base-package="com.oldpeoplehome">
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
</context:component-scan>
</beans>