Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	src/core/process/Process.java

.idea/jsonSchemas.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JsonSchemaMappingsProjectConfiguration">
+    <state>
+      <map>
+        <entry key="bukkit-plugin">
+          <value>
+            <SchemaInfo>
+              <option name="name" value="bukkit-plugin" />
+              <option name="relativePathToSchema" value="http://json.schemastore.org/bukkit-plugin" />
+              <option name="applicationDefined" value="true" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="path" value="src/core/user/student.json" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
+      </map>
+    </state>
+  </component>
+</project>

.idea/misc.xml

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

src/core/process/AuxiliaryProcess.java

@@ -1,7 +0,0 @@
-package core.process;
-
-public class AuxiliaryProcess extends Process {
-    public AuxiliaryProcess(String permission, String operationName, String processOptions, String info) throws Exception {
-        super(permission, operationName, processOptions, info);
-    }
-}

src/core/process/Cls_TeacherSelectStudent.java

@@ -0,0 +1,17 @@
+//package core.process;
+////
+////import java.util.ArrayList;
+////import java.util.List;
+////
+////public class Cls_TeacherSelectStudent extends Process {
+////    List<String> list;
+////
+////    public Cls_TeacherSelectStudent clone(){
+////        Cls_TeacherSelectStudent tst = new Cls_TeacherSelectStudent();
+////        tst.setInfo( this.getInfo());
+////        List<String> list = new ArrayList<>();
+////        for(String s:this.list){
+////            list.add(new String(s));
+////        }
+////    }
+////}

src/core/process/Condition.java

@@ -3,7 +3,7 @@ package core.process;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Condition {
+public class Condition {//条件
     public List<Process> getProcesses() {
         return processes;
     }

src/core/process/LastProcess.java

@@ -1,8 +0,0 @@
-package core.process;
-
-public class LastProcess extends Process{
-
-    public LastProcess(String permission, String operationName, String processOptions, String info) throws Exception {
-        super(permission, operationName, processOptions, info);
-    }
-}

src/core/process/Process.java

@@ -7,43 +7,19 @@ import error.GExcptSQL;
 
 public abstract class Process implements Cloneable{
 
-    private String permission;
+    private static String permission;
-    private Operation operation;
+    private static String buttonName;
-    private String buttonName;
+    private static String info;
-    private String info;
+
-    private String processOptions;
+
-    private String UserOptions;
     @Override
     public Process clone(){
         //todo
         return null;
-    }
-    public Process(String permission, String operationName, String processOptions, String info) throws Exception {
-        super();
-        this.setPermission(permission);
-        this.setOperation(operationName);
-        this.setInfo(info);
-        this.setProcessOptions(processOptions);
-        operation.setProcessOperations(processOptions);
-    }
 
-    public void setUserOperations(String key,Object value){
-        this.operation.addUserOperations(key,value);
-    }
-    public void execute(User subject) throws GExcptSQL {
-        this.operation.execute(subject);
-    }
-    private void setOperation(String operationName) throws GExcptFactory {
-        try {
-            this.operation = (Operation) core.utils.GetObjectByName.getOperationByName(operationName);
-        } catch (Exception e) {
-            throw new GExcptFactory("create"+operationName+"failure");
-        }
     }
 
-    public void setInfo(String info) {
+    public void setInfo(String info) { this.info = info; }
-        this.info = info;
-    }
     public String getButtonName() {
         return buttonName;
     }
@@ -61,20 +37,6 @@ public abstract class Process implements Cloneable{
         this.permission = permission;
     }
 
-    public Operation getOperation() {
-        return operation;
-    }
-
-    public void setOperation(Operation operation) {
-        this.operation = operation;
-    }
 
-    public String getProcessOptions() {
-        return processOptions;
-    }
-
-    public void setProcessOptions(String processOptions) {
-        this.processOptions = processOptions;
-    }
 
 }

src/core/process/ProcessManagement.java

@@ -4,14 +4,14 @@ import java.io.File;
 import java.util.List;
 import java.util.Map;
 
-public class ProcessManagement {
+public class ProcessManagement {//过程管理
-    private List<TemporaryProcess> temporaryProcesses;
+    //private List<TemporaryProcess> temporaryProcesses;
     private Map<String, List<Process>> lastProcesses;
-    private List<AuxiliaryProcess> auxiliaryProcesses;
+    //private List<AuxiliaryProcess> auxiliaryProcesses;
     public void setProcessesByJson(File file){
         //todo
     }
-    public Process getTemporaryProcess(int index){
+   /*public Process getTemporaryProcess(int index){
         return temporaryProcesses.get(index).clone();
     }
     public Condition getCondition(String userType, List<Integer> index){
@@ -20,6 +20,6 @@ public class ProcessManagement {
             condition.add(getTemporaryProcess(i));
         }
         return condition;
-    }
+    }*/
 
 }

src/core/process/TemporaryProcess.java

@@ -1,9 +0,0 @@
-package core.process;
-
-
-
-public class TemporaryProcess extends Process {
-    public TemporaryProcess(String permission, String operationName, String processOptions, String info) throws Exception {
-        super(permission, operationName, processOptions, info);
-    }
-}

src/servlet/account/Srvlt_TeacherSelectStudent.java

@@ -0,0 +1,19 @@
+package servlet.account;
+
+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 java.io.IOException;
+
+@WebServlet(name = "Srvlt_TeacherSelectStudent")
+public class Srvlt_TeacherSelectStudent extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+    }
+}