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/test.java
hechu1
何楚 6 years ago
parent 255db387e1
commit a9c426ee6f
7 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
.idea/artifacts/GDMS_war_exploded.xml
Unescape View File

@ -0,0 +1,16 @@
<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>
</element>
<element id="javaee-facet-resources" facet="GDMS/web/Web" />
</root>
</artifact>
</component>

12
.idea/libraries/com_hynnet_json_lib_2_4.xml
Unescape View File

@ -2,12 +2,12 @@
<library name="com.hynnet:json-lib:2.4" type="repository"> <library name="com.hynnet:json-lib:2.4" type="repository">
<properties maven-id="com.hynnet:json-lib:2.4" /> <properties maven-id="com.hynnet:json-lib:2.4" />
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/lib/json-lib-2.4.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/hynnet/json-lib/2.4/json-lib-2.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.8.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-collections-3.2.1.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-lang-2.5.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.5/commons-lang-2.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ezmorph-1.0.6.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
GDMS.iml
Unescape View File

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

2
src/gdms/GDMS.java
Unescape View File

@ -217,7 +217,7 @@ public class GDMS {
while (it.hasNext()) { while (it.hasNext()) {
String key = (String)it.next(); String key = (String)it.next();
Object value = jo.get(key); Object value = jo.get(key);
schedules.put(key, new utils.Utils.dateFormat((String) value)); //schedules.put(key, new utils.Utils.dateFormat((String) value));
} }
} }
} }

7
web/jsFile/test.js
Unescape View File

@ -0,0 +1,7 @@
$(document).ready(
function () {
alert("你好");
})
function alet() {
alert("成功");
}

20
web/manage/manage_time.jsp
Unescape View File

@ -0,0 +1,20 @@
<%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2019/1/16
Time: 9:58
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>毕业设计管理系统</title>
</head>
<body>
<div class="updated">
<form>
<input type="date">
</form>
</div>
</body>
</html>

19
web/test.jsp
Unescape View File

@ -0,0 +1,19 @@
<%--
Created by IntelliJ IDEA.
User: lenovo
Date: 2019/1/16
Time: 1:11
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
<script type="text/javascript" src="jsFile/jquery-3.3.1.js" language="JavaScript"></script>
<script charset="GBK" type="text/javascript" src="jsFile/test.js" language="JavaScript"></script>
</head>
<body>
<button class="but">nihao</button>
<div>hhhhhhhhhhhhhh</div>
</body>
</html>
Write Preview
Loading…
Cancel
Save