LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maxkey v1.0 GA

Browse Source 
Maxkey v1.0 GA
This commit is contained in:
shimingxy
2019-11-09 22:53:27 +08:00
parent b1e194ca0c
commit c07aea5788
69 changed files with 1198 additions and 2466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java
View File

@@ -49,7 +49,7 @@ public class DesktopDetailsController extends BaseAppContorller {
transform(desktopDetails);
desktopDetailsService.insert(desktopDetails);
if (appsService.insert(desktopDetails)) {
if (appsService.insertApp(desktopDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success);
} else {
@@ -81,7 +81,7 @@ public class DesktopDetailsController extends BaseAppContorller {
_logger.debug("-update application :" + desktopDetails);
transform(desktopDetails);
if (desktopDetailsService.update(desktopDetails)&&appsService.update(desktopDetails)) {
if (desktopDetailsService.update(desktopDetails)&&appsService.updateApp(desktopDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success);
} else {

4
maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/FormBasedDetailsController.java
View File

@@ -50,7 +50,7 @@ public class FormBasedDetailsController extends BaseAppContorller {
transform(formBasedDetails);
if (formBasedDetailsService.insert(formBasedDetails)&&appsService.insert(formBasedDetails)) {
if (formBasedDetailsService.insert(formBasedDetails)&&appsService.insertApp(formBasedDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success);
} else {
@@ -80,7 +80,7 @@ public class FormBasedDetailsController extends BaseAppContorller {
//
_logger.debug("-update application :" + formBasedDetails);
transform(formBasedDetails);
if (formBasedDetailsService.update(formBasedDetails)&&appsService.update(formBasedDetails)) {
if (formBasedDetailsService.update(formBasedDetails)&&appsService.updateApp(formBasedDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success);
} else {

4
maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/SAML20DetailsController.java
View File

@@ -68,7 +68,7 @@ public class SAML20DetailsController extends BaseAppContorller {
e.printStackTrace();
}
saml20DetailsService.insert(saml20Details);
if (appsService.insert(saml20Details)) {
if (appsService.insertApp(saml20Details)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success);
} else {
@@ -102,7 +102,7 @@ public class SAML20DetailsController extends BaseAppContorller {
e.printStackTrace();
}
saml20DetailsService.update(saml20Details);
if (appsService.update(saml20Details)) {
if (appsService.updateApp(saml20Details)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success);
} else {

4
maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/TokenBasedDetailsController.java
View File

@@ -50,7 +50,7 @@ public class TokenBasedDetailsController extends BaseAppContorller {
tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret());
if (tokenBasedDetailsService.insert(tokenBasedDetails)&&appsService.insert(tokenBasedDetails)) {
if (tokenBasedDetailsService.insert(tokenBasedDetails)&&appsService.insertApp(tokenBasedDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),MessageType.success);
} else {
@@ -82,7 +82,7 @@ public class TokenBasedDetailsController extends BaseAppContorller {
_logger.debug("-update application :" + tokenBasedDetails);
transform(tokenBasedDetails);
tokenBasedDetails.setAlgorithmKey(tokenBasedDetails.getSecret());
if (tokenBasedDetailsService.update(tokenBasedDetails)&&appsService.update(tokenBasedDetails)) {
if (tokenBasedDetailsService.update(tokenBasedDetails)&&appsService.updateApp(tokenBasedDetails)) {
new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success);
} else {

7
maxkey-web-manage/src/main/resources/static/js/Chart.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
View File

@@ -40,6 +40,7 @@
<link href="<@base />/static/jquery/metisMenu-v3.0.4/css/mm-vertical.css" rel="stylesheet" >
<link href="<@base />/static/jquery/metisMenu-v3.0.4/metisMenu.min.css" rel="stylesheet" >
<script src ="<@base />/static/jquery/metisMenu-v3.0.4/metisMenu.min.js" type="text/javascript" ></script>
<script src ="<@base />/static/js/Chart.min.js" type="text/javascript" ></script>
<#-- common script start -->
<script type="text/javascript">
$(function () {

367
maxkey-web-manage/src/main/resources/templates/views/main.ftl
View File

@@ -3,7 +3,13 @@
<head>
<#include "layout/header.ftl"/>
<#include "layout/common.cssjs.ftl"/>
<style>
canvas {
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
}
</style>
</head>
<body>
<div class="app header-default side-nav-dark">
@@ -44,7 +50,7 @@
</div>
<div class="info-box-content">
<h4 class="number">1125</h4>
<p class="info-text">All Properties</p>
<p class="info-text">用户在线</p>
</div>
</div>
</div>
@@ -55,7 +61,7 @@
</div>
<div class="info-box-content">
<h4 class="number">351</h4>
<p class="info-text">For Sale</p>
<p class="info-text">当天访问量</p>
</div>
</div>
</div>
@@ -66,7 +72,7 @@
</div>
<div class="info-box-content">
<h4 class="number">774</h4>
<p class="info-text">For Rent</p>
<p class="info-text">当月新用户</p>
</div>
</div>
</div>
@@ -76,8 +82,8 @@
<i class="lni-wallet"></i>
</div>
<div class="info-box-content">
<h4 class="number">$49450</h4>
<p class="info-text">Total Revenue</p>
<h4 class="number">49450</h4>
<p class="info-text">本月活跃用户</p>
</div>
</div>
</div>
@@ -86,295 +92,104 @@
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h5 class="card-title">Business Overview</h5>
<h5 class="card-title">本月访问情况</h5>
<div class="float-right">
<ul class="list-inline d-none d-sm-block">
<li>
<span class="status bg-primary"></span>
<span class="text-semibold">Sales</span>
<span class="text-semibold"></span>
</li>
<li>
<span class="status bg-success"></span>
<span class="text-semibold">Expense</span>
<span class="text-semibold"></span>
</li>
</ul>
</div>
</div>
<div class="card-body">
<div id="morris-line-example" style="height: 300px"></div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-8 col-md-12 col-xs-12">
<div class="row">
<div class="col-lg-6 col-md-12 col-xs-12">
<div class="card">
<div class="card-body">
<h5 class="card-title">Sales Details of Properties</h5>
<div class="row">
<div class="col-5 m-t-20">
<h3 class="text-primary">$7492</h3>
<p class="text-muted">July 2018</p>
<b>(149 Sales)</b>
</div>
<div class="col-7">
<div id="sales1" class="text-right">
<div id="morris-bar-example" style="height: 130px"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-6 col-md-12 col-xs-12">
<div class="card">
<div class="card-body">
<h5 class="card-title">Rent Details of Properties</h5>
<div class="row">
<div class="col-5 m-t-20">
<h3 class="text-info">$1930</h3>
<p class="light_op_text">July 2018</p>
<b class="">(170 Rentals)</b>
</div>
<div class="col-7">
<div id="morris-bar-stacked" style="height: 130px"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="properties">
<div class="card">
<div class="card-header">
<h4 class="card-title">Recent properties</h4>
<div class="card-toolbar">
<ul>
<li>
<a class="text-gray" href="#">
<i class="lni-more-alt"></i>
</a>
</li>
</ul>
</div>
</div>
<div class="card-body">
<ul class="list-media">
<li class="list-item">
<div class="client-item">
<div class="media-img">
<img src="assets/img/properties/img1.jpg" alt="">
</div>
<div class="info">
<h4 class="title text-semibold"><a href="#">795 Folsom Ave, Suite 600 San Francisco</a></h4>
<p class="m-0">20 July 2018, John Doe</p>
<div class="float-item">
<button class="btn btn-success">Rent</button>
</div>
</div>
</div>
</li>
<li class="list-item">
<div class="client-item">
<div class="media-img">
<img src="assets/img/properties/img2.jpg" alt="">
</div>
<div class="info">
<h4 class="title text-semibold"><a href="#">795 Folsom Ave, Suite 600 San Francisco</a></h4>
<p class="m-0">17 July 2018, Venessa Fern</p>
<div class="float-item">
<button class="btn btn-common">Sale</button>
</div>
</div>
</div>
</li>
<li class="list-item">
<div class="client-item">
<div class="media-img">
<img src="assets/img/properties/img3.jpg" alt="">
</div>
<div class="info">
<h4 class="title text-semibold"><a href="#">795 Folsom Ave, Suite 600 San Francisco</a></h4>
<p class="m-0">13 July 2018, Danielle M. Stong</p>
<div class="float-item">
<button class="btn btn-success">Rent</button>
</div>
</div>
</div>
</li>
<li class="list-item">
<div class="client-item">
<div class="media-img">
<img src="assets/img/properties/img4.jpg" alt="">
</div>
<div class="info">
<h4 class="title text-semibold"><a href="#">795 Folsom Ave, Suite 600 San Francisco</a></h4>
<p class="m-0">09 July 2018, Ample</p>
<div class="float-item">
<button class="btn btn-common">Sale</button>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 col-lg-4 col-xs-12">
<div class="card">
<div class="profile-bg">
<div class="user-profile">
<figure class="profile-wall-img">
<img class="img-fluid" src="assets/img/profile/user-bg.jpg" alt="User Wall">
</figure>
<div class="profile-body">
<figure class="profile-user-avatar">
<img src="assets/img/profile/user1.jpg" alt="User Wall">
</figure>
<h3 class="profile-user-name m-0">Michael A. Franklin</h3>
<small class="profile-user-address">California, United States</small>
</div>
<form class="forms-profile">
<h4 class="text-center">
Request Inquiry
</h4>
<div class="form-group row">
<div class="col-sm-12">
<input type="text" class="form-control" id="exampleInputUsername2" placeholder="Full Name*">
</div>
</div>
<div class="form-group row">
<div class="col-sm-12">
<input type="email" class="form-control" id="exampleInputEmail2" placeholder="Email ID*">
</div>
</div>
<div class="form-group row">
<div class="col-sm-12">
<input type="text" class="form-control" id="exampleInputMobile" placeholder="Mobile number*">
</div>
</div>
<div class="form-group">
<textarea class="form-control" id="exampleTextarea1" rows="3"></textarea>
</div>
<button type="submit" class="btn btn-common">Submit</button>
</form>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-xs-12">
<div class="card">
<div class="card-header">
<h4 class="card-title">Property Overview</h4>
</div>
<div class="table-overflow">
<table class="table table-hover table-lg">
<thead>
<tr>
<td class="text-dark text-semibold">Order No.</td>
<td class="text-dark text-semibold">Customer</td>
<td class="text-dark text-semibold">Property</td>
<td class="text-dark text-semibold">Date</td>
<td class="text-dark text-semibold">Status</td>
<td class="text-dark text-semibold">Action</td>
</tr>
</thead>
<tbody>
<tr>
<td>
<a href="invoice.html">#ODN84952</a>
</td>
<td>John Doe</td>
<td>795 Folsom Ave, Suite 600 San Francisco</td>
<td>25/07/2018</td>
<td><a href="#" class="badge badge-success">Paid</a></td>
<td>
<div class="btn-group dropdown">
<a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="lni-more-alt"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#"><i class="lni-pencil mr-2 text-muted"></i>Edit Contact</a>
<a class="dropdown-item" href="#"><i class="lni-trash mr-2 text-muted"></i>Remove</a>
<a class="dropdown-item" href="#"><i class="lni-envelope mr-2 text-muted"></i>Send Email</a>
</div>
</div>
</td>
</tr>
<tr>
<td>
<a href="invoice.html">#ODN84952</a>
</td>
<td>Venessa Fern</td>
<td>795 Folsom Ave, Suite 600 San Francisco</td>
<td>19/07/2018</td>
<td><a href="#" class="badge badge-info">Pending</a></td>
<td>
<div class="btn-group dropdown">
<a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="lni-more-alt"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#"><i class="lni-pencil mr-2 text-muted"></i>Edit Contact</a>
<a class="dropdown-item" href="#"><i class="lni-trash mr-2 text-muted"></i>Remove</a>
<a class="dropdown-item" href="#"><i class="lni-envelope mr-2 text-muted"></i>Send Email</a>
</div>
</div>
</td>
</tr>
<tr>
<td>
<a href="invoice.html">#ODN84952</a>
</td>
<td>John Doe</td>
<td>795 Folsom Ave, Suite 600 San Francisco</td>
<td>15/07/2018</td>
<td><a href="#" class="badge badge-danger">Fuiled</a></td>
<td>
<div class="btn-group dropdown">
<a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="lni-more-alt"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#"><i class="lni-pencil mr-2 text-muted"></i>Edit Contact</a>
<a class="dropdown-item" href="#"><i class="lni-trash mr-2 text-muted"></i>Remove</a>
<a class="dropdown-item" href="#"><i class="lni-envelope mr-2 text-muted"></i>Send Email</a>
</div>
</div>
</td>
</tr>
<tr>
<td>
<a href="invoice.html">#ODN84952</a>
</td>
<td>Ample</td>
<td>795 Folsom Ave, Suite 600 San Francisco</td>
<td>04/07/2018</td>
<td><a href="#" class="badge badge-success">Paid</a></td>
<td>
<div class="btn-group dropdown">
<a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="lni-more-alt"></i></a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#"><i class="lni-pencil mr-2 text-muted"></i>Edit Contact</a>
<a class="dropdown-item" href="#"><i class="lni-trash mr-2 text-muted"></i>Remove</a>
<a class="dropdown-item" href="#"><i class="lni-envelope mr-2 text-muted"></i>Send Email</a>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<div id="morris-line-example" >
<canvas id="canvas" style="height: 400px;width:98%;"></canvas>
</div>
</div>
</div>
</div>
</div>
<script>
var randomScalingFactor = function() {
return Math.ceil(Math.random() * 10.0) * Math.pow(10, Math.ceil(Math.random() * 5));
};
var config = {
type: 'line',
data: {
labels: ['1', '2', '3', '4', '5', '6', '7','8','9','10',
'11','12','13','14','15','16','17','18','19','20',
'21','22','23','24','25','26','27','28','29','30','31'],
datasets: [{
label:"访问量",
backgroundColor: 'rgb(75, 192, 192)',
borderColor: 'rgb(75, 192, 192)',
fill: false,
data: [
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor(),
randomScalingFactor()
],
}]
},
options: {
responsive: true,
title: {
display: true
//,text: '访问情况'
},
scales: {
xAxes: [{
display: true,
}],
yAxes: [{
display: true,
type: 'logarithmic',
}]
}
}
};
window.onload = function() {
var ctx = document.getElementById('canvas').getContext('2d');
window.myLine = new Chart(ctx, config);
};
</script>
<footer class="content-footer">
<#include "layout/footer.ftl"/>
</footer>