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

Skip to content

L
liquidnet-bus-v1
Commit 4ea037a3 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/master' into douYinPay

parents c358b3a9 a069696e
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 134 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java
View file @ 4ea037a3
......@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.util.CollectionUtils;
......@@ -44,6 +45,10 @@ import java.util.stream.Collectors;
@RequestMapping("adam/member")
public class AdamMemberAdminController extends BaseController {
private final String prefix = "zhengzai/adam/member";
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired
IAdamMemberAdminService adamMemberService;
@Autowired
......@@ -136,6 +141,7 @@ public class AdamMemberAdminController extends BaseController {
);
mmap.put("memberPrice", memberPrice);
}
mmap.put("platformUrl", platformUrl);
return prefix + "/info";
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/zhengzai/html/upload.html deleted 100644 → 0
View file @ c358b3a9
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<link href="favicon.ico" rel="shortcut icon">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/jquery.contextMenu.min.css" rel="stylesheet">
<link href="/css/font-awesome.min.css" rel="stylesheet">
<link href="/css/animate.css" rel="stylesheet">
<link href="/css/style.css" rel="stylesheet">
<link href="/css/skins.css" rel="stylesheet">
<link href="/ruoyi/css/ry-ui.css?v=4.6.1" rel="stylesheet">
<link href="/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=20201202" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<div class="file-loading">
<input id="fileinput-demo-1" type="file" name="file" data-browse-on-zone-click="true"
data-msg-placeholder="Select {files} for upload...">
<input hidden id="coverImg" name="coverImg">
</div>
</div>
<!-- 全局js -->
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/js/jquery.contextMenu.min.js"></script>
<script src="/ajax/libs/blockUI/jquery.blockUI.js"></script>
<script src="/ajax/libs/layer/layer.min.js"></script>
<script src="/ruoyi/js/ry-ui.js?v=4.6.1"></script>
<script src="/ruoyi/js/common.js?v=4.6.1"></script>
<script src="/ruoyi/index.js?v=20201208"></script>
<script src="/ajax/libs/fullscreen/jquery.fullscreen.js"></script>
<script src="/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=20201202"></script>
<script type="text/javascript">
var platformUrl = "[[${platformUrl}]]";
var url6 = "[[${url6}]]";
var url7 = "[[${url7}]]";
var url14 = "[[${url14}]]";
$(function () {
$("#fileinput-demo-1").fileinput({
'theme': 'explorer-fas',
// 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
},
// overwriteInitial: false,
// initialPreviewAsData: true,
autoReplace: true,
dropZoneTitle: "请上传文件",
maxFileCount: 1
});
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
window.localStorage.setItem('vipBanner', data.response.data.ossPath);
});
})
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/zhengzai/html/uploadMember.html deleted 100644 → 0
View file @ c358b3a9
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<link href="favicon.ico" rel="shortcut icon">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/jquery.contextMenu.min.css" rel="stylesheet">
<link href="/css/font-awesome.min.css" rel="stylesheet">
<link href="/css/animate.css" rel="stylesheet">
<link href="/css/style.css" rel="stylesheet">
<link href="/css/skins.css" rel="stylesheet">
<link href="/ruoyi/css/ry-ui.css?v=4.6.1" rel="stylesheet">
<link href="/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=20201202" rel="stylesheet">
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<div class="file-loading">
<input id="fileinput-demo-1" type="file" name="file" data-browse-on-zone-click="true"
data-msg-placeholder="Select {files} for upload...">
<input hidden id="coverImg" name="coverImg">
</div>
</div>
<!-- 全局js -->
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/js/jquery.contextMenu.min.js"></script>
<script src="/ajax/libs/blockUI/jquery.blockUI.js"></script>
<script src="/ajax/libs/layer/layer.min.js"></script>
<script src="/ruoyi/js/ry-ui.js?v=4.6.1"></script>
<script src="/ruoyi/js/common.js?v=4.6.1"></script>
<script src="/ruoyi/index.js?v=20201208"></script>
<script src="/ajax/libs/fullscreen/jquery.fullscreen.js"></script>
<script src="/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=20201202"></script>
<script type="text/javascript">
var platformUrl = "[[${platformUrl}]]";
var url6 = "[[${url6}]]";
var url7 = "[[${url7}]]";
var url14 = "[[${url14}]]";
$(function () {
$("#fileinput-demo-1").fileinput({
'theme': 'explorer-fas',
// 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
},
// overwriteInitial: false,
// initialPreviewAsData: true,
autoReplace: true,
dropZoneTitle: "请上传文件",
maxFileCount: 1
});
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
window.localStorage.setItem('vipLast', data.response.data.ossPath);
});
})
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html
View file @ 4ea037a3
......@@ -496,6 +496,7 @@
<script th:inline="javascript">
var member = [[${member}]];
console.log(member);
var platformUrl = [[${platformUrl}]];
var memberRightsList = [[${memberRightsList}]];
console.log(memberRightsList);
var couponMemberDtoListMap = [[${couponMemberDtoListMap}]];
......@@ -512,7 +513,8 @@
'theme': 'explorer-fas',
// 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
// 'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 4ea037a3
......@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600
blacklist_grace_period: 5
mysql:
urlHostAndPort: 39.106.122.201:3308
urlHostAndPort: 39.107.71.112:3308
username: testmall
password: zhengzai!mYT
rabbitmq:
......@@ -33,19 +33,19 @@ liquidnet:
redis:
dbs: 0,16
database: 15
host: 39.106.122.201
host: 39.107.71.112
port: 6379
password: 3Xa%8p
dragon:
host: 39.106.122.201
host: 39.107.71.112
port: 6379
password: 3Xa%8p
sweet:
host: 39.106.122.201
host: 39.107.71.112
port: 6379
password: 3Xa%8p
mongodb:
host: 39.106.122.201:27017
host: 39.107.71.112:27017
port: 27017
user: admin
pwd: S&y$6d*JwJ
......@@ -85,7 +85,7 @@ liquidnet:
executor-main:
xxl:
admin:
addresses: 172.17.205.50:8090
addresses: 39.107.71.112:8090
client:
admin:
phpPayUrl: http://devdragon.zhengzai.tv
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 4ea037a3
......@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600
blacklist_grace_period: 5
mysql:
urlHostAndPort: 172.17.205.50:3308
urlHostAndPort: 39.107.71.112:3308
username: root
password: Zhengzai@rd2U#
rabbitmq:
......@@ -45,12 +45,12 @@ liquidnet:
port: 6380
password: PO@B!Iud32
mongodb:
host: 172.17.205.50:27017
host: 39.107.71.112:27017
port: 27017
user: admin
pwd: S&y$6d*JwJ
chime:
host: 172.17.205.50:27017
host: 39.107.71.112:27017
port: 27017
user: admin
pwd: S&y$6d*JwJ
......
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