From 8e2dafa9ac0a90c9ff9bdc844c5230fe33cfd640 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 16 Apr 2023 16:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcErrorreportController.java | 8 ++++++++ .../src/main/resources/application-prod.yml | 17 +++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java index b4a62f64..8058b7dc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcErrorreport/controller/KcErrorreportController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.kcErrorreport.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -9,8 +10,11 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.kc.kcErrorreport.entity.KcErrorreport; import org.jeecg.modules.kc.kcErrorreport.service.IKcErrorreportService; @@ -68,6 +72,9 @@ public class KcErrorreportController extends JeecgController page = new Page(pageNo, pageSize); +// if(StringUtils.isNotBlank(kcErrorreport.getEndTime())){ +// kcErrorreport.setEndTime(kcErrorreport.getEndTime()+" 23:59:59"); +// } IPage pageList = kcErrorreportService.selectPageList(page, kcErrorreport); return Result.OK(pageList); } @@ -82,6 +89,7 @@ public class KcErrorreportController extends JeecgController add(@RequestBody KcErrorreport kcErrorreport) { + kcErrorreport.setReportstime(DateUtils.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss")); kcErrorreportService.save(kcErrorreport); return Result.OK("提交报错信息成功！"); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 973f99b4..118a62a7 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -131,16 +131,17 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3307/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 - #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver +# multi-oracle: +# #url: jdbc:oracle:thin:@//JN7JP1QPL10ZKOW:1521/ORCL +# url: jdbc:oracle:thin:@202.198.129.24:1521:orcl +# username: C##XSKC +# password: mAPP2t2ABAfx7 +# driver-class-name: oracle.jdbc.OracleDriver #redis 配置 redis: database: 0 @@ -177,7 +178,7 @@ jeecg: uploadType: local # 前端访问地址 domainUrl: - pc: http://localhost:3100 + pc: http://210.47.17.166 app: http://localhost:8051 path: #文件上传根目录 设置 @@ -238,7 +239,7 @@ jeecg: enabled: true #cas单点登录 cas: - prefixUrl: http://cas.example.org:8443/cas + prefixUrl: https://authserver.nenu.edu.cn/authserver #Mybatis输出sql日志 logging: level: