From c55c9a51cea46caea88b2bee5cc3c9ddaa9fc468 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期三, 11 十二月 2024 08:44:22 +0800
Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现：问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注：除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象，因此这里还有报错信息
---
src/main/resources/application.yml | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cf2f525..350ca41 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,31 +3,6 @@
ds1:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
- #-鏈湴娴嬭瘯鏈嶅姟鍣�-
- # username: root
- # password: 123456
- # url: jdbc:mysql://localhost:3306/supervision?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-
- #-灞�鍩熺綉鏈嶅姟鍣�-
- # url: jdbc:mysql://192.168.0.200:3306/supervision?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- # username: root
- # password: cn.FLIGHTFEATHER
-
- #-杩滅▼娴嬭瘯鏈嶅姟鍣�-
- url: jdbc:mysql://47.100.191.150:3306/supervision?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- username: remoteU1
- password: eSoF8DnzfGTlhAjE
-
- #-鍙戝竷鏈嶅姟鍣�-
-# url: jdbc:mysql://localhost:3306/supervision?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-# username: supervision
-# password: supervision_feiyu2021
-
- #-鐜鐫ｅ療娴嬭瘯鏈嶅姟鍣�-
-# url: jdbc:mysql://192.168.0.200:3306/supervision_ii?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-# username: root
-# password: cn.FLIGHTFEATHER
-
initialSize: 5
minIdle: 5
maxWait: 60000
@@ -45,17 +20,6 @@
ds2:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
-
- #-鍙戝竷鏈嶅姟鍣�-
-# url: jdbc:mysql://localhost:3306/ledger?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-# username: ledger
-# password: ledger_fxxchackxr
-
- # 寮�鍙戣繙绋嬫湇鍔″櫒
- url: jdbc:mysql://47.100.191.150:3306/ledger?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- username: remoteU1
- password: eSoF8DnzfGTlhAjE
-
initialSize: 5
minIdle: 5
maxWait: 60000
@@ -100,15 +64,19 @@
request-timeout: 20s
profiles:
- active: '@profileActive@'
+ active: @profileActive@
jmx:
default-domain: ETSupervision
# mybatis 閰嶇疆
mybatis:
- type-aliases-package: cn.flightfeather.supervision.domain.ds1.entity, cn.flightfeather.supervision.domain.ds2.entity
+ type-aliases-package: cn.flightfeather.supervision.domain.ds1.entity, cn.flightfeather.supervision.domain.ds2.entity, cn.flightfeather.supervision.domain.ds3.entity
mapper-locations: classpath*:mapper/**/*.xml
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+ # map-underscore-to-camel-case: true
## 閫氱敤 Mapper 閰嶇疆
#mappers 澶氫釜鎺ュ彛鏃堕�楀彿闅斿紑
@@ -119,11 +87,13 @@
#logging璺緞璁剧疆
logging:
- config: classpath:log4j2.xml
+ config: classpath:log4j2.xml
+# level:
+# cn.flightfeather.supervision.domain: debug
springfox:
documentation:
swagger:
v2:
- enabled: true
+ enabled: false
--
Gitblit v1.9.3