111

.idea/artifacts/jeeplus_war.xml

@@ -9,6 +9,17 @@
     </properties>
     <root id="archive" name="jeeplus.war">
       <element id="artifact" artifact-name="jeeplus:war exploded" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="lib">
+          <element id="library" level="module" name="Maven: com.alibaba:jconsole:1.8.0" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: com.alibaba:tools:1.8.0" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: ojdbc14:ojdbc14:10.2.0.3.0" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: batik:batik-util:1.6-1" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: org.wltea:analyzer:2012_u6" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: gencode:gencode:2.0" module-name="jeeplus" />
+          <element id="library" level="module" name="Maven: QRCoder:QRCoder:1.0" module-name="jeeplus" />
+        </element>
+      </element>
     </root>
   </artifact>
 </component>

.idea/jeeplus.iml

@@ -55,7 +55,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_221/lib/jconsole.jar!/" />
+          <root url="jar://D:/JDK/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -64,7 +64,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_221/lib/tools.jar!/" />
+          <root url="jar://D:/JDK/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.sys.web;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.Cookie;
@@ -11,6 +12,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.common.utils.*;
+import com.jeeplus.modules.act.entity.Act;
+import com.jeeplus.modules.act.service.ActTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -60,6 +63,9 @@ public class LoginController extends BaseController{
 	
 	@Autowired
 	private MailBoxService mailBoxService;
+
+	@Autowired
+	private ActTaskService actTaskService;
 	
 	
 	/**
@@ -357,7 +363,10 @@ public class LoginController extends BaseController{
 	 */
 	@RequestMapping(value = "${adminPath}/home")
 	public String home(HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-		
+		Act act = new Act();
+		Page<HashMap<String,String>> page = actTaskService.todoList(new  Page<HashMap<String,String>>(request, response),act);
+		model.addAttribute("actlist",page.getList());
+		model.addAttribute("actCount",page.getCount());
 		return "modules/sys/login/sysHome";
 		
 	}

src/main/resources/properties/jeeplus.properties

@@ -15,6 +15,7 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://192.168.2.4:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+#jdbc.url=jdbc:mysql://localhost:3306/sg_audit?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 jdbc.username=root
 jdbc.password=root
 jdbc.testSql=SELECT 'x'
@@ -38,84 +39,84 @@ jdbc.pool.maxActive=20
 #===== System settings ======#
 #============================#
 
-#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
-productName=JeePlus \u5feb\u901f\u5f00\u53d1\u5e73\u53f0
+#\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
+productName=\u9547\u6C5F\u5E02\u4F9B\u7535\u516C\u53F8\u4FE1\u606F\u7CFB\u7EDF
 copyrightYear=2017
 version=V3.0
 
 #\u9ED8\u8BA4\u4E3B\u9898(\u53EF\u9009\u503C jp\uFF0Cdefault\uFF0C  jp\u662F\u9ED8\u8BA4\u6A2A\u5411\u83DC\u5355\uFF0Cdefault\u9ED8\u8BA4\u662F\u5DE6\u4FA7\u83DC\u5355\u7ECF\u5178\u98CE\u683C)
 defaultTheme = jp
 
-#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
+#\u6F14\u793A\u6A21\u5F0F: \u4E0D\u80FD\u64CD\u4F5C\u548C\u4FDD\u5B58\u7684\u6A21\u5757\uFF1A sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
+#\u7BA1\u7406\u57FA\u7840\u8DEF\u5F84, \u9700\u540C\u6B65\u4FEE\u6539\uFF1Aweb.xml
 adminPath=/a
 
-#\u524d\u7aef\u57fa\u7840\u8def\u5f84
+#\u524D\u7AEF\u57FA\u7840\u8DEF\u5F84
 frontPath=/f
 
-#\u7f51\u7ad9URL\u540e\u7f00
+#\u7F51\u7AD9URL\u540E\u7F00
 urlSuffix=.html
 
-#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
+#\u662F\u5426\u4E0D\u5141\u8BB8\u5237\u65B0\u4E3B\u9875\uFF0C\u4E0D\u5141\u8BB8\u60C5\u51B5\u4E0B\uFF0C\u5237\u65B0\u4E3B\u9875\u4F1A\u5BFC\u81F4\u91CD\u65B0\u767B\u5F55
 notAllowRefreshIndex=false
 
-#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
+#\u662F\u5426\u5141\u8BB8\u591A\u8D26\u53F7\u540C\u65F6\u767B\u5F55
 user.multiAccountLogin=true
 
-#\u5206\u9875\u914d\u7f6e
+#\u5206\u9875\u914D\u7F6E
 page.pageSize=10
 
-#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
+#\u7855\u6B63\u7EC4\u4EF6\u662F\u5426\u4F7F\u7528\u7F13\u5B58
 supcan.useCache=false
 
-#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
+#\u901A\u77E5\u95F4\u9694\u65F6\u95F4\u8BBE\u7F6E, \u5355\u4F4D\uFF1A\u6BEB\u79D2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4F1A\u8BDD\u8D85\u65F6\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
+#\u4F1A\u8BDD\u6E05\u7406\u95F4\u9694\u65F6\u95F4\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#\u7d22\u5f15\u9875\u8def\u5f84
+#\u7D22\u5F15\u9875\u8DEF\u5F84
 web.view.index=/a
 
-#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
+#\u89C6\u56FE\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
 web.view.prefix=/webpage/
 web.view.suffix=.jsp
 
 #\u6587\u4EF6\u7BA1\u7406\u7CFB\u7EDF\u5141\u8BB8\u4E0A\u4F20\u7684\u6700\u5927\u6587\u4EF6
 web.maxUploadSize=1073741824
 
-#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
+#\u65E5\u5FD7\u62E6\u622A\u8BBE\u7F6E\uFF0C\u6392\u9664\u7684URI\uFF1B\u5305\u542B @RequestMapping\u6CE8\u89E3\u7684value\u3002\uFF08\u5DF2\u4F5C\u5E9F\uFF09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#\u9759\u6001\u6587\u4ef6\u540e\u7f00
+#\u9759\u6001\u6587\u4EF6\u540E\u7F00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
+#\u5355\u70B9\u767B\u5F55CAS\u8BBE\u7F6E
 cas.server.url=e
 cas.project.url=http://127.0.0.1:8080/jeeplus
 
-#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
+#\u5DE5\u4F5C\u6D41\u8BBE\u7F6E
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
-activiti.diagram.activityFontName=\u5b8b\u4f53
-activiti.diagram.labelFontName=\u5b8b\u4f53
-#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
+#activiti font (windows font: \u5B8B\u4F53  linux font: simsun)
+activiti.diagram.activityFontName=\u5B8B\u4F53
+activiti.diagram.labelFontName=\u5B8B\u4F53
+#activiti\u5916\u90E8\u8868\u5355\u6839\u5730\u5740\u914D\u7F6E
 activiti.form.server.url=
 
-#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
+#\u4E0A\u4F20\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84, \u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8\u5305\u542B\u201Cuserfiles\u201D
 #userfiles.basedir=D:/jeeplus
 
-#\u5de5\u7a0b\u8def\u5f84\uff0c\u5728\u4ee3\u7801\u751f\u6210\u65f6\u83b7\u53d6\u4e0d\u5230\u5de5\u7a0b\u8def\u5f84\u65f6\uff0c\u53ef\u518d\u6b64\u6307\u5b9a\u7edd\u5bf9\u8def\u5f84\u3002
+#\u5DE5\u7A0B\u8DEF\u5F84\uFF0C\u5728\u4EE3\u7801\u751F\u6210\u65F6\u83B7\u53D6\u4E0D\u5230\u5DE5\u7A0B\u8DEF\u5F84\u65F6\uFF0C\u53EF\u518D\u6B64\u6307\u5B9A\u7EDD\u5BF9\u8DEF\u5F84\u3002
 projectPath=D:\\jeeplus\\jeeplus-ani-menu-big\\jeeplus-maven
 #======================================#\u6587\u4EF6\u4E0A\u4F20\u9650\u5236#======================================#
 spring.http.multipart.max-file-size=100MB

src/main/webapp/webpage/modules/sys/login/sysHome.jsp

@@ -148,55 +148,63 @@
 						<div class="todo-body">
 							<div class="todo-list-wrap">
 								<ul class="todo-list">
-									<li class="">
-										<label class="checkbox1" for="option1">
-											<input id="option1" type="checkbox" class="">
-											<span></span>
-										</label>
-										<span class="done-false">9:00开晨会安排工作</span>
-									</li>
-									<li class="">
-										<label class="checkbox1" for="option3">
-											<input id="option3" type="checkbox" class="">
-											<span></span>
-										</label>
-										<span class="done-false">9:00~12:00客户需求分析</span>
-									</li>
-									<li class="">
-										<label class="checkbox1" for="option4">
-											<input id="option4" type="checkbox" class="">
-											<span></span>
-										</label>
-										<span class="done-false">12:00和客户电话会议</span>
-									</li>
-									<li class="">
-										<label class="checkbox1" for="option5">
-											<input id="option5" type="checkbox" class="">
-											<span></span>
-										</label>
-										<span class="done-false">2:00参加技术论坛</span>
-									</li>
-									<li class="">
-										<label class="checkbox1" for="option2">
-											<input id="option2" type="checkbox" class="">
-											<span></span>
-										</label>
-										<span class="done-false">5:00晚会总结进度</span>
-									</li>
+									<c:if test="${ not empty actlist}">
+										<c:forEach items="${actlist}" var="actlist" varStatus="index">
+										<li>
+										<%--<label class="checkbox1" for="option1">--%>
+											<%--<input id="option1" type="checkbox" class="">--%>
+											<%--<span></span>--%>
+										<%--</label>--%>
+											<%--<span>${actlist.task.id}</span>--%>
+										   <a href="${ctx}/act/task/form?taskId=${list.task.id}&taskName=${list.task.name}&taskDefKey=${list.task.taskDefinitionKey}&procInsId=${list.task.processInstanceId}&procDefId=${list.task.processDefinitionId}&status=${list.status}">${actlist.vars.title}</a>
+									    </li>
+										</c:forEach>
+									</c:if>
+									<c:if test="${empty actlist}">
+										<span>暂无代办事项</span>
+									</c:if>
+									<%--<li class="">--%>
+										<%--<label class="checkbox1" for="option3">--%>
+											<%--<input id="option3" type="checkbox" class="">--%>
+											<%--<span></span>--%>
+										<%--</label>--%>
+										<%--<span class="done-false">9:00~12:00客户需求分析</span>--%>
+									<%--</li>--%>
+									<%--<li class="">--%>
+										<%--<label class="checkbox1" for="option4">--%>
+											<%--<input id="option4" type="checkbox" class="">--%>
+											<%--<span></span>--%>
+										<%--</label>--%>
+										<%--<span class="done-false">12:00和客户电话会议</span>--%>
+									<%--</li>--%>
+									<%--<li class="">--%>
+										<%--<label class="checkbox1" for="option5">--%>
+											<%--<input id="option5" type="checkbox" class="">--%>
+											<%--<span></span>--%>
+										<%--</label>--%>
+										<%--<span class="done-false">2:00参加技术论坛</span>--%>
+									<%--</li>--%>
+									<%--<li class="">--%>
+										<%--<label class="checkbox1" for="option2">--%>
+											<%--<input id="option2" type="checkbox" class="">--%>
+											<%--<span></span>--%>
+										<%--</label>--%>
+										<%--<span class="done-false">5:00晚会总结进度</span>--%>
+									<%--</li>--%>
 								</ul>
 							</div>
-							<form class="form-horizontal todo-from-bottom">
-								<div class="row">
-									<div class="col-sm-12">
-										<div class="input-group">
-											<input type="text" class="form-control" placeholder="">
-											<span class="input-group-btn">
-										<button class="btn btn-default" type="submit">增加</button>
-									</span>
-										</div>
-									</div>
-								</div>
-							</form>
+							<%--<form class="form-horizontal todo-from-bottom">--%>
+								<%--<div class="row">--%>
+									<%--<div class="col-sm-12">--%>
+										<%--<div class="input-group">--%>
+											<%--<input type="text" class="form-control" placeholder="">--%>
+											<%--<span class="input-group-btn">--%>
+										<%--<button class="btn btn-default" type="submit">增加</button>--%>
+									<%--</span>--%>
+										<%--</div>--%>
+									<%--</div>--%>
+								<%--</div>--%>
+							<%--</form>--%>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -40,7 +40,7 @@
 				<span class="icon-bar"></span>
 			</button>
 
-			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">JeePlus快速开发框架</a>
+			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">zjgd</a>
 		</div>
 	</div>
 	<div class="navbar-container container-fluid">
@@ -101,11 +101,11 @@
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 						<i class="fa fa-bell-o"></i>
-						<span class="label label-info">${count }</span>
+						<span class="label label-info">${count}</span>
 					</a>
 					<ul class="dropdown-menu animated fadeIn">
 						<li class="messages-top text-center">
-							你有 ${count } 条新通知.
+							你有 ${count} 条新通知.
 						</li>
 						<c:forEach items="${page.list}" var="oaNotify">
 							<li class="dropdown-notifications">
@@ -117,6 +117,11 @@
 								</a>
 							</li>
 						</c:forEach>
+                        <li class=" text-center">
+                            <a class="J_menuItem" href="${ctx}/oa/oaNotify/self">
+                                <font color='gray'><i class="fa fa-bell"></i>查看所有通知</font>
+                            </a>
+                        </li>
 					</ul>
 				</li>
 
@@ -342,9 +347,9 @@
 		</div>
 	</div>
 
-	<div class="footer">
-		<div class="pull-left"><a href="http://www.jeeplus.org">http://www.jeeplus.org</a> &copy; 2015-2025</div>
-	</div>
+	<%--<div class="footer">--%>
+		<%--<div class="pull-left"><a href="http://www.jeeplus.org">http://www.jeeplus.org</a> &copy; 2015-2025</div>--%>
+	<%--</div>--%>
 
 </section>
 

src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -24,7 +24,7 @@
 				<span class="icon-bar"></span>
 			</button>
 
-			<a class="navbar-brand J_menuItem"  href="${ctx}/home">JeePlus </a>
+			<a class="navbar-brand J_menuItem"  href="${ctx}/home">zjgd</a>
 		</div>
 		<div class="collapse navbar-collapse">
 			<form class="navbar-form navbar-left" role="search">

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -44,7 +44,7 @@
 		<div class="row">
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 				<img  class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
-				<h1>Jeeplus</h1>
+				<h1>镇江市供电公司信息系统</h1>
 				<sys:message content="${message}" showType="1"/>
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 					<div class="form-content">