From 1eed180f9c2bf73130ddcab66d25e6a641660ff0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:13:33 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java | 4
cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java | 4
cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java | 12
cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties | 30
cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/MyQrCodeUtil.java | 16
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html | 108 +++
cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 28
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 108 +++
cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java | 6
cloud-server-account/src/main/resources/sharding-jdbc.properties | 28
cloud-server-activity/src/main/resources/sharding-jdbc.properties | 30
cloud-server-course/src/main/resources/sharding-jdbc.properties | 30
cloud-server-competition/src/main/resources/sharding-jdbc.properties | 30
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit2.html | 108 +++
cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java | 4
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html | 105 +++
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add2.html | 105 +++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/PayMoneyUtil.java | 5
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html | 108 +++
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html | 668 ++++++++++++++++------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 36
cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js | 15
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html | 108 +++
28 files changed, 1,390 insertions(+), 320 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index d38da4b..c75ba4e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -78,7 +78,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/account";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/account";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -86,7 +86,7 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
/**
diff --git a/cloud-server-account/src/main/resources/sharding-jdbc.properties b/cloud-server-account/src/main/resources/sharding-jdbc.properties
index 367da05..cd3746e 100644
--- a/cloud-server-account/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-account/src/main/resources/sharding-jdbc.properties
@@ -1,20 +1,7 @@
-datasource.names=master0
-datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-datasource.master0.username=root
-datasource.master0.password=123456
-datasource.master0.maxActive=20
-datasource.master0.maxWait=60000
-datasource.master0.minIdle=5
-datasource.master0.initialSize=2
-
-
-
#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://192.168.110.80/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
#datasource.master0.password=123456
#datasource.master0.maxActive=20
@@ -24,3 +11,16 @@
+datasource.names=master0
+datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+datasource.master0.url=jdbc:mysql://127.0.0.1/playpai_account?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.username=root
+datasource.master0.password=playpai2023!
+datasource.master0.maxActive=20
+datasource.master0.maxWait=60000
+datasource.master0.minIdle=5
+datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
index 22638c7..b502866 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java
@@ -99,7 +99,7 @@
// 通过分类Id和课程id 查询视频
List<BenefitsVideos> result = bfvService.getBybIdAndcId(site.getBenefitsVideoClassificationId(), site.getCourseId());
if (result.size() > 0) {
- return 500;
+ return false;
}
if (site.getId() == null) {
return bfvService.save(site);
diff --git a/cloud-server-activity/src/main/resources/sharding-jdbc.properties b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
index a8273e2..7f8645e 100644
--- a/cloud-server-activity/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@
-datasource.names=master0
-datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-datasource.master0.username=root
-datasource.master0.password=123456
-datasource.master0.maxActive=20
-datasource.master0.maxWait=60000
-datasource.master0.minIdle=5
-datasource.master0.initialSize=2
-
-
-
#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
-#datasource.master0.password=playpai2023!
+#datasource.master0.password=123456
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
@@ -24,4 +11,17 @@
+datasource.names=master0
+datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.username=root
+datasource.master0.password=playpai2023!
+datasource.master0.maxActive=20
+datasource.master0.maxWait=60000
+datasource.master0.minIdle=5
+datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index d13cbad..31fc7dc 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -187,7 +187,7 @@
map.put("space_id", tGame.getSiteId() + "");
map.put("red_sutu_id", tGame.getRed());
map.put("blue_sutu_id", tGame.getBlue());
- map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
+ map.put("api_url", "http://8.137.22.229:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
map.put("custom", JSON.toJSONString(ids));
String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/quickStart", map);
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/PayMoneyUtil.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/PayMoneyUtil.java
index 7815c84..8c05a9d 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/PayMoneyUtil.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/util/PayMoneyUtil.java
@@ -57,7 +57,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/communityWorldCup";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/communityWorldCup";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -65,9 +65,8 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
-// private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
/**
diff --git a/cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties b/cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties
index e531088..5d8430d 100644
--- a/cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@
-datasource.names=master0
-datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-datasource.master0.username=root
-datasource.master0.password=123456
-datasource.master0.maxActive=20
-datasource.master0.maxWait=60000
-datasource.master0.minIdle=5
-datasource.master0.initialSize=2
-
-
-
#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
-#datasource.master0.password=playpai2023!
+#datasource.master0.password=123456
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
@@ -24,3 +11,16 @@
+datasource.names=master0
+datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.username=root
+datasource.master0.password=playpai2023!
+datasource.master0.maxActive=20
+datasource.master0.maxWait=60000
+datasource.master0.minIdle=5
+datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java b/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
index 34ba428..6ab1a0d 100644
--- a/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
+++ b/cloud-server-communityWorldCup/src/test/java/com/dsh/CommunityWorldCupApplicationTest.java
@@ -26,7 +26,7 @@
// map.put("space_id", "2024");
// map.put("red_sutu_id", "1037");
// map.put("blue_sutu_id", "1036");
-// map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
+// map.put("api_url", "http://8.137.22.229:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
// map.put("custom", "");
//
// String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/batterGame", map);
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
index fc97d88..4491656 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
@@ -57,7 +57,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/competition";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/competition";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -65,7 +65,7 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
/**
diff --git a/cloud-server-competition/src/main/resources/sharding-jdbc.properties b/cloud-server-competition/src/main/resources/sharding-jdbc.properties
index 2346d3e..ae42f8b 100644
--- a/cloud-server-competition/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-competition/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@
-datasource.names=master0
-datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-datasource.master0.username=root
-datasource.master0.password=123456
-datasource.master0.maxActive=20
-datasource.master0.maxWait=60000
-datasource.master0.minIdle=5
-datasource.master0.initialSize=2
-
-
-
#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
-#datasource.master0.password=playpai2023!
+#datasource.master0.password=123456
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
@@ -24,3 +11,16 @@
+datasource.names=master0
+datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_competition?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.username=root
+datasource.master0.password=playpai2023!
+datasource.master0.maxActive=20
+datasource.master0.maxWait=60000
+datasource.master0.minIdle=5
+datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
index d521003..b7b3e6c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
@@ -61,7 +61,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/course";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/course";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -69,7 +69,7 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
public ResultUtil confirm(String smid,String code, String outTradeNo, String amount) {
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
diff --git a/cloud-server-course/src/main/resources/sharding-jdbc.properties b/cloud-server-course/src/main/resources/sharding-jdbc.properties
index d34043a..02b67d5 100644
--- a/cloud-server-course/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-course/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@
-datasource.names=master0
-datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-datasource.master0.username=root
-datasource.master0.password=123456
-datasource.master0.maxActive=20
-datasource.master0.maxWait=60000
-datasource.master0.minIdle=5
-datasource.master0.initialSize=2
-
-
-
#datasource.names=master0
#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#datasource.master0.username=root
-#datasource.master0.password=playpai2023!
+#datasource.master0.password=123456
#datasource.master0.maxActive=20
#datasource.master0.maxWait=60000
#datasource.master0.minIdle=5
@@ -24,3 +11,16 @@
+datasource.names=master0
+datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.username=root
+datasource.master0.password=playpai2023!
+datasource.master0.maxActive=20
+datasource.master0.maxWait=60000
+datasource.master0.minIdle=5
+datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index c7de4e1..eadb4c6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -117,25 +117,25 @@
return SUCCESS_TIP;
}
- public static void main(String[] args) {
+// public static void main(String[] args) {
+//// HashMap<String, String> map = new HashMap<>();
+//// map.put("page","1");
+//// map.put("space_id","2010");
+//// // 获取门禁列表
+//// String s1 = HttpRequestUtil.getRequest
+//// ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
+//// System.err.println(s1);
+//
// HashMap<String, String> map = new HashMap<>();
-// map.put("page","1");
-// map.put("space_id","2010");
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id","1");
+// map.put("device_id","1");
+// map.put("region_id","2010");
// // 获取门禁列表
// String s1 = HttpRequestUtil.getRequest
// ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
// System.err.println(s1);
-
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","1");
- map.put("device_id","1");
- map.put("region_id","2010");
- // 获取门禁列表
- String s1 = HttpRequestUtil.getRequest
- ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
- System.err.println(s1);
- };
+// };
/**
* 跳转到车辆管理首页
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
index 7c67a64..1126a4c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java
@@ -211,9 +211,9 @@
if (bvcf.getId()!=null){
return benefitsVideoClient.addBenefitsVideos(bvcf);
}else {
- bvcf.setState(1);
- bvcf.setInsertTime(new Date());
- return benefitsVideoClient.addBenefitsVideos(bvcf);
+ bvcf.setState(1);
+ bvcf.setInsertTime(new Date());
+ return benefitsVideoClient.addBenefitsVideos(bvcf);
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index f2bad29..5acaff0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -285,6 +285,7 @@
, String zs, BigDecimal zsCoin, BigDecimal zsCash, String zsImage, BigDecimal zsInt, Integer zsId,Integer zsIId
, String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId
, String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId
+ , String v3, BigDecimal v3Coin, BigDecimal v3Cash, String v3Image, BigDecimal v3Int, Integer v3Id,Integer v3IId
,String sutuName
) throws Exception {
@@ -550,6 +551,18 @@
gameConfigly.setIntegral(lyInt);
gameConfigly.setOtherId(gameId);
gameConfigList.add(gameConfigly);
+
+ //激战3V3
+ TGameConfig gameConfigv3 = new TGameConfig();
+ gameConfigv3.setGameId(v3Id);
+ gameConfigv3.setId(v3IId);
+ gameConfigv3.setCash(v3Cash);
+ gameConfigv3.setImg(v3Image);
+ gameConfigv3.setName(v3);
+ gameConfigv3.setPlayCoin(v3Coin);
+ gameConfigv3.setIntegral(v3Int);
+ gameConfigv3.setOtherId(gameId);
+ gameConfigList.add(gameConfigv3);
HashMap<String, String> map1 = new HashMap<>();
HashMap<String, String> map2 = new HashMap<>();
@@ -573,14 +586,14 @@
return null;
}
- public static void main(String[] args) {
- HashMap<String, String> map3 = new HashMap<>();
- map3.put("space_id", "1001");
- map3.put("area_id", "4352");
- String s3 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map3);
-
- System.err.println(s3);
- }
+// public static void main(String[] args) {
+// HashMap<String, String> map3 = new HashMap<>();
+// map3.put("space_id", "1001");
+// map3.put("area_id", "4352");
+// String s3 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map3);
+//
+// System.err.println(s3);
+// }
@RequestMapping("/pre_add")
public String add(Model model) {
@@ -661,6 +674,9 @@
TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
model.addAttribute("ly",ly);
+
+ TGameConfig v3 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 0));
+ model.addAttribute("v3",v3);
Integer objectType = UserExt.getUser().getObjectType();
@@ -730,7 +746,9 @@
TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
model.addAttribute("ly",ly);
-
+
+ TGameConfig v3 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 0));
+ model.addAttribute("v3",v3);
return PREFIX+"ball_pre_info.html";
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/MyQrCodeUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/MyQrCodeUtil.java
index c0c05c2..44d0ca2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/MyQrCodeUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/MyQrCodeUtil.java
@@ -83,13 +83,13 @@
return bufferedImage;
}
- public static void main(String[] args) {
- String param = "{\n" +
- " \"scan_type\": 1,\n" +
- " \"space_id\": 2,\n" +
- " \"sutu_id\": 3\n" +
- "}";
- createCodeToFile(param);
- }
+// public static void main(String[] args) {
+// String param = "{\n" +
+// " \"scan_type\": 1,\n" +
+// " \"space_id\": 2,\n" +
+// " \"sutu_id\": 3\n" +
+// "}";
+// createCodeToFile(param);
+// }
}
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java
index 7624579..7d89f83 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java
@@ -48,7 +48,7 @@
private String key = "";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/account";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/account";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -56,7 +56,7 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
String signType = "RSA2" ;
String serverHost = "openchannel.alipay.com" ;
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java
index 9b23d82..c7c01b3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/QRCodeUtils.java
@@ -263,10 +263,10 @@
return QRCodeUtils.decode(new File(path));
}
- public static void main(String[] args) throws Exception {
- String text = "http://www.baidu.com"; //这里设置自定义网站url
- String logoPath = "C:\\Users\\admin\\Desktop\\test\\test.jpg";
- String destPath = "C:\\Users\\admin\\Desktop\\test\\";
- logger.debug(QRCodeUtils.encode(text, "test", logoPath, destPath, true));
- }
+// public static void main(String[] args) throws Exception {
+// String text = "http://www.baidu.com"; //这里设置自定义网站url
+// String logoPath = "C:\\Users\\admin\\Desktop\\test\\test.jpg";
+// String destPath = "C:\\Users\\admin\\Desktop\\test\\";
+// logger.debug(QRCodeUtils.encode(text, "test", logoPath, destPath, true));
+// }
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index bf7fdfd..bf8831a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -1446,7 +1446,113 @@
"columnClassName": "p-l-lg"
},
{
- "body": [],
+ "body": [
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "社区小球王"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ }
+ ],
+ "actions": [],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
+ ],
"id": "u:5a16b34e0128"
},
{
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html
index 3d18e3e..a0e80f1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add1.html
@@ -1268,6 +1268,111 @@
},
{
"body": [
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "社区小球王"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ }
+ ],
+ "actions": [],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add2.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add2.html
index 2fe2b87..218994a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add2.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add2.html
@@ -1320,6 +1320,111 @@
},
{
"body": [
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "社区小球王"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg"
+ }
+ ],
+ "actions": [],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
index 95e2678..ffe8b0a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit.html
@@ -1473,6 +1473,114 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3IId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${v3.id}`
+ },
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false,
+ "value":`${v3.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "激战3V3"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.playCoin}`
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.cash}`
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.integral}`
+ }
+ ],
+ "actions": [
+ ],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html
index 4d42f66..9a4a851 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit1.html
@@ -1479,6 +1479,114 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3IId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${v3.id}`
+ },
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false,
+ "value":`${v3.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "激战3V3"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.playCoin}`
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.cash}`
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.integral}`
+ }
+ ],
+ "actions": [
+ ],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit2.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit2.html
index 5948c2a..7125b3c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit2.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_edit2.html
@@ -1452,6 +1452,114 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3IId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${v3.id}`
+ },
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false,
+ "value":`${v3.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "激战3V3"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.playCoin}`
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.cash}`
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.integral}`
+ }
+ ],
+ "actions": [
+ ],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
index f239a30..b8a73cc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
@@ -1438,6 +1438,114 @@
},
{
"body": [
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3IId",
+ "id": "u:a4dbdeb9115e",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": `${v3.id}`
+ },
+ {
+ "type": "card",
+ "header": {
+ "title": "激战3V3",
+ "subTitle": ""
+ },
+ "body": [
+ {
+ "type": "input-image",
+ "label": "背景图：",
+ "name": "v3Image",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "imageClassName": "r w-full",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "id": "u:704c6970b70d",
+ "labelClassName": "text-dark",
+ "mode": "inline",
+ "accept": ".jpeg, .jpg, .png, .gif",
+ "multiple": false,
+ "hideUploadButton": false,
+ "fixedSize": false,
+ "value":`${v3.img}`
+ },{
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "          推荐像素：780px x 424px",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3",
+ "id": "u:c4a543b6cda0",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "激战3V3"
+ },
+ {
+ "type": "hidden",
+ "label": "",
+ "name": "v3Id",
+ "id": "u:90d5f2fa406a",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b",
+ "value": "0"
+ },
+ {
+ "type": "tpl",
+ "id": "u:587781d5d181",
+ "tpl": "                                ",
+ "inline": true,
+ "wrapperComponent": "",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "玩派币",
+ "name": "v3Coin",
+ "id": "u:d78d236c5f95",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.playCoin}`
+ },
+ {
+ "type": "input-text",
+ "label": "现金",
+ "name": "v3Cash",
+ "id": "u:20b24611e53c",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.cash}`
+ },
+ {
+ "type": "input-text",
+ "label": "积分",
+ "name": "v3Int",
+ "id": "u:25e10253effb",
+ "mode": "inline",
+ "labelClassName": "text-dark m-b text-lg",
+ "value":`${v3.integral}`
+ }
+ ],
+ "actions": [
+ ],
+ "id": "u:fe79896823ad",
+ "bodyClassName": "no-border b-light",
+ "className": "no-border"
+ }
],
"id": "u:5a16b34e0128"
},
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
index 7a4d02c..f0ca987 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html
@@ -1392,190 +1392,490 @@
],
"id": "u:efb71048f771"
},
- {
- "title": "绿茵密码",
- "body": [
- {
- "type": "form",
- "id": "u:bd64f7f50007",
- "title": "",
- "mode": "horizontal",
- "dsType": "api",
- "feat": "Insert",
- "body": [
- {
- "type": "input-text",
- "label": "文本",
- "name": "id",
- "id": "u:4c0a1ededc47",
- "value": "5",
- "hidden": true
- },
- {
- "type": "input-rich-text",
- "receiver": {
- "url": "/mgr/uploadImgAmis",
- "method": "post"
- },
- "label": "文字介绍",
- "name": "jieshao",
- "id": "u:aa105bcfd51b",
- "minRows": 10,
- "maxRows": 20,
- "required": true
- },
- {
- "type": "input-file",
- "label": "文件上传",
- "autoUpload": true,
- "proxy": true,
- "uploadType": "fileReceptor",
- "name": "vedio",
- "id": "u:d84964c25e87",
- "btnLabel": "文件上传",
- "multiple": false,
- "useChunk": false,
- "accept": "",
- "drag": false,
- "receiver": {
- "url": "/mgr/uploadImgAmis",
- "method": "post"
- },
- "required": true
- },
- {
- "type": "flex",
- "id": "u:5f159aae8bd6",
- "className": "p-1",
- "items": [
- {
- "type": "wrapper",
- "body": [
- ],
- "size": "xs",
- "style": {
- "position": "static",
- "display": "block",
- "flex": "1 1 auto",
- "flexGrow": 1,
- "flexBasis": "auto"
- },
- "isFixedHeight": false,
- "isFixedWidth": false,
- "id": "u:732576d95680"
- },
- {
- "type": "button",
- "id": "u:6c0b8f917bf7",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- }
- },
- {
- "type": "button",
- "id": "u:30fd93656c25",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f50007",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary"
- },
- {
- "type": "wrapper",
- "body": [
- ],
- "size": "xs",
- "style": {
- "position": "static",
- "display": "block",
- "flex": "1 1 auto",
- "flexGrow": 1,
- "flexBasis": "auto"
- },
- "isFixedHeight": false,
- "isFixedWidth": false,
- "id": "u:dd2cc231e8b1"
- }
- ],
- "style": {
- "position": "static"
- },
- "direction": "row",
- "justify": "flex-start",
- "alignItems": "stretch"
- }
- ],
- "actions": [
- {
- "type": "button",
- "label": "关闭",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "custom",
- "args": {
- },
- "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
- }
- ]
- }
- },
- "id": "u:6c0b8f917bf7"
- },
- {
- "type": "button",
- "label": "提交",
- "onEvent": {
- "click": {
- "actions": [
- {
- "actionType": "submit",
- "componentId": "u:bd64f7f50007",
- "outputVar": "submitResult"
- }
- ]
- }
- },
- "level": "primary",
- "id": "u:30fd93656c25"
- }
- ],
- "resetAfterSubmit": false,
- "api": {
- "url": "/ball/addjs",
- "method": "post",
- "requestAdaptor": "",
- "adaptor": "",
- "messages": {
- }
- },
- "initApi": {
- "url": "/ball/get/$id",
- "method": "get"
- }
- }
- ],
- "id": "u:50cf027d8c62"
- },
+ {
+ "title": "绿茵密码",
+ "body": [
+ {
+ "type": "form",
+ "id": "u:bd64f7f5f999",
+ "title": "",
+ "mode": "horizontal",
+ "dsType": "api",
+ "feat": "Insert",
+ "body": [
+ {
+ "type": "input-text",
+ "label": "文本",
+ "name": "id",
+ "id": "u:4c0a1ededc47",
+ "value": "5",
+ "hidden": true
+ },
+ {
+ "type": "input-rich-text",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "label": "文字介绍",
+ "name": "jieshao",
+ "id": "u:aa105bcfd51b",
+ "minRows": 10,
+ "maxRows": 20,
+ "required": true
+ },
+ {
+ "type": "input-file",
+ "label": "文件上传",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "name": "vedio",
+ "id": "u:d84964c25e87",
+ "btnLabel": "文件上传",
+ "multiple": false,
+ "useChunk": false,
+ "accept": "",
+ "drag": false,
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:6fbe66eae6e1",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f999",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
+ }
+ ],
+ "actions": [
+ ],
+ "resetAfterSubmit": false,
+ "api": {
+ "url": "/ball/addjs",
+ "method": "post",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "messages": {
+ }
+ },
+ "initApi": {
+ "url": "/ball/get/$id",
+ "method": "get"
+ }
+ }
+ ],
+ "id": "u:efb71048f771"
+ },
+ {
+ "title": "激战3V3",
+ "body": [
+ {
+ "type": "form",
+ "id": "u:bd64f7f5f999",
+ "title": "",
+ "mode": "horizontal",
+ "dsType": "api",
+ "feat": "Insert",
+ "body": [
+ {
+ "type": "input-text",
+ "label": "文本",
+ "name": "id",
+ "id": "u:4c0a1ededc47",
+ "value": "0",
+ "hidden": true
+ },
+ {
+ "type": "input-rich-text",
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "label": "文字介绍",
+ "name": "jieshao",
+ "id": "u:aa105bcfd51b",
+ "minRows": 10,
+ "maxRows": 20,
+ "required": true
+ },
+ {
+ "type": "input-file",
+ "label": "文件上传",
+ "autoUpload": true,
+ "proxy": true,
+ "uploadType": "fileReceptor",
+ "name": "vedio",
+ "id": "u:d84964c25e87",
+ "btnLabel": "文件上传",
+ "multiple": false,
+ "useChunk": false,
+ "accept": "",
+ "drag": false,
+ "receiver": {
+ "url": "/mgr/uploadImgAmis",
+ "method": "post"
+ },
+ "required": true
+ },
+ {
+ "type": "flex",
+ "id": "u:5f159aae8bd6",
+ "className": "p-1",
+ "items": [
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:732576d95680"
+ },
+ {
+ "type": "button",
+ "id": "u:6c0b8f917bf7",
+ "label": "关闭",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "custom",
+ "args": {
+ },
+ "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "button",
+ "id": "u:6fbe66eae6e1",
+ "label": "提交",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "actionType": "submit",
+ "componentId": "u:bd64f7f5f999",
+ "outputVar": "submitResult"
+ }
+ ]
+ }
+ },
+ "level": "primary"
+ },
+ {
+ "type": "wrapper",
+ "body": [
+ ],
+ "size": "xs",
+ "style": {
+ "position": "static",
+ "display": "block",
+ "flex": "1 1 auto",
+ "flexGrow": 1,
+ "flexBasis": "auto"
+ },
+ "isFixedHeight": false,
+ "isFixedWidth": false,
+ "id": "u:dd2cc231e8b1"
+ }
+ ],
+ "style": {
+ "position": "static"
+ },
+ "direction": "row",
+ "justify": "flex-start",
+ "alignItems": "stretch"
+ }
+ ],
+ "actions": [
+ ],
+ "resetAfterSubmit": false,
+ "api": {
+ "url": "/ball/addjs",
+ "method": "post",
+ "requestAdaptor": "",
+ "adaptor": "",
+ "messages": {
+ }
+ },
+ "initApi": {
+ "url": "/ball/get/$id",
+ "method": "get"
+ }
+ }
+ ],
+ "id": "u:efb71048f771"
+ },
+ // {
+ // "title": "绿茵密码",
+ // "body": [
+ // {
+ // "type": "form",
+ // "id": "u:bd64f7f50007",
+ // "title": "",
+ // "mode": "horizontal",
+ // "dsType": "api",
+ // "feat": "Insert",
+ // "body": [
+ // {
+ // "type": "input-text",
+ // "label": "文本",
+ // "name": "id",
+ // "id": "u:4c0a1ededc47",
+ // "value": "5",
+ // "hidden": true
+ // },
+ // {
+ // "type": "input-rich-text",
+ // "receiver": {
+ // "url": "/mgr/uploadImgAmis",
+ // "method": "post"
+ // },
+ // "label": "文字介绍",
+ // "name": "jieshao",
+ // "id": "u:aa105bcfd51b",
+ // "minRows": 10,
+ // "maxRows": 20,
+ // "required": true
+ // },
+ // {
+ // "type": "input-file",
+ // "label": "文件上传",
+ // "autoUpload": true,
+ // "proxy": true,
+ // "uploadType": "fileReceptor",
+ // "name": "vedio",
+ // "id": "u:d84964c25e87",
+ // "btnLabel": "文件上传",
+ // "multiple": false,
+ // "useChunk": false,
+ // "accept": "",
+ // "drag": false,
+ // "receiver": {
+ // "url": "/mgr/uploadImgAmis",
+ // "method": "post"
+ // },
+ // "required": true
+ // },
+ // {
+ // "type": "flex",
+ // "id": "u:5f159aae8bd6",
+ // "className": "p-1",
+ // "items": [
+ // {
+ // "type": "wrapper",
+ // "body": [
+ // ],
+ // "size": "xs",
+ // "style": {
+ // "position": "static",
+ // "display": "block",
+ // "flex": "1 1 auto",
+ // "flexGrow": 1,
+ // "flexBasis": "auto"
+ // },
+ // "isFixedHeight": false,
+ // "isFixedWidth": false,
+ // "id": "u:732576d95680"
+ // },
+ // {
+ // "type": "button",
+ // "id": "u:6c0b8f917bf7",
+ // "label": "关闭",
+ // "onEvent": {
+ // "click": {
+ // "actions": [
+ // {
+ // "actionType": "custom",
+ // "args": {
+ // },
+ // "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ // }
+ // ]
+ // }
+ // }
+ // },
+ // {
+ // "type": "button",
+ // "id": "u:30fd93656c25",
+ // "label": "提交",
+ // "onEvent": {
+ // "click": {
+ // "actions": [
+ // {
+ // "actionType": "submit",
+ // "componentId": "u:bd64f7f50007",
+ // "outputVar": "submitResult"
+ // }
+ // ]
+ // }
+ // },
+ // "level": "primary"
+ // },
+ // {
+ // "type": "wrapper",
+ // "body": [
+ // ],
+ // "size": "xs",
+ // "style": {
+ // "position": "static",
+ // "display": "block",
+ // "flex": "1 1 auto",
+ // "flexGrow": 1,
+ // "flexBasis": "auto"
+ // },
+ // "isFixedHeight": false,
+ // "isFixedWidth": false,
+ // "id": "u:dd2cc231e8b1"
+ // }
+ // ],
+ // "style": {
+ // "position": "static"
+ // },
+ // "direction": "row",
+ // "justify": "flex-start",
+ // "alignItems": "stretch"
+ // }
+ // ],
+ // "actions": [
+ // {
+ // "type": "button",
+ // "label": "关闭",
+ // "onEvent": {
+ // "click": {
+ // "actions": [
+ // {
+ // "actionType": "custom",
+ // "args": {
+ // },
+ // "script": "parent.layer.close(window.parent.TStudent.layerIndex);"
+ // }
+ // ]
+ // }
+ // },
+ // "id": "u:6c0b8f917bf7"
+ // },
+ // {
+ // "type": "button",
+ // "label": "提交",
+ // "onEvent": {
+ // "click": {
+ // "actions": [
+ // {
+ // "actionType": "submit",
+ // "componentId": "u:bd64f7f50007",
+ // "outputVar": "submitResult"
+ // }
+ // ]
+ // }
+ // },
+ // "level": "primary",
+ // "id": "u:30fd93656c25"
+ // }
+ // ],
+ // "resetAfterSubmit": false,
+ // "api": {
+ // "url": "/ball/addjs",
+ // "method": "post",
+ // "requestAdaptor": "",
+ // "adaptor": "",
+ // "messages": {
+ // }
+ // },
+ // "initApi": {
+ // "url": "/ball/get/$id",
+ // "method": "get"
+ // }
+ // }
+ // ],
+ // "id": "u:50cf027d8c62"
+ // },
{
"title": "步骤说明",
"body": [
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js b/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
index e8bd949..0a9776d 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/benefits/tBenefitsVideos_add.js
@@ -282,13 +282,12 @@
data: JSON.stringify(data),
contentType: "application/json",
success: function (response) {
- if (response === 500){
+ if (!response){
Feng.error("所选视频已经存在于当前福利视频分类下！");
- window.parent.TQuestion.table.refresh();
- TQuestion.close();
-
}else{
Feng.success("添加成功");
+ window.parent.TQuestion.table.refresh();
+ TQuestion.close();
}
},
error: function (xhr, status, error) {
@@ -314,7 +313,13 @@
data: JSON.stringify(data),
contentType: "application/json",
success: function (response) {
- Feng.success("添加成功");
+ if (!response){
+ Feng.error("所选视频已经存在于当前福利视频分类下！");
+ }else{
+ Feng.success("编辑成功");
+ window.parent.TQuestion.table.refresh();
+ TQuestion.close();
+ }
},
error: function (xhr, status, error) {
Feng.error("添加失败！" + error);
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
index 9692051..96f2a61 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/PayMoneyUtil.java
@@ -60,7 +60,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://221.182.45.100:56666/other";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/other";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
@@ -68,7 +68,7 @@
private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
- private String certPath = "C:\\Users\\Admin\\Desktop\\weixin_cert\\apiclient_cert.p12";//微信证书
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
--
Gitblit v1.7.1