From 82f9e0bcabaca6e9daed496451d8abcfcf1a2810 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Thu, 22 Jul 2021 09:16:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add=20SQL=5FSERVER=20=E4=BB=A5=E5=8F=8AJDBC?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataSource/service/impl/DataSourceServiceImpl.java | 4 ++++ .../anjiplus/template/gaea/business/util/JdbcConstants.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java index 2b1d2f2c..5ce0ae78 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java @@ -96,6 +96,8 @@ public class DataSourceServiceImpl implements DataSourceService { case JdbcConstants.MYSQL: case JdbcConstants.KUDU_IMAPLA: case JdbcConstants.ORACLE: + case JdbcConstants.SQL_SERVER: + case JdbcConstants.JDBC: testRelationalDb(dto); break; case JdbcConstants.HTTP: @@ -118,6 +120,8 @@ public class DataSourceServiceImpl implements DataSourceService { case JdbcConstants.MYSQL: case JdbcConstants.KUDU_IMAPLA: case JdbcConstants.ORACLE: + case JdbcConstants.SQL_SERVER: + case JdbcConstants.JDBC: return executeRelationalDb(dto); case JdbcConstants.HTTP: return executeHttp(dto); diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java index e77f3538..94e945ec 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java @@ -12,8 +12,8 @@ public class JdbcConstants { public final static String MYSQL = "mysql"; public final static String ORACLE = "oracle"; public final static String ELASTIC_SEARCH_SQL = "elasticsearch_sql"; - - + public final static String SQL_SERVER = "mssqlserver"; + public final static String JDBC = "jdbc"; @@ -25,7 +25,6 @@ public class JdbcConstants { public final static String POSTGRESQL = "postgresql"; public final static String POSTGRESQL_DRIVER = "org.postgresql.Driver"; public final static String SYBASE = "sybase"; - public final static String SQL_SERVER = "sqlserver"; public final static String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver"; public final static String SQL_SERVER_DRIVER_SQLJDBC4 = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; public final static String SQL_SERVER_DRIVER_JTDS = "net.sourceforge.jtds.jdbc.Driver"; From d7625bd2abd63bc79574a2627d550100f31d9329 Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Thu, 22 Jul 2021 13:22:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-core/src/main/resources/bootstrap-dev.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/report-core/src/main/resources/bootstrap-dev.yml b/report-core/src/main/resources/bootstrap-dev.yml index df803613..1272340c 100644 --- a/report-core/src/main/resources/bootstrap-dev.yml +++ b/report-core/src/main/resources/bootstrap-dev.yml @@ -67,11 +67,13 @@ management: logging: config: classpath:logback.xml file: + #上传对应本地全路径 dist-path: /app/disk/upload/ white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi excelSuffix: .xlsx|.xls|.csv - downloadPath: http://10.108.26.197:9095/file/ - + #上传对应下载的下载链接路径 http://serverip:9095/file/download + downloadPath: http://10.108.26.197:9095/file/download + customer: # 跳过token验证和权限验证的url清单 - skip-authenticate-urls: /gaeaDict/all, /login, /static, /file/download/, /index.html \ No newline at end of file + skip-authenticate-urls: /gaeaDict/all, /login, /static, /file/download/, /index.html