记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 05b28e0e authored by 张国柄's avatar 张国柄
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 84d2055b 8b8de87e
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 39 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesRecommendController.java
View file @ 05b28e0e
...@@ -36,7 +36,7 @@ public class KylinPerformancesRecommendController extends BaseController { ...@@ -36,7 +36,7 @@ public class KylinPerformancesRecommendController extends BaseController {
@Autowired @Autowired
private IKylinPerformancesAdminService kylinPerformancesService; private IKylinPerformancesAdminService kylinPerformancesService;
@RequiresPermissions("kylin:performances:recommend") // @RequiresPermissions("kylin:performances:recommend")
@GetMapping() @GetMapping()
public String recommend() { public String recommend() {
return prefix + "/recommend"; return prefix + "/recommend";
...@@ -45,7 +45,7 @@ public class KylinPerformancesRecommendController extends BaseController { ...@@ -45,7 +45,7 @@ public class KylinPerformancesRecommendController extends BaseController {
/** /**
* 查询演出列表 * 查询演出列表
*/ */
@RequiresPermissions("kylin:performances:recommend:list") // @RequiresPermissions("kylin:performances:recommend:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list() { public TableDataInfo list() {
...@@ -64,7 +64,7 @@ public class KylinPerformancesRecommendController extends BaseController { ...@@ -64,7 +64,7 @@ public class KylinPerformancesRecommendController extends BaseController {
/** /**
* 修改 * 修改
*/ */
@RequiresPermissions("kylin:performances:recommend:change") // @RequiresPermissions("kylin:performances:recommend:change")
@PostMapping("/change") @PostMapping("/change")
@ResponseBody @ResponseBody
public AjaxResult setRecommend(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "isRecommend",required = false) Integer isRecommend) { public AjaxResult setRecommend(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "isRecommend",required = false) Integer isRecommend) {
...@@ -82,7 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController { ...@@ -82,7 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController {
return prefix + "/edit"; return prefix + "/edit";
} }
@RequiresPermissions("kylin:performances:recommend:change") // @RequiresPermissions("kylin:performances:recommend:change")
@GetMapping(value = "/performance/status") @GetMapping(value = "/performance/status")
@ResponseBody @ResponseBody
public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) { public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRoadShowController.java
View file @ 05b28e0e
...@@ -41,13 +41,13 @@ public class KylinRoadShowController extends BaseController { ...@@ -41,13 +41,13 @@ public class KylinRoadShowController extends BaseController {
@Autowired @Autowired
private IKylinPerformancesAdminService kylinPerformancesService; private IKylinPerformancesAdminService kylinPerformancesService;
@RequiresPermissions("kylin:performances:roadShow") // @RequiresPermissions("kylin:performances:roadShow")
@GetMapping() @GetMapping()
public String roadShow() { public String roadShow() {
return prefix + "/roadShow"; return prefix + "/roadShow";
} }
@RequiresPermissions("kylin:performances:roadShow:list") // @RequiresPermissions("kylin:performances:roadShow:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo listRoadShow(@RequestParam(value = "title", required = false) String title, public TableDataInfo listRoadShow(@RequestParam(value = "title", required = false) String title,
...@@ -66,7 +66,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -66,7 +66,7 @@ public class KylinRoadShowController extends BaseController {
return prefix + "/add"; return prefix + "/add";
} }
@RequiresPermissions("kylin:performances:roadShow:add") // @RequiresPermissions("kylin:performances:roadShow:add")
@Log(title = "巡演", businessType = BusinessType.INSERT) @Log(title = "巡演", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ResponseBody @ResponseBody
...@@ -74,7 +74,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -74,7 +74,7 @@ public class KylinRoadShowController extends BaseController {
return toAjax(!kylinRoadShowsAdminService.createRoadShow(createRoadShowParam).equals("")); return toAjax(!kylinRoadShowsAdminService.createRoadShow(createRoadShowParam).equals(""));
} }
@RequiresPermissions("kylin:performances:roadShow:details") // @RequiresPermissions("kylin:performances:roadShow:details")
@GetMapping(value = "/details/{roadShowId}") @GetMapping(value = "/details/{roadShowId}")
public String detailsRoadShow(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) { public String detailsRoadShow(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
KylinRoadShowAdminVo result = kylinRoadShowsAdminService.detailsRoadShow(roadShowId); KylinRoadShowAdminVo result = kylinRoadShowsAdminService.detailsRoadShow(roadShowId);
...@@ -82,7 +82,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -82,7 +82,7 @@ public class KylinRoadShowController extends BaseController {
return prefix + "/edit"; return prefix + "/edit";
} }
@RequiresPermissions("kylin:performances:roadShow:edit") // @RequiresPermissions("kylin:performances:roadShow:edit")
@Log(title = "巡演", businessType = BusinessType.UPDATE) @Log(title = "巡演", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
...@@ -100,7 +100,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -100,7 +100,7 @@ public class KylinRoadShowController extends BaseController {
return prefix + "/details"; return prefix + "/details";
} }
@RequiresPermissions("kylin:performances:roadShow:addPerformance") // @RequiresPermissions("kylin:performances:roadShow:addPerformance")
@GetMapping(value = "/performance/{roadShowId}") @GetMapping(value = "/performance/{roadShowId}")
@ResponseBody @ResponseBody
public TableDataInfo listByRoadShowId(@PathVariable("roadShowId") String roadShowId) { public TableDataInfo listByRoadShowId(@PathVariable("roadShowId") String roadShowId) {
...@@ -109,7 +109,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -109,7 +109,7 @@ public class KylinRoadShowController extends BaseController {
} }
@RequiresPermissions("kylin:performances:roadShow:change:performance") // @RequiresPermissions("kylin:performances:roadShow:change:performance")
@PostMapping(value = "/roadShow/relation") @PostMapping(value = "/roadShow/relation")
@ResponseBody @ResponseBody
public AjaxResult changeRoadShowId(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "roadShowId",required = false) String roadShowId) { public AjaxResult changeRoadShowId(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "roadShowId",required = false) String roadShowId) {
...@@ -126,7 +126,7 @@ public class KylinRoadShowController extends BaseController { ...@@ -126,7 +126,7 @@ public class KylinRoadShowController extends BaseController {
return prefix + "/addPerformances"; return prefix + "/addPerformances";
} }
@RequiresPermissions("kylin:performances:roadShow:change:performance") // @RequiresPermissions("kylin:performances:roadShow:change:performance")
@GetMapping(value = "/performance/status") @GetMapping(value = "/performance/status")
@ResponseBody @ResponseBody
public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) { public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index.html
View file @ 05b28e0e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>正在映画系统首页</title> <title>摩登天空信息管理系统</title>
<!-- 避免IE使用兼容模式 --> <!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/> <link th:href="@{favicon.ico}" rel="shortcut icon"/>
...@@ -16,6 +16,12 @@ ...@@ -16,6 +16,12 @@
<link th:href="@{/css/skins.css}" rel="stylesheet"/> <link th:href="@{/css/skins.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/> <link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.1}" rel="stylesheet"/>
</head> </head>
<style>
.logo-lg {
font-size: 17px;
font-weight: bold;
}
</style>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">
<div id="wrapper"> <div id="wrapper">
...@@ -26,7 +32,7 @@ ...@@ -26,7 +32,7 @@
</div> </div>
<a th:href="@{/index}"> <a th:href="@{/index}">
<li class="logo hidden-xs"> <li class="logo hidden-xs">
<span class="logo-lg">Modernsky IMS</span> <span class="logo-lg">摩登天空信息管理系统</span>
</li> </li>
</a> </a>
<div class="sidebar-collapse"> <div class="sidebar-collapse">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/login.html
View file @ 05b28e0e
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>登录正在映画系统</title> <title>摩登天空信息管理系统</title>
<meta name="description" content="正在映画后台管理框架"> <meta name="description" content="摩登天空信息管理系统">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/> <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/> <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/> <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
...@@ -15,7 +15,42 @@ ...@@ -15,7 +15,42 @@
<!-- 避免IE使用兼容模式 --> <!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/> <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
<style type="text/css">label.error { position:inherit; }</style> <style type="text/css">
label.error { position:inherit; }
.signinpanel {
width: 400px;
margin-top: 17%;
}
.col-sm-5 {
color: #666666;
width: 100% !important;
}
.pull-left {
float: none !important;
}
.signup-footer {
margin-top: 0;
border-top: 0;
text-align: center;
color: #000000;
font-size: 14px;
}
body.signin {
background: #d2d6de !important;
}
.signinpanel form {
background: #fff;
}
.index_title {
padding-bottom: 10px;
font-size: 24px;
color: #000000;
text-align: center;
}
.index_title p{
margin: 0;
}
</style>
<script> <script>
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location}; if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
</script> </script>
...@@ -23,29 +58,32 @@ ...@@ -23,29 +58,32 @@
<body class="signin"> <body class="signin">
<div class="signinpanel"> <div class="signinpanel">
<div class="row"> <div class="row">
<div class="col-sm-7"> <!-- <div class="col-sm-7">-->
<div class="signin-info"> <!-- <div class="signin-info">-->
<div class="logopanel m-b"> <!-- <div class="logopanel m-b">-->
<h1><img alt="[ 正在映画 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1> <!-- <h1><img alt="[ 正在映画 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>-->
</div> <!-- </div>-->
<div class="m-b"></div> <!-- <div class="m-b"></div>-->
<h4>欢迎使用 <strong>正在映画 后台管理系统</strong></h4> <!-- <h4>欢迎使用 <strong>摩登天空信息管理系统</strong></h4>-->
<ul class="m-b"> <!-- <ul class="m-b">-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>-->
</ul> <!-- </ul>-->
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong> <!-- <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>-->
</div> <!-- </div>-->
<!-- </div>-->
<div class="index_title">
<p><img th:src="@{/img/log.png}" alt="User Image"></p>
摩登天空信息管理系统
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<form id="signupForm" autocomplete="off"> <form id="signupForm" autocomplete="off">
<h4 class="no-margins">登录：</h4> <h4 class="no-margins">登录：</h4>
<p class="m-t-md">你若不离不弃，我必生死相依</p> <input type="text" name="username" class="form-control uname" placeholder="用户名" value="" />
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" /> <input type="password" name="password" class="form-control pword" placeholder="密码" value="" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" />
<div class="row m-t" th:if="${captchaEnabled==true}"> <div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6"> <div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" /> <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
...@@ -65,7 +103,7 @@ ...@@ -65,7 +103,7 @@
</div> </div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <div class="pull-left">
Copyright © 2018-2021 ruoyi.vip All Rights Reserved. <br> Copyright © 1997-2020 Modernsky All rights reserved <br>
</div> </div>
</div> </div>
</div> </div>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/main.html
View file @ 05b28e0e
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="row border-bottom white-bg dashboard-header"> <div class="row border-bottom white-bg dashboard-header">
<div class="col-sm-12"> <div class="col-sm-12">
<h2>LiquidNet后台管理框架</h2> <h2>推荐使用Chrome浏览器</h2>
</div> </div>
</div> </div>
<script th:src="@{/js/jquery.min.js}"></script> <script th:src="@{/js/jquery.min.js}"></script>
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPartnerController.java
View file @ 05b28e0e
...@@ -58,7 +58,7 @@ public class KylinCheckUserPartnerController { ...@@ -58,7 +58,7 @@ public class KylinCheckUserPartnerController {
public ResponseDto<String> change(@RequestParam("merchantId") @NotNull String merchantId, public ResponseDto<String> change(@RequestParam("merchantId") @NotNull String merchantId,
@RequestParam("checkUserId") @NotNull String checkUserId, @RequestParam("checkUserId") @NotNull String checkUserId,
@RequestParam("name") @NotNull String name, @RequestParam("name") @NotNull String name,
@RequestParam(value = "pwd",required = false) @NotNull String pwd, @RequestParam(value = "pwd",required = false) String pwd,
@RequestParam("mobile") @Length(max = 11) String mobile) { @RequestParam("mobile") @Length(max = 11) String mobile) {
return checkUserPartnerService.change(merchantId, checkUserId, name, pwd, mobile); return checkUserPartnerService.change(merchantId, checkUserId, name, pwd, mobile);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment