benjobs 7 лет назад
Родитель
Сommit
4bd639fdc4
4 измененных файлов с 21 добавлено и 38 удалено
  1. 0 17
      agent.sh
  2. 4 4
      opencron-server/src/main/webapp/WEB-INF/layouts/menu.jsp
  3. 17 0
      opencron-server/startup.sh
  4. 0 17
      server.sh

+ 0 - 17
agent.sh

@@ -32,23 +32,6 @@ echo_w () {
     echo -e "[${GREEN_COLOR}opencron${RES}] ${WHITE_COLOR}$1${RES}"
 }
 
-echo -ne "${GREEN_COLOR}"
-cat<<EOT
-
-      --------------------------------------------
-    /                                              \\
-   /   ___  _ __   ___ _ __   ___ _ __ ___  _ __    \\
-  /   / _ \| '_ \ / _ \ '_ \ / __| '__/ _ \| '_ \\    \\
- /   | (_) | |_) |  __/ | | | (__| | | (_) | | | |    \\
- \\    \___/| .__/ \___|_| |_|\___|_|  \___/|_| |_|    /
-  \\        |_|                                       /
-   \\                                                /
-    \\       --opencron,Let's crontab easy!         /
-      --------------------------------------------
-
-EOT
-echo -ne "${RES}";
-
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false
 darwin=false

+ 4 - 4
opencron-server/src/main/webapp/WEB-INF/layouts/menu.jsp

@@ -16,13 +16,13 @@
 			<!-- Profile Menu -->
 			<div class="text-center s-widget m-b-25 dropdown" id="profile-menu">
 				<a href="" id="header-img" data-toggle="dropdown" class="animated a-hover">
-					<img class="profile-pic" id="profile-pic" width="140px;" height="140px;"  onerror="javascript:this.src='${contextPath}/static/img/profile-pic.jpg'"
-					<c:if test="${opencron_user.headerPath == null}  ">
-						 src="${contextPath}/upload/${opencron_user.userId}${opencron_user.picExtName}?<%=System.currentTimeMillis()%>">
-					</c:if>
+					<img class="profile-pic" id="profile-pic" width="140px;" height="140px;"
 					<c:if test="${opencron_user.headerPath != null}">
 						src="${opencron_user.headerPath}?<%=System.currentTimeMillis()%>">
 					</c:if>
+					<c:if test="${opencron_user.headerPath == null}">
+						src="${contextPath}/static/img/profile-pic.jpg">
+					</c:if>
 					<div class="change-text" id="change-img" href="javascript:void(0);">更换头像</div>
 				</a>
 				<h4 class="m-0">${opencron_user.userName}</h4>

+ 17 - 0
opencron-server/startup.sh

@@ -8,6 +8,23 @@ GREEN_COLOR="\E[1;32m";
 YELLOW_COLOR="\E[1;33m";
 RES="\E[0m";
 
+echo -ne "${GREEN_COLOR}"
+cat<<EOT
+
+      --------------------------------------------
+    /                                              \\
+   /   ___  _ __   ___ _ __   ___ _ __ ___  _ __    \\
+  /   / _ \| '_ \ / _ \ '_ \ / __| '__/ _ \| '_ \\    \\
+ /   | (_) | |_) |  __/ | | | (__| | | (_) | | | |    \\
+ \\    \___/| .__/ \___|_| |_|\___|_|  \___/|_| |_|    /
+  \\        |_|                                       /
+   \\                                                /
+    \\       --opencron,Let's crontab easy!         /
+      --------------------------------------------
+
+EOT
+echo -ne "${RES}";
+
 echo_r () {
     # Color red: Error, Failed
     [ $# -ne 1 ] && return 1

+ 0 - 17
server.sh

@@ -32,23 +32,6 @@ echo_w () {
     echo -e "[${GREEN_COLOR}opencron${RES}] ${WHITE_COLOR}$1${RES}"
 }
 
-echo -ne "${GREEN_COLOR}"
-cat<<EOT
-
-      --------------------------------------------
-    /                                              \\
-   /   ___  _ __   ___ _ __   ___ _ __ ___  _ __    \\
-  /   / _ \| '_ \ / _ \ '_ \ / __| '__/ _ \| '_ \\    \\
- /   | (_) | |_) |  __/ | | | (__| | | (_) | | | |    \\
- \\    \___/| .__/ \___|_| |_|\___|_|  \___/|_| |_|    /
-  \\        |_|                                       /
-   \\                                                /
-    \\       --opencron,Let's crontab easy!         /
-      --------------------------------------------
-
-EOT
-echo -ne "${RES}";
-
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
   if $darwin; then