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

Skip to content

L
liquidnet-bus-v1
Commit 652e1507 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !182
parents c0bacfd0 401e2dcb
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 52 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetActiveController.java
View file @ 652e1507
...@@ -57,6 +57,9 @@ import java.util.List; ...@@ -57,6 +57,9 @@ import java.util.List;
public class SweetActiveController extends BaseController { public class SweetActiveController extends BaseController {
private String prefix = "zhengzai/sweet/qrCode"; private String prefix = "zhengzai/sweet/qrCode";
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired @Autowired
private ISweetAdminActiveTypeService sweetAdminActiveTypeService; private ISweetAdminActiveTypeService sweetAdminActiveTypeService;
...@@ -131,6 +134,7 @@ public class SweetActiveController extends BaseController { ...@@ -131,6 +134,7 @@ public class SweetActiveController extends BaseController {
@GetMapping("/addQrCode/{type}") @GetMapping("/addQrCode/{type}")
public String addQrCode(@PathVariable("type") String type, ModelMap mmap) { public String addQrCode(@PathVariable("type") String type, ModelMap mmap) {
mmap.put("type", type); mmap.put("type", type);
mmap.put("platformUrl", platformUrl);
return prefix + "/addQrCode"; return prefix + "/addQrCode";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test.yml
View file @ 652e1507
...@@ -6,7 +6,7 @@ liquidnet: ...@@ -6,7 +6,7 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
host: 172.17.192.6: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
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html
View file @ 652e1507
...@@ -162,13 +162,16 @@ ...@@ -162,13 +162,16 @@
</div> </div>
<div class="gitPic"> <div class="gitPic">
<img id="viewImg" src="" alt="" style="max-height:150px;margin-top: 12px;margin-left: 12px;"> <img id="viewImg" src="" alt="" style="max-height:150px;margin-top: 12px;margin-left: 12px;">
<div class="ibox-content" style="border: none;padding-bottom: 0;"> <div class="ibox-content" style="border: none;padding-bottom: 0;display:flex;align-items:center;">
<em style="color:red;margin-right:12px">*</em>
<div class="form-group"> <div class="form-group">
<div class="file-loading"> <div class="file-loading">
<input id="fileinput" type="file" name="file" data-browse-on-zone-click="true" data-theme="fas"> <input id="fileinput" type="file" name="file" data-browse-on-zone-click="true" data-theme="fas">
</div> </div>
</div> </div>
<p style="margin-left:12px;">图片尺寸为54PX,比例为1:1</p>
</div> </div>
</div> </div>
<div class="bottomBtn"> <div class="bottomBtn">
<a src="javascript:;" class="layui-layer-btn0 paddings" onclick="yes(1,2)">确定</a> <a src="javascript:;" class="layui-layer-btn0 paddings" onclick="yes(1,2)">确定</a>
...@@ -313,7 +316,7 @@ ...@@ -313,7 +316,7 @@
name = $("#threeIpt").val(); name = $("#threeIpt").val();
catePid = $("#secondTypeSelect").val(); catePid = $("#secondTypeSelect").val();
} }
if (!name) { if (!name || !$("#viewImg").attr('src')) {
return layer.msg('请将必填项填写完整！') return layer.msg('请将必填项填写完整！')
} }
let data = { let data = {
...@@ -328,9 +331,14 @@ ...@@ -328,9 +331,14 @@
url: '/goblin/category/addSave', url: '/goblin/category/addSave',
data, data,
success: function (res) { success: function (res) {
console.log(res, '121212')
if (res.code == 0) {
$("pull-right button[type=refresh]").click(); $("pull-right button[type=refresh]").click();
closeModal (); closeModal ();
refreshItem(); refreshItem();
} else {
layer.msg(res.msg)
}
} }
}) })
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 652e1507
...@@ -34,80 +34,80 @@ liquidnet: ...@@ -34,80 +34,80 @@ liquidnet:
kylin: kylin:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
slime: slime:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
dragon: dragon:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
sweet: sweet:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
adam: adam:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
candy: candy:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
goblin: goblin:
database: 255 database: 255
dbs: 0,256 dbs: 0,256
host: r-2zetgw7zdxea5wtnr8.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: Zhengzai@2021 password: PO@B!Iud32
mongodb: mongodb:
host: s-2zeb52774ceac644.mongodb.rds.aliyuncs.com:3717,s-2ze8994d25d37d74.mongodb.rds.aliyuncs.com:3717 host: 39.107.71.112:27017
port: 3717 port: 27017
user: root user: admin
pwd: Qwer1234 pwd: S&y$6d*JwJ
service: service:
adam: adam:
url-pay: url-pay:
pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
callback: http://ttestadam.zhengzai.tv/adam/member/order/callback callback: http://testadam.zhengzai.tv/adam/member/order/callback
url: http://ttestadam.zhengzai.tv url: http://testadam.zhengzai.tv
kylin: kylin:
url-pay: url-pay:
pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://ttestkylin.zhengzai.tv/kylin/order/syncOrder localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
url: http://ttestkylin.zhengzai.tv/kylin url: http://testkylin.zhengzai.tv/kylin
candy: candy:
url: http://ttestcandy.zhengzai.tv/candy url: http://testcandy.zhengzai.tv/candy
goblin: goblin:
url: http://ttestgoblin.zhengzai.tv url: http://testgoblin.zhengzai.tv
stone: stone:
url: http://tteststone.zhengzai.tv/stone url: http://teststone.zhengzai.tv/stone
order: order:
adam: adam:
url: http://ttestadam.zhengzai.tv/adam url: http://testadam.zhengzai.tv/adam
url-pay: url-pay:
pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://ttestorder.zhengzai.tv/order/order/syncOrder localUrl: http://testorder.zhengzai.tv/order/order/syncOrder
goblinUrl: http://ttestorder.zhengzai.tv/order/goblin/syncOrder goblinUrl: http://testorder.zhengzai.tv/order/goblin/syncOrder
goblinRefundUrl: http://ttestorder.zhengzai.tv/order/goblin/refundSyncOrder goblinRefundUrl: http://testorder.zhengzai.tv/order/goblin/refundSyncOrder
dragon: dragon:
notifyUrl: https://ttestdragon.zhengzai.tv/dragon notifyUrl: https://testdragon.zhengzai.tv/dragon
urls: urls:
refundApply: https://testdragon.zhengzai.tv/dragon/refund/refundSingle refundApply: https://testdragon.zhengzai.tv/dragon/refund/refundSingle
refundResult: https://testdragon.zhengzai.tv/dragon/refund/refund/alipay/result refundResult: https://testdragon.zhengzai.tv/dragon/refund/refund/alipay/result
...@@ -115,11 +115,11 @@ liquidnet: ...@@ -115,11 +115,11 @@ liquidnet:
urls: urls:
ticketRefundNotify: https://testplatform.zhengzai.tv/platform/refund/callback ticketRefundNotify: https://testplatform.zhengzai.tv/platform/refund/callback
memberRefundNotify: https://testplatform.zhengzai.tv/platform/amorder/callack/refund memberRefundNotify: https://testplatform.zhengzai.tv/platform/amorder/callack/refund
url: http://ttestplatform.zhengzai.tv url: http://testplatform.zhengzai.tv
sweet: sweet:
url: http://ttestsweet.zhengzai.tv url: http://testsweet.zhengzai.tv
chime: chime:
url: http://ttestchime.zhengzai.tv url: http://testchime.zhengzai.tv
other: other:
ticketSystemUrl: http://dev-report.capapiao.com/ ticketSystemUrl: http://dev-report.capapiao.com/
appId: 11920532 appId: 11920532
...@@ -130,13 +130,13 @@ liquidnet: ...@@ -130,13 +130,13 @@ liquidnet:
xxl: xxl:
admin: admin:
addresses: 172.17.207.177:8090 addresses: 172.17.207.177:8090
# addresses: 192.168.96.147:8090 # addresses: 192.168.96.147:8090
client: client:
admin: admin:
phpPayUrl: http://ttestdragon.zhengzai.tv phpPayUrl: http://testdragon.zhengzai.tv
phpMallUrl: https://ttestmall.zhengzai.tv phpMallUrl: https://testmall.zhengzai.tv
platformUrl: https://ttestplatform.zhengzai.tv platformUrl: https://testplatform.zhengzai.tv
h5Url: https://ttestm.zhengzai.tv h5Url: https://testm.zhengzai.tv
aliyun: aliyun:
dypns: dypns:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml
View file @ 652e1507
...@@ -6,7 +6,7 @@ liquidnet: ...@@ -6,7 +6,7 @@ liquidnet:
username: user username: user
password: user123 password: user123
eureka: eureka:
host: 172.17.192.6: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
......
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