diff --git a/admin-core/src/main/resources/templates/teacherIndex.html b/admin-core/src/main/resources/templates/teacherIndex.html index 7ee68d9a..68ceea26 100644 --- a/admin-core/src/main/resources/templates/teacherIndex.html +++ b/admin-core/src/main/resources/templates/teacherIndex.html @@ -64,7 +64,7 @@ <span style="position: absolute;left: 4%;"> 时间: <div class="layui-input-inline"> - <input type="text" name="" placeholder="开始时间 —— 结束时间" autocomplete="off" class="layui-input" + <input type="text" name="" style="width: 340px" placeholder="开始时间 —— 结束时间" autocomplete="off" class="layui-input" id="allDate"> </div> </span> @@ -79,7 +79,7 @@ </div> <div class="layui-col-md8 jsrc1" style="text-align: right"> <p>注册用户数</p> - <p style="margin-top: 20px;">15302</p> + <p style="margin-top: 20px;">1302</p> </div> </div> <div class="jstd" style="background-color: #f5cb43"> @@ -88,7 +88,7 @@ </div> <div class="layui-col-md8" style="text-align: right"> <p>登录人数</p> - <p style="margin-top: 20px;">123544</p> + <p style="margin-top: 20px;">32</p> </div> </div> <div class="jsrc" style="background-color: #cba43f"> @@ -97,7 +97,7 @@ </div> <div class="layui-col-md8 jsrc1" style="text-align: right"> <p>登录人次</p> - <p style="margin-top: 20px;">554454</p> + <p style="margin-top: 20px;">4454</p> </div> </div> <div class="jstd" style="background-color: #fd9e2d"> @@ -153,7 +153,7 @@ </div> <div class="layui-col-md8 jsrc1" style="text-align: right"> <p>上线应用数</p> - <p style="margin-top: 20px;">15</p> + <p style="margin-top: 20px;">6</p> </div> </div> </div> diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java index 31794e32..6a99b619 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java @@ -1039,8 +1039,7 @@ public class IndexController { Long orgId = platformService.getCurrentOrgId(); MenuItem menuItem = platformService.getMenuItem(currentUser.getId(), orgId); -// UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - UniversitiesCollegesJurisdictionExperimentalSystem uSystem = null; + UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); if(null != uSystem){ //子系统logo view.addObject("subsystemLogo",StringUtils.isNotBlank(uSystem.getSubsystemLogo())?uSystem.getSubsystemLogo():null); // 如果是空则用这个子系统默认的 diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties index f059f06d..9f2c8e3d 100644 --- a/web/src/main/resources/application-prod.properties +++ b/web/src/main/resources/application-prod.properties @@ -20,7 +20,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1 # master spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.dynamic.datasource.master.url=jdbc:mysql://116.205.131.177:3306/tianze-pro?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true +spring.datasource.dynamic.datasource.master.url=jdbc:mysql://localhost:3306/tianze-pro?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true spring.datasource.dynamic.datasource.master.username=tianze-pro spring.datasource.dynamic.datasource.master.password=xYR3A4EXCWxkHmNX spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 @@ -66,4 +66,4 @@ dynamic.beetlsql.cs.dbStyle = org.beetl.sql.core.db.MySqlStyle dynamic.beetlsql.cs.dynamicConnectionSource = master,ds2 #\u6559\u5E08\u7AEF\u548C\u5B66\u751F\u7AEF\u7684\u767B\u5F55\u5730\u5740 -student.teacher.url = http://116.205.131.177:8080/ \ No newline at end of file +student.teacher.url = http://116.205.131.177:9090/ \ No newline at end of file