From c68b28eb76d48b8545c07a26c09b41b4ed64329a Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sat, 29 Oct 2022 08:57:46 +0800 Subject: [PATCH 1/2] 1 --- web/src/main/java/com/ibeetl/jlw/web/IndexController.java | 3 +-- web/src/main/resources/application-prod.properties | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) 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 From 3ff9f42078aaa8e0f00ac32f3230658e83c24bf4 Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Sat, 29 Oct 2022 11:12:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/teacherIndex.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 @@ 时间:
-
@@ -79,7 +79,7 @@

注册用户数

-

15302

+

1302

@@ -88,7 +88,7 @@

登录人数

-

123544

+

32

@@ -97,7 +97,7 @@

登录人次

-

554454

+

4454

@@ -153,7 +153,7 @@

上线应用数

-

15

+

6