~

.gitignore

@@ -0,0 +1,9 @@
+# Logs
+logs
+*.log
+
+node_modules
+dist
+
+# Editor directories and files
+#.idea

.idea/misc.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="https://101.132.47.245:8443/svn/wjs_app" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wjs_app.iml" filepath="$PROJECT_DIR$/.idea/wjs_app.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

.idea/wjs_app.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/workspace.xml

@@ -2,43 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="398ddf8b-5624-46a8-8b25-6e211927d6a0" name="Default" comment="~">
-      <change afterPath="$PROJECT_DIR$/addTest.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/approveNew.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/approveTest.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu1.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu10.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu11.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu12.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu13.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu14.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu15.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu16.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu2.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu3.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu4.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu5.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu6.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu7.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu8.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/help/tu9.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/tupian1.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/image/tupian2.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/js/jweixin.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/js/require.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/loginTest.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mainTest.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CommonJS/DBUtil_JS/WsCommonClassAsmx.js" beforeDir="false" afterPath="$PROJECT_DIR$/CommonJS/DBUtil_JS/WsCommonClassAsmx.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CommonJS/DBUtil_JS/WsCommonClassJava.js" beforeDir="false" afterPath="$PROJECT_DIR$/CommonJS/DBUtil_JS/WsCommonClassJava.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/approve.html" beforeDir="false" afterPath="$PROJECT_DIR$/approve.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/changePass.html" beforeDir="false" afterPath="$PROJECT_DIR$/changePass.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/mui.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/mui.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/mui.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/mui.min.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/help.html" beforeDir="false" afterPath="$PROJECT_DIR$/help.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/fileImg.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/fileImg.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/wjs_app.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/login.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.html" beforeDir="false" afterPath="$PROJECT_DIR$/main.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wjsapp.war" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wjsappnew.war" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,7 +24,11 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="ProjectId" id="2cl0XHUmRmYt9TdywHk67JYDXTK" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -64,6 +39,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../map_widget/data-services" />
     <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="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -77,24 +53,6 @@
     <configuration>C:\Users\admin\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
   </component>
-  <component name="SvnFileUrlMappingImpl">
-    <option name="myMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="E:\project_data\卫生疾控\wjs_app" />
-          <option name="myCopyRoot" value="E:\project_data\卫生疾控\wjs_app" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-    <option name="myMoreRealMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="E:\project_data\卫生疾控\wjs_app" />
-          <option name="myCopyRoot" value="E:\project_data\卫生疾控\wjs_app" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="398ddf8b-5624-46a8-8b25-6e211927d6a0" name="Default" comment="" />
@@ -245,6 +203,7 @@
       <workItem from="1713921705596" duration="5155000" />
       <workItem from="1716342582621" duration="5367000" />
       <workItem from="1720574654475" duration="2601000" />
+      <workItem from="1721959304354" duration="901000" />
     </task>
     <servers />
   </component>
@@ -256,18 +215,22 @@
     <option name="LAST_COMMIT_MESSAGE" value="~" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="594" y="102" key="CommitChangelistDialog2" timestamp="1713948985488">
+    <state x="594" y="102" key="CommitChangelistDialog2" timestamp="1721960045067">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
-    <state x="594" y="102" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1713948985488" />
+    <state x="594" y="102" key="CommitChangelistDialog2/0.0.1920.1032@0.0.1920.1032" timestamp="1721960045067" />
     <state x="740" y="271" key="FileChooserDialogImpl" timestamp="1713337221224">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
     <state x="740" y="271" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1713337221224" />
-    <state x="1117" y="170" width="596" height="532" key="find.popup" timestamp="1713231640959">
+    <state x="461" y="160" key="SettingsEditor" timestamp="1721960198744">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="461" y="160" key="SettingsEditor/0.0.1920.1032@0.0.1920.1032" timestamp="1721960198744" />
+    <state x="773" y="355" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1721960055572">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
-    <state x="1117" y="170" width="596" height="532" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1713231640959" />
+    <state x="773" y="355" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1032@0.0.1920.1032" timestamp="1721960055572" />
     <state x="760" y="412" key="svn.passwordDialog" timestamp="1713346817429">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>