diff --git a/script/soul.sql b/script/soul.sql index 466165771540..a538ffd42f25 100644 --- a/script/soul.sql +++ b/script/soul.sql @@ -4,7 +4,6 @@ MySQL - 5.5.56-MariaDB : Database - skyway ********************************************************************* */ - /*!40101 SET NAMES utf8 */; /*!40101 SET SQL_MODE=''*/; @@ -18,25 +17,23 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/`soul` /*!40100 DEFAULT CHARACTER SET ut USE `soul`; /*Table structure for table `app_auth` */ - DROP TABLE IF EXISTS `app_auth`; CREATE TABLE `app_auth` ( - `id` varchar(128) NOT NULL AUTO_INCREMENT COMMENT '主键id', + `id` varchar(128) NOT NULL COMMENT '主键id', `app_key` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '应用标识key', `app_secret` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '加密算法secret', `enabled` tinyint(4) NOT NULL COMMENT '是否删除', `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `dashboard_user` */ - DROP TABLE IF EXISTS `dashboard_user`; CREATE TABLE `dashboard_user` ( - `id` varchar(128) NOT NULL AUTO_INCREMENT COMMENT '主键id', + `id` varchar(128) NOT NULL COMMENT '主键id', `user_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户名', `password` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '用户密码', `role` int(4) NOT NULL COMMENT '角色', @@ -44,27 +41,25 @@ CREATE TABLE `dashboard_user` ( `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `plugin` */ - DROP TABLE IF EXISTS `plugin`; CREATE TABLE `plugin` ( - `id` varchar(128) NOT NULL AUTO_INCREMENT COMMENT '主键id', + `id` varchar(128) NOT NULL COMMENT '主键id', `name` varchar(62) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '插件名称', `enable` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启(0,未开启,1开启)', `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `rule` */ - DROP TABLE IF EXISTS `rule`; CREATE TABLE `rule` ( - `id` varchar(128) NOT NULL AUTO_INCREMENT COMMENT '主键id', + `id` varchar(128) NOT NULL COMMENT '主键id', `selector_id` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '选择器id', `match_mode` int(2) NOT NULL COMMENT '匹配方式(0 and 1 or)', `name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '规则名称', @@ -75,15 +70,14 @@ CREATE TABLE `rule` ( `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `rule_condition` */ - DROP TABLE IF EXISTS `rule_condition`; CREATE TABLE `rule_condition` ( - `id` varchar(128) NOT NULL AUTO_INCREMENT COMMENT '主键id', - `rule_id` bigint(10) NOT NULL COMMENT '规则id', + `id` varchar(128) NOT NULL COMMENT '主键id', + `rule_id` varchar(128) NOT NULL COMMENT '规则id', `param_type` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '参数类型(post query uri等)', `operator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '匹配符(= > < like match)', `param_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '参数名称', @@ -91,18 +85,17 @@ CREATE TABLE `rule_condition` ( `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `selector` */ - DROP TABLE IF EXISTS `selector`; CREATE TABLE `selector` ( `id` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键id varchar', - `plugin_id` bigint(10) NOT NULL COMMENT '插件id', + `plugin_id` varchar(128) NOT NULL COMMENT '插件id', `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '选择器名称', `match_mode` int(2) NOT NULL COMMENT '匹配方式(0 and 1 or)', - `type` tinyint(4) NOT NULL COMMENT '类型(0,全流量,1自定义流量)', + `type` int(4) NOT NULL COMMENT '类型(0,全流量,1自定义流量)', `rank` int(4) NOT NULL COMMENT '排序', `enabled` tinyint(4) NOT NULL COMMENT '是否开启', `loged` tinyint(4) NOT NULL COMMENT '是否打印日志', @@ -113,12 +106,11 @@ CREATE TABLE `selector` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*Table structure for table `selector_condition` */ - DROP TABLE IF EXISTS `selector_condition`; CREATE TABLE `selector_condition` ( - `id` bigint(10) NOT NULL AUTO_INCREMENT COMMENT '主键id', - `selector_id` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '选择器id', + `id` varchar(128) NOT NULL COMMENT '主键id', + `selector_id` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '选择器id', `param_type` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '参数类型(post query uri等)', `operator` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '匹配符(= > < like match)', `param_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '参数名称', @@ -126,13 +118,9 @@ CREATE TABLE `selector_condition` ( `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `date_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - - - +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*plugin*/ - INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updated`) VALUES ('1', 'sign', '0', '2018-06-14 10:17:35', '2018-06-14 10:17:35'); INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updated`) VALUES ('2', 'waf', '0', '2018-06-23 10:26:30', '2018-06-13 15:43:10'); INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updated`) VALUES ('3', 'rewrite', '0', '2018-06-23 10:26:34', '2018-06-25 13:59:31'); @@ -141,7 +129,5 @@ INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updat INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updated`) VALUES ('6', 'dubbo', '0', '2018-06-23 10:26:41', '2018-06-11 10:11:47'); INSERT INTO `soul`.`plugin` (`id`, `name`, `enable`, `date_created`, `date_updated`) VALUES ('7', 'monitor', '0', '2018-06-25 13:47:57', '2018-06-25 13:47:57'); - /**user**/ -INSERT INTO `soul`.`dashboard_user` (`id`, `user_name`, `password`, `role`, `enabled`, `date_created`, `date_updated`) VALUES ('1', 'admin', '123456', '1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23'); - +INSERT INTO `soul`.`dashboard_user` (`id`, `user_name`, `password`, `role`, `enabled`, `date_created`, `date_updated`) VALUES ('1', 'admin', '123456', '1', '1', '2018-06-23 15:12:22', '2018-06-23 15:12:23'); \ No newline at end of file diff --git a/soul-admin/pom.xml b/soul-admin/pom.xml index 56e1043e3213..baf3ddce995b 100644 --- a/soul-admin/pom.xml +++ b/soul-admin/pom.xml @@ -8,15 +8,13 @@ 1.0.0-SNAPSHOT 4.0.0 - soul-admin - - org.dromara.soul soul-common + org.dromara.soul soul-configuration @@ -27,7 +25,6 @@ spring-boot-starter-webflux - org.springframework.boot spring-boot-starter-logging @@ -37,14 +34,17 @@ com.google.guava guava + org.springframework.boot spring-boot-starter-actuator + org.projectreactor reactor-spring + org.springframework.boot spring-boot-starter-test @@ -55,10 +55,12 @@ org.mybatis.spring.boot mybatis-spring-boot-starter + commons-dbcp commons-dbcp + mysql mysql-connector-java @@ -74,6 +76,7 @@ pagehelper 5.1.1 + com.101tec zkclient @@ -93,10 +96,12 @@ com.esotericsoftware kryo-shaded + com.dyuproject.protostuff protostuff-core + com.dyuproject.protostuff protostuff-runtime @@ -106,7 +111,7 @@ com.caucho hessian - + com.alibaba fastjson @@ -155,6 +160,4 @@ - - \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/SoulAdminApplication.java b/soul-admin/src/main/java/org/dromara/soul/admin/SoulAdminApplication.java index 48f53c8dc0ba..749cf32c7d42 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/SoulAdminApplication.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/SoulAdminApplication.java @@ -31,7 +31,7 @@ */ @SpringBootApplication @ComponentScan("org.dromara.soul") -@Import(value = { ZookeeperConfiguration.class }) +@Import(value = {ZookeeperConfiguration.class}) public class SoulAdminApplication { /** @@ -42,5 +42,4 @@ public class SoulAdminApplication { public static void main(final String[] args) { SpringApplication.run(SoulAdminApplication.class, args); } - -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/AppAuthDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/AppAuthDTO.java index 29a9abea768a..6deaf104fa9f 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/dto/AppAuthDTO.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/AppAuthDTO.java @@ -23,16 +23,30 @@ import java.io.Serializable; /** - * this is from by web front. + * this is application authority from by web front. * * @author xiaoyu(549477611 @ qq.com) */ @Data public class AppAuthDTO implements Serializable { + /** + * primary key + */ private String id; + /** + * application key + */ private String appKey; + /** + * encryption secret + */ + private String appSecret; + + /** + * whether enabled + */ private Boolean enabled; -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/DashboardUserDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/DashboardUserDTO.java new file mode 100644 index 000000000000..63fcde8ee8a7 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/DashboardUserDTO.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * this is dashboard user from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class DashboardUserDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * user name + */ + private String userName; + + /** + * user password + */ + private String password; + + /** + * dashboard role + */ + private Integer role; + + /** + * whether enabled + */ + private Boolean enabled; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/PluginDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/PluginDTO.java new file mode 100644 index 000000000000..cce356616299 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/PluginDTO.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * this is plugin from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class PluginDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * plugin name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleConditionDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleConditionDTO.java new file mode 100644 index 000000000000..d13fec9d1ab1 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleConditionDTO.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * this is rule condition from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleConditionDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * rule id + */ + private String ruleId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleDTO.java new file mode 100644 index 000000000000..917baccd5569 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/RuleDTO.java @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * this is rule from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * selector id + */ + private String selectorId; + + /** + * match mode + */ + private Integer matchMode; + + /** + * rule name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * whether loged + */ + private Boolean loged; + + /** + * process logic + */ + private String handle; + + /** + * rule conditions + */ + private List ruleConditions; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorConditionDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorConditionDTO.java new file mode 100644 index 000000000000..6d8a43d4a0cc --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorConditionDTO.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * this is selector condition from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorConditionDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * selector id + */ + private String selectorId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorDTO.java b/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorDTO.java new file mode 100644 index 000000000000..5f31df7ec955 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/dto/SelectorDTO.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * this is selector from by web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorDTO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * plugin id + */ + private String pluginId; + + /** + * selector name + */ + private String name; + + /** + * match mode + */ + private Integer matchMode; + + /** + * selector type + */ + private Integer type; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * selector conditions + */ + private List selectorConditions; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/AppAuthDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/AppAuthDO.java index 49a883d01849..bd4222bb42bc 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/entity/AppAuthDO.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/AppAuthDO.java @@ -28,10 +28,18 @@ @Data public class AppAuthDO extends BaseDO { + /** + * application key + */ private String appKey; + /** + * encryption secret + */ private String appSecret; + /** + * whether enabled + */ private Boolean enabled; - -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/BaseDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/BaseDO.java index cf6d7d256a89..50a075749118 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/entity/BaseDO.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/BaseDO.java @@ -32,7 +32,7 @@ public class BaseDO implements Serializable { /** - * primary kay. + * primary key. */ private String id; @@ -45,4 +45,4 @@ public class BaseDO implements Serializable { * updated time. */ private LocalDateTime dateUpdated; -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/DashboardUserDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/DashboardUserDO.java new file mode 100644 index 000000000000..18f272c61d1a --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/DashboardUserDO.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * DashboardUserDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class DashboardUserDO extends BaseDO { + + /** + * user name + */ + private String userName; + + /** + * user password + */ + private String password; + + /** + * dashboard role + */ + private Integer role; + + /** + * whether enabled + */ + private Boolean enabled; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/PluginDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/PluginDO.java new file mode 100644 index 000000000000..75a91af01b68 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/PluginDO.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * PluginDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class PluginDO extends BaseDO { + + /** + * plugin name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleConditionDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleConditionDO.java new file mode 100644 index 000000000000..720575d88665 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleConditionDO.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * RuleConditionDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleConditionDO extends BaseDO { + + /** + * rule id + */ + private String ruleId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleDO.java new file mode 100644 index 000000000000..10e9ab6e0c72 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/RuleDO.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * RuleDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleDO extends BaseDO { + + /** + * selector id + */ + private String selectorId; + + /** + * match mode + */ + private Integer matchMode; + + /** + * rule name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * whether loged + */ + private Boolean loged; + + /** + * sort rank + */ + private Integer rank; + + /** + * process logic + */ + private String handle; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorConditionDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorConditionDO.java new file mode 100644 index 000000000000..675c0f6602b3 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorConditionDO.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * SelectorConditionDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorConditionDO extends BaseDO { + + /** + * selector id + */ + private String selectorId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorDO.java b/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorDO.java new file mode 100644 index 000000000000..77b250ff67e6 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/entity/SelectorDO.java @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.entity; + +import lombok.Data; + +/** + * SelectorDO. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorDO extends BaseDO { + + /** + * plugin id + */ + private String pluginId; + + /** + * selector name + */ + private String name; + + /** + * match mode + */ + private Integer matchMode; + + /** + * selector type + */ + private Integer type; + + /** + * sort rank + */ + private Integer rank; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * whether loged + */ + private Boolean loged; + + /** + * whether continued + */ + private Boolean continued; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/AppAuthMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/AppAuthMapper.java index 362513c09607..d22147fd578d 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/AppAuthMapper.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/AppAuthMapper.java @@ -18,9 +18,54 @@ package org.dromara.soul.admin.mapper; +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.AppAuthDO; + /** * AppAuthMapper. + * * @author xiaoyu(549477611 @ qq.com) */ +@Mapper public interface AppAuthMapper { -} + + /** + * select application authority by id + * + * @param id + * @return + */ + AppAuthDO selectById(String id); + + /** + * insert application authority + * + * @param appAuthDO + * @return + */ + int insert(AppAuthDO appAuthDO); + + /** + * insert selective application authority + * + * @param appAuthDO + * @return + */ + int insertSelective(AppAuthDO appAuthDO); + + /** + * update application authority + * + * @param appAuthDO + * @return + */ + int update(AppAuthDO appAuthDO); + + /** + * update selective application authority + * + * @param appAuthDO + * @return + */ + int updateSelective(AppAuthDO appAuthDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/DashboardUserMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/DashboardUserMapper.java new file mode 100644 index 000000000000..cbf3fe4ea9b5 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/DashboardUserMapper.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.DashboardUserDO; + +/** + * DashboardUserMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface DashboardUserMapper { + + /** + * select dashboard user by id + * + * @param id + * @return + */ + DashboardUserDO selectById(String id); + + /** + * insert dashboard user + * + * @param dashboardUserDO + * @return + */ + int insert(DashboardUserDO dashboardUserDO); + + /** + * insert selective dashboard user + * + * @param dashboardUserDO + * @return + */ + int insertSelective(DashboardUserDO dashboardUserDO); + + /** + * update dashboard user + * + * @param dashboardUserDO + * @return + */ + int update(DashboardUserDO dashboardUserDO); + + /** + * update selective dashboard user + * + * @param dashboardUserDO + * @return + */ + int updateSelective(DashboardUserDO dashboardUserDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/PluginMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/PluginMapper.java new file mode 100644 index 000000000000..8845ece52671 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/PluginMapper.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.PluginDO; + +/** + * PluginMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface PluginMapper { + + /** + * select plugin by id + * + * @param id + * @return + */ + PluginDO selectById(String id); + + /** + * insert plugin + * + * @param pluginDO + * @return + */ + int insert(PluginDO pluginDO); + + /** + * insert selective plugin + * + * @param pluginDO + * @return + */ + int insertSelective(PluginDO pluginDO); + + /** + * update plugin + * + * @param pluginDO + * @return + */ + int update(PluginDO pluginDO); + + /** + * update selective plugin + * + * @param pluginDO + * @return + */ + int updateSelective(PluginDO pluginDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleConditionMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleConditionMapper.java new file mode 100644 index 000000000000..70833a28d022 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleConditionMapper.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.RuleConditionDO; +import org.dromara.soul.admin.entity.RuleDO; + +/** + * RuleConditionMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface RuleConditionMapper { + + /** + * select rule condition by id + * + * @param id + * @return + */ + RuleDO selectById(String id); + + /** + * insert rule condition + * + * @param ruleConditionDO + * @return + */ + int insert(RuleConditionDO ruleConditionDO); + + /** + * insert selective rule condition + * + * @param ruleConditionDO + * @return + */ + int insertSelective(RuleConditionDO ruleConditionDO); + + /** + * update rule condition + * + * @param ruleConditionDO + * @return + */ + int update(RuleConditionDO ruleConditionDO); + + /** + * update selective rule condition + * + * @param ruleConditionDO + * @return + */ + int updateSelective(RuleConditionDO ruleConditionDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleMapper.java new file mode 100644 index 000000000000..1a4d77e446b8 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/RuleMapper.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.RuleDO; + +/** + * RuleMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface RuleMapper { + + /** + * select rule by id + * + * @param id + * @return + */ + RuleDO selectById(String id); + + /** + * insert rule + * + * @param ruleDO + * @return + */ + int insert(RuleDO ruleDO); + + /** + * insert selective rule + * + * @param ruleDO + * @return + */ + int insertSelective(RuleDO ruleDO); + + /** + * update rule + * + * @param ruleDO + * @return + */ + int update(RuleDO ruleDO); + + /** + * update selective rule + * + * @param ruleDO + * @return + */ + int updateSelective(RuleDO ruleDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorConditionMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorConditionMapper.java new file mode 100644 index 000000000000..1b7c944c0564 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorConditionMapper.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.SelectorConditionDO; + +/** + * SelectorConditionMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface SelectorConditionMapper { + + /** + * select selector condition by id + * + * @param id + * @return + */ + SelectorConditionDO selectById(String id); + + /** + * insert selector condition + * + * @param selectorConditionDO + * @return + */ + int insert(SelectorConditionDO selectorConditionDO); + + /** + * insert selective selector condition + * + * @param selectorConditionDO + * @return + */ + int insertSelective(SelectorConditionDO selectorConditionDO); + + /** + * update selector condition + * + * @param selectorConditionDO + * @return + */ + int update(SelectorConditionDO selectorConditionDO); + + /** + * update selective selector condition + * + * @param selectorConditionDO + * @return + */ + int updateSelective(SelectorConditionDO selectorConditionDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorMapper.java b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorMapper.java new file mode 100644 index 000000000000..605ca9b36500 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/mapper/SelectorMapper.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.soul.admin.entity.SelectorDO; + +/** + * SelectorMapper. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Mapper +public interface SelectorMapper { + + /** + * select selector by id + * + * @param id + * @return + */ + SelectorDO selectById(String id); + + /** + * insert selector + * + * @param selectorDO + * @return + */ + int insert(SelectorDO selectorDO); + + /** + * insert selective selector + * + * @param selectorDO + * @return + */ + int insertSelective(SelectorDO selectorDO); + + /** + * update selector + * + * @param selectorDO + * @return + */ + int update(SelectorDO selectorDO); + + /** + * update selective selector + * + * @param selectorDO + * @return + */ + int updateSelective(SelectorDO selectorDO); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/query/AppAuthQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/query/AppAuthQuery.java index 53604d30ffd6..92473b622985 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/query/AppAuthQuery.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/query/AppAuthQuery.java @@ -24,7 +24,7 @@ import java.io.Serializable; /** - * this is app auth query. + * this is application authority query. * * @author xiaoyu(549477611 @ qq.com) */ @@ -32,9 +32,12 @@ public class AppAuthQuery implements Serializable { /** - * appKey. + * application key. */ private String appKey; + /** + * page parameter + */ private PageParameter pageParameter; -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/query/DashboardUserQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/query/DashboardUserQuery.java new file mode 100644 index 000000000000..110a916539ce --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/query/DashboardUserQuery.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.query; + +import lombok.Data; +import org.dromara.soul.admin.page.PageParameter; + +import java.io.Serializable; + +/** + * this is dashboard user query. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class DashboardUserQuery implements Serializable { + + /** + * page parameter + */ + private PageParameter pageParameter; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/query/PluginQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/query/PluginQuery.java new file mode 100644 index 000000000000..b63b58d29f61 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/query/PluginQuery.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.query; + +import lombok.Data; +import org.dromara.soul.admin.page.PageParameter; + +import java.io.Serializable; + +/** + * this is plugin query. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class PluginQuery implements Serializable { + + /** + * page parameter + */ + private PageParameter pageParameter; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/query/RuleQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/query/RuleQuery.java new file mode 100644 index 000000000000..cf24b542eb41 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/query/RuleQuery.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.query; + +import lombok.Data; +import org.dromara.soul.admin.page.PageParameter; + +import java.io.Serializable; + +/** + * this is rule query. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleQuery implements Serializable { + + /** + * page parameter + */ + private PageParameter pageParameter; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/query/SelectorQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/query/SelectorQuery.java new file mode 100644 index 000000000000..eddd94916f03 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/query/SelectorQuery.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.query; + +import lombok.Data; +import org.dromara.soul.admin.page.PageParameter; + +import java.io.Serializable; + +/** + * this is selector query. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorQuery implements Serializable { + + /** + * page parameter + */ + private PageParameter pageParameter; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/AppAuthService.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/AppAuthService.java index 445af1e73c1a..2a39480c6a51 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/service/AppAuthService.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/AppAuthService.java @@ -25,14 +25,14 @@ import org.dromara.soul.admin.vo.AppAuthVO; /** - * this is app auth service. + * this is application authority service. * * @author xiaoyu(549477611 @ qq.com) */ public interface AppAuthService { /** - * save or update app auth. + * save or update application authority. * * @param appAuthDTO {@linkplain AppAuthDTO} * @return rows @@ -40,7 +40,7 @@ public interface AppAuthService { int saveOrUpdate(AppAuthDTO appAuthDTO); /** - * enabled or disabled app auth . + * enabled or disabled application authority. * * @param appAuthDTO {@linkplain AppAuthDTO} * @return rows @@ -48,7 +48,7 @@ public interface AppAuthService { int enabled(AppAuthDTO appAuthDTO); /** - * find by id. + * find application authority by id. * * @param id pk. * @return {@linkplain AppAuthDO} @@ -56,7 +56,7 @@ public interface AppAuthService { AppAuthDO findById(String id); /** - * find by appKey. + * find application authority by appKey. * * @param appKey appKey. * @return {@linkplain AppAuthDO} @@ -64,12 +64,10 @@ public interface AppAuthService { AppAuthDO findByAppKey(String appKey); /** - * find page by query. + * find page of application authority by query. * * @param appAuthQuery {@linkplain AppAuthQuery} * @return CommonPager */ CommonPager listByPage(AppAuthQuery appAuthQuery); - - -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/DashboardUserService.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/DashboardUserService.java new file mode 100644 index 000000000000..3d2b7ee3d615 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/DashboardUserService.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service; + +import org.dromara.soul.admin.dto.DashboardUserDTO; +import org.dromara.soul.admin.entity.DashboardUserDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.DashboardUserQuery; + +/** + * this is dashboard user service. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +public interface DashboardUserService { + + /** + * save or update dashboard user. + * + * @param dashboardUserDTO {@linkplain DashboardUserDTO} + * @return rows + */ + int saveOrUpdate(DashboardUserDTO dashboardUserDTO); + + /** + * enabled or disabled dashboard user. + * + * @param dashboardUserDTO {@linkplain DashboardUserDTO} + * @return rows + */ + int enabled(DashboardUserDTO dashboardUserDTO); + + /** + * find dashboard user by id. + * + * @param id pk. + * @return {@linkplain DashboardUserDO} + */ + DashboardUserDO findById(String id); + + /** + * find page of dashboard user by query. + * + * @param dashboardUserQuery {@linkplain DashboardUserQuery} + * @return CommonPager + */ + CommonPager listByPage(DashboardUserQuery dashboardUserQuery); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/PluginService.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/PluginService.java new file mode 100644 index 000000000000..4daf6dc25967 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/PluginService.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service; + +import org.dromara.soul.admin.dto.PluginDTO; +import org.dromara.soul.admin.entity.PluginDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.PluginQuery; + +/** + * this is plugin service. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +public interface PluginService { + + /** + * save or update plugin. + * + * @param pluginDTO {@linkplain PluginDTO} + * @return rows + */ + int saveOrUpdate(PluginDTO pluginDTO); + + /** + * enabled or disabled plugin. + * + * @param pluginDTO {@linkplain PluginDTO} + * @return rows + */ + int enabled(PluginDTO pluginDTO); + + /** + * find plugin by id. + * + * @param id pk. + * @return {@linkplain PluginDO} + */ + PluginDO findById(String id); + + /** + * find page of plugin by query. + * + * @param pluginQuery {@linkplain PluginQuery} + * @return CommonPager + */ + CommonPager listByPage(PluginQuery pluginQuery); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/RuleService.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/RuleService.java new file mode 100644 index 000000000000..5f16c5276c44 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/RuleService.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service; + +import org.dromara.soul.admin.dto.RuleDTO; +import org.dromara.soul.admin.entity.RuleDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.RuleQuery; +import org.dromara.soul.admin.vo.RuleVO; + +/** + * this is rule service. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +public interface RuleService { + + /** + * save or update rule. + * + * @param ruleDTO {@linkplain RuleDTO} + * @return rows + */ + int saveOrUpdate(RuleDTO ruleDTO); + + /** + * enabled or disabled rule. + * + * @param ruleDTO {@linkplain RuleDTO} + * @return rows + */ + int enabled(RuleDTO ruleDTO); + + /** + * find rule by id. + * + * @param id pk. + * @return {@linkplain RuleDO} + */ + RuleDO findById(String id); + + /** + * find page of rule by query. + * + * @param ruleQuery {@linkplain RuleQuery} + * @return CommonPager + */ + CommonPager listByPage(RuleQuery ruleQuery); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/SelectorService.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/SelectorService.java new file mode 100644 index 000000000000..6061a4269147 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/SelectorService.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service; + +import org.dromara.soul.admin.dto.SelectorDTO; +import org.dromara.soul.admin.entity.SelectorDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.SelectorQuery; +import org.dromara.soul.admin.vo.SelectorVO; + +/** + * this is selector service. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +public interface SelectorService { + + /** + * save or update selector. + * + * @param selectorDTO {@linkplain SelectorDTO} + * @return rows + */ + int saveOrUpdate(SelectorDTO selectorDTO); + + /** + * enabled or disabled selector. + * + * @param selectorDTO {@linkplain SelectorDTO} + * @return rows + */ + int enabled(SelectorDTO selectorDTO); + + /** + * find selector by id. + * + * @param id pk. + * @return {@linkplain SelectorDO} + */ + SelectorDO findById(String id); + + /** + * find page of selector by query. + * + * @param selectorQuery {@linkplain SelectorQuery} + * @return CommonPager + */ + CommonPager listByPage(SelectorQuery selectorQuery); +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/AppAuthServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/AppAuthServiceImpl.java index ad6868b695e3..341c35dcf1a9 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/AppAuthServiceImpl.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/AppAuthServiceImpl.java @@ -33,28 +33,59 @@ */ @Service("appAuthService") public class AppAuthServiceImpl implements AppAuthService { + + /** + * save or update application authority. + * + * @param appAuthDTO {@linkplain AppAuthDTO} + * @return rows + */ @Override public int saveOrUpdate(final AppAuthDTO appAuthDTO) { return 0; } + /** + * enabled or disabled application authority. + * + * @param appAuthDTO {@linkplain AppAuthDTO} + * @return rows + */ @Override public int enabled(final AppAuthDTO appAuthDTO) { return 0; } + /** + * find application authority by id. + * + * @param id pk. + * @return {@linkplain AppAuthDO} + */ @Override public AppAuthDO findById(final String id) { return null; } + /** + * find application authority by appKey. + * + * @param appKey appKey. + * @return {@linkplain AppAuthDO} + */ @Override public AppAuthDO findByAppKey(final String appKey) { return null; } + /** + * find page of application authority by query. + * + * @param appAuthQuery {@linkplain AppAuthQuery} + * @return CommonPager + */ @Override public CommonPager listByPage(final AppAuthQuery appAuthQuery) { return null; } -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/DashboardUserServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/DashboardUserServiceImpl.java new file mode 100644 index 000000000000..b0697cf5d9a2 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/DashboardUserServiceImpl.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service.impl; + +import org.dromara.soul.admin.dto.DashboardUserDTO; +import org.dromara.soul.admin.entity.DashboardUserDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.DashboardUserQuery; +import org.dromara.soul.admin.service.DashboardUserService; +import org.springframework.stereotype.Service; + +/** + * DashboardUserServiceImpl. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Service("dashboardUserService") +public class DashboardUserServiceImpl implements DashboardUserService { + + /** + * save or update dashboard user. + * + * @param dashboardUserDTO {@linkplain DashboardUserDTO} + * @return rows + */ + public int saveOrUpdate(DashboardUserDTO dashboardUserDTO) { + return 0; + } + + /** + * enabled or disabled dashboard user. + * + * @param dashboardUserDTO {@linkplain DashboardUserDTO} + * @return rows + */ + public int enabled(DashboardUserDTO dashboardUserDTO) { + return 0; + } + + /** + * find dashboard user by id. + * + * @param id pk. + * @return {@linkplain DashboardUserDO} + */ + public DashboardUserDO findById(String id) { + return null; + } + + /** + * find page of dashboard user by query. + * + * @param dashboardUserQuery {@linkplain DashboardUserQuery} + * @return CommonPager + */ + public CommonPager listByPage(DashboardUserQuery dashboardUserQuery) { + return null; + } +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/PluginServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/PluginServiceImpl.java new file mode 100644 index 000000000000..f277c47bb885 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/PluginServiceImpl.java @@ -0,0 +1,75 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service.impl; + +import org.dromara.soul.admin.dto.PluginDTO; +import org.dromara.soul.admin.entity.PluginDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.PluginQuery; +import org.dromara.soul.admin.service.PluginService; +import org.springframework.stereotype.Service; + +/** + * PluginServiceImpl. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Service("pluginService") +public class PluginServiceImpl implements PluginService { + + /** + * save or update plugin. + * + * @param pluginDTO {@linkplain PluginDTO} + * @return rows + */ + public int saveOrUpdate(PluginDTO pluginDTO) { + return 0; + } + + /** + * enabled or disabled plugin. + * + * @param pluginDTO {@linkplain PluginDTO} + * @return rows + */ + public int enabled(PluginDTO pluginDTO) { + return 0; + } + + /** + * find plugin by id. + * + * @param id pk. + * @return {@linkplain PluginDO} + */ + public PluginDO findById(String id) { + return null; + } + + /** + * find page of plugin by query. + * + * @param pluginQuery {@linkplain PluginQuery} + * @return CommonPager + */ + public CommonPager listByPage(PluginQuery pluginQuery) { + return null; + } +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/RuleServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/RuleServiceImpl.java new file mode 100644 index 000000000000..cafbfd81a1aa --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/RuleServiceImpl.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service.impl; + +import org.dromara.soul.admin.dto.RuleDTO; +import org.dromara.soul.admin.entity.RuleDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.RuleQuery; +import org.dromara.soul.admin.service.RuleService; +import org.dromara.soul.admin.vo.RuleVO; +import org.springframework.stereotype.Service; + +/** + * RuleServiceImpl. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Service("ruleService") +public class RuleServiceImpl implements RuleService { + + /** + * save or update rule. + * + * @param ruleDTO {@linkplain RuleDTO} + * @return rows + */ + @Override + public int saveOrUpdate(RuleDTO ruleDTO) { + return 0; + } + + /** + * enabled or disabled rule. + * + * @param ruleDTO {@linkplain RuleDTO} + * @return rows + */ + @Override + public int enabled(RuleDTO ruleDTO) { + return 0; + } + + /** + * find rule by id. + * + * @param id pk. + * @return {@linkplain RuleDO} + */ + @Override + public RuleDO findById(String id) { + return null; + } + + /** + * find page of rule by query. + * + * @param ruleQuery {@linkplain RuleQuery} + * @return CommonPager + */ + @Override + public CommonPager listByPage(RuleQuery ruleQuery) { + return null; + } +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/SelectorServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/SelectorServiceImpl.java new file mode 100644 index 000000000000..f3914c08729e --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/SelectorServiceImpl.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.service.impl; + +import org.dromara.soul.admin.dto.SelectorDTO; +import org.dromara.soul.admin.entity.SelectorDO; +import org.dromara.soul.admin.page.CommonPager; +import org.dromara.soul.admin.query.SelectorQuery; +import org.dromara.soul.admin.service.SelectorService; +import org.dromara.soul.admin.vo.SelectorVO; +import org.springframework.stereotype.Service; + +/** + * SelectorServiceImpl. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Service("selectorService") +public class SelectorServiceImpl implements SelectorService { + + /** + * save or update selector. + * + * @param selectorDTO {@linkplain SelectorDTO} + * @return rows + */ + @Override + public int saveOrUpdate(SelectorDTO selectorDTO) { + return 0; + } + + /** + * enabled or disabled selector. + * + * @param selectorDTO {@linkplain SelectorDTO} + * @return rows + */ + @Override + public int enabled(SelectorDTO selectorDTO) { + return 0; + } + + /** + * find selector by id. + * + * @param id pk. + * @return {@linkplain SelectorDO} + */ + @Override + public SelectorDO findById(String id) { + return null; + } + + /** + * find page of selector by query. + * + * @param selectorQuery {@linkplain SelectorQuery} + * @return CommonPager + */ + @Override + public CommonPager listByPage(SelectorQuery selectorQuery) { + return null; + } +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/AppAuthVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/AppAuthVO.java index b5ddaacc0cc4..ed08c478684f 100644 --- a/soul-admin/src/main/java/org/dromara/soul/admin/vo/AppAuthVO.java +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/AppAuthVO.java @@ -24,19 +24,31 @@ import java.time.LocalDateTime; /** - * this is view to front. + * this is application authority view to web front. * * @author xiaoyu(549477611 @ qq.com) */ @Data public class AppAuthVO implements Serializable { + /** + * primary key + */ private String id; + /** + * application key + */ private String appKey; + /** + * encryption secret + */ private String appSecret; + /** + * whether enabled + */ private Boolean enabled; /** @@ -48,4 +60,4 @@ public class AppAuthVO implements Serializable { * updated time. */ private LocalDateTime dateUpdated; -} +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/DashboardUserVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/DashboardUserVO.java new file mode 100644 index 000000000000..91249cb1744f --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/DashboardUserVO.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +/** + * this is dashboard user view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class DashboardUserVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * user name + */ + private String userName; + + /** + * user password + */ + private String password; + + /** + * dashboard role + */ + private Integer role; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/PluginVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/PluginVO.java new file mode 100644 index 000000000000..310f58d0a45b --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/PluginVO.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * this is plugin view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class PluginVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * plugin name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleConditionVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleConditionVO.java new file mode 100644 index 000000000000..c90bb5cdf2c1 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleConditionVO.java @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * this is rule condition view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleConditionVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * rule id + */ + private String ruleId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleVO.java new file mode 100644 index 000000000000..44246247256d --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/RuleVO.java @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +/** + * this is rule view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class RuleVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * selector id + */ + private String selectorId; + + /** + * match mode + */ + private Integer matchMode; + + /** + * rule name + */ + private String name; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * whether loged + */ + private Boolean loged; + + /** + * sort rank + */ + private Integer rank; + + /** + * process logic + */ + private String handle; + + /** + * rule conditions + */ + private List ruleConditions; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorConditionVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorConditionVO.java new file mode 100644 index 000000000000..2edb9d1a3524 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorConditionVO.java @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * this is selector condition view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorConditionVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * selector id + */ + private String selectorId; + + /** + * parameter type + */ + private String paramType; + + /** + * match operator + */ + private String operator; + + /** + * parameter name + */ + private String paramName; + + /** + * parameter value + */ + private String paramValue; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorVO.java b/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorVO.java new file mode 100644 index 000000000000..6825a82afca8 --- /dev/null +++ b/soul-admin/src/main/java/org/dromara/soul/admin/vo/SelectorVO.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dromara.soul.admin.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +/** + * this is selector view to web front. + * + * @author jiangxiaofeng(programgeek @ 163.com) + */ +@Data +public class SelectorVO implements Serializable { + + /** + * primary key + */ + private String id; + + /** + * plugin id + */ + private String pluginId; + + /** + * selector name + */ + private String name; + + /** + * match mode + */ + private Integer matchMode; + + /** + * selector type + */ + private Integer type; + + /** + * sort rank + */ + private Integer rank; + + /** + * whether enabled + */ + private Boolean enabled; + + /** + * whether loged + */ + private Boolean loged; + + /** + * whether continued + */ + private Boolean continued; + + /** + * selector conditions + */ + private List selectorConditions; + + /** + * created time. + */ + private LocalDateTime dateCreated; + + /** + * updated time. + */ + private LocalDateTime dateUpdated; +} \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/app-auth-sqlmap.xml b/soul-admin/src/main/resources/mybatis/app-auth-sqlmap.xml new file mode 100644 index 000000000000..974c8e0d498f --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/app-auth-sqlmap.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, APP_KEY, APP_SECRET, ENABLED + + + + + + insert into APP_AUTH (ID, DATE_CREATED, DATE_UPDATED, + APP_KEY, APP_SECRET, ENABLED) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{appKey,jdbcType=VARCHAR}, #{appSecret,jdbcType=VARCHAR}, #{enabled,jdbcType=TINYINT}) + + + + insert into APP_AUTH + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + APP_KEY, + + + APP_SECRET, + + + ENABLED, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{appKey,jdbcType=VARCHAR}, + + + #{appSecret,jdbcType=VARCHAR}, + + + #{enabled,jdbcType=TINYINT}, + + + + + + update APP_AUTH + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + APP_KEY = #{appKey,jdbcType=VARCHAR}, + APP_SECRET = #{appSecret,jdbcType=VARCHAR}, + ENABLED = #{enabled,jdbcType=TINYINT} + where ID = #{id,jdbcType=VARCHAR} + + + + update APP_AUTH + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + APP_KEY = #{appKey,jdbcType=VARCHAR}, + + + APP_SECRET = #{appSecret,jdbcType=VARCHAR}, + + + ENABLED = #{enabled,jdbcType=TINYINT}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/dashboard-user-sqlmap.xml b/soul-admin/src/main/resources/mybatis/dashboard-user-sqlmap.xml new file mode 100644 index 000000000000..97437fbc73b3 --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/dashboard-user-sqlmap.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, USER_NAME, PASSWORD, ROLE, ENABLED + + + + + + insert into DASHBOARD_USER (ID, DATE_CREATED, DATE_UPDATED, + USER_NAME, PASSWORD, ENABLED) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{role,jdbcType=INTEGER}, + #{enabled,jdbcType=TINYINT}) + + + + insert into DASHBOARD_USER + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + USER_NAME, + + + PASSWORD, + + + ROLE, + + + ENABLED, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{userName,jdbcType=VARCHAR}, + + + #{password,jdbcType=VARCHAR}, + + + #{role,jdbcType=INTEGER}, + + + #{enabled,jdbcType=TINYINT}, + + + + + + update DASHBOARD_USER + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + USER_NAME = #{userName,jdbcType=VARCHAR}, + PASSWORD = #{password,jdbcType=VARCHAR}, + ROLE = #{role,jdbcType=INTEGER}, + ENABLED = #{enabled,jdbcType=TINYINT} + where ID = #{id,jdbcType=VARCHAR} + + + + update DASHBOARD_USER + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + USER_NAME = #{userName,jdbcType=VARCHAR}, + + + PASSWORD = #{password,jdbcType=VARCHAR}, + + + ROLE = #{role,jdbcType=INTEGER}, + + + ENABLED = #{enabled,jdbcType=TINYINT}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/mybatis-config.xml b/soul-admin/src/main/resources/mybatis/mybatis-config.xml index 60df89c60dd8..02f53c18c00c 100644 --- a/soul-admin/src/main/resources/mybatis/mybatis-config.xml +++ b/soul-admin/src/main/resources/mybatis/mybatis-config.xml @@ -6,34 +6,36 @@ + - + - + - + - + - + - + - + - - - - - - + + + + + + + @@ -65,6 +67,13 @@ - - - + + + + + + + + + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/plugin-sqlmap.xml b/soul-admin/src/main/resources/mybatis/plugin-sqlmap.xml new file mode 100644 index 000000000000..360acc0e7aa5 --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/plugin-sqlmap.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, PLUGIN_ID, NAME, ENABLED + + + + + + insert into PLUGIN (ID, DATE_CREATED, DATE_UPDATED, + PLUGIN_ID, NAME, ENABLED) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{pluginId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{enabled,jdbcType=TINYINT}) + + + + insert into PLUGIN + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + PLUGIN_ID, + + + NAME, + + + ENABLED, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{pluginId,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{enabled,jdbcType=TINYINT}, + + + + + + update PLUGIN + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + PLUGIN_ID = #{pluginId,jdbcType=VARCHAR}, + NAME = #{name,jdbcType=VARCHAR}, + ENABLED = #{enabled,jdbcType=TINYINT} + where ID = #{id,jdbcType=VARCHAR} + + + + update PLUGIN + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + PLUGIN_ID = #{pluginId,jdbcType=VARCHAR}, + + + NAME = #{name,jdbcType=VARCHAR}, + + + ENABLED = #{enabled,jdbcType=TINYINT}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/rule-condition-sqlmap.xml b/soul-admin/src/main/resources/mybatis/rule-condition-sqlmap.xml new file mode 100644 index 000000000000..02c1a8c48e58 --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/rule-condition-sqlmap.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, RULE_ID, PARAM_TYPE, + OPERATOR, PARAM_NAME, PARAM_VALUE + + + + + + insert into RULE_CONDITION (ID, DATE_CREATED, DATE_UPDATED, + RULE_ID, PARAM_TYPE, OPERATOR, PARAM_NAME, PARAM_VALUE) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{ruleId,jdbcType=VARCHAR}, #{paramType,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, + #{paramName,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR}) + + + + insert into RULE_CONDITION + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + RULE_ID, + + + PARAM_TYPE, + + + OPERATOR, + + + PARAM_NAME, + + + PARAM_VALUE, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{ruleId,jdbcType=VARCHAR}, + + + #{paramType,jdbcType=VARCHAR}, + + + #{operator,jdbcType=VARCHAR}, + + + #{paramName,jdbcType=VARCHAR}, + + + #{paramValue,jdbcType=VARCHAR}, + + + + + + update RULE_CONDITION + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + RULE_ID = #{ruleId,jdbcType=VARCHAR}, + PARAM_TYPE = #{paramType,jdbcType=VARCHAR}, + OPERATOR = #{operator,jdbcType=VARCHAR}, + PARAM_NAME = #{paramName,jdbcType=VARCHAR}, + PARAM_VALUE = #{paramValue,jdbcType=VARCHAR} + where ID = #{id,jdbcType=VARCHAR} + + + + update RULE_CONDITION + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + RULE_ID = #{ruleId,jdbcType=VARCHAR}, + + + PARAM_TYPE = #{paramType,jdbcType=VARCHAR}, + + + OPERATOR = #{operator,jdbcType=VARCHAR}, + + + PARAM_NAME = #{paramName,jdbcType=VARCHAR}, + + + PARAM_VALUE = #{paramValue,jdbcType=VARCHAR}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/rule-sqlmap.xml b/soul-admin/src/main/resources/mybatis/rule-sqlmap.xml new file mode 100644 index 000000000000..7d4817ba5318 --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/rule-sqlmap.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, SELECTOR_ID, NAME, MATCH_MODE, + RANK, ENABLED, LOGED, HANDLE + + + + + + insert into RULE (ID, DATE_CREATED, DATE_UPDATED, + SELECTOR_ID, NAME, MATCH_MODE, RANK, ENABLED, + LOGED, HANDLE) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{selectorId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{matchMode,jdbcType=INTEGER}, + #{rank,jdbcType=INTEGER}, #{enabled,jdbcType=TINYINT}, #{loged,jdbcType=TINYINT}, + #{handle,jdbcType=VARCHAR}) + + + + insert into RULE + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + SELECTOR_ID, + + + NAME, + + + MATCH_MODE, + + + RANK, + + + ENABLED, + + + LOGED, + + + HANDLE, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{selectorId,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{matchMode,jdbcType=INTEGER}, + + + #{rank,jdbcType=INTEGER}, + + + #{enabled,jdbcType=TINYINT}, + + + #{loged,jdbcType=TINYINT}, + + + #{handle,jdbcType=VARCHAR}, + + + + + + update RULE + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + SELECTOR_ID = #{selectorId,jdbcType=VARCHAR}, + NAME = #{name,jdbcType=VARCHAR}, + MATCH_MODE = #{matchMode,jdbcType=INTEGER}, + RANK = #{rank,jdbcType=INTEGER}, + ENABLED = #{enabled,jdbcType=TINYINT}, + LOGED = #{loged,jdbcType=TINYINT}, + HANDLE = #{handle,jdbcType=VARCHAR} + where ID = #{id,jdbcType=VARCHAR} + + + + update RULE + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + SELECTOR_ID = #{selectorId,jdbcType=VARCHAR}, + + + NAME = #{name,jdbcType=VARCHAR}, + + + MATCH_MODE = #{matchMode,jdbcType=INTEGER}, + + + RANK = #{rank,jdbcType=INTEGER}, + + + ENABLED = #{enabled,jdbcType=TINYINT}, + + + LOGED = #{loged,jdbcType=TINYINT}, + + + HANDLE = #{handle,jdbcType=VARCHAR}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/selector-condition-sqlmap.xml b/soul-admin/src/main/resources/mybatis/selector-condition-sqlmap.xml new file mode 100644 index 000000000000..72b2ebd8ee20 --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/selector-condition-sqlmap.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, SELECTOR_ID, PARAM_TYPE, + OPERATOR, PARAM_NAME, PARAM_VALUE + + + + + + insert into SELECTOR_CONDITION (ID, DATE_CREATED, DATE_UPDATED, + SELECTOR_ID, PARAM_TYPE, OPERATOR, PARAM_NAME, PARAM_VALUE) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{selectorId,jdbcType=VARCHAR}, #{paramType,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, + #{paramName,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR}) + + + + insert into SELECTOR_CONDITION + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + SELECTOR_ID, + + + PARAM_TYPE, + + + OPERATOR, + + + PARAM_NAME, + + + PARAM_VALUE, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{selectorId,jdbcType=VARCHAR}, + + + #{paramType,jdbcType=VARCHAR}, + + + #{operator,jdbcType=VARCHAR}, + + + #{paramName,jdbcType=VARCHAR}, + + + #{paramValue,jdbcType=VARCHAR}, + + + + + + update SELECTOR_CONDITION + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + SELECTOR_ID = #{selectorId,jdbcType=VARCHAR}, + PARAM_TYPE = #{paramType,jdbcType=VARCHAR}, + OPERATOR = #{operator,jdbcType=VARCHAR}, + PARAM_NAME = #{paramName,jdbcType=VARCHAR}, + PARAM_VALUE = #{paramValue,jdbcType=VARCHAR} + where ID = #{id,jdbcType=VARCHAR} + + + + update SELECTOR_CONDITION + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + SELECTOR_ID = #{selectorId,jdbcType=VARCHAR}, + + + PARAM_TYPE = #{paramType,jdbcType=VARCHAR}, + + + OPERATOR = #{operator,jdbcType=VARCHAR}, + + + PARAM_NAME = #{paramName,jdbcType=VARCHAR}, + + + PARAM_VALUE = #{paramValue,jdbcType=VARCHAR}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/soul-admin/src/main/resources/mybatis/selector-sqlmap.xml b/soul-admin/src/main/resources/mybatis/selector-sqlmap.xml new file mode 100644 index 000000000000..a159937a1f9a --- /dev/null +++ b/soul-admin/src/main/resources/mybatis/selector-sqlmap.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + ID, DATE_CREATED, DATE_UPDATED, PLUGIN_ID, NAME, MATCH_MODE, + TYPE, RANK, ENABLED, LOGED, CONTINUED + + + + + + insert into SELECTOR (ID, DATE_CREATED, DATE_UPDATED, + PLUGIN_ID, NAME, MATCH_MODE, TYPE, RANK, ENABLED, + LOGED, CONTINUED) + values (#{id,jdbcType=VARCHAR}, #{dateCreated,jdbcType=TIMESTAMP}, #{dateUpdated,jdbcType=TIMESTAMP}, + #{pluginId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{matchMode,jdbcType=INTEGER}, + #{type,jdbcType=INTEGER}, #{rank,jdbcType=INTEGER}, #{enabled,jdbcType=TINYINT}, + #{loged,jdbcType=TINYINT}, #{continued,jdbcType=TINYINT}) + + + + insert into SELECTOR + + ID, + + DATE_CREATED, + + + DATE_UPDATED, + + + PLUGIN_ID, + + + NAME, + + + MATCH_MODE, + + + TYPE, + + + RANK, + + + ENABLED, + + + LOGED, + + + CONTINUED, + + + + #{id,jdbcType=VARCHAR}, + + #{dateCreated,jdbcType=TIMESTAMP}, + + + #{dateUpdated,jdbcType=TIMESTAMP}, + + + #{pluginId,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{matchMode,jdbcType=INTEGER}, + + + #{type,jdbcType=INTEGER}, + + + #{rank,jdbcType=INTEGER}, + + + #{enabled,jdbcType=TINYINT}, + + + #{loged,jdbcType=TINYINT}, + + + #{continued,jdbcType=TINYINT}, + + + + + + update SELECTOR + set DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + PLUGIN_ID = #{pluginId,jdbcType=VARCHAR}, + NAME = #{name,jdbcType=VARCHAR}, + MATCH_MODE = #{matchMode,jdbcType=INTEGER}, + TYPE = #{type,jdbcType=INTEGER}, + RANK = #{rank,jdbcType=INTEGER}, + ENABLED = #{enabled,jdbcType=TINYINT}, + LOGED = #{loged,jdbcType=TINYINT}, + CONTINUED = #{continued,jdbcType=TINYINT} + where ID = #{id,jdbcType=VARCHAR} + + + + update SELECTOR + + + DATE_CREATED = #{dateCreated,jdbcType=TIMESTAMP}, + + + DATE_UPDATED = #{dateUpdated,jdbcType=TIMESTAMP}, + + + PLUGIN_ID = #{pluginId,jdbcType=VARCHAR}, + + + NAME = #{name,jdbcType=VARCHAR}, + + + MATCH_MODE = #{matchMode,jdbcType=INTEGER}, + + + TYPE = #{type,jdbcType=INTEGER}, + + + RANK = #{rank,jdbcType=INTEGER}, + + + ENABLED = #{enabled,jdbcType=TINYINT}, + + + LOGED = #{loged,jdbcType=TINYINT}, + + + CONTINUED = #{continued,jdbcType=TINYINT}, + + + where ID = #{id,jdbcType=VARCHAR} + + \ No newline at end of file