Merge remote-tracking branch 'origin/master'
This commit is contained in:
flower
commit
1eac91410a
|
|
@ -1,5 +1,7 @@
|
||||||
# 数据源配置
|
# 数据源配置
|
||||||
spring:
|
spring:
|
||||||
|
jmx:
|
||||||
|
default-domain: exam
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
|
|
@ -19,6 +19,13 @@
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
.nav > li:hover .dropdown-menu {display: block;}
|
.nav > li:hover .dropdown-menu {display: block;}
|
||||||
#content-main.max { height: calc(100% - 110px); overflow: hidden; width: 100%; height: 100%; left: 0px; position: absolute; top: 0px; z-index: 9998; margin: 0; }
|
#content-main.max { height: calc(100% - 110px); overflow: hidden; width: 100%; height: 100%; left: 0px; position: absolute; top: 0px; z-index: 9998; margin: 0; }
|
||||||
|
.profile-element{
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
.userInfo{
|
||||||
|
margin-top: 5px;
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}">
|
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}">
|
||||||
|
|
@ -33,15 +40,17 @@
|
||||||
<ul class="nav" id="side-menu">
|
<ul class="nav" id="side-menu">
|
||||||
<li class="nav-header">
|
<li class="nav-header">
|
||||||
<div class="dropdown profile-element"> <span>
|
<div class="dropdown profile-element"> <span>
|
||||||
<img th:src="@{/juncong.jpg}" alt="image" class="img-circle" height="60" width="60"/></span>
|
<img th:src="@{/juncong.jpg}" alt="image" class="img-circle" height="60" width="60"/></span>
|
||||||
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
|
<div class="userInfo">
|
||||||
<span class="clear"><span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">用户</strong></span>
|
<a data-toggle="dropdown" class="dropdown-toggle" href="#">
|
||||||
<span class="text-muted text-xs block"><span th:text="${user.dept?.deptName}">部门</span> <b class="caret"></b></span> </span> </a>
|
<span class="clear"><span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">用户</strong></span>
|
||||||
<ul class="dropdown-menu animated fadeInRight m-t-xs">
|
<span class="text-muted text-xs block"><span th:text="${user.dept?.deptName}">部门</span> <b class="caret"></b></span> </span> </a>
|
||||||
<li><a class="menuItem" th:href="@{/system/user/profile}">个人信息</a></li>
|
<ul class="dropdown-menu animated fadeInRight m-t-xs">
|
||||||
<li class="divider"></li>
|
<li><a class="menuItem" th:href="@{/system/user/profile}">个人信息</a></li>
|
||||||
<li><a th:href="@{logout}">退出</a></li>
|
<li class="divider"></li>
|
||||||
</ul>
|
<li><a th:href="@{logout}">退出</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="active">
|
<li class="active">
|
||||||
|
|
|
||||||
86
ry.sh
86
ry.sh
|
|
@ -1,86 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
AppName=RuoYi.jar
|
|
||||||
|
|
||||||
#JVM参数
|
|
||||||
JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
|
|
||||||
APP_HOME=`pwd`
|
|
||||||
LOG_PATH=$APP_HOME/logs/$AppName.log
|
|
||||||
|
|
||||||
if [ "$1" = "" ];
|
|
||||||
then
|
|
||||||
echo -e "\033[0;31m 未输入操作名 \033[0m \033[0;34m {start|stop|restart|status} \033[0m"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$AppName" = "" ];
|
|
||||||
then
|
|
||||||
echo -e "\033[0;31m 未输入应用名 \033[0m"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
function start()
|
|
||||||
{
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
|
|
||||||
|
|
||||||
if [ x"$PID" != x"" ]; then
|
|
||||||
echo "$AppName is running..."
|
|
||||||
else
|
|
||||||
nohup java -jar $JVM_OPTS target/$AppName > /dev/null 2>&1 &
|
|
||||||
echo "Start $AppName success..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop()
|
|
||||||
{
|
|
||||||
echo "Stop $AppName"
|
|
||||||
|
|
||||||
PID=""
|
|
||||||
query(){
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
|
|
||||||
}
|
|
||||||
|
|
||||||
query
|
|
||||||
if [ x"$PID" != x"" ]; then
|
|
||||||
kill -TERM $PID
|
|
||||||
echo "$AppName (pid:$PID) exiting..."
|
|
||||||
while [ x"$PID" != x"" ]
|
|
||||||
do
|
|
||||||
sleep 1
|
|
||||||
query
|
|
||||||
done
|
|
||||||
echo "$AppName exited."
|
|
||||||
else
|
|
||||||
echo "$AppName already stopped."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function restart()
|
|
||||||
{
|
|
||||||
stop
|
|
||||||
sleep 2
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
function status()
|
|
||||||
{
|
|
||||||
PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
|
|
||||||
if [ $PID != 0 ];then
|
|
||||||
echo "$AppName is running..."
|
|
||||||
else
|
|
||||||
echo "$AppName is not running..."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
start)
|
|
||||||
start;;
|
|
||||||
stop)
|
|
||||||
stop;;
|
|
||||||
restart)
|
|
||||||
restart;;
|
|
||||||
status)
|
|
||||||
status;;
|
|
||||||
*)
|
|
||||||
|
|
||||||
esac
|
|
||||||
Loading…
Reference in New Issue