limeng 2 anni fa
parent
commit
96d08cf0af

+ 5 - 0
.idea/jarRepositories.xml

@@ -3,6 +3,11 @@
   <component name="RemoteRepositoriesConfiguration">
     <remote-repository>
       <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>

+ 65 - 163
.idea/workspace.xml

@@ -9,86 +9,7 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ebd7f95b-51eb-4fbd-af10-5dcac8d98656" name="Default Changelist" comment="Default Changelist">
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles" afterDir="true" />
-      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/component/beetl/fun/ContentRoleCategoryFunction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/component/beetl/fun/ContentTreeRoleCategoryFunction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/VisitsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/impl/VisitsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/mybatis/mapper/TSysRoleCategoryMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/mybatis/mapper/TSysVisitsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/sooka/mybatis/model/TSysRoleCategory.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/com/sooka/mybatis/mapper/TSysRoleCategoryMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/com/sooka/mybatis/mapper/TSysVisitsMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/autoformat.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/long.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/mobile_menu.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_30.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_31.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_32.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_33.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_34.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_35.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_36.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_37.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/images/sygzw_38.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/www/syjcy/style/sy_gzw_media.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/child_footer.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/sookaCms_war.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/sookaCms_war.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/sookaCms_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/sookaCms_war_exploded.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sookaCms.iml" beforeDir="false" afterPath="$PROJECT_DIR$/sookaCms.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/common/upload/UploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/common/upload/UploadController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/component/beetl/BeetlConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/component/beetl/BeetlConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/ContentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/ContentController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/IndexController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/CategoryService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/CategoryService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/impl/CategoryServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/impl/CategoryServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/impl/ContentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/service/impl/ContentServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/RoleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/RoleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/system/service/impl/RoleServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/sooka/mybatis/model/TCmsCategory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/mybatis/model/TCmsCategory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/sooka/mybatis/mapper/TCmsCategoryMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/sooka/mybatis/mapper/TCmsCategoryMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/ckeditor4.8/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/ckeditor4.8/config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/login/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/login/login.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/cms/category_input.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/cms/category_input.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/cms/content.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/cms/content.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/cms/content_input.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/cms/content_input.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/cms/content_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/cms/content_list.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/cms/friend_link.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/cms/friend_link.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/error.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/error.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/admin_input.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/admin_input.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/change_password.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/change_password.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/log_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/log_list.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/role_input.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/role_input.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_14.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_14.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_21.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_21.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_25.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_25.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_29.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_29.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_33.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_33.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_37.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_37.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_41.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_41.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_45.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_45.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_49.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_49.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_53.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_53.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_57.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_57.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_61.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_61.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_65.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_65.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_69.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_69.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_73.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_73.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_77.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/child_index_77.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/child_header.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/child_header.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/footer.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/footer.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/header.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/script.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/include/script.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/www/syjcy/index.html" afterDir="false" />
-    </list>
+    <list default="true" id="ebd7f95b-51eb-4fbd-af10-5dcac8d98656" name="Default Changelist" comment="Default Changelist" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -110,7 +31,7 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:\apache-maven-3.6.3" />
+        <option name="mavenHome" value="D:\JetBrains\IntelliJ IDEA 2020.2.2\plugins\maven\lib\maven3" />
         <option name="userSettingsFile" value="D:\apache-maven-3.6.3\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
@@ -123,6 +44,7 @@
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="Downloaded.Files.Path.Enabled" value="true" />
+    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
     <property name="Repository.Attach.JavaDocs" value="false" />
     <property name="Repository.Attach.Sources" value="false" />
     <property name="RequestMappingsPanelOrder0" value="0" />
@@ -136,13 +58,13 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1634110829233" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../syjcy_jmw" />
     <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="Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.3505747" />
-    <property name="settings.editor.selected.configurable" value="editor.preferences.smartKeys" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.gutterIcons" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
@@ -207,6 +129,19 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="CLASS" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" />
@@ -224,6 +159,8 @@
         </pattern>
       </extension>
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.sooka.CmsApplication" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+      <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -265,24 +202,6 @@
     <configuration>C:\Users\Administrator\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
   </component>
-  <component name="SvnFileUrlMappingImpl">
-    <option name="myMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\项目\运维-沈阳检察院\CMS\内网\sookaCms" />
-          <option name="myCopyRoot" value="D:\项目\运维-沈阳检察院\CMS\内网\sookaCms" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-    <option name="myMoreRealMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="D:\项目\运维-沈阳检察院\CMS\内网\sookaCms" />
-          <option name="myCopyRoot" value="D:\项目\运维-沈阳检察院\CMS\内网\sookaCms" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="ebd7f95b-51eb-4fbd-af10-5dcac8d98656" name="Default Changelist" comment="" />
@@ -436,6 +355,12 @@
       <workItem from="1655969627750" duration="36000" />
       <workItem from="1655969731287" duration="3455000" />
       <workItem from="1667869640532" duration="468000" />
+      <workItem from="1668060483722" duration="2835000" />
+      <workItem from="1668063824900" duration="834000" />
+      <workItem from="1668238544108" duration="531000" />
+      <workItem from="1670381095846" duration="146000" />
+      <workItem from="1670565210562" duration="844000" />
+      <workItem from="1670572386934" duration="891000" />
     </task>
     <task id="LOCAL-00001" summary="适配内容添加页面">
       <created>1633937725548</created>
@@ -617,86 +542,63 @@
     <option name="LAST_COMMIT_MESSAGE" value="Default Changelist" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="488" y="69" key="#com.intellij.ide.util.MemberChooser" timestamp="1655969741420">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="223" y="63" width="1089" height="713" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1670565295353">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state x="488" y="69" key="#com.intellij.ide.util.MemberChooser/0.0.1366.728@0.0.1366.728" timestamp="1655969741420" />
-    <state x="463" y="119" key="FileChooserDialogImpl" timestamp="1655969911718">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="223" y="63" width="1089" height="713" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.816@0.0.1536.816" timestamp="1670565295353" />
+    <state x="549" y="163" key="FileChooserDialogImpl" timestamp="1670572652921">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state x="463" y="119" key="FileChooserDialogImpl/0.0.1366.728@0.0.1366.728" timestamp="1655969911718" />
-    <state width="1323" height="305" key="GridCell.Tab.0.bottom" timestamp="1655975172127">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="549" y="163" key="FileChooserDialogImpl/0.0.1536.816@0.0.1536.816" timestamp="1670572652921" />
+    <state width="1493" height="258" key="GridCell.Tab.0.bottom" timestamp="1670572572487">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state width="1323" height="305" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1655975172127" />
-    <state width="1323" height="305" key="GridCell.Tab.0.center" timestamp="1655975172127">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="1323" height="327" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1668064422697" />
+    <state width="1493" height="258" key="GridCell.Tab.0.bottom/0.0.1536.816@0.0.1536.816" timestamp="1670572572487" />
+    <state width="1493" height="258" key="GridCell.Tab.0.center" timestamp="1670572572487">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state width="1323" height="305" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1655975172127" />
-    <state width="1323" height="305" key="GridCell.Tab.0.left" timestamp="1655975172127">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="305" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1655975172127" />
-    <state width="1323" height="305" key="GridCell.Tab.0.right" timestamp="1655975172127">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="305" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1655975172127" />
-    <state width="1323" height="305" key="GridCell.Tab.1.bottom" timestamp="1655975172128">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="305" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1655975172128" />
-    <state width="1323" height="305" key="GridCell.Tab.1.center" timestamp="1655975172128">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="305" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1655975172128" />
-    <state width="1323" height="305" key="GridCell.Tab.1.left" timestamp="1655975172128">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="1323" height="327" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1668064422697" />
+    <state width="1493" height="258" key="GridCell.Tab.0.center/0.0.1536.816@0.0.1536.816" timestamp="1670572572487" />
+    <state width="1493" height="258" key="GridCell.Tab.0.left" timestamp="1670572572487">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state width="1323" height="305" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1655975172128" />
-    <state width="1323" height="305" key="GridCell.Tab.1.right" timestamp="1655975172128">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="1323" height="327" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1668064422697" />
+    <state width="1493" height="258" key="GridCell.Tab.0.left/0.0.1536.816@0.0.1536.816" timestamp="1670572572487" />
+    <state width="1493" height="258" key="GridCell.Tab.0.right" timestamp="1670572572487">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state width="1323" height="305" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1655975172128" />
-    <state width="1323" height="262" key="GridCell.Tab.2.bottom" timestamp="1652925865342">
+    <state width="1323" height="327" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1668064422697" />
+    <state width="1493" height="258" key="GridCell.Tab.0.right/0.0.1536.816@0.0.1536.816" timestamp="1670572572487" />
+    <state width="1323" height="327" key="GridCell.Tab.1.bottom" timestamp="1668064422698">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="262" key="GridCell.Tab.2.bottom/0.0.1366.728@0.0.1366.728" timestamp="1652925865342" />
-    <state width="1323" height="262" key="GridCell.Tab.2.center" timestamp="1652925865342">
+    <state width="1323" height="327" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1668064422698" />
+    <state width="1323" height="327" key="GridCell.Tab.1.center" timestamp="1668064422698">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="262" key="GridCell.Tab.2.center/0.0.1366.728@0.0.1366.728" timestamp="1652925865342" />
-    <state width="1323" height="262" key="GridCell.Tab.2.left" timestamp="1652925865342">
+    <state width="1323" height="327" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1668064422698" />
+    <state width="1323" height="327" key="GridCell.Tab.1.left" timestamp="1668064422698">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="262" key="GridCell.Tab.2.left/0.0.1366.728@0.0.1366.728" timestamp="1652925865342" />
-    <state width="1323" height="262" key="GridCell.Tab.2.right" timestamp="1652925865342">
+    <state width="1323" height="327" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1668064422698" />
+    <state width="1323" height="327" key="GridCell.Tab.1.right" timestamp="1668064422698">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1323" height="262" key="GridCell.Tab.2.right/0.0.1366.728@0.0.1366.728" timestamp="1652925865342" />
-    <state x="184" y="0" key="SettingsEditor" timestamp="1652921113292">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state width="1323" height="327" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1668064422698" />
+    <state x="270" y="53" key="SettingsEditor" timestamp="1670565251539">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state x="184" y="0" key="SettingsEditor/0.0.1366.728@0.0.1366.728" timestamp="1652921113292" />
-    <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1655970048440">
+    <state x="270" y="53" key="SettingsEditor/0.0.1536.816@0.0.1536.816" timestamp="1670565251539" />
+    <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1668061668701">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1366.728@0.0.1366.728" timestamp="1655970048440" />
-    <state x="225" y="93" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1652924377813">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="225" y="93" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1366.728@0.0.1366.728" timestamp="1652924377813" />
-    <state x="385" y="96" width="596" height="536" key="find.popup" timestamp="1655970727982">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="385" y="96" width="596" height="536" key="find.popup/0.0.1366.728@0.0.1366.728" timestamp="1655970727982" />
-    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup" timestamp="1655970962212">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1655970962212" />
-    <state x="488" y="260" key="svn.passwordDialog" timestamp="1655969774693">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1366.728@0.0.1366.728" timestamp="1668061668701" />
+    <state x="389" y="55" width="756" height="760" key="search.everywhere.popup" timestamp="1670572600539">
+      <screen x="0" y="0" width="1536" height="816" />
     </state>
-    <state x="488" y="260" key="svn.passwordDialog/0.0.1366.728@0.0.1366.728" timestamp="1655969774693" />
+    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1668061534305" />
+    <state x="389" y="55" width="756" height="760" key="search.everywhere.popup/0.0.1536.816@0.0.1536.816" timestamp="1670572600539" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

+ 3 - 3
src/main/resources/application.properties

@@ -22,9 +22,9 @@ spring.devtools.restart.enabled=true
 #datasource
 spring.datasource.driver-class-name=com.oscar.Driver
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cms?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-spring.datasource.url=jdbc:oscar://localhost:2003/OSRDB
-spring.datasource.username=sysdba
-spring.datasource.password=szoscar55
+spring.datasource.url=jdbc:oscar://192.168.2.144:2003/OSRDB
+spring.datasource.username=SYJCY
+spring.datasource.password=A123456
 
 #druid
 spring.datasource.druid.initial-size= 1

BIN
src/main/resources/static/libs/oscarJDBC.jar