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

Skip to content

L
liquidnet-bus-v1
Commit 84a6ad6e authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents e3370339 19ae5497
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 38 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 84a6ad6e
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
<head> <head>
<th:block th:include="include :: header('选项卡 & 面板')"/> <th:block th:include="include :: header('选项卡 & 面板')"/>
</head> </head>
<style>
.img-details{
width: 30%;
height: 40%;
}
</style>
<body class="gray-bg"> <body class="gray-bg">
<div class="wrapper wrapper-content animated fadeIn"> <div class="wrapper wrapper-content animated fadeIn">
<div class="row"> <div class="row">
...@@ -57,12 +64,17 @@ ...@@ -57,12 +64,17 @@
th:object="${kylinPerformanceMisVo}"> th:object="${kylinPerformanceMisVo}">
<div> <div>
<p>演出封面：</p> <p>演出封面：</p>
<img name="img" th:src="*{imgPoster}"> <img class="img-details" name="img" th:src="*{imgPoster}" th:onclick="click_big([[*{imgPoster}]])">
</div> </div>
<div> <div>
<label>演出名称：</label> <label>演出名称：</label>
<span th:text="*{title}"></span> <span th:text="*{title}"></span>
</div> </div>
<div>
<label>是否实名：</label>
<span th:if="*{isTrueName==1}">是</span>
<span th:if="*{isTrueName==0}">否</span>
</div>
<div> <div>
<label>时间：</label> <label>时间：</label>
<span th:text="*{timeStart}"></span> <span th:text="*{timeStart}"></span>
...@@ -101,7 +113,7 @@ ...@@ -101,7 +113,7 @@
</div> </div>
<div> <div>
<p>演出批文：</p> <p>演出批文：</p>
<img name="img" th:src="*{approvalUrl}"> <img class="img-details" name="img" th:src="*{approvalUrl}" th:onclick="click_big([[*{approvalUrl}]])">
</div> </div>
<div class="ibox-content" id="eg"> <div class="ibox-content" id="eg">
...@@ -380,6 +392,24 @@ ...@@ -380,6 +392,24 @@
$("#tab-nav-1").bind("click", function () { $("#tab-nav-1").bind("click", function () {
$("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "")); $("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
}); });
// 点击图片放大
function click_big(url){
console.log(url)
var json = {
"data": [ //相册包含的图片，数组格式
{
"alt": "演出封面",
"src": url, //原图地址
}
]
};
layer.photos({
photos: json,
closeBtn: 1, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
};
</script> </script>
</body> </body>
</html> </html>
liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-example/liquidnet-service-example-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,11 +9,9 @@ liquidnet: ...@@ -9,11 +9,9 @@ liquidnet:
#host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001 #host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
profiles: profiles:
include: service-example include: service-example
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml
View file @ 84a6ad6e
...@@ -9,8 +9,8 @@ liquidnet: ...@@ -9,8 +9,8 @@ liquidnet:
#host: 172.17.207.177:7001 #host: 172.17.207.177:7001
instance: instance:
prefer-ip-address: true prefer-ip-address: true
host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
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