commit:同步2.3版本

This commit is contained in:
Jerry
2022-02-20 13:40:36 +08:00
parent c7cc3f5354
commit cbe0f7947d
668 changed files with 172592 additions and 821 deletions

View File

@@ -42,7 +42,7 @@ spring:
# feign 配置
feign:
hystrix:
sentinel:
enabled: true
httpclient:
enabled: true
@@ -66,22 +66,9 @@ feign:
response:
enabled: true
hystrix:
command:
default:
execution:
isolation:
strategy: SEMAPHORE
thread:
timeoutInMilliseconds: 30000
shareSecurityContext: true
#请求处理的超时时间
ribbon:
ReadTimeout: 7000
ConnectTimeout: 3000
MaxAutoRetries: 1
MaxAutoRetriesNextServer: 1
common-core:
# 可选值为 mysql / postgresql
databaseType: mysql
swagger:
# 当enabled为false的时候则可禁用swagger。
@@ -116,8 +103,7 @@ management:
# keys-to-sanitize:
keys-to-sanitize: password
server:
servlet:
context-path: "/"
base-path: "/"
# 存储session数据的Redis所有服务均需要因此放到公共配置中。
# 根据实际情况该Redis也可以用于存储其他数据。

View File

@@ -33,27 +33,15 @@ spring:
- Path=/admin/upms/**
filters:
- StripPrefix=2
- name: Hystrix
args:
name: default
fallbackUri: forward:/fallback
- id: course-class
uri: lb://course-class
predicates:
- Path=/admin/CourseClass/**
filters:
- StripPrefix=2
- name: Hystrix
args:
name: default
fallbackUri: forward:/fallback
- id: stats
uri: lb://stats
predicates:
- Path=/admin/stats/**
filters:
- StripPrefix=2
- name: Hystrix
args:
name: default
fallbackUri: forward:/fallback

View File

@@ -11,19 +11,6 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
BEGIN;
INSERT INTO `zz_data_sync_producer_update_mark` VALUES (1,0,CURDATE());
COMMIT;
-- ----------------------------
-- 管理员账号数据
-- ----------------------------
BEGIN;
INSERT INTO `zz_sys_dept` VALUES(1293376634891538435,NULL,'公司总部',1,1293376634887344128,CURDATE(),1293376634887344128,CURDATE(),1);
INSERT INTO `zz_sys_user` VALUES(1293376634887344128,'admin','$2a$10$vBEU0Zgx2X0crltvKEoxnOWF3O1eKIuVI9EJngv/dn5BGKMi6SH3.','管理员',1293376634891538435,NULL,0,0,1293376634887344128,CURDATE(),1293376634887344128,CURDATE(),1);
INSERT INTO `zz_sys_dept_relation` VALUES(1293376634891538435,1293376634891538435);
COMMIT;
-- ----------------------------
-- 全部菜单数据

View File

@@ -13,9 +13,6 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
DELETE FROM `zz_data_sync_producer_update_mark` WHERE id = 1;
-- ----------------------------
-- 全部菜单数据
-- ----------------------------

View File

@@ -315,4 +315,17 @@ CREATE TABLE `zz_data_sync_producer_update_mark` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='数据同步生产者消息流水表的高水标记表';
BEGIN;
INSERT INTO `zz_data_sync_producer_update_mark` VALUES (1,0,CURDATE());
COMMIT;
-- ----------------------------
-- 管理员账号数据
-- ----------------------------
BEGIN;
INSERT INTO `zz_sys_dept` VALUES(1293376634891538435,NULL,'公司总部',1,1293376634887344128,CURDATE(),1293376634887344128,CURDATE(),1);
INSERT INTO `zz_sys_user` VALUES(1293376634887344128,'admin','$2a$10$CDcvRR6vbruoSPkiorYaEueAwdLKNhBfPdj0dypAHot21SWDlFx8m','管理员',1293376634891538435,NULL,0,0,1293376634887344128,CURDATE(),1293376634887344128,CURDATE(),1);
INSERT INTO `zz_sys_dept_relation` VALUES(1293376634891538435,1293376634891538435);
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;