Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

 .idea/misc.xml

@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="JavaScriptSettings">
    <option name="languageLevel" value="ES6" />
  </component>
  <component name="MavenProjectsManager">
    <option name="originalFiles">
      <list>
        <option value="$PROJECT_DIR$/cloud-server-parent/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-other/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-management/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-gateway/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-course/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-competition/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-auth/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-activity/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-other/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-course/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-parent/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-account/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-gateway/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-activity/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-management/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-competition/pom.xml" />
        <option value="$PROJECT_DIR$/cloud-server-communityWorldCup/pom.xml" />
      </list>
    </option>

 .idea/modules.xml

@@ -2,7 +2,17 @@
<project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/PlayPai.iml" filepath="$PROJECT_DIR$/.idea/PlayPai.iml" />
      <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" filepath="$PROJECT_DIR$/cloud-server-account/mb-cloud-account.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" filepath="$PROJECT_DIR$/cloud-server-activity/mb-cloud-activity.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" filepath="$PROJECT_DIR$/cloud-server-auth/mb-cloud-auth.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-communityWorldCup/mb-cloud-communityWorldCup.iml" filepath="$PROJECT_DIR$/cloud-server-communityWorldCup/mb-cloud-communityWorldCup.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-competition/mb-cloud-competition.iml" filepath="$PROJECT_DIR$/cloud-server-competition/mb-cloud-competition.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-course/mb-cloud-course.iml" filepath="$PROJECT_DIR$/cloud-server-course/mb-cloud-course.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-gateway/mb-cloud-gateway.iml" filepath="$PROJECT_DIR$/cloud-server-gateway/mb-cloud-gateway.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-management/mb-cloud-management.iml" filepath="$PROJECT_DIR$/cloud-server-management/mb-cloud-management.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-other/mb-cloud-other.iml" filepath="$PROJECT_DIR$/cloud-server-other/mb-cloud-other.iml" />
      <module fileurl="file://$PROJECT_DIR$/cloud-server-parent/mb-cloud-parent.iml" filepath="$PROJECT_DIR$/cloud-server-parent/mb-cloud-parent.iml" />
    </modules>
  </component>
</project>

 cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java

@@ -68,7 +68,7 @@

    private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥

    private String smid = "2088330203191220";//平台支付宝商户号
    private String smid = "2088330203191220";//平台支付宝商户号...

    private String appid = "wx41d32f362ba0f911";//微信appid

@@ -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";//微信证书


    /**

 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




 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);

 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





 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";//微信证书


    /**

 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




 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);

 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";//微信证书


    /**

 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




 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",

 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




 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);
    };
//    };
    /**
     * 跳转到车辆管理首页
     */

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -287,6 +287,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 {
@@ -556,6 +557,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<>();

@@ -579,6 +592,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);
//    }
    @RequestMapping("/pre_add")
    public String add(Model model) {

@@ -660,6 +681,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();

@@ -729,6 +753,8 @@
        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";

 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);
//    }

}

 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" ;


 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));
//    }
}

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },
                {

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素：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": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                                  "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"
                },

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/jieshao.html

@@ -1397,7 +1397,7 @@
                            "body": [
                                {
                                    "type": "form",
                                    "id": "u:bd64f7f50007",
                                    "id": "u:bd64f7f5f999",
                                    "title": "",
                                    "mode": "horizontal",
                                    "dsType": "api",
@@ -1483,14 +1483,14 @@
                                                },
                                                {
                                                    "type": "button",
                                                    "id": "u:30fd93656c25",
                                                    "id": "u:6fbe66eae6e1",
                                                    "label": "提交",
                                                    "onEvent": {
                                                        "click": {
                                                            "actions": [
                                                                {
                                                                    "actionType": "submit",
                                                                    "componentId": "u:bd64f7f50007",
                                                                    "componentId": "u:bd64f7f5f999",
                                                                    "outputVar": "submitResult"
                                                                }
                                                            ]
@@ -1524,40 +1524,6 @@
                                        }
                                    ],
                                    "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": {
@@ -1574,9 +1540,343 @@
                                    }
                                }
                            ],
                            "id": "u:50cf027d8c62"
                            "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": [
                                {

 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);

 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";//微信证书




 logs/mb-cloud-management/2023-10/debug.2023-10-07.0.log117386460201400.tmp

File was deleted

 logs/mb-cloud-management/2023-10/debug.2023-10-11.0.log34100332372300.tmp

File was deleted

 logs/mb-cloud-management/2023-10/debug.2023-10-17.0.log1492349991300.tmp

File was deleted

 logs/mb-cloud-management/2023-10/debug.2023-10-21.0.log3887694707600.tmp

File was deleted

 logs/mb-cloud-management/2023-10/debug.2023-10-28.0.log3610732711500.tmp

File was deleted