|
|
@@ -1,7 +1,84 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="" />
|
|
|
+ <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/application.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/auth/pub.key" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/com/usoftchina/smartschool/school/SchoolApplication.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/config/application-dev.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/config/application-docker-prod.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/config/application-docker-test.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/config/application-docker.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/target/classes/logback-spring.xml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/Result.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/dto/CommonBaseDTO.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/entity/BaseEntity.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/entity/CommonBaseEntity.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/mapper/BaseMapper.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/mapper/CommonBaseMapper.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/service/BaseService.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/service/BaseServiceImpl.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/service/CommonBaseService.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/base/service/CommonBaseServiceImpl.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/cache/BaseRedisCache.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/cache/Cache.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/cache/CacheKeyHelper.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/cache/RedisConfig.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/cache/RedisHashCache.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/constant/CommonConstants.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/context/BaseContextHolder.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/context/SpringContextHolder.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/BaseCheckedException.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/BaseException.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/BaseExceptionCode.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/BaseUncheckedException.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/BizException.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/CommonException.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/exception/ExceptionCode.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/Connectable.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/DynamicDataSource.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/DynamicDataSourceContextHolder.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/DynamicDataSourceRegister.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/JdbcUrl$Type.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/jdbc/JdbcUrl.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/page/PageDefault.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/page/PageRequest.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/page/PageRequestArgumentResolver.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/BeanMapper.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/BizAssert.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/CollectionUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/DateUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/JsonUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/ObjectUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/RedisUtil.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/RegexpUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/RsaUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/StringUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/Hex.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HmacEncoder.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HmacSHA256Encoder.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HmacUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HttpUtil$1.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HttpUtil$2.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HttpUtil$3.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HttpUtil$Response.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/classes/com/usoftchina/smartschool/utils/http/HttpUtil.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/core-1.0-SNAPSHOT.jar" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/maven-archiver/pom.properties" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/META-INF/spring.factories" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/banner.txt" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/ServerAutoConfiguration.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/context/SpringContextListener.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/error/DefaultErrorConfig.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/error/GlobalExceptionHandler.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/error/ServletErrorUtils.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/error/UnCaughtErrorFilter.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/web/DefaultWebMvcConfig.class" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/framework/server-starter/target/classes/com/usoftchina/smartschool/server/web/ServletUtils.class" afterPath="" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ </list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/applications/target/" />
|
|
|
@@ -50,8 +127,8 @@
|
|
|
<file leaf-file-name="SchoolApplication.java" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="117">
|
|
|
- <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
|
|
|
+ <state relative-caret-position="152">
|
|
|
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#740#741#0" expanded="true" />
|
|
|
@@ -179,6 +256,9 @@
|
|
|
<replace>smartschool</replace>
|
|
|
</replaceStrings>
|
|
|
</component>
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ </component>
|
|
|
<component name="GradleLocalSettings">
|
|
|
<option name="externalProjectsViewState">
|
|
|
<projects_view />
|
|
|
@@ -233,11 +313,11 @@
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" />
|
|
|
<option value="$PROJECT_DIR$/framework/server-starter/src/main/resources/META-INF/spring.factories" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/logback-spring.xml" />
|
|
|
- <option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
|
|
|
<option value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/ServerAutoConfiguration.java" />
|
|
|
<option value="$PROJECT_DIR$/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/framework/core/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -287,6 +367,7 @@
|
|
|
<option name="width" value="1346" />
|
|
|
<option name="height" value="728" />
|
|
|
</component>
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
|
<flattenPackages />
|
|
|
@@ -625,12 +706,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1547624293267</updated>
|
|
|
<workItem from="1547624296253" duration="4914000" />
|
|
|
- <workItem from="1547630177539" duration="2620000" />
|
|
|
+ <workItem from="1547630177539" duration="2979000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="7534000" />
|
|
|
+ <option name="totallyTimeSpent" value="7893000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
@@ -643,10 +724,10 @@
|
|
|
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19901316" sideWeight="0.12254161" order="14" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45688352" sideWeight="0.49041095" order="4" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.57990116" sideWeight="0.5484115" order="11" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1924342" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.57990116" sideWeight="0.5484115" order="11" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24876441" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47116968" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16144976" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3756178" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30332828" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
@@ -1114,8 +1195,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="117">
|
|
|
- <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
|
|
|
+ <state relative-caret-position="152">
|
|
|
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#740#741#0" expanded="true" />
|