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

Skip to content

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

Merge branch 'master' into dev_merchant

parents 9482c9ac a069696e
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 202 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 @ 8a5887b8
...@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -44,6 +45,10 @@ import java.util.stream.Collectors; ...@@ -44,6 +45,10 @@ import java.util.stream.Collectors;
@RequestMapping("adam/member") @RequestMapping("adam/member")
public class AdamMemberAdminController extends BaseController { public class AdamMemberAdminController extends BaseController {
private final String prefix = "zhengzai/adam/member"; private final String prefix = "zhengzai/adam/member";
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired @Autowired
IAdamMemberAdminService adamMemberService; IAdamMemberAdminService adamMemberService;
@Autowired @Autowired
...@@ -136,6 +141,7 @@ public class AdamMemberAdminController extends BaseController { ...@@ -136,6 +141,7 @@ public class AdamMemberAdminController extends BaseController {
); );
mmap.put("memberPrice", memberPrice); mmap.put("memberPrice", memberPrice);
} }
mmap.put("platformUrl", platformUrl);
return prefix + "/info"; return prefix + "/info";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ToolsBaseController.java
View file @ 8a5887b8
...@@ -79,7 +79,7 @@ public class ToolsBaseController extends BaseController { ...@@ -79,7 +79,7 @@ public class ToolsBaseController extends BaseController {
return error("查无订单"); return error("查无订单");
} }
ExcelUtil<OrderExportVo> util = new ExcelUtil(OrderExportVo.class); ExcelUtil<OrderExportVo> util = new ExcelUtil(OrderExportVo.class);
return util.exportExcel(list, list.get(0).getPerformanceTitle() + "-" + mobileType); return util.exportExcel(list, mobileType+"");
} }
/** /**
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test.yml
View file @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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/static/zhengzai/html/upload.html deleted 100644 → 0
View file @ 9482c9ac
<!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 @ 9482c9ac
<!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 @ 8a5887b8
...@@ -496,6 +496,7 @@ ...@@ -496,6 +496,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var member = [[${member}]]; var member = [[${member}]];
console.log(member); console.log(member);
var platformUrl = [[${platformUrl}]];
var memberRightsList = [[${memberRightsList}]]; var memberRightsList = [[${memberRightsList}]];
console.log(memberRightsList); console.log(memberRightsList);
var couponMemberDtoListMap = [[${couponMemberDtoListMap}]]; var couponMemberDtoListMap = [[${couponMemberDtoListMap}]];
...@@ -512,7 +513,8 @@ ...@@ -512,7 +513,8 @@
'theme': 'explorer-fas', 'theme': 'explorer-fas',
// 'uploadUrl': "/kylin/banners/upload3", // 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload", // '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": { "uploadExtraData": {
"pathName" : "banner", "pathName" : "banner",
"buckType" : 1 "buckType" : 1
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 8a5887b8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
height: 400px; height: 400px;
} }
.img-Approval{ .img-Approval{
width-max:300px; max-width:300px;
height: 400px; height: 400px;
} }
</style> </style>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ 8a5887b8
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<label>申请退款类型：</label> <label>申请退款类型：</label>
<select name="type"> <select name="type">
<option value="">全部</option> <option value="">全部</option>
<option value="0">客服申请</option> <option value="4">客服申请</option>
<option value="1">超时退款</option> <option value="1">超时退款</option>
<option value="2">用户申请普通退款</option> <option value="2">用户申请普通退款</option>
<option value="3">用户申请快递退款</option> <option value="3">用户申请快递退款</option>
......
liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test.yml
View file @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 8a5887b8
...@@ -13,7 +13,7 @@ liquidnet: ...@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600 refresh-ttl: 525600
blacklist_grace_period: 5 blacklist_grace_period: 5
mysql: mysql:
urlHostAndPort: 39.106.122.201:3308 urlHostAndPort: 39.107.71.112:3308
username: testmall username: testmall
password: zhengzai!mYT password: zhengzai!mYT
rabbitmq: rabbitmq:
...@@ -33,19 +33,19 @@ liquidnet: ...@@ -33,19 +33,19 @@ liquidnet:
redis: redis:
dbs: 0,16 dbs: 0,16
database: 15 database: 15
host: 39.106.122.201 host: 39.107.71.112
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
dragon: dragon:
host: 39.106.122.201 host: 39.107.71.112
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
sweet: sweet:
host: 39.106.122.201 host: 39.107.71.112
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
mongodb: mongodb:
host: 39.106.122.201:27017 host: 39.107.71.112:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
...@@ -85,7 +85,7 @@ liquidnet: ...@@ -85,7 +85,7 @@ liquidnet:
executor-main: executor-main:
xxl: xxl:
admin: admin:
addresses: 172.17.205.50:8090 addresses: 39.107.71.112:8090
client: client:
admin: admin:
phpPayUrl: http://devdragon.zhengzai.tv phpPayUrl: http://devdragon.zhengzai.tv
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 8a5887b8
...@@ -13,7 +13,7 @@ liquidnet: ...@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600 refresh-ttl: 525600
blacklist_grace_period: 5 blacklist_grace_period: 5
mysql: mysql:
urlHostAndPort: 172.17.205.50:3308 urlHostAndPort: 39.107.71.112:3308
username: root username: root
password: Zhengzai@rd2U# password: Zhengzai@rd2U#
rabbitmq: rabbitmq:
...@@ -45,12 +45,12 @@ liquidnet: ...@@ -45,12 +45,12 @@ liquidnet:
port: 6380 port: 6380
password: PO@B!Iud32 password: PO@B!Iud32
mongodb: mongodb:
host: 172.17.205.50:27017 host: 39.107.71.112:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
chime: chime:
host: 172.17.205.50:27017 host: 39.107.71.112:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ 8a5887b8
...@@ -88,9 +88,12 @@ ...@@ -88,9 +88,12 @@
<if test="orderTicketsId!=''"> <if test="orderTicketsId!=''">
AND a.order_tickets_id = #{orderTicketsId} AND a.order_tickets_id = #{orderTicketsId}
</if> </if>
<if test="type!=''"> <if test="type!='' and type != 4">
AND a.type = #{type} AND a.type = #{type}
</if> </if>
<if test="type!='' and type == 4">
AND a.type = 0
</if>
<choose> <choose>
<when test="roleType!=''"> <when test="roleType!=''">
<if test="roleType == 1"> <if test="roleType == 1">
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml
View file @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #host: 192.168.193.41:7001
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
spring: spring:
......
liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-test.yml
View file @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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 @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #host: 192.168.193.41:7001
# end-test-这里是配置信息基本值 # end-test-这里是配置信息基本值
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml
View file @ 8a5887b8
...@@ -6,11 +6,11 @@ liquidnet: ...@@ -6,11 +6,11 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
#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 #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