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

Skip to content

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

Merge branch 'dev' into test

parents 2d016f4d 05b28e0e
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 29 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberSimpleVo.java
View file @ 2cb9a97b
...@@ -8,7 +8,7 @@ import java.io.Serializable; ...@@ -8,7 +8,7 @@ import java.io.Serializable;
@ApiModel(value = "AdamMemberSimpleVo", description = "会员简述响应数据") @ApiModel(value = "AdamMemberSimpleVo", description = "会员简述响应数据")
@Data @Data
public class AdamMemberSimpleVo implements Serializable { public class AdamMemberSimpleVo implements Serializable, Cloneable {
private static final long serialVersionUID = -3246848259206596250L; private static final long serialVersionUID = -3246848259206596250L;
@ApiModelProperty(position = 10, value = "会员ID[50]") @ApiModelProperty(position = 10, value = "会员ID[50]")
private String memberId; private String memberId;
...@@ -20,4 +20,24 @@ public class AdamMemberSimpleVo implements Serializable { ...@@ -20,4 +20,24 @@ public class AdamMemberSimpleVo implements Serializable {
private String subTitle; private String subTitle;
@ApiModelProperty(position = 14, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png") @ApiModelProperty(position = 14, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
private String icon; private String icon;
private static final AdamMemberSimpleVo obj = new AdamMemberSimpleVo();
public static AdamMemberSimpleVo getNew() {
try {
return (AdamMemberSimpleVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new AdamMemberSimpleVo();
}
}
public AdamMemberSimpleVo copy(AdamMemberVo source) {
if (null == this) return this;
this.setMemberId(source.getMemberId());
this.setName(source.getName());
this.setTitle(source.getTitle());
this.setSubTitle(source.getSubTitle());
this.setIcon(source.getIcon());
return this;
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index.html
View file @ 2cb9a97b
...@@ -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 @ 2cb9a97b
...@@ -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 @ 2cb9a97b
...@@ -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/service/impl/adam/dm/DMRdmService.java
View file @ 2cb9a97b
...@@ -364,6 +364,10 @@ public class DMRdmService { ...@@ -364,6 +364,10 @@ public class DMRdmService {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */
public boolean setMemberSimpleVo(AdamMemberSimpleVo vo) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
}
public AdamMemberSimpleVo getMemberSimpleVo() { public AdamMemberSimpleVo getMemberSimpleVo() {
AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE); AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
// if (null == vo) { // if (null == vo) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java
View file @ 2cb9a97b
package com.liquidnet.service.platform.service.impl.adam.dm.processor; package com.liquidnet.service.platform.service.impl.adam.dm.processor;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo; import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.entity.AdamMember; import com.liquidnet.service.adam.entity.AdamMember;
import com.liquidnet.service.adam.entity.AdamMemberPrice; import com.liquidnet.service.adam.entity.AdamMemberPrice;
...@@ -20,7 +20,6 @@ import java.sql.DriverManager; ...@@ -20,7 +20,6 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
...@@ -86,6 +85,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService { ...@@ -86,6 +85,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
AdamMemberVo vo = AdamMemberVo.getNew().copy(o); AdamMemberVo vo = AdamMemberVo.getNew().copy(o);
dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo); dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
dmRdmService.setMemberSimpleVo(AdamMemberSimpleVo.getNew().copy(vo));
memberMapper.insert(o); memberMapper.insert(o);
// mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName()); // mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
......
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