Commit 46c93b637f2338def96a9c5d9699c30453cf5b87
1 parent
47beb13a
chore: update deps
Showing
3 changed files
with
9 additions
and
8 deletions
sql/optional/visualization/jimureport.mysql5.7.create.sql
| ... | ... | @@ -418,17 +418,19 @@ CREATE TABLE `jimu_report_data_source` ( |
| 418 | 418 | `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', |
| 419 | 419 | `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期', |
| 420 | 420 | `connect_times` int(1) UNSIGNED NULL DEFAULT 0 COMMENT '连接失败次数', |
| 421 | + `tenant_id` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识', | |
| 422 | + `type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型(report:报表;drag:仪表盘)', | |
| 421 | 423 | PRIMARY KEY (`id`) USING BTREE, |
| 422 | 424 | INDEX `idx_jmdatasource_report_id`(`report_id`) USING BTREE, |
| 423 | 425 | INDEX `idx_jmdatasource_code`(`code`) USING BTREE |
| 424 | -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; | |
| 426 | +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; | |
| 425 | 427 | |
| 426 | 428 | -- ---------------------------- |
| 427 | 429 | -- Records of jimu_report_data_source |
| 428 | 430 | -- ---------------------------- |
| 429 | -INSERT INTO `jimu_report_data_source` VALUES ('1324261983692902402', 'jeewx', '1324261770294071296', '', NULL, 'MYSQL', 'com.mysql.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeewx-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'jeecg', '2020-11-05 16:07:15', NULL, '2020-11-05 16:07:15', 0); | |
| 430 | -INSERT INTO `jimu_report_data_source` VALUES ('26d21fe4f27920d2f56abc8d90a8e527', 'oracle', '1308645288868712448', '', NULL, 'ORACLE', 'oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@192.168.1.199:1521:helowin', 'jeecgbootbpm', 'jeecg196283', 'admin', '2021-01-05 19:26:24', NULL, '2021-01-05 19:26:24', 1); | |
| 431 | -INSERT INTO `jimu_report_data_source` VALUES ('8f90daf47d15d35ca6cf420748b8b9ba', 'localhost', '1316944968992034816', '', NULL, 'MYSQL5.7', 'com.mysql.cj.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'admin', '2021-01-13 14:34:00', NULL, '2021-01-13 14:34:00', 0); | |
| 431 | +INSERT INTO `jimu_report_data_source` VALUES ('1324261983692902402', 'jeewx', '1324261770294071296', '', NULL, 'MYSQL', 'com.mysql.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeewx-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'jeecg', '2020-11-05 16:07:15', NULL, '2020-11-05 16:07:15', 0, NULL, 'report'); | |
| 432 | +INSERT INTO `jimu_report_data_source` VALUES ('26d21fe4f27920d2f56abc8d90a8e527', 'oracle', '1308645288868712448', '', NULL, 'ORACLE', 'oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@192.168.1.199:1521:helowin', 'jeecgbootbpm', 'jeecg196283', 'admin', '2021-01-05 19:26:24', NULL, '2021-01-05 19:26:24', 1, NULL, 'report'); | |
| 433 | +INSERT INTO `jimu_report_data_source` VALUES ('8f90daf47d15d35ca6cf420748b8b9ba', 'localhost', '1316944968992034816', '', NULL, 'MYSQL5.7', 'com.mysql.cj.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'admin', '2021-01-13 14:34:00', NULL, '2021-01-13 14:34:00', 0, NULL, 'report'); | |
| 432 | 434 | |
| 433 | 435 | -- ---------------------------- |
| 434 | 436 | -- Table structure for jimu_report_db | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -25,14 +25,14 @@ |
| 25 | 25 | <druid.version>1.2.15</druid.version> |
| 26 | 26 | <mybatis-plus.version>3.5.2</mybatis-plus.version> |
| 27 | 27 | <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version> |
| 28 | - <dynamic-datasource.version>3.5.2</dynamic-datasource.version> | |
| 28 | + <dynamic-datasource.version>3.6.0</dynamic-datasource.version> | |
| 29 | 29 | <redisson.version>3.18.0</redisson.version> |
| 30 | 30 | <!-- 服务保障相关 --> |
| 31 | 31 | <lock4j.version>2.2.3</lock4j.version> |
| 32 | 32 | <resilience4j.version>1.7.1</resilience4j.version> |
| 33 | 33 | <!-- 监控相关 --> |
| 34 | 34 | <skywalking.version>8.12.0</skywalking.version> |
| 35 | - <spring-boot-admin.version>2.7.7</spring-boot-admin.version> | |
| 35 | + <spring-boot-admin.version>2.7.9</spring-boot-admin.version> | |
| 36 | 36 | <opentracing.version>0.33.0</opentracing.version> |
| 37 | 37 | <!-- Test 测试相关 --> |
| 38 | 38 | <podam.version>7.2.11.RELEASE</podam.version> |
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version> |
| 65 | 65 | <tencentcloud-sdk-java.version>3.1.637</tencentcloud-sdk-java.version> |
| 66 | 66 | <justauth.version>1.4.0</justauth.version> |
| 67 | - <jimureport.version>1.5.4</jimureport.version> | |
| 67 | + <jimureport.version>1.5.6</jimureport.version> | |
| 68 | 68 | <xercesImpl.version>2.12.2</xercesImpl.version> |
| 69 | 69 | </properties> |
| 70 | 70 | ... | ... |
yudao-framework/yudao-spring-boot-starter-file/pom.xml