玩湃
parent: 32106f51 | 补丁 | 提交 | ignore whitespace
puzhibing
2023-12-09 2436ee143332c792e52d2df8fc8a4a3dfec48ebe 
修改bug
6个文件已修改
161 ■■■■■ 已修改文件
cloud-server-account/src/main/resources/sharding-jdbc.properties 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-activity/src/main/resources/sharding-jdbc.properties 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-competition/src/main/resources/sharding-jdbc.properties 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/resources/sharding-jdbc.properties 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/webapp/WEB-INF/view/login.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 cloud-server-account/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_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://127.0.0.1:3306/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=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_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/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-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/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/system/BallController.java


@@ -273,26 +273,23 @@


        // 添加门禁 红蓝方


        TSite si = siteService.getById(site);


        TStore st = storeService.getById(store);


        map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");


        map3.put("space_id", si.getId() + "");


        map3.put("name", sutuName);


        map3.put("city_code", "");


        String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map3);


        System.out.println("---------------------------"+s3);


        JSONObject jsonObject = new JSONObject(s3);


        // 获取 data 字段的值


        JSONObject dataObject = jsonObject.getJSONObject("data");


        // 获取 sutu_id 字段的值


        String sutuIdValue = dataObject.getString("sutu_id");


        Integer sutuId = Integer.valueOf(sutuIdValue);


        game.setSutuId(sutuId);


//        map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");


//        map3.put("space_id", si.getId() + "");


//        map3.put("name", ToolUtil.isEmpty(sutuName) ? "" : sutuName);


//        map3.put("city_code", "");


//        String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map3);


//        System.out.println("---------------------------"+s3);


//        JSONObject jsonObject = new JSONObject(s3);


//        // 获取 data 字段的值


//        JSONObject dataObject = jsonObject.getJSONObject("data");


//        // 获取 sutu_id 字段的值


//        String sutuIdValue = dataObject.getString("sutu_id");


//        Integer sutuId = Integer.valueOf(sutuIdValue);


//        game.setSutuId(sutuId);


        Integer gameId = ballClient.save(game);


List<TGameConfig> gameConfigList = new ArrayList<>();


        List<TGameConfig> gameConfigList = new ArrayList<>();








//玩湃跨城赛




        //玩湃跨城赛


        TGameConfig gameConfigkuacheng = new TGameConfig();


        gameConfigkuacheng.setId(kcId);


        gameConfigkuacheng.setGameId(kuachengId);


@@ -304,7 +301,7 @@


        gameConfigkuacheng.setOtherId(gameId);


        System.out.println("========gameConfig======"+gameConfigkuacheng);


        gameConfigList.add(gameConfigkuacheng);


System.out.println("======gameConfigList======="+gameConfigList);


        System.out.println("======gameConfigList======="+gameConfigList);




        //社区冠军赛






 cloud-server-management/src/main/webapp/WEB-INF/view/login.html


@@ -64,16 +64,16 @@


        <form class="m-t" role="form" action="${ctxPath}/login" method="post">


            <div class="item">


                <img src="${ctxPath}/img/account.png" />


                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入账号" required="" value="admin">


                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入账号" required="" value="">


            </div>


            <div  class="item">


                <img src="${ctxPath}/img/password.png" />


                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入密码" required="" value="123456">


                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入密码" required="" value="">


            </div>




            <div class="form-group" style="float: left;">


                <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">


                    <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="111111">


                    <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="">


                </div>


                <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">


                    <img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>