zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/gdms/GDMS.java
hechu1
何楚 6 years ago
parent a19ca349b8
commit 6d1ee2f0d1
3 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File

39
.idea/artifacts/gdms_war_exploded.xml
Unescape View File

@ -0,0 +1,39 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="gdms:war exploded">
<output-path>$PROJECT_DIR$/out/artifacts/gdms_war_exploded</output-path>
<root id="root">
<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 9.0/lib/tomcat-jdbc.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/json-lib-2.4.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/ezmorph-1.0.6.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/jsonunicode-1.0.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/commons-lang-2.5.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/hutool-core-4.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/hutool-json-4.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/commons-logging-1.1.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar" />
<element id="file-copy" path="$PROJECT_DIR$/lib/commons-collections-3.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/jstl.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/standard.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/json-lib-2.4.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/ezmorph-1.0.6.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-io-2.6.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/jsonunicode-1.0.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-lang-2.5.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/hutool-core-4.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/hutool-json-4.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-logging-1.1.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-beanutils-1.8.0.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-fileupload-1.3.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/commons-collections-3.2.1.jar" />
<element id="file-copy" path="$PROJECT_DIR$/web/WEB-INF/lib/mariadb-java-client-2.3.0.jar" />
</element>
</element>
<element id="javaee-facet-resources" facet="gdms/web/Web" />
</root>
</artifact>
</component>

10
src/init/Init.java
Unescape View File

@ -20,15 +20,7 @@ public class Init extends HttpServlet {
if(ifInit) return;
System.out.println("init start");
DBManagement.init();
try {
GDMS.init();
} catch (GExcptInit gExcptInit) {
gExcptInit.printStackTrace();
System.exit(1);
} catch (GExcptFormat gExcptFormat) {
gExcptFormat.printStackTrace();
System.exit(1);
}
ifInit = true;
System.out.println("init finished");
}

12
web/home/fillSbjMsg.jsp
Unescape View File

@ -20,12 +20,12 @@
<body>
<div class="updated">
<%
int processIndex=Integer.parseInt(request.getParameter("proccessIndex"));
User user=(User)session.getAttribute("user");
TempProcess process= (TempProcess) user.getCondition().get(processIndex);
String index=request.getParameter("processIndex");
// User user=(User)session.getAttribute("user");
//TempProcess process= (TempProcess) user.getCondition().get(processIndex);
%>
<div class="blank-frame-sub">
<div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
<div class="fill-top-blank"><div class="model-info">填写选题信息<%=index%></div></div>
<div class="sub-msg">
<form class="subform">
@ -64,8 +64,10 @@
<div class="sub-tips">题目描述:</div>
<textarea class="sub-scb-text description_of_topic" placeholder="请填写题目描述" name="description_of_topic"></textarea>
</div>
<input class="sub-input" name="id" type="text" value="<!%=process.getGraduationDesignId()%>"
placeholder="id">
<input class="sub-input-button" type="button" value="提交">
<input class="id" type="text" value="<%=process.getGraduationDesignId()%>">
</form>
</div>
</div>

Write Preview
Loading…
Cancel
Save