重构

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,16 +1,16 @@
 <component name="ArtifactManager">
-  <artifact type="exploded-war" name="GDMS:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/GDMS_war_exploded</output-path>
+  <artifact type="exploded-war" name="gdms:war exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/gdms_war_exploded</output-path>
     <root id="root">
+      <element id="javaee-facet-resources" facet="gdms/web/Web" />
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
-          <element id="module-output" name="GDMS" />
+          <element id="module-output" name="gdms" />
         </element>
         <element id="directory" name="lib">
           <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
         </element>
       </element>
-      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
     </root>
   </artifact>
 </component>

.idea/artifacts/gdms_Web_exploded.xml

@@ -1,17 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="gdms:Web exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
-    <root id="root">
-      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="gdms" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
-          <element id="library" level="project" name="lib" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>

.idea/dataSources.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="gdms@localhost" uuid="9ab10673-d584-44a7-a783-8ac833d52c51">
-      <driver-ref>mariadb</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mariadb://localhost:3306/gdms</jdbc-url>
-      <driver-properties>
-        <property name="autoReconnect" value="true" />
-        <property name="zeroDateTimeBehavior" value="convertToNull" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>

.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt

@@ -1,22 +0,0 @@
-com.intellij.database.serialization.ImportException: RDBMS is not specified int the model file
-	at com.intellij.database.serialization.ModelImporter.deserializeModel(ModelImporter.java:57)
-	at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:37)
-	at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:27)
-	at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:683)
-	at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:671)
-	at com.intellij.database.dataSource.DataSourceStorage.loadModels(DataSourceStorage.java:488)
-	at com.intellij.database.dataSource.DataSourceStorage.access$000(DataSourceStorage.java:90)
-	at com.intellij.database.dataSource.DataSourceStorage$2.run(DataSourceStorage.java:398)
-	at com.intellij.openapi.progress.impl.CoreProgressManager$TaskRunnable.run(CoreProgressManager.java:736)
-	at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcess$1(CoreProgressManager.java:157)
-	at com.intellij.openapi.progress.impl.CoreProgressManager.registerIndicatorAndRun(CoreProgressManager.java:580)
-	at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:525)
-	at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:85)
-	at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:144)
-	at com.intellij.openapi.progress.impl.CoreProgressManager$4.run(CoreProgressManager.java:395)
-	at com.intellij.openapi.application.impl.ApplicationImpl$1.run(ApplicationImpl.java:314)
-	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
-	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
-	at java.lang.Thread.run(Thread.java:745)

.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51/storage_v2/_src_/schema/gdms.Q1cwAA.meta

@@ -1 +0,0 @@
-#n:gdms

.idea/dictionaries/zhai_.xml

@@ -2,8 +2,6 @@
   <dictionary name="zhai_">
     <words>
       <w>gdms</w>
-      <w>mariadb</w>
-      <w>zhai</w>
     </words>
   </dictionary>
 </component>

.idea/encodings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="file://$PROJECT_DIR$/web/jsFile/login.js" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/libraries/lib.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="lib">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/web/WEB-INF/lib" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/web/WEB-INF/lib" recursive="false" />
-  </library>
-</component>

.idea/misc.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES5" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/GDMS.iml" filepath="$PROJECT_DIR$/GDMS.iml" />
+      <module fileurl="file://$PROJECT_DIR$/gdms.iml" filepath="$PROJECT_DIR$/gdms.iml" />
     </modules>
   </component>
 </project>

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

GDMS.iml

@@ -19,6 +19,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9.0.14" level="application_server_libraries" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -28,7 +29,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 9" level="application_server_libraries" />
-    <orderEntry type="library" name="com.hynnet:json-lib:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="com.hynnet:json-lib:2.4" level="project" />
   </component>
 </module>

src/core/process/TempProcess.java

@@ -31,7 +31,7 @@ public abstract class TempProcess extends Process {
         TempProcess.nextProcess = nextProcess;
     }
 
-    public static void updateStatus(){
-        ;
+    public void updateStatus(){
+        System.out.println(table+" "+fileds);
     }
 }

src/core/user/AccountManagement.java

@@ -1,4 +1,4 @@
-package core.user.utils;
+package core.user;
 
 import core.user.Student;
 import core.user.User;
@@ -68,7 +68,7 @@ public interface AccountManagement {
         user.initCondition();
         return user;
     }
-    String defaultStatus = "1";
+    String defaultStatus = "0";
     static void initAllStatus(String id) throws GExcptSQL {
         for(String table:DBManagement.graduationDesignTables){
             Map<String,String> vMap = new HashMap<>();

src/core/user/User.java

@@ -4,7 +4,6 @@ import core.process.Condition;
 import core.process.ProcessManagement;
 import core.user.userFun.AccountManageable;
 import core.user.userFun.ProcessConfigurable;
-import core.user.utils.AccountManagement;
 
 import java.util.List;
 import java.util.Map;
@@ -94,11 +93,11 @@ public abstract class User implements AccountManageable, ProcessConfigurable{
     public abstract String getType();
 
     public void destroy(){
-        core.user.utils.AccountManagement.destroy(this);
+        AccountManagement.destroy(this);
     }
 
     public void logout(){
-        core.user.utils.AccountManagement.logout(this);
+        AccountManagement.logout(this);
     }
 
     @Override

src/gdms/GDMS.java

@@ -45,6 +45,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("teacher_choose_student start!");
                         List<String> fields = new ArrayList<>();
                         fields.add("student_choose_teacher_status");
                         try {
@@ -59,6 +60,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("choose_topic finished!");
                         List<String> fields = new ArrayList<>();
                         fields.add("student_choose_teacher_status");
                         fields.add("teacher_choose_student_status");
@@ -101,6 +103,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("opening_report_submit finished");
                         List<String> fields = new ArrayList<>();
                         fields.add("opening_report_mentor_opinion_status");
                         fields.add("opening_report_teacher_team_opinion_status");
@@ -126,6 +129,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("finished_product_submit finished!");
                         List<String> fields = new ArrayList<>();
                         fields.add("finished_product_status");
                         try {
@@ -156,6 +160,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("finished_product_review_submit finished!");
                         List<String> fields = new ArrayList<>();
                         fields.add("finished_product_mentor_score_status");
                         try {
@@ -190,6 +195,7 @@ public class GDMS {
                 return new TimerTask() {
                     @Override
                     public void run() {
+                        System.out.println("reply_opinion_submit finished!");
                         List<String> fields = new ArrayList<>();
                         fields.add("reply_mentor_score_status");
                         fields.add("reply_teacher_team_score_status");

src/gdms/test.java

@@ -15,6 +15,6 @@ import java.util.Map;
 
 public class test {
     public static void main(String[] args){
-
+        new C_StudentSelectTeacher().updateStatus();
     }
 }

src/init/Init.java

@@ -1,10 +1,8 @@
 package init;
 
-import core.user.utils.AccountManagement;
 import dao.DBManagement;
 import error.GExcptFormat;
 import error.GExcptInit;
-import error.GExcptSQL;
 import gdms.GDMS;
 
 import javax.servlet.ServletException;
@@ -16,9 +14,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@WebServlet(name = "Init")
 public class Init extends HttpServlet {
+    static boolean ifInit = false;
     public void init(){
+        if(ifInit) return;
         System.out.println("init start");
         DBManagement.init();
         try {
@@ -30,13 +29,7 @@ public class Init extends HttpServlet {
             gExcptFormat.printStackTrace();
             System.exit(1);
         }
+        ifInit = true;
         System.out.println("init finished");
     }
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-    }
-
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-    }
 }

src/servlet/account/S_Login.java

@@ -3,15 +3,13 @@ package servlet.account;
 import java.io.IOException;
 import java.sql.SQLException;
 
-import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import core.user.Student;
 import core.user.User;
-import core.user.utils.AccountManagement;
+import core.user.AccountManagement;
 import error.GExcptAccount;
 import error.GExcptSQL;
 

src/servlet/account/S_Register.java

@@ -1,7 +1,7 @@
 package servlet.account;
 
 import core.user.User;
-import core.user.utils.AccountManagement;
+import core.user.AccountManagement;
 import error.GExcptAccount;
 import error.GExcptSQL;
 import javax.servlet.ServletException;

web/WEB-INF/web.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
          version="4.0">
     <welcome-file-list>
-      <welcome-file>login.jsp</welcome-file>
+        <welcome-file>login.jsp</welcome-file>
     </welcome-file-list>
-  <servlet>
+    <servlet>
         <servlet-name>Init</servlet-name>
         <servlet-class>init.Init</servlet-class>
         <load-on-startup>1</load-on-startup>

web/index.jsp

@@ -1,16 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: zhai_
-  Date: 2019/1/15
-  Time: 16:43
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-  <head>
-    <title>$Title$</title>
-  </head>
-  <body>
-  $END$
-  </body>
-</html>