Explorar o código

oscarJDBC.jar

limeng %!s(int64=2) %!d(string=hai) anos
pai
achega
ebd407334b

+ 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>

+ 2 - 2
.idea/libraries/oscarJDBC.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="oscarJDBC">
     <CLASSES>
-      <root url="jar://D:/oscarJDBC.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/main/resources/static/libs/oscarJDBC.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://D:/oscarJDBC.jar!/" />
+      <root url="jar://$PROJECT_DIR$/src/main/resources/static/libs/oscarJDBC.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 97 - 189
.idea/workspace.xml

@@ -9,82 +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/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_zxw_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/ZrzcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/sooka/module/web/cms/ZrzcController.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/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/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/login.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" />
@@ -119,7 +44,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>
@@ -144,10 +69,10 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1634284397860" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../内网/sookaCms" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/libs/oscarJDBC.jar" />
     <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="Artifacts" />
+    <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="preferences.pluginManager" />
@@ -215,6 +140,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <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" />
@@ -273,24 +209,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="" />
@@ -433,6 +351,11 @@
       <workItem from="1655969707759" duration="16000" />
       <workItem from="1655969836520" duration="64000" />
       <workItem from="1667869625671" duration="845000" />
+      <workItem from="1668056995281" duration="6294000" />
+      <workItem from="1668063813132" duration="920000" />
+      <workItem from="1668238556831" duration="524000" />
+      <workItem from="1668247143240" duration="2091000" />
+      <workItem from="1670572655163" duration="651000" />
     </task>
     <task id="LOCAL-00001" summary="适配内容添加页面">
       <created>1633937725548</created>
@@ -642,104 +565,89 @@
     <option name="LAST_COMMIT_MESSAGE" value="Default Changelist" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="463" y="119" key="FileChooserDialogImpl" timestamp="1667869636827">
-      <screen x="0" y="0" width="1366" height="728" />
+    <state x="223" y="63" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1670573023030">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state x="223" y="63" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.816@0.0.1536.816" timestamp="1670573023030" />
+    <state x="521" y="133" key="FileChooserDialogImpl" timestamp="1670573308806">
+      <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="1668252873025" />
+    <state x="521" y="133" key="FileChooserDialogImpl/0.0.1536.816@0.0.1536.816" timestamp="1670573308806" />
+    <state width="1493" height="408" key="GridCell.Tab.0.bottom" timestamp="1670573209869">
+      <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="1667869636827" />
+    <state width="1323" height="394" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.0.bottom/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.0.center" timestamp="1670573209868">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.0.center/0.0.1536.816@0.0.1536.816" timestamp="1670573209868" />
+    <state width="1493" height="408" key="GridCell.Tab.0.left" timestamp="1670573209868">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.0.left/0.0.1536.816@0.0.1536.816" timestamp="1670573209868" />
+    <state width="1493" height="408" key="GridCell.Tab.0.right" timestamp="1670573209868">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.0.right/0.0.1536.816@0.0.1536.816" timestamp="1670573209868" />
+    <state width="1493" height="408" key="GridCell.Tab.1.bottom" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.1.bottom/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.1.center" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.1.center/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.1.left" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.1.left/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.1.right" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="394" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1668061296163" />
+    <state width="1493" height="408" key="GridCell.Tab.1.right/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.2.bottom" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="152" key="GridCell.Tab.2.bottom/0.0.1366.728@0.0.1366.728" timestamp="1668060435438" />
+    <state width="1493" height="408" key="GridCell.Tab.2.bottom/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.2.center" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="152" key="GridCell.Tab.2.center/0.0.1366.728@0.0.1366.728" timestamp="1668060435438" />
+    <state width="1493" height="408" key="GridCell.Tab.2.center/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.2.left" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="152" key="GridCell.Tab.2.left/0.0.1366.728@0.0.1366.728" timestamp="1668060435438" />
+    <state width="1493" height="408" key="GridCell.Tab.2.left/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state width="1493" height="408" key="GridCell.Tab.2.right" timestamp="1670573209869">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state width="1323" height="152" key="GridCell.Tab.2.right/0.0.1366.728@0.0.1366.728" timestamp="1668060435438" />
+    <state width="1493" height="408" key="GridCell.Tab.2.right/0.0.1536.816@0.0.1536.816" timestamp="1670573209869" />
+    <state x="249" y="0" key="SettingsEditor" timestamp="1670573312334">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state x="249" y="0" key="SettingsEditor/0.0.1536.816@0.0.1536.816" timestamp="1670573312334" />
+    <state x="389" y="55" width="756" height="760" key="search.everywhere.popup" timestamp="1670573216724">
+      <screen x="0" y="0" width="1536" height="816" />
+    </state>
+    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1668060694303" />
+    <state x="389" y="55" width="756" height="760" key="search.everywhere.popup/0.0.1536.816@0.0.1536.816" timestamp="1670573216724" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <last-edited>sookaCms:war</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Spring</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>sookaCms</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>oscarJDBC</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.3505747" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
   <component name="mavenExecuteGoalHistory">
     <option value="" />
   </component>

+ 1 - 1
sookaCms.iml

@@ -38,7 +38,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="oscarJDBC" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.11.RELEASE" level="project" />
@@ -231,5 +230,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: xalan:serializer:2.7.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: xalan:xalan:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" name="oscarJDBC" level="project" />
   </component>
 </module>

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

@@ -22,9 +22,9 @@ spring.devtools.restart.enabled=true
 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://10.121.0.5:2003/OSRDB
-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=BIN
src/main/resources/static/libs/oscarJDBC.jar