diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 55c27d720..02a6ed9d1 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -130,5 +130,5 @@ spring:
url: http://localhost:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
- username: ruoyi
- password: 123456
+ username: admin
+ password: admin123
diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
index 72485783d..3f94095ae 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -130,5 +130,5 @@ spring:
url: http://localhost:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
- username: ruoyi
- password: 123456
+ username: admin
+ password: admin123
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
index a59c5c023..8edfcb289 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
@@ -10,8 +10,8 @@ spring:
url: http://localhost:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
- username: ruoyi
- password: 123456
+ username: admin
+ password: admin123
--- # redis 配置
spring:
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index dc0830373..9db00a9ff 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -28,6 +28,22 @@
de.codecentric
spring-boot-admin-starter-server
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
index 98834a9bc..3b34d3dcb 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
@@ -1,13 +1,19 @@
package com.ruoyi.monitor.admin.config;
import de.codecentric.boot.admin.server.config.AdminServerProperties;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import javax.sql.DataSource;
+
/**
* spring security配置
*
@@ -45,4 +51,20 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.headers().frameOptions().disable();
}
+ @Bean
+ public UserDetailsService userDetailsService(DataSource dataSource) {
+ JdbcDaoImpl service = new JdbcDaoImpl();
+ service.setDataSource(dataSource);
+ return service;
+ }
+
+ /**
+ * 强散列哈希加密实现
+ */
+ @Bean
+ public BCryptPasswordEncoder bCryptPasswordEncoder()
+ {
+ return new BCryptPasswordEncoder();
+ }
+
}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 631f3e772..fced7df80 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -2,10 +2,13 @@ server:
port: 9090
spring:
- security:
- user:
- name: ruoyi
- password: 123456
boot:
admin:
context-path: /admin
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+ username: root
+ password: root
+
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 6029c5c52..c1c2f307b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.isc.RouteUtils;
+import com.ruoyi.isc.utils.RouteUtils;
import com.ruoyi.isc.domain.IscAppService;
import com.ruoyi.isc.domain.IscAppServiceApply;
import com.ruoyi.isc.domain.IscService;
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
similarity index 96%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
rename to ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 63352a594..d47c3ee45 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.isc;
+package com.ruoyi.isc.utils;
import cn.hutool.crypto.SecureUtil;
import com.ruoyi.common.exception.ServiceException;
@@ -33,4 +33,5 @@ public class RouteUtils
return String.format("%s/%s/%s%s", PATH_PREFIX, SecureUtil.md5(String.valueOf(applicationId)),
SecureUtil.md5(String.valueOf(serviceId)), uri.getPath());
}
+
}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
new file mode 100644
index 000000000..bfd071015
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author Wechao Gong
+ * @date 2021/9-14
+ */
+@Getter
+@Setter
+public class GatewayRoute implements Serializable
+{
+}
diff --git a/sql/isc.sql b/sql/isc.sql
index 5664a8f7c..15207cb48 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -2,216 +2,182 @@ SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
--- Table structure for isc_app_service
--- ----------------------------
-DROP TABLE IF EXISTS `isc_app_service`;
-CREATE TABLE `isc_app_service` (
- `app_service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
- `service_id` bigint NULL DEFAULT NULL COMMENT '服务ID',
- `application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
- `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
- `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
- `status` char(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
- `virtual_addr` varchar(255) DEFAULT NULL COMMENT '虚拟地址',
- `end_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间',
- `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
- `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
- `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
- `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
- `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
- PRIMARY KEY (`app_service_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
-
--- ----------------------------
--- Records of isc_app_service
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_app_service_apply
--- ----------------------------
-DROP TABLE IF EXISTS `isc_app_service_apply`;
-CREATE TABLE `isc_app_service_apply` (
- `apply_id` bigint NOT NULL AUTO_INCREMENT COMMENT '申请ID',
- `app_service_id` bigint NOT NULL COMMENT '应用服务ID',
- `apply_type` char(1) DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
- `status` char(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
- `audit_mind` varchar(255) DEFAULT NULL COMMENT '审核意见',
- `renewal_duration` int NULL DEFAULT NULL COMMENT '续期时长（单位月）',
- `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
- `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
- `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
- `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
- `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
- `remark` varchar(500) DEFAULT NULL COMMENT '备注',
- PRIMARY KEY (`apply_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务申请信息';
-
--- ----------------------------
--- Records of isc_app_service_apply
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_application
--- ----------------------------
-DROP TABLE IF EXISTS `isc_application`;
-CREATE TABLE `isc_application` (
- `application_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用ID',
- `application_name` varchar(255) NOT NULL COMMENT '应用名称',
- `access_key` varchar(32) NOT NULL COMMENT '应用密钥',
- `user_id` bigint NOT NULL COMMENT '用户ID',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
- `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
- `remark` varchar(500) DEFAULT NULL COMMENT '备注',
- PRIMARY KEY (`application_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用信息';
-
--- ----------------------------
--- Records of isc_application
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_service
+-- 服务信息
-- ----------------------------
DROP TABLE IF EXISTS `isc_service`;
-CREATE TABLE `isc_service` (
- `service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '服务ID',
- `service_name` varchar(255) NOT NULL COMMENT '服务名称',
- `service_addr` varchar(255) NOT NULL COMMENT '服务地址',
- `probe_active_addr` varchar(255) DEFAULT NULL COMMENT '探活地址',
- `request_method` varchar(10) DEFAULT NULL COMMENT '请求方式（默认GET）',
- `remark` varchar(500) DEFAULT NULL COMMENT '备注',
- `cors_flag` char(1) DEFAULT NULL COMMENT '跨域标志（Y是 N否）',
- `hidden_params` varchar(500) DEFAULT NULL COMMENT '隐藏参数',
- `api_doc` text COMMENT 'JSON文档',
- `online_status` char(1) DEFAULT NULL COMMENT '是否在线（0离线 1在线）',
- `status` char(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
- `audit_mind` varchar(255) DEFAULT NULL COMMENT '审核意见',
- `enabled` char(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
- `cate_full_path` varchar(30) DEFAULT NULL COMMENT '服务分类全路径',
- `user_id` bigint NOT NULL COMMENT '用户ID',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
- `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
- PRIMARY KEY (`service_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务信息';
+CREATE TABLE `isc_service`
+(
+ `service_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '服务ID',
+ `service_name` VARCHAR(255) NOT NULL COMMENT '服务名称',
+ `service_addr` VARCHAR(255) NOT NULL COMMENT '服务地址',
+ `probe_active_addr` VARCHAR(255) DEFAULT NULL COMMENT '探活地址',
+ `request_method` VARCHAR(10) DEFAULT NULL COMMENT '请求方式（默认GET）',
+ `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注',
+ `cors_flag` CHAR(1) DEFAULT NULL COMMENT '跨域标志（Y是 N否）',
+ `hidden_params` VARCHAR(500) DEFAULT NULL COMMENT '隐藏参数',
+ `api_doc` TEXT COMMENT 'JSON文档',
+ `online_status` CHAR(1) DEFAULT NULL COMMENT '是否在线（0离线 1在线）',
+ `status` CHAR(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+ `audit_mind` VARCHAR(255) DEFAULT NULL COMMENT '审核意见',
+ `enabled` CHAR(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
+ `cate_full_path` VARCHAR(30) DEFAULT NULL COMMENT '服务分类全路径',
+ `user_id` BIGINT NOT NULL COMMENT '用户ID',
+ `create_by` VARCHAR(64) DEFAULT '' COMMENT '创建者',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` VARCHAR(64) DEFAULT '' COMMENT '更新者',
+ `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `del_flag` CHAR(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ PRIMARY KEY (`service_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '服务信息';
-- ----------------------------
--- Records of isc_service
--- ----------------------------
-BEGIN;
-INSERT INTO `isc_service` VALUES (1, '测试', 'https://www.baidu.com/', 'https://www.baidu.com/', 'GET', NULL, 'Y', NULL, '{}', '1', '0', NULL, '0', '001000000000000000000000000000', 1, 'admin', '2021-09-05 22:47:41', 'admin', '2021-09-05 22:47:41', '0');
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_service_cate
+-- 服务分类
-- ----------------------------
DROP TABLE IF EXISTS `isc_service_cate`;
-CREATE TABLE `isc_service_cate` (
- `cate_id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类ID',
- `parent_id` bigint NULL DEFAULT NULL COMMENT '父分类ID',
- `cate_name` varchar(64) DEFAULT NULL COMMENT '分类名称',
- `full_path` varchar(30) DEFAULT NULL COMMENT '搜索全路径',
- `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
- `order_num` int NULL DEFAULT 0 COMMENT '显示顺序',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
- `del_flag` char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
- `remark` varchar(500) DEFAULT NULL COMMENT '备注',
- PRIMARY KEY (`cate_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 COMMENT = '服务分类';
+CREATE TABLE `isc_service_cate`
+(
+ `cate_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '分类ID',
+ `parent_id` BIGINT NULL DEFAULT NULL COMMENT '父分类ID',
+ `cate_name` VARCHAR(64) DEFAULT NULL COMMENT '分类名称',
+ `full_path` VARCHAR(30) DEFAULT NULL COMMENT '搜索全路径',
+ `enabled` CHAR(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
+ `order_num` INT NULL DEFAULT 0 COMMENT '显示顺序',
+ `create_by` VARCHAR(64) DEFAULT '' COMMENT '创建者',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` VARCHAR(64) DEFAULT '' COMMENT '更新者',
+ `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `del_flag` CHAR(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`cate_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 4 COMMENT = '服务分类';
-- ----------------------------
--- Records of isc_service_cate
+-- 应用信息
-- ----------------------------
-BEGIN;
-INSERT INTO `isc_service_cate` VALUES (10, 0, 'API服务', '001000000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:35:13', 'admin', '2021-09-04 23:35:13', '0', NULL), (11, 0, '地图服务', '002000000000000000000000000000', '0', 20, 'admin', '2021-09-04 23:35:37', 'admin', '2021-09-04 23:35:37', '0', NULL), (12, 0, '数据服务', '003000000000000000000000000000', '0', 30, 'admin', '2021-09-04 23:36:01', 'admin', '2021-09-04 23:36:01', '0', NULL), (13, 11, 'WFS服务', '002001000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:36:26', 'admin', '2021-09-04 23:36:26', '0', NULL);
-COMMIT;
+DROP TABLE IF EXISTS `isc_application`;
+CREATE TABLE `isc_application`
+(
+ `application_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '应用ID',
+ `application_name` VARCHAR(255) NOT NULL COMMENT '应用名称',
+ `access_key` VARCHAR(32) NOT NULL COMMENT '应用密钥',
+ `user_id` BIGINT NOT NULL COMMENT '用户ID',
+ `create_by` VARCHAR(64) DEFAULT '' COMMENT '创建者',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` VARCHAR(64) DEFAULT '' COMMENT '更新者',
+ `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `del_flag` CHAR(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`application_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '应用信息';
-- ----------------------------
--- Table structure for isc_service_log_count
+-- 应用服务信息
-- ----------------------------
-DROP TABLE IF EXISTS `isc_service_log_count`;
-CREATE TABLE `isc_service_log_count` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
- `service_id` bigint NOT NULL COMMENT '服务ID',
- `count_date` date NOT NULL COMMENT '统计日期',
- `total_num` bigint NOT NULL COMMENT '调用次数',
- `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务每日统计';
+DROP TABLE IF EXISTS `isc_app_service`;
+CREATE TABLE `isc_app_service`
+(
+ `app_service_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
+ `service_id` BIGINT NULL DEFAULT NULL COMMENT '服务ID',
+ `application_id` BIGINT NULL DEFAULT NULL COMMENT '应用ID',
+ `user_id` BIGINT NULL DEFAULT NULL COMMENT '用户ID',
+ `enabled` CHAR(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
+ `status` CHAR(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+ `virtual_addr` VARCHAR(255) DEFAULT NULL COMMENT '虚拟地址',
+ `end_time` DATETIME(0) NULL DEFAULT NULL COMMENT '到期时间',
+ `quota_days` INT NULL DEFAULT NULL COMMENT '天配额',
+ `quota_hours` INT NULL DEFAULT NULL COMMENT '小时配额',
+ `quota_minutes` INT NULL DEFAULT NULL COMMENT '分钟配额',
+ `quota_seconds` INT NULL DEFAULT NULL COMMENT '秒配额',
+ `create_by` VARCHAR(64) DEFAULT '' COMMENT '创建者',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` VARCHAR(64) DEFAULT '' COMMENT '更新者',
+ `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `del_flag` CHAR(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ PRIMARY KEY (`app_service_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
-- ----------------------------
--- Records of isc_service_log_count
+-- 应用服务申请信息
-- ----------------------------
-BEGIN;
-COMMIT;
+DROP TABLE IF EXISTS `isc_app_service_apply`;
+CREATE TABLE `isc_app_service_apply`
+(
+ `apply_id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '申请ID',
+ `app_service_id` BIGINT NOT NULL COMMENT '应用服务ID',
+ `apply_type` CHAR(1) DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
+ `status` CHAR(1) DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+ `audit_mind` VARCHAR(255) DEFAULT NULL COMMENT '审核意见',
+ `renewal_duration` INT NULL DEFAULT NULL COMMENT '续期时长（单位月）',
+ `quota_days` INT NULL DEFAULT NULL COMMENT '天配额',
+ `quota_hours` INT NULL DEFAULT NULL COMMENT '小时配额',
+ `quota_minutes` INT NULL DEFAULT NULL COMMENT '分钟配额',
+ `quota_seconds` INT NULL DEFAULT NULL COMMENT '秒配额',
+ `create_by` VARCHAR(64) DEFAULT '' COMMENT '创建者',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` VARCHAR(64) DEFAULT '' COMMENT '更新者',
+ `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+ `del_flag` CHAR(1) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+ `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注',
+ PRIMARY KEY (`apply_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '应用服务申请信息';
-- ----------------------------
--- Table structure for isc_service_log_detail
+-- 服务调用日志
-- ----------------------------
DROP TABLE IF EXISTS `isc_service_log_detail`;
-CREATE TABLE `isc_service_log_detail` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志ID',
- `service_id` bigint NOT NULL COMMENT '服务ID',
- `application_id` bigint NOT NULL COMMENT '应用ID',
- `user_id` bigint NOT NULL COMMENT '用户ID',
- `request_ip` varchar(64) DEFAULT NULL COMMENT '调用IP',
- `begin_time` timestamp(0) NULL DEFAULT NULL COMMENT '开始时间',
- `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '结束时间',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- `remark` varchar(500) DEFAULT NULL COMMENT '备注信息',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务调用日志';
+CREATE TABLE `isc_service_log_detail`
+(
+ `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+ `service_id` BIGINT NOT NULL COMMENT '服务ID',
+ `application_id` BIGINT NOT NULL COMMENT '应用ID',
+ `user_id` BIGINT NOT NULL COMMENT '用户ID',
+ `request_ip` VARCHAR(64) DEFAULT NULL COMMENT '调用IP',
+ `begin_time` TIMESTAMP(0) NULL DEFAULT NULL COMMENT '开始时间',
+ `end_time` TIMESTAMP(0) NULL DEFAULT NULL COMMENT '结束时间',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注信息',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '服务调用日志';
-- ----------------------------
--- Records of isc_service_log_detail
+-- 服务每日统计
-- ----------------------------
-BEGIN;
-COMMIT;
+DROP TABLE IF EXISTS `isc_service_log_count`;
+CREATE TABLE `isc_service_log_count`
+(
+ `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+ `service_id` BIGINT NOT NULL COMMENT '服务ID',
+ `count_date` DATE NOT NULL COMMENT '统计日期',
+ `total_num` BIGINT NOT NULL COMMENT '调用次数',
+ `avg_time` BIGINT NULL DEFAULT NULL COMMENT '平均响应时间',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '服务每日统计';
-- ----------------------------
--- Table structure for isc_service_log_user_count
+-- 服务日志用户统计
-- ----------------------------
DROP TABLE IF EXISTS `isc_service_log_user_count`;
-CREATE TABLE `isc_service_log_user_count` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
- `service_id` bigint NOT NULL COMMENT '服务ID',
- `application_id` bigint NOT NULL COMMENT '应用ID',
- `user_id` bigint NOT NULL COMMENT '用户ID',
- `count_date` date NULL DEFAULT NULL COMMENT '统计日期',
- `total_num` bigint NULL DEFAULT NULL COMMENT '调用次数',
- `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务日志用户统计';
-
--- ----------------------------
--- Records of isc_service_log_user_count
--- ----------------------------
-BEGIN;
-COMMIT;
+CREATE TABLE `isc_service_log_user_count`
+(
+ `id` INT NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+ `service_id` BIGINT NOT NULL COMMENT '服务ID',
+ `application_id` BIGINT NOT NULL COMMENT '应用ID',
+ `user_id` BIGINT NOT NULL COMMENT '用户ID',
+ `count_date` DATE NULL DEFAULT NULL COMMENT '统计日期',
+ `total_num` BIGINT NULL DEFAULT NULL COMMENT '调用次数',
+ `avg_time` BIGINT NULL DEFAULT NULL COMMENT '平均响应时间',
+ `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1 COMMENT = '服务日志用户统计';
BEGIN;
INSERT INTO `sys_menu` VALUES (1607, '服务分类', 1606, 1, 'cate', 'isc/cate/index', 1, 0, 'C', '0', '0', 'isc:cate:list', '#', 'admin', '2021-09-08 13:59:21', 'admin', '2021-09-08 14:02:25', '服务分类菜单');
@@ -265,4 +231,22 @@ INSERT INTO `sys_dict_data` VALUES (108, 1, 'GET', 'GET', 'isc_request_method',
INSERT INTO `sys_dict_data` VALUES (109, 2, 'POST', 'POST', 'isc_request_method', NULL, 'info', 'N', '0', 'admin', '2021-09-07 22:13:40', 'admin', '2021-09-07 22:13:40', NULL);
COMMIT;
+-- ----------------------------
+-- Security 用户视图
+-- ----------------------------
+CREATE OR REPLACE VIEW users AS (
+SELECT user_name AS username,
+ `password` AS `password`,
+ (CASE WHEN `status` = 0 AND del_flag = 0 THEN 1 ELSE 0 END) AS enabled
+FROM sys_user
+);
+
+-- ----------------------------
+-- Security 权限视图
+-- ----------------------------
+CREATE OR REPLACE VIEW authorities AS (
+SELECT user_name AS username,
+ NULL AS authority
+FROM sys_user
+);
SET FOREIGN_KEY_CHECKS = 1;