diff --git a/README.md b/README.md index 47f5600..f8ba517 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Kongx 使用指南请参考：[Wiki](https://www.kancloud.cn/raoxiaoyan/kongx/19 平台快速部署请参见[Quick Start](https://www.kancloud.cn/raoxiaoyan/kongx/1984323) +Docker部署请参见[Docker Quick Start](./docker-quick-start/readme.md) + 系统环境默认用户：admin/123456(部署登录后，请前往'个人设置'页面，及时修改密码) ## Screenshots ![](./docs/screen.png) diff --git a/docker-quick-start/Dockerfile b/docker-quick-start/Dockerfile new file mode 100644 index 0000000..635ea95 --- /dev/null +++ b/docker-quick-start/Dockerfile @@ -0,0 +1,24 @@ +FROM openjdk:8-jre-alpine + + +ENV KONGX_RUN_MODE "Docker" +ENV VERSION 2.0.0 +ENV SERVER_PORT 8095 + +RUN \ + echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \ + echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \ + apk update upgrade && \ + apk add --no-cache procps curl bash unzip tzdata && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo "Asia/Shanghai" > /etc/timezone && \ + mkdir -p /kongx-serve +ADD kongx-serve-${VERSION}.zip /kongx-serve/kongx-serve-${VERSION}.zip + +RUN unzip /kongx-serve/kongx-serve-${VERSION}.zip -d /kongx-serve \ + && rm -rf /kongx-serve/kongx-serve-${VERSION}.zip \ + && chmod +x /kongx-serve/scripts/startup.sh + +EXPOSE $SERVER_PORT + +CMD ["/kongx-serve/scripts/startup.sh"] \ No newline at end of file diff --git a/docker-quick-start/conf/my.cnf b/docker-quick-start/conf/my.cnf new file mode 100644 index 0000000..e7076b6 --- /dev/null +++ b/docker-quick-start/conf/my.cnf @@ -0,0 +1,9 @@ +[client] +default-character-set=utf8mb4 + +[mysql] +default-character-set=utf8mb4 + +[mysqld] +character-set-server=utf8mb4 +collation-server=utf8mb4_general_ci diff --git a/docker-quick-start/docker-compose.yml b/docker-quick-start/docker-compose.yml new file mode 100644 index 0000000..112b951 --- /dev/null +++ b/docker-quick-start/docker-compose.yml @@ -0,0 +1,37 @@ +version: '2' +services: + kongx_serve: + build: + context: . + dockerfile: Dockerfile + container_name: kongx_serve + depends_on: + - kongx_db + ports: + - "8095:8095" + links: + - kongx_db + kongx_db: + image: mysql:5.7 + command: [ + '--default-time-zone=+8:00' + ] + container_name: kongx_db + environment: + TZ: Asia/Shanghai + MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' + ports: + - "13306:3306" + volumes: + - ./sql:/docker-entrypoint-initdb.d + - /var/lib/mysql + - ./conf:/etc/mysql + - /etc/localtime:/etc/localtime +# volumes_from: +# - kongx_db_data +# kongx_db_data: +# image: alpine:latest +# container_name: kongx_db_data +# volumes: +# - /var/lib/mysql + diff --git a/docker-quick-start/readme.md b/docker-quick-start/readme.md new file mode 100644 index 0000000..9b06aab --- /dev/null +++ b/docker-quick-start/readme.md @@ -0,0 +1,88 @@ +#Docker quick start +## 1. docker环境准备 + docker及docker-compose的安装，请参考： + https://www.runoob.com/docker/centos-docker-install.html + https://www.runoob.com/docker/docker-compose.html +## 2. 安装准备 +将docker-quick-start 上传到linux目录下（如：/opt/kongx） +## 3. 下载安装包 +从gitee下载：点击[发布版本](https://gitee.com/raoxy/kongx/releases)下载kong-serve-2.0.0.zip +下载后，安装目录结构如下显示： +```text +./ +├── conf +│   └── my.cnf +├── docker-compose.yml +├── Dockerfile +├── kongx-serve-2.0.0.zip +└── sql + └── kongx.sql + +``` +## 4. 开始部署 +```shell script +docker-compose build +``` +```text +[root@localhost docker-quick-start]# docker-compose build +kongx_db uses an image, skipping +Building kongx_serve +Step 1/9 : FROM openjdk:8-jre-alpine + ---> f7a292bbb70c +Step 2/9 : ENV KONGX_RUN_MODE "Docker" + ---> Using cache + ---> 2f0edf749734 +Step 3/9 : ENV VERSION 2.0.0 + ---> Using cache + ---> e800cc68a4aa +Step 4/9 : ENV SERVER_PORT 8095 + ---> Using cache + ---> 5be1e9d2e646 +Step 5/9 : RUN echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && apk update upgrade && apk add --no-cache procps curl bash unzip tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone && mkdir -p /kongx-serve + ---> Using cache + ---> b608753f9c61 +Step 6/9 : ADD kongx-serve-${VERSION}.zip /kongx-serve/kongx-serve-${VERSION}.zip + ---> ee7d59225dff +Step 7/9 : RUN unzip /kongx-serve/kongx-serve-${VERSION}.zip -d /kongx-serve && rm -rf /kongx-serve/kongx-serve-${VERSION}.zip && chmod +x /kongx-serve/scripts/startup.sh + ---> Running in 27e8844c565f +Archive: /kongx-serve/kongx-serve-2.0.0.zip + creating: /kongx-serve/scripts/ + inflating: /kongx-serve/kongx-serve.conf + extracting: /kongx-serve/kongx-serve-2.0.0-sources.jar + inflating: /kongx-serve/scripts/startup.sh + inflating: /kongx-serve/kongx-serve-2.0.0.jar + inflating: /kongx-serve/config/application.properties + inflating: /kongx-serve/scripts/shutdown.sh +Removing intermediate container 27e8844c565f + ---> 253a1bacf32d +Step 8/9 : EXPOSE $SERVER_PORT + ---> Running in 7c4adb442eee +Removing intermediate container 7c4adb442eee + ---> 865948e2336f +Step 9/9 : CMD ["/kongx-serve/scripts/startup.sh"] + ---> Running in e688eb30d605 +Removing intermediate container e688eb30d605 + ---> 2cbb91315c9d +``` +## 5. 启动kongx +```shell script +docker-compose up -d +``` +```text +[root@localhost docker-quick-start]# docker-compose up -d +Starting kongx_db ... done +Starting kongx_serve ... done +[root@localhost docker-quick-start]# +``` + +## 6. 访问kongx +http://docker-host-ip:8095/ + +## 7. 访问数据库 +http://docker-host-ip:13306/kongx_serve + +用户：root + +密码：无 + +端口号：13306 \ No newline at end of file diff --git a/docker-quick-start/sql/kongx.sql b/docker-quick-start/sql/kongx.sql new file mode 100644 index 0000000..c2b9cfc --- /dev/null +++ b/docker-quick-start/sql/kongx.sql @@ -0,0 +1,372 @@ +/* +Navicat MySQL Data Transfer + +Source Server : 192.168.66.1 +Source Server Version : 50725 +Source Host : 192.168.66.1:3306 +Source Database : kongx_serve + +Target Server Type : MYSQL +Target Server Version : 50725 +File Encoding : 65001 + +Date: 2020-11-02 14:12:14 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +# Create Database +# ------------------------------------------------------------ + +CREATE DATABASE IF NOT EXISTS kongx_serve DEFAULT CHARACTER SET = utf8mb4; + +Use kongx_serve; + +-- ---------------------------- +-- Table structure for kongx_operation_log +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_operation_log`; +CREATE TABLE `kongx_operation_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `userId` varchar(64) DEFAULT NULL, + `profile` varchar(32) DEFAULT NULL, + `creator` varchar(255) DEFAULT NULL, + `operation_type` varchar(255) DEFAULT NULL, + `content` json DEFAULT NULL, + `target` varchar(255) DEFAULT NULL, + `create_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `remark` varchar(2048) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_target_hash` (`target`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=335 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of kongx_operation_log +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_server_config +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_server_config`; +CREATE TABLE `kongx_server_config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `config_key` varchar(255) DEFAULT NULL, + `config_value` text, + `config_type` varchar(255) DEFAULT NULL COMMENT '参数类型', + `comment` varchar(2048) DEFAULT NULL, + `create_at` timestamp NULL DEFAULT NULL, + `creator` varchar(255) DEFAULT NULL, + `modifier` varchar(255) DEFAULT NULL, + `modify_at` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `unique_config_key` (`config_key`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of kongx_server_config +-- ---------------------------- +INSERT INTO `kongx_server_config` VALUES ('1', 'super_admin', 'admin,zhangshan', 'system', '超级管理员', '2019-12-12 16:34:07', 'admin', null, '2019-12-12 16:33:58.156'); +INSERT INTO `kongx_server_config` VALUES ('6', 'envs', '[\n {\n \"name\": \"开发环境\",\n \"code\": \"dev\",\n \"deployType\": \"beta\",\n \"profiles\": [\n {\n \"profile\":\"f\",\n \"code\":\"betaf\"\n }\n ]\n },\n {\n \"name\": \"测试环境\",\n \"code\": \"beta\",\n \"deployType\": \"beta\",\n \"profiles\": [\n {\n \"profile\":\"a\",\n \"code\":\"betaa\"\n }]\n }]\n', 'system', '环境列表，默认支持', '2019-12-16 17:06:27', null, null, '2019-12-16 16:37:53.122'); +INSERT INTO `kongx_server_config` VALUES ('7', 'envs_extension', '[]', 'extension', '环境列表的扩展配置', '2019-12-16 16:09:21', null, null, '2019-12-16 16:08:59.814'); +INSERT INTO `kongx_server_config` VALUES ('13', 'default_domains', '[\"examples.com\",\"a.examples.com\"]', null, '默认的网关域名列表', '2020-01-19 11:43:34', null, null, '2020-01-19 11:43:45.75'); +INSERT INTO `kongx_server_config` VALUES ('20', 'config_type', '[{\"label\":\"内置参数\",\"value\":\"system\"},{\"label\":\"扩展参数\",\"value\":\"extension\"}]', 'system', '系统内置参数', '2020-04-09 16:36:52', null, null, '2020-04-09 19:19:56.202'); +INSERT INTO `kongx_server_config` VALUES ('21', 'config_type_extension', '[]', 'extension', '扩展参数类型', '2020-04-09 19:31:05', null, null, '2020-04-09 19:31:05.433'); +-- ---------------------------- +-- Table structure for kongx_sync_config +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_sync_config`; +CREATE TABLE `kongx_sync_config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sync_no` varchar(255) DEFAULT NULL, + `services` json DEFAULT NULL, + `dest_clients` json DEFAULT NULL, + `comment` varchar(4000) DEFAULT NULL, + `status` varchar(255) DEFAULT NULL, + `creator` varchar(255) DEFAULT NULL, + `create_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `data_type` varchar(255) DEFAULT NULL, + `policy` varchar(255) DEFAULT NULL, + `src_client` json DEFAULT NULL, + `log_type` int(11) DEFAULT '0', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of kongx_sync_config +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_sync_log +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_sync_log`; +CREATE TABLE `kongx_sync_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sync_no` varchar(255) DEFAULT NULL, + `service` varchar(255) DEFAULT NULL, + `src_client` varchar(255) DEFAULT NULL, + `dest_client` varchar(255) DEFAULT NULL, + `creator` varchar(255) DEFAULT NULL, + `create_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `status` varchar(255) DEFAULT NULL, + `content` json DEFAULT NULL, + `comment` varchar(2048) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of kongx_sync_log +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_system_function +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_system_function`; +CREATE TABLE `kongx_system_function` ( + `id` int(64) NOT NULL AUTO_INCREMENT, + `parent_id` bigint(20) DEFAULT NULL COMMENT '父ID', + `code` varchar(64) DEFAULT NULL COMMENT '编码', + `name` varchar(64) NOT NULL COMMENT '菜单名称', + `menu_icon` varchar(512) DEFAULT NULL COMMENT '图标icon', + `visit_view` varchar(2048) DEFAULT NULL COMMENT '访问视图', + `visit_path` varchar(1024) DEFAULT NULL COMMENT '访问路径', + `use_yn` varchar(6) NOT NULL DEFAULT 'y' COMMENT '是否可用n-不可用，y-可用', + `menu_type` varchar(20) NOT NULL DEFAULT 'menu' COMMENT '菜单类型(menu=菜单,point=功能点)', + `application_code` varchar(64) NOT NULL DEFAULT 'kongx' COMMENT '所属系统code', + `sort_order` int(11) DEFAULT '0' COMMENT '排序，小的在前面', + PRIMARY KEY (`id`), + KEY `nh_parentid` (`parent_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8mb4 COMMENT='系统菜单表'; + +-- ---------------------------- +-- Records of kongx_system_function +-- ---------------------------- +INSERT INTO `kongx_system_function` VALUES ('1', '-1', '', '首页', 'icon-shouye', 'page/wel', '/home', 'y', 'menu', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('4', '5', '', 'Kong Shell', 'icon-shell', 'views/gateway/shell/index', 'shell', 'y', 'menu', 'kongx', '9'); +INSERT INTO `kongx_system_function` VALUES ('5', '-1', null, 'Gateway', 'icon-gateway', '', '/gateway', 'y', 'menu', 'kongx', '4'); +INSERT INTO `kongx_system_function` VALUES ('6', '5', '', 'Upstreams', 'icon-gateway', 'views/gateway/upstream/index', 'upstream', 'y', 'menu', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('7', '5', null, 'Services', 'icon-services', 'views/gateway/service/index', 'service', 'y', 'menu', 'kongx', '3'); +INSERT INTO `kongx_system_function` VALUES ('8', '5', '', 'Routes', 'icon-route', 'views/gateway/routing/index', 'routing', 'y', 'menu', 'kongx', '4'); +INSERT INTO `kongx_system_function` VALUES ('9', '5', '', 'Plugins', 'icon-plugin', 'views/gateway/plugin/index', 'plugin', 'y', 'menu', 'kongx', '5'); +INSERT INTO `kongx_system_function` VALUES ('10', '-1', '', '系统管理', 'icon-system', '', '/system', 'y', 'menu', 'kongx', '6'); +INSERT INTO `kongx_system_function` VALUES ('11', '10', null, '用户管理', 'icon-yonghuguanli', 'views/admin/user/index', 'user', 'y', 'menu', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('12', '10', null, '角色管理', 'icon-quanxianguanli', 'views/admin/role/index', 'role', 'y', 'menu', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('13', '10', null, '菜单管理', 'icon-caidanguanli', 'views/admin/menu/index', 'menu', 'y', 'menu', 'kongx', '4'); +INSERT INTO `kongx_system_function` VALUES ('14', '-1', null, '参数管理', 'icon-canshuguanli', '', '/operating', 'y', 'menu', 'kongx', '7'); +INSERT INTO `kongx_system_function` VALUES ('15', '14', null, '环境管理', 'icon-huanjingguanli', 'views/operating/env/index', 'envs', 'y', 'menu', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('16', '14', null, '系统参数', 'icon-xitongcanshu', 'views/operating/params/index', 'params', 'y', 'menu', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('17', '-1', null, '日志管理', 'icon-rizhiguanli1', '', '/audit', 'y', 'menu', 'kongx', '8'); +INSERT INTO `kongx_system_function` VALUES ('18', '17', '', '同步日志', 'icon-sync', 'views/operating/synclog/index', 'synclog', 'y', 'menu', 'kongx', '3'); +INSERT INTO `kongx_system_function` VALUES ('19', '17', null, '操作日志', 'icon-log', 'views/operating/log/index', 'operationlog', 'y', 'menu', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('20', '6', 'upstream_add', '新增上游代理', '', '', '', 'y', 'point', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('21', '6', 'upstream_update', '修改上游代理', '', '', '', 'y', 'point', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('22', '6', 'upstream_delete', '删除上游代理', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('23', '7', 'service_add', '新增服务', '', '', '', 'y', 'point', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('24', '7', 'service_update', '修改服务', '', '', '', 'y', 'point', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('25', '7', 'service_delete', '删除服务', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('26', '7', 'service_sync', '同步服务', '', '', '', 'y', 'point', 'kongx', '4'); +INSERT INTO `kongx_system_function` VALUES ('27', '8', 'route_update', '更新路由', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('28', '8', 'route_delete', '删除路由', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('29', '9', 'plugin_update', '更新插件', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('30', '9', 'plugin_delete', '删除插件', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('31', '9', 'plugin_add', '新增插件', '', '', '', 'y', 'point', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('32', '11', 'user_authority', '用户授权', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('33', '13', 'menu_add', '新建菜单', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('34', '13', 'menu_delete', '删除菜单', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('35', '13', 'menu_update', '修改菜单', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('36', '12', 'role_add', '新建角色', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('37', '12', 'role_update', '修改角色', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('38', '12', 'role_config', '配置权限', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('39', '7', 'service_view', '查看服务', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('40', '6', 'upstream_view', '查看上游代理', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('41', '8', 'route_view', '查看路由', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('42', '9', 'plugin_view', '查看插件', '', '', '', 'y', 'point', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('43', '11', 'user_view', '查看用户列表', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('44', '13', 'menu_view', '查看菜单', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('45', '12', 'role_view', '查看角色', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('46', '16', 'params_view', '查看系统参数', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('47', '10', null, '用户组管理', 'icon-yonghuzuguanli', 'views/admin/usergroup/index', 'group', 'y', 'menu', 'kongx', '3'); +INSERT INTO `kongx_system_function` VALUES ('48', '47', 'usergroup_add', '新增用户组', '', '', '', 'y', 'point', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('49', '47', 'usergroup_update', '修改用户组', '', '', '', 'y', 'point', 'kongx', '2'); +INSERT INTO `kongx_system_function` VALUES ('50', '47', 'usergroup_delete', '删除用户组', '', '', '', 'y', 'point', 'kongx', '3'); +INSERT INTO `kongx_system_function` VALUES ('51', '47', 'usergroup_view', '查看用户组', '', '', '', 'y', 'point', 'kongx', '1'); +INSERT INTO `kongx_system_function` VALUES ('52', '47', 'usergroup_config', '用户组配置', '', '', '', 'y', 'point', 'kongx', '4'); +INSERT INTO `kongx_system_function` VALUES ('53', '5', '', 'Consumers', 'icon-consumer', 'views/gateway/consumer/index', '', 'y', 'menu', 'kongx', '6'); +INSERT INTO `kongx_system_function` VALUES ('54', '53', 'consumer_view', '查看consumer', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('55', '16', 'params_add', '新增参数', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('56', '16', 'params_update', '修改参数', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('58', '15', 'manage_env', '环境维护', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('59', '5', '', 'Snis', 'icon-sni', 'views/gateway/sni/index', 'snis', 'y', 'menu', 'kongx', '7'); +INSERT INTO `kongx_system_function` VALUES ('60', '5', '', 'Certificates', 'icon-certificate', 'views/gateway/certificate/index', 'certificate', 'y', 'menu', 'kongx', '8'); +INSERT INTO `kongx_system_function` VALUES ('61', '53', 'consumer_add', '新增consumer', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('62', '53', 'consumer_update', '更新consumer', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('63', '53', 'consumer_delete', '删除consumer', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('64', '60', 'certificate_view', '查看certificate', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('65', '60', 'certificate_add', '新增certificate', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('66', '60', 'certificate_update', '修改certificate', '', '', '', 'y', 'point', 'kongx', '999'); +INSERT INTO `kongx_system_function` VALUES ('67', '60', 'certificate_delete', '删除certificate', '', '', '', 'y', 'point', 'kongx', '999'); + +-- ---------------------------- +-- Table structure for kongx_system_profile +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_system_profile`; +CREATE TABLE `kongx_system_profile` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `profile_code` varchar(255) DEFAULT NULL COMMENT '环境编码', + `name` varchar(255) DEFAULT NULL, + `env` varchar(255) DEFAULT NULL COMMENT '所属环境', + `deploy_type` varchar(255) DEFAULT NULL COMMENT '部署类型', + `ab` varchar(255) DEFAULT NULL COMMENT '简称', + `version` varchar(255) DEFAULT '' COMMENT 'kong版本号', + `url` varchar(255) DEFAULT NULL, + `extensions` varchar(4000) DEFAULT NULL, + `create_at` timestamp NULL DEFAULT NULL, + `profile` varchar(255) DEFAULT NULL, + `creator` varchar(255) DEFAULT NULL, + `remark` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `uh_profile_code` (`profile_code`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Table structure for kongx_system_role +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_system_role`; +CREATE TABLE `kongx_system_role` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `code` varchar(64) DEFAULT NULL COMMENT '角色编码', + `name` varchar(64) DEFAULT NULL COMMENT '角色名称', + `role_type` varchar(32) DEFAULT NULL COMMENT '角色类型: roleType 菜单角色，数据权限角色', + `sort_order` bigint(20) DEFAULT NULL COMMENT '排序', + `use_yn` varchar(6) DEFAULT NULL COMMENT '是否可用n-不可用，y-可用', + `remark` varchar(1024) DEFAULT NULL COMMENT '备注', + `create_at` timestamp NULL DEFAULT NULL, + `creator` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `modifier` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '修改人', + `modify_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='系统角色表'; + +-- ---------------------------- +-- Records of kongx_system_role +-- ---------------------------- +INSERT INTO `kongx_system_role` VALUES ('1', 'super_admin', '超级管理员', 'menu', null, 'y', null, '2020-05-11 16:00:00', 'admin', 'admin', '2020-09-28 15:05:49'); +INSERT INTO `kongx_system_role` VALUES ('2', 'domestic_consumer', '普通用户', 'menu', null, 'y', null, '2020-05-09 16:42:53', 'admin', 'admin', '2020-09-28 15:05:51'); + +-- ---------------------------- +-- Table structure for kongx_system_role_function +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_system_role_function`; +CREATE TABLE `kongx_system_role_function` ( + `id` int(64) NOT NULL AUTO_INCREMENT, + `role_id` bigint(20) DEFAULT NULL COMMENT '角色Id', + `half_checked` varchar(11) DEFAULT 'y' COMMENT '是否半选中', + `function_id` bigint(20) DEFAULT NULL COMMENT '菜单id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=854 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统角色与菜单关系表'; + +-- ---------------------------- +-- Table structure for kongx_system_user_role +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_system_user_role`; +CREATE TABLE `kongx_system_user_role` ( + `id` int(64) NOT NULL AUTO_INCREMENT, + `user_id` varchar(64) DEFAULT NULL COMMENT '用户Id', + `role_id` bigint(20) DEFAULT NULL COMMENT '角色id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户与角色关系表'; + +-- ---------------------------- +-- Records of kongx_system_user_role +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_user_group +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_user_group`; +CREATE TABLE `kongx_user_group` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(1024) DEFAULT NULL COMMENT '用户组名称', + `use_yn` varchar(255) DEFAULT NULL COMMENT '是否可用', + `create_at` timestamp NULL DEFAULT NULL COMMENT '创建时间', + `creator` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '创建人', + `modifier` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '修改人', + `modify_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `remark` varchar(255) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='用户组'; + +-- ---------------------------- +-- Records of kongx_user_group +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_user_group_role +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_user_group_role`; +CREATE TABLE `kongx_user_group_role` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `group_id` int(11) NOT NULL COMMENT '用户组ID', + `role_id` int(11) NOT NULL COMMENT '角色ID', + `profile` varchar(255) NOT NULL COMMENT '所属环境', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户组与角色关系表'; + +-- ---------------------------- +-- Records of kongx_user_group_role +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_user_group_user +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_user_group_user`; +CREATE TABLE `kongx_user_group_user` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `group_id` int(11) NOT NULL COMMENT '用户组ID', + `user_id` varchar(255) NOT NULL COMMENT '用户ID', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户组与用户的关系表'; + +-- ---------------------------- +-- Records of kongx_user_group_user +-- ---------------------------- + +-- ---------------------------- +-- Table structure for kongx_user_info +-- ---------------------------- +DROP TABLE IF EXISTS `kongx_user_info`; +CREATE TABLE `kongx_user_info` ( + `user_id` varchar(50) NOT NULL COMMENT '用户Id', + `name` varchar(50) NOT NULL COMMENT '用户名', + `email` varchar(50) DEFAULT '' COMMENT '邮箱', + `mobile` varchar(50) DEFAULT NULL COMMENT '手机号', + `password` varchar(255) NOT NULL, + `status` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '状态', + `creator` varchar(255) CHARACTER SET utf8 DEFAULT NULL COMMENT '创建人', + `create_at` timestamp NULL DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`user_id`), + KEY `mobile` (`mobile`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; + +-- ---------------------------- +-- Records of kongx_user_info +-- ---------------------------- +INSERT INTO `kongx_user_info` VALUES ('admin', 'admin', '', '', '60029c3f5fdb5f1291362f52f7251702507ebc5b', 'activate', 'admin', '2020-09-10 18:21:38'); + +-- ---------------------------- +-- Records of kongx_system_role_function super_admin的权限信息 +-- ---------------------------- +insert into kongx_system_role_function(role_id,half_checked,function_id) +select '1' role_id,'n' half_checked,'-1' as function_id +union all +select '1' role_id,'n' half_checked,id as function_id from kongx_system_function; +-- ---------------------------- +-- Records of kongx_system_role_function 初始化domestic_consumer权限信息 +-- ---------------------------- +insert into kongx_system_role_function(role_id,half_checked,function_id) +select '2' role_id,'y' half_checked,'-1' as function_id +union +select '2' role_id,'y' half_checked,id as function_id from kongx_system_function where name in ('Gateway','Upstreams','Services','Routes','Plugins','Kong Shell','Consumers','Certificates','日志管理') +union +select '2' role_id,'n' half_checked,id as function_id from kongx_system_function where code in ('service_view','upstream_view','route_view','plugin_view','consumer_view','certificate_view') +union +select '2' role_id,'n' half_checked,id as function_id from kongx_system_function where name='操作日志' \ No newline at end of file diff --git a/kongx-serve/src/main/scripts/startup.sh b/kongx-serve/src/main/scripts/startup.sh index dfca457..3a47a57 100644 --- a/kongx-serve/src/main/scripts/startup.sh +++ b/kongx-serve/src/main/scripts/startup.sh @@ -109,46 +109,51 @@ if [[ ! -f PATH_TO_JAR && -d current ]]; then done fi -if [[ -f $SERVICE_NAME".jar" ]]; then - rm -rf $SERVICE_NAME".jar" +# For Docker environment, start in foreground mode +if [[ -n "$KONGX_RUN_MODE" ]] && [[ "$KONGX_RUN_MODE" == "Docker" ]]; then + $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR +else + if [[ -f $SERVICE_NAME".jar" ]]; then + rm -rf $SERVICE_NAME".jar" + fi + + printf "$(date) ==== Starting ==== \n" + + ln $PATH_TO_JAR $SERVICE_NAME".jar" + chmod a+x $SERVICE_NAME".jar" + ./$SERVICE_NAME".jar" start + + rc=$?; + + if [[ $rc != 0 ]]; + then + echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" + exit $rc; + fi + + declare -i counter=0 + declare -i max_counter=48 # 48*5=240s + declare -i total_time=0 + + printf "Waiting for server startup" + until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --max-time 2 --head $SERVER_URL | grep "HTTP")" != "" ]]; + do + printf "." + counter+=1 + sleep 5 + + checkPidAlive + done + + total_time=counter*5 + + if [[ (( counter -ge max_counter )) ]]; + then + printf "\n$(date) Server failed to start in $total_time seconds!\n" + exit 1; + fi + + printf "\n$(date) Server started in $total_time seconds!\n" + + exit 0; fi - -printf "$(date) ==== Starting ==== \n" - -ln $PATH_TO_JAR $SERVICE_NAME".jar" -chmod a+x $SERVICE_NAME".jar" -./$SERVICE_NAME".jar" start - -rc=$?; - -if [[ $rc != 0 ]]; -then - echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" - exit $rc; -fi - -declare -i counter=0 -declare -i max_counter=48 # 48*5=240s -declare -i total_time=0 - -printf "Waiting for server startup" -until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --max-time 2 --head $SERVER_URL | grep "HTTP")" != "" ]]; -do - printf "." - counter+=1 - sleep 5 - - checkPidAlive -done - -total_time=counter*5 - -if [[ (( counter -ge max_counter )) ]]; -then - printf "\n$(date) Server failed to start in $total_time seconds!\n" - exit 1; -fi - -printf "\n$(date) Server started in $total_time seconds!\n" - -exit 0; diff --git a/scripts/build.bat b/scripts/build.bat index 86dcb1f..cac037d 100644 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -1,7 +1,7 @@ @echo off rem kongx serve db info -set kongx_serve_db_url="jdbc:mysql://localhost:3306/kongx_serve?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true" +set kongx_serve_db_url="jdbc:mysql://kongx_db:3306/kongx_serve?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true" set kongx_serve_db_username="root" set kongx_serve_db_password="" diff --git a/scripts/build.sh b/scripts/build.sh index 6b566f5..4205722 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # kongx serve db info -kongx_serve_db_url="jdbc:mysql://localhost:3306/kongx_serve?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true" +kongx_serve_db_url="jdbc:mysql://kongx_db:3306/kongx_serve?useUnicode=true&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true" kongx_serve_db_username="root" kongx_serve_db_password="" diff --git a/scripts/db/mysql/kongx-1.2.x.sql b/scripts/db/mysql/kongx-1.2.x.sql index 026c9a8..f7b806b 100644 --- a/scripts/db/mysql/kongx-1.2.x.sql +++ b/scripts/db/mysql/kongx-1.2.x.sql @@ -15,6 +15,9 @@ Date: 2020-10-12 12:00:11 SET FOREIGN_KEY_CHECKS=0; +CREATE DATABASE IF NOT EXISTS kongx_serve DEFAULT CHARACTER SET = utf8mb4; + +Use kongx_serve; -- ---------------------------- -- Table structure for kongx_operation_log -- ---------------------------- diff --git a/scripts/db/mysql/kongx-2.0.0.sql b/scripts/db/mysql/kongx-2.0.0.sql index e19b4c6..79fb6f1 100644 --- a/scripts/db/mysql/kongx-2.0.0.sql +++ b/scripts/db/mysql/kongx-2.0.0.sql @@ -14,7 +14,9 @@ Date: 2020-11-02 14:12:14 */ SET FOREIGN_KEY_CHECKS=0; +CREATE DATABASE IF NOT EXISTS kongx_serve DEFAULT CHARACTER SET = utf8mb4; +Use kongx_serve; -- ---------------------------- -- Table structure for kongx_operation_log -- ---------------------------- @@ -344,3 +346,23 @@ CREATE TABLE `kongx_user_info` ( -- Records of kongx_user_info -- ---------------------------- INSERT INTO `kongx_user_info` VALUES ('admin', 'admin', '', '', '60029c3f5fdb5f1291362f52f7251702507ebc5b', 'activate', 'admin', '2020-09-10 18:21:38'); + + +-- ---------------------------- +-- Records of kongx_system_role_function super_admin的权限信息 +-- ---------------------------- +insert into kongx_system_role_function(role_id,half_checked,function_id) +select '1' role_id,'n' half_checked,'-1' as function_id +union all +select '1' role_id,'n' half_checked,id as function_id from kongx_system_function; +-- ---------------------------- +-- Records of kongx_system_role_function 初始化domestic_consumer权限信息 +-- ---------------------------- +insert into kongx_system_role_function(role_id,half_checked,function_id) +select '2' role_id,'y' half_checked,'-1' as function_id +union +select '2' role_id,'y' half_checked,id as function_id from kongx_system_function where name in ('Gateway','Upstreams','Services','Routes','Plugins','Kong Shell','Consumers','Certificates','日志管理') +union +select '2' role_id,'n' half_checked,id as function_id from kongx_system_function where code in ('service_view','upstream_view','route_view','plugin_view','consumer_view','certificate_view') +union +select '2' role_id,'n' half_checked,id as function_id from kongx_system_function where name='操作日志' \ No newline at end of file