diff --git a/LICENSE b/LICENSE index bd95df18..ab4ee75e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,6 @@ MIT License +Copyright (c) 2021 林恩 Copyright (c) 2020 若依 Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/README.md b/README.md index c0e1343f..36896a52 100644 --- a/README.md +++ b/README.md @@ -11,29 +11,29 @@ ## 系统模块 ~~~ -com.ruoyi -├── ruoyi-ui // 前端框架 [80] -├── ruoyi-gateway // 网关模块 [8080] -├── ruoyi-auth // 认证中心 [9200] -├── ruoyi-api // 接口模块 -│ └── ruoyi-api-system // 系统接口 -├── ruoyi-common // 通用模块 -│ └── ruoyi-common-core // 核心模块 -│ └── ruoyi-common-datascope // 权限范围 -│ └── ruoyi-common-datasource // 多数据源 -│ └── ruoyi-common-log // 日志记录 -│ └── ruoyi-common-redis // 缓存服务 -│ └── ruoyi-common-security // 安全模块 -│ └── ruoyi-common-swagger // 系统接口 -├── ruoyi-modules // 业务模块 -│ └── ruoyi-system // 系统模块 [9201] -│ └── ruoyi-gen // 代码生成 [9202] -│ └── ruoyi-job // 定时任务 [9203] -│ └── ruoyi-file // 文件服务 [9300] -│ └── lynn-magic-api // 基于magic-api的接口服务 [9400] -├── ruoyi-visual // 图形化管理模块 -│ └── ruoyi-visual-monitor // 监控中心 [9100] -├──pom.xml // 公共依赖 +com.lynn +├── lynn-ui // 前端框架 [80] +├── lynn-gateway // 网关模块 [8080] +├── lynn-auth // 认证中心 [9200] +├── lynn-api // 接口模块 +│ └── lynn-api-system // 系统接口 +├── lynn-common // 通用模块 +│ └── lynn-common-core // 核心模块 +│ └── lynn-common-datascope // 权限范围 +│ └── lynn-common-datasource // 多数据源 +│ └── lynn-common-log // 日志记录 +│ └── lynn-common-redis // 缓存服务 +│ └── lynn-common-security // 安全模块 +│ └── lynn-common-swagger // 系统接口 +├── lynn-modules // 业务模块 +│ └── lynn-system // 系统模块 [9201] +│ └── lynn-gen // 代码生成 [9202] +│ └── lynn-job // 定时任务 [9203] +│ └── lynn-file // 文件服务 [9300] +│ └── lynn-magic-api // 基于magic-api的接口服务 [9400] +├── lynn-visual // 图形化管理模块 +│ └── lynn-visual-monitor // 监控中心 [9100] +├──pom.xml // 公共依赖 ~~~ ## 架构图 @@ -103,10 +103,6 @@ com.ruoyi - - - - diff --git a/docker/deploy.sh b/docker/deploy.sh index fe34eaaa..71b7f22a 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -25,35 +25,40 @@ port(){ } copy(){ - cp -f ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar/ruoyi-gateway.jar - cp -f ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar/ruoyi-auth.jar - cp -f ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar/ruoyi-modules-system.jar - cp -f ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar/ruoyi-modules-file.jar - cp -f ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar/ruoyi-modules-gen.jar - cp -f ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar/ruoyi-modules-job.jar + #删除各模块下的jar文件 + find ./lynn-cloud/*/jar/ -name "*.jar" -exec rm -f {} \; + find ./lynn-cloud/*/*/jar/ -name "*.jar" -exec rm -f {} \; - cp -f ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/all/jar/ruoyi-gateway.jar - cp -f ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/all/jar/ruoyi-auth.jar - cp -f ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/all/jar/ruoyi-modules-system.jar - cp -f ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/all/jar/ruoyi-modules-file.jar - cp -f ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/all/jar/ruoyi-modules-gen.jar - cp -f ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/all/jar/ruoyi-modules-job.jar - cp -f ../ruoyi-modules/ruoyi-magicapi/target/ruoyi-magicapi.jar ./ruoyi/all/jar/ruoyi-magicapi.jar + #将各个模块的jar文件复制到指定的docker容器文件夹中 + cp -f ../ruoyi-gateway/target/*.jar ./lynn-cloud/gateway/jar/ + cp -f ../ruoyi-auth/target/*.jar ./lynn-cloud/auth/jar/ + cp -f ../ruoyi-modules/ruoyi-system/target/*.jar ./lynn-cloud/modules/system/jar/ + cp -f ../ruoyi-modules/ruoyi-file/target/*.jar ./lynn-cloud/modules/file/jar/ + cp -f ../ruoyi-modules/ruoyi-gen/target/*.jar ./lynn-cloud/modules/gen/jar/ + cp -f ../ruoyi-modules/ruoyi-job/target/*.jar ./lynn-cloud/modules/job/jar/ + cp -f ../ruoyi-modules/lynn-magic-api/target/*.jar ./lynn-cloud/modules/magic-api/jar/ + + #删除all文件夹下的所有jar文件 + find ./lynn-cloud/all/jar/ -name "*.jar" -exec rm -f {} \; + + #将各模块下的jar文件复制到all/jar文件夹内 + cp -f ../*/target/*.jar ./lynn-cloud/all/jar/ + cp -f ../*/*/target/*.jar ./lynn-cloud/all/jar/ } # 启动基础环境（必须） base(){ - docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos ruoyi-nginx + docker-compose up -d lynn-mysql lynn-redis lynn-nacos lynn-nginx } # 启动程序模块（必须） modules(){ - docker-compose up -d ruoyi-gateway ruoyi-auth ruoyi-modules-system + docker-compose up -d lynn-gateway lynn-auth lynn-modules-system lynn-magic-api } # 启动程序模块（opt） opts(){ - docker-compose up -d ruoyi-modules-file ruoyi-modules-gen ruoyi-modules-job + docker-compose up -d lynn-modules-file lynn-modules-gen ruoyi-modules-job } # 关闭所有环境/模块 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6c391a73..af561a4e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version : '3.8' services: - ruoyi-nacos: - container_name: ruoyi-nacos + lynn-nacos: + container_name: lynn-nacos image: nacos/nacos-server:1.4.2 build: context: ./nacos @@ -15,11 +15,11 @@ services: - "9848:9848" - "9849:9849" depends_on: - - ruoyi-mysql + - lynn-mysql links: - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-mysql: - container_name: ruoyi-mysql + - "lynn-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 + lynn-mysql: + container_name: lynn-mysql image: mysql:5.7 build: context: ./mysql @@ -38,122 +38,133 @@ services: '--lower-case-table-names=1' ] environment: - MYSQL_DATABASE: 'ruoyi_cloud_db' + MYSQL_DATABASE: 'lynn-cloud-db' MYSQL_ROOT_PASSWORD: lynntech - ruoyi-redis: - container_name: ruoyi-redis + lynn-redis: + container_name: lynn-redis image: redis build: context: ./redis ports: - "6379:6379" volumes: - - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf + - ./redis/conf/redis.conf:/home/lynn/redis/redis.conf - ./redis/data:/data - command: redis-server /home/ruoyi/redis/redis.conf - ruoyi-nginx: - container_name: ruoyi-nginx + command: redis-server /home/lynn/redis/redis.conf + lynn-nginx: + container_name: lynn-nginx image: nginx build: context: ./nginx ports: - "808:80" volumes: - - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui + - ./nginx/html/dist:/home/lynn/projects/lynn-ui - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - ./nginx/logs:/var/log/nginx - ./nginx/conf.d:/etc/nginx/conf.d #depends_on: - #- ruoyi-gateway + #- lynn-gateway links: - - ruoyi-gateway - ruoyi-gateway: - container_name: ruoyi-gateway + - lynn-gateway + lynn-gateway: + container_name: lynn-gateway build: - context: ./ruoyi/gateway + context: lynn-cloud/gateway dockerfile: dockerfile ports: - "8080:8080" depends_on: - - ruoyi-redis + - lynn-redis links: - - ruoyi-redis - - ruoyi-nacos - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-auth: - container_name: ruoyi-auth + - lynn-redis + - lynn-nacos + - lynn-mysql + lynn-auth: + container_name: lynn-auth build: - context: ./ruoyi/auth + context: lynn-cloud/auth dockerfile: dockerfile ports: - "9200:9200" depends_on: - - ruoyi-redis + - lynn-redis links: - - ruoyi-redis - - "ruoyi-nacos:nacos_server" - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-modules-system: - container_name: ruoyi-modules-system + - lynn-redis + - lynn-nacos + - lynn-mysql + lynn-modules-system: + container_name: lynn-modules-system build: - context: ./ruoyi/modules/system + context: lynn-cloud/modules/system dockerfile: dockerfile ports: - "9201:9201" depends_on: - - ruoyi-redis - - ruoyi-mysql + - lynn-redis + - lynn-mysql links: - - ruoyi-redis - - ruoyi-nacos - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-modules-gen: - container_name: ruoyi-modules-gen + - lynn-redis + - lynn-nacos + - lynn-mysql + lynn-modules-gen: + container_name: lynn-modules-gen build: - context: ./ruoyi/modules/gen + context: lynn-cloud/modules/gen dockerfile: dockerfile ports: - "9202:9202" depends_on: - - ruoyi-mysql + - lynn-mysql links: - - ruoyi-nacos - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-modules-job: - container_name: ruoyi-modules-job + - lynn-nacos + - lynn-mysql + lynn-modules-job: + container_name: lynn-modules-job build: - context: ./ruoyi/modules/job + context: lynn-cloud/modules/job dockerfile: dockerfile ports: - "9203:9203" depends_on: - - ruoyi-mysql + - lynn-mysql links: - - ruoyi-nacos - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 - ruoyi-modules-file: - container_name: ruoyi-modules-file + - lynn-nacos + - lynn-mysql + lynn-modules-file: + container_name: lynn-modules-file build: - context: ./ruoyi/modules/file + context: lynn-cloud/modules/file dockerfile: dockerfile ports: - "9300:9300" volumes: - - ./ruoyi/uploadPath:/home/ruoyi/uploadPath + - ./lynn-cloud/uploadPath:/home/lynn/uploadPath links: - - ruoyi-nacos - ruoyi-visual-monitor: - container_name: ruoyi-visual-monitor + - lynn-nacos + lynn-visual-monitor: + container_name: lynn-visual-monitor build: - context: ./ruoyi/visual/monitor + context: lynn-cloud/visual/monitor dockerfile: dockerfile ports: - "9100:9100" - - ruoyi-modules-all: - container_name: ruoyi-modules-all + lynn-magic-api: + container_name: lynn-magic-api build: - context: ./ruoyi/all + context: lynn-cloud/modules/magic-api + dockerfile: dockerfile + ports: + - "9500:9500" + links: + - lynn-nacos + - lynn-mysql + - lynn-auth + - "lynn-modules-system:lynn-system" + lynn-modules-all: + container_name: lynn-modules-all + build: + context: lynn-cloud/all dockerfile: dockerfile ports: - "8080:8080" #gateway @@ -161,11 +172,11 @@ services: - "9201:9201" #system - "9202:9202" #gen - "9203:9203" #job - #- "9204:9204" #magicapi - "9300:9300" #file + - "9500:9500" #magicapi depends_on: - - ruoyi-redis + - lynn-redis links: - - ruoyi-redis - - ruoyi-nacos - - "ruoyi-mysql:database" #作为主机的别名访问，可用于数据库的连接字符串中 \ No newline at end of file + - lynn-redis + - lynn-nacos + - lynn-mysql \ No newline at end of file diff --git a/docker/lynn-cloud/all/dockerfile b/docker/lynn-cloud/all/dockerfile new file mode 100644 index 00000000..36512d65 --- /dev/null +++ b/docker/lynn-cloud/all/dockerfile @@ -0,0 +1,16 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn +# 创建目录 +RUN mkdir -p /home/lynn +# 指定路径 +WORKDIR /home/lynn +# 复制jar文件到路径 +COPY ./jar/*.* /home/lynn/ +RUN chmod +x /home/lynn/startup.sh +# 启动网关服务 +ENTRYPOINT ["/home/lynn/startup.sh"] \ No newline at end of file diff --git a/docker/lynn-cloud/auth/dockerfile b/docker/lynn-cloud/auth/dockerfile new file mode 100644 index 00000000..615832a3 --- /dev/null +++ b/docker/lynn-cloud/auth/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn +# 创建目录 +RUN mkdir -p /home/lynn +# 指定路径 +WORKDIR /home/lynn +# 复制jar文件到路径 +COPY ./jar/*.jar /home/lynn/ +# 启动认证服务 +ENTRYPOINT ["java","-jar","lynn-auth.jar"] \ No newline at end of file diff --git a/docker/lynn-cloud/gateway/dockerfile b/docker/lynn-cloud/gateway/dockerfile new file mode 100644 index 00000000..d7e5a996 --- /dev/null +++ b/docker/lynn-cloud/gateway/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn +# 创建目录 +RUN mkdir -p /home/lynn +# 指定路径 +WORKDIR /home/lynn +# 复制jar文件到路径 +COPY ./jar/*.jar /home/lynn/ +# 启动网关服务 +ENTRYPOINT ["java","-jar","lynn-gateway.jar"] \ No newline at end of file diff --git a/docker/lynn-cloud/modules/gen/dockerfile b/docker/lynn-cloud/modules/gen/dockerfile new file mode 100644 index 00000000..79132abd --- /dev/null +++ b/docker/lynn-cloud/modules/gen/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn +# 创建目录 +RUN mkdir -p /home/lynn +# 指定路径 +WORKDIR /home/lynn +# 复制jar文件到路径 +COPY ./jar/*.jar /home/lynn/ +# 启动代码生成服务 +ENTRYPOINT ["java","-jar","lynn-modules-gen.jar"] \ No newline at end of file diff --git a/docker/lynn-cloud/modules/job/dockerfile b/docker/lynn-cloud/modules/job/dockerfile new file mode 100644 index 00000000..e6cbc2f9 --- /dev/null +++ b/docker/lynn-cloud/modules/job/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn +# 创建目录 +RUN mkdir -p /home/lynn +# 指定路径 +WORKDIR /home/lynn +# 复制jar文件到路径 +COPY ./jar/*.jar /home/lynn/ +# 启动定时任务服务 +ENTRYPOINT ["java","-jar","lynn-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/lynn-cloud/visual/monitor/dockerfile similarity index 100% rename from docker/ruoyi/visual/monitor/dockerfile rename to docker/lynn-cloud/visual/monitor/dockerfile diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt index 0b22f3fe..8c0c3522 100644 --- a/docker/mysql/db/readme.txt +++ b/docker/mysql/db/readme.txt @@ -1 +1 @@ -sqlĿ¼µнűdockerԶִС \ No newline at end of file +将初始化需要用到的sql文件放于此文件夹中 \ No newline at end of file diff --git a/docker/mysql/db/ry_20210908.sql b/docker/mysql/db/ry_20210908.sql index ec92c5a8..c94c58e2 100644 --- a/docker/mysql/db/ry_20210908.sql +++ b/docker/mysql/db/ry_20210908.sql @@ -1,3 +1,12 @@ +DROP DATABASE IF EXISTS `lynn-cloud-db`; + +CREATE DATABASE `lynn-cloud-db` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +USE `lynn-cloud-db`; + -- ---------------------------- -- 1、部门表 -- ---------------------------- @@ -23,16 +32,16 @@ create table sys_dept ( -- ---------------------------- -- 初始化-部门表数据 -- ---------------------------- -insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(100, 0, '0', '林恩科技', 0, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '林恩', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -- ---------------------------- @@ -65,8 +74,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); +insert into sys_user values(1, 103, 'admin', '林恩', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '林恩', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); -- ---------------------------- @@ -160,7 +169,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '林恩官网', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '林恩官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); @@ -619,8 +628,8 @@ create table sys_notice ( -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('1', '温馨提醒：2018-07-01 林恩新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('2', '维护通知：2018-07-01 林恩系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); -- ---------------------------- @@ -681,3 +690,31 @@ create table gen_table_column ( update_time datetime comment '更新时间', primary key (column_id) ) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; + +-- ---------------------------- +-- Table structure for magic_api_file +-- ---------------------------- +DROP TABLE IF EXISTS `magic_api_file`; +CREATE TABLE `magic_api_file` ( + `file_path` varchar(512) NOT NULL, + `file_content` mediumtext, + PRIMARY KEY (`file_path`) +) ENGINE=InnoDB auto_increment=1 comment = 'magic-api生成的api'; + +-- ---------------------------- +-- Table structure for magic_api_backup +-- ---------------------------- +DROP TABLE IF EXISTS `magic_api_backup`; +CREATE TABLE `magic_api_backup` ( + `id` varchar(32) NOT NULL COMMENT '原对象ID', + `create_date` bigint NOT NULL COMMENT '备份时间', + `tag` varchar(32) DEFAULT NULL COMMENT '标签', + `type` varchar(32) DEFAULT NULL COMMENT '类型', + `name` varchar(64) DEFAULT NULL COMMENT '原名称', + `content` mediumtext COMMENT '备份内容', + `create_by` varchar(64) DEFAULT NULL COMMENT '操作人', + PRIMARY KEY (`id`,`create_date`) +) ENGINE=InnoDB auto_increment=1 comment = 'magic-api生成的api的备份'; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 56492d8c..be6327be 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -1,6 +1,6 @@ spring.datasource.platform=mysql db.num=1 -db.url.0=jdbc:mysql://database:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.url.0=jdbc:mysql://lynn.server.local:3306/lynn-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root db.password=lynntech diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 56bf0ca2..8b2aedcf 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -1,36 +1,36 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name localhost; - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /prod-api/{ - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://ruoyi-gateway:8080/; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name localhost; + + location / { + root /home/lynn/projects/lynn-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /prod-api/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://lynn-gateway:8080/; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } }# requirepass 123456 \ No newline at end of file diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index e0025b1b..45c94f21 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -1,15 +1,15 @@ -# 基础镜像 -FROM nginx -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui +# 基础镜像 +FROM nginx +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn/projects/lynn-ui +# 创建目录 +RUN mkdir -p /home/lynn/projects/lynn-ui +# 指定路径 +WORKDIR /home/lynn/projects/lynn-ui +# 复制conf文件到路径 +COPY ./conf/nginx.conf /etc/nginx/nginx.conf +# 复制html文件到路径 +COPY ./html/dist /home/lynn/projects/lynn-ui diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index dd7eaa80..fea87c3f 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -1,13 +1,13 @@ -# 基础镜像 -FROM redis -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/redis -# 创建目录 -RUN mkdir -p /home/ruoyi/redis -# 指定路径 -WORKDIR /home/ruoyi/redis -# 复制conf文件到路径 -COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf +# 基础镜像 +FROM redis +# author +MAINTAINER lynn + +# 挂载目录 +VOLUME /home/lynn/redis +# 创建目录 +RUN mkdir -p /home/lynn/redis +# 指定路径 +WORKDIR /home/lynn/redis +# 复制conf文件到路径 +COPY ./conf/redis.conf /home/lynn/redis/redis.conf diff --git a/docker/ruoyi/all/dockerfile b/docker/ruoyi/all/dockerfile deleted file mode 100644 index d4396dbd..00000000 --- a/docker/ruoyi/all/dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.* /home/ruoyi/ -RUN chmod +x /home/ruoyi/startup.sh -# 启动网关服务 -# ENTRYPOINT ["java","-jar","ruoyi-gateway.jar","ruoyi-auth.jar"] -ENTRYPOINT ["/home/ruoyi/startup.sh"] \ No newline at end of file diff --git a/docker/ruoyi/all/jar/startup.sh b/docker/ruoyi/all/jar/startup.sh deleted file mode 100644 index bdbf8016..00000000 --- a/docker/ruoyi/all/jar/startup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# 命令后加入 & ，保持程序后台持续运行 -nohup java -jar ./ruoyi-gateway.jar & -nohup java -jar ./ruoyi-auth.jar & -nohup java -jar ./ruoyi-modules-gen.jar & -nohup java -jar ./ruoyi-modules-file.jar & -nohup java -jar ./ruoyi-modules-job.jar & -nohup java -jar ./ruoyi-magicapi.jar & -java -jar ./ruoyi-modules-system.jar \ No newline at end of file diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/dockerfile deleted file mode 100644 index 3361f1f2..00000000 --- a/docker/ruoyi/auth/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/dockerfile deleted file mode 100644 index f896cf91..00000000 --- a/docker/ruoyi/gateway/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/dockerfile deleted file mode 100644 index 7863f9fd..00000000 --- a/docker/ruoyi/modules/file/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动文件服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/dockerfile deleted file mode 100644 index 5a0ab5da..00000000 --- a/docker/ruoyi/modules/gen/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动代码生成服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/dockerfile deleted file mode 100644 index 2f205e6c..00000000 --- a/docker/ruoyi/modules/job/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动定时任务服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/dockerfile deleted file mode 100644 index 83c461f7..00000000 --- a/docker/ruoyi/modules/system/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/*.jar /home/ruoyi/ -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3b3b5c50..4d3b8abc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + cn.lynntech + lynn 3.1.0 - ruoyi - http://www.ruoyi.vip - 若依微服务系统 + lynnCloud + http://www.lynntech.cn + 林恩低代码开发平台 - 3.1.0 + 3.1.0 UTF-8 UTF-8 1.8 @@ -182,58 +182,58 @@ - com.ruoyi - ruoyi-common-core - ${ruoyi.version} + cn.lynntech + lynn-common-core + ${lynn.version} - com.ruoyi - ruoyi-common-swagger - ${ruoyi.version} + cn.lynntech + lynn-common-swagger + ${lynn.version} - com.ruoyi - ruoyi-common-security - ${ruoyi.version} + cn.lynntech + lynn-common-security + ${lynn.version} - com.ruoyi - ruoyi-common-datascope - ${ruoyi.version} + cn.lynntech + lynn-common-datascope + ${lynn.version} - com.ruoyi - ruoyi-common-datasource - ${ruoyi.version} + cn.lynntech + lynn-common-datasource + ${lynn.version} - com.ruoyi - ruoyi-common-log - ${ruoyi.version} + cn.lynntech + lynn-common-log + ${lynn.version} - com.ruoyi - ruoyi-common-redis - ${ruoyi.version} + cn.lynntech + lynn-common-redis + ${lynn.version} - com.ruoyi - ruoyi-api-system - ${ruoyi.version} + cn.lynntech + lynn-api-system + ${lynn.version} diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 552d66a4..7a1c13d7 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -1,22 +1,22 @@ - - - - com.ruoyi - ruoyi - 3.1.0 - - 4.0.0 - - - ruoyi-api-system - - - ruoyi-api - pom - - - ruoyi-api系统接口 - - - + + + + cn.lynntech + lynn + 3.1.0 + + 4.0.0 + + + ruoyi-api-system + + + lynn-api + pom + + + ruoyi-api系统接口 + + + diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 7cf8df02..6a90f0a6 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -1,28 +1,28 @@ - - - - com.ruoyi - ruoyi-api - 3.1.0 - - 4.0.0 - - ruoyi-api-system - - - ruoyi-api-system系统接口模块 - - - - - - - com.ruoyi - ruoyi-common-core - - - - + + + + cn.lynntech + lynn-api + 3.1.0 + + 4.0.0 + + lynn-api-system + + + ruoyi-api-system系统接口模块 + + + + + + + cn.lynntech + lynn-common-core + + + + \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index cb41993e..5d97ca26 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -1,74 +1,74 @@ - - - com.ruoyi - ruoyi - 3.1.0 - - 4.0.0 - - ruoyi-auth - - - ruoyi-auth认证授权中心 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.ruoyi - ruoyi-common-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - + + + cn.lynntech + lynn + 3.1.0 + + 4.0.0 + + lynn-auth + + + lynn-auth认证授权中心 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + cn.lynntech + lynn-common-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f5dba312..72605c9e 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-auth + name: lynn-auth profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a91432a6..fa3b9623 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -1,28 +1,28 @@ - - - - com.ruoyi - ruoyi - 3.1.0 - - 4.0.0 - - - ruoyi-common-log - ruoyi-common-core - ruoyi-common-redis - ruoyi-common-swagger - ruoyi-common-security - ruoyi-common-datascope - ruoyi-common-datasource - - - ruoyi-common - pom - - - ruoyi-common通用模块 - - - + + + + cn.lynntech + lynn + 3.1.0 + + 4.0.0 + + + ruoyi-common-log + ruoyi-common-core + ruoyi-common-redis + ruoyi-common-swagger + ruoyi-common-security + ruoyi-common-datascope + ruoyi-common-datasource + + + lynn-common + pom + + + ruoyi-common通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 70ea3883..aa227405 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -1,112 +1,112 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-core - - - ruoyi-common-core核心模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - org.apache.commons - commons-pool2 - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba - fastjson - - - - - org.apache.commons - commons-lang3 - - - - - commons-io - commons-io - - - - - commons-fileupload - commons-fileupload - - - - - org.apache.poi - poi-ooxml - - - - - javax.servlet - javax.servlet-api - - - - - io.swagger - swagger-annotations - - - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-core + + + ruoyi-common-core核心模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + org.apache.commons + commons-pool2 + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba + fastjson + + + + + org.apache.commons + commons-lang3 + + + + + commons-io + commons-io + + + + + commons-fileupload + commons-fileupload + + + + + org.apache.poi + poi-ooxml + + + + + javax.servlet + javax.servlet-api + + + + + io.swagger + swagger-annotations + + + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java index a7dcfdd6..b689e504 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java @@ -1,24 +1,24 @@ -package com.ruoyi.common.core.constant; - -/** - * 服务名称 - * - * @author ruoyi - */ -public class ServiceNameConstants -{ - /** - * 认证服务的serviceid - */ - public static final String AUTH_SERVICE = "ruoyi-auth"; - - /** - * 系统模块的serviceid - */ - public static final String SYSTEM_SERVICE = "ruoyi-system"; - - /** - * 文件服务的serviceid - */ - public static final String FILE_SERVICE = "ruoyi-file"; -} +package com.ruoyi.common.core.constant; + +/** + * 服务名称 + * + * @author ruoyi + */ +public class ServiceNameConstants +{ + /** + * 认证服务的serviceid + */ + public static final String AUTH_SERVICE = "lynn-auth"; + + /** + * 系统模块的serviceid + */ + public static final String SYSTEM_SERVICE = "lynn-system"; + + /** + * 文件服务的serviceid + */ + public static final String FILE_SERVICE = "lynn-file"; +} diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index e338f727..54eaffc4 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -1,27 +1,27 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-datascope - - - ruoyi-common-datascope权限范围 - - - - - - - com.ruoyi - ruoyi-common-security - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-datascope + + + ruoyi-common-datascope权限范围 + + + + + + + cn.lynntech + lynn-common-security + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 4efa4a15..d2e3c7d4 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -1,41 +1,41 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-datasource - - - ruoyi-common-datasource多数据源 - - - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-seata - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-datasource + + + ruoyi-common-datasource多数据源 + + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-seata + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index bf6510db..b02ec25c 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -1,27 +1,27 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-log - - - ruoyi-common-log日志记录 - - - - - - - com.ruoyi - ruoyi-common-security - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-log + + + ruoyi-common-log日志记录 + + + + + + + cn.lynntech + lynn-common-security + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index ea0d2975..8ef3166b 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -1,33 +1,33 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-redis - - - ruoyi-common-redis缓存服务 - - - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - com.ruoyi - ruoyi-common-core - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-redis + + + ruoyi-common-redis缓存服务 + + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + cn.lynntech + lynn-common-core + + + \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index e5d62b22..e43a5ab7 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -1,33 +1,33 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-security - - - ruoyi-common-security安全模块 - - - - - - - com.ruoyi - ruoyi-api-system - - - - - com.ruoyi - ruoyi-common-redis - - - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-security + + + ruoyi-common-security安全模块 + + + + + + + cn.lynntech + lynn-api-system + + + + + cn.lynntech + lynn-common-redis + + + + + diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index ceb7ee41..4cf097b6 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -1,34 +1,34 @@ - - - - com.ruoyi - ruoyi-common - 3.1.0 - - 4.0.0 - - ruoyi-common-swagger - - - ruoyi-common-swagger系统接口 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - + + + + cn.lynntech + lynn-common + 3.1.0 + + 4.0.0 + + lynn-common-swagger + + + ruoyi-common-swagger系统接口 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 001eeada..3d3f6331 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.ruoyi - ruoyi + cn.lynntech + lynn 3.1.0 4.0.0 - ruoyi-gateway + lynn-gateway - ruoyi-gateway网关模块 + lynn-gateway网关模块 @@ -66,8 +66,8 @@ - com.ruoyi - ruoyi-common-redis + cn.lynntech + lynn-common-redis diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index d8110950..dffb2b35 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-gateway + name: lynn-gateway profiles: # 环境配置 active: dev @@ -16,10 +16,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -35,8 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: ruoyi-nacos:8848 - dataId: sentinel-ruoyi-gateway + server-addr: lynn-nacos:8848 + dataId: sentinel-lynn-gateway groupId: DEFAULT_GROUP data-type: json rule-type: flow diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 74a43ccb..56d40576 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -2,8 +2,8 @@ - com.ruoyi - ruoyi + cn.lynntech + lynn 3.1.0 4.0.0 @@ -13,10 +13,10 @@ ruoyi-gen ruoyi-job ruoyi-file - ruoyi-magicapi + lynn-magic-api - ruoyi-modules + lynn-modules pom diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 9a6cb51b..4c931555 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -1,88 +1,88 @@ - - - - com.ruoyi - ruoyi-modules - 3.1.0 - - 4.0.0 - - ruoyi-modules-file - - - ruoyi-modules-file文件服务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.github.tobato - fastdfs-client - - - - - io.minio - minio - ${minio.version} - - - - - com.ruoyi - ruoyi-api-system - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + cn.lynntech + lynn-modules + 3.1.0 + + 4.0.0 + + lynn-modules-file + + + lynn-modules-file文件服务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.github.tobato + fastdfs-client + + + + + io.minio + minio + ${minio.version} + + + + + cn.lynntech + lynn-api-system + + + + + cn.lynntech + lynn-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index ca1bf452..bcd6f934 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-file + name: lynn-file profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 0eeb170a..4436a43d 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -1,100 +1,100 @@ - - - - com.ruoyi - ruoyi-modules - 3.1.0 - - 4.0.0 - - ruoyi-modules-gen - - - ruoyi-modules-gen代码生成 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - org.apache.velocity - velocity - - - - - commons-collections - commons-collections - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + cn.lynntech + lynn-modules + 3.1.0 + + 4.0.0 + + lynn-modules-gen + + + ruoyi-modules-gen代码生成 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.apache.velocity + velocity + + + + + commons-collections + commons-collections + + + + + mysql + mysql-connector-java + + + + + cn.lynntech + lynn-common-log + + + + + cn.lynntech + lynn-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index fba8c840..bca72e35 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-gen + name: lynn-gen profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index d8f18876..b1aedb77 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -1,100 +1,100 @@ - - - - com.ruoyi - ruoyi-modules - 3.1.0 - - 4.0.0 - - ruoyi-modules-job - - - ruoyi-modules-job定时任务 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - org.quartz-scheduler - quartz - - - com.mchange - c3p0 - - - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + cn.lynntech + lynn-modules + 3.1.0 + + 4.0.0 + + lynn-modules-job + + + ruoyi-modules-job定时任务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + mysql + mysql-connector-java + + + + + cn.lynntech + lynn-common-log + + + + + cn.lynntech + lynn-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 26f72251..cae6cd66 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-job + name: lynn-job profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-magicapi/pom.xml b/ruoyi-modules/ruoyi-magicapi/pom.xml deleted file mode 100644 index 0d95caa0..00000000 --- a/ruoyi-modules/ruoyi-magicapi/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - com.ruoyi - ruoyi-modules - 3.1.0 - -4.0.0 - -ruoyi-magicapi - - - ruoyi-magic-api - - - 1.4.1 - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - com.ruoyi - ruoyi-auth - 3.1.0 - - - - org.ssssssss - magic-api-spring-boot-starter - ${margic.api.version} - - - org.springframework.security - spring-security-core - 5.5.1 - compile - - - org.springframework.security - spring-security-web - 5.5.1 - compile - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/MagicapiApplication.java b/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/MagicapiApplication.java deleted file mode 100644 index a6a69191..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/MagicapiApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.lynntech.magicapi; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; - -/** - * 系统模块 - * - * @author ruoyi - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication -public class MagicapiApplication -{ - public static void main(String[] args) - { - SpringApplication.run(MagicapiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ MagicApi模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/cn/lynntech/magicapi/filter/AuthFilter.java b/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/cn/lynntech/magicapi/filter/AuthFilter.java deleted file mode 100644 index ed15917a..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/java/cn/lynntech/magicapi/cn/lynntech/magicapi/filter/AuthFilter.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.lynntech.magicapi.filter; - - import com.ruoyi.common.core.utils.StringUtils; - import com.ruoyi.common.security.service.TokenService; - import com.ruoyi.system.api.model.LoginUser; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.http.HttpStatus; - import org.springframework.http.MediaType; - import org.springframework.stereotype.Component; - import org.springframework.web.filter.OncePerRequestFilter; - - import javax.servlet.FilterChain; - import javax.servlet.ServletException; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import java.io.IOException; - import java.io.OutputStream; - import java.nio.charset.StandardCharsets; - -/** - * token过滤器 验证token有效性 - * - * @author wanfeng - */ -@Component -public class AuthFilter extends OncePerRequestFilter -{ - private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); - - @Autowired - private TokenService tokenService; - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException - { - log.info("ACCESS URL => {}", request.getRequestURI()); - Object trust = request.getAttribute("TrustHostFiltered"); - if (trust != null && (Boolean)trust) { - chain.doFilter(request, response); - return; - } - LoginUser loginUser = tokenService.getLoginUser(request); - if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getToken())) - { - if(request.getRequestURI().startsWith("/api")){ - //异常处理，无权限 - //throw new HttpClientErrorException(HttpStatus.UNAUTHORIZED); - response.setStatus(HttpStatus.UNAUTHORIZED.value()); - response.setContentLength(-1); - response.setContentType(MediaType.TEXT_PLAIN_VALUE + ";charset=utf-8"); - OutputStream stream = response.getOutputStream(); - stream.write("用户未登录".getBytes(StandardCharsets.UTF_8)); - stream.flush(); - stream.close(); - } - } - chain.doFilter(request, response); - } -} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/resources/META-INF/MANIFEST.MF b/ruoyi-modules/ruoyi-magicapi/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 8ac5f921..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,77 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: SparseBitSet-1.2.jar checker-qual-3.10.0.jar feign-form-3. - 8.0.jar spring-cloud-starter-bootstrap-3.0.3.jar javax.servlet-api-4. - 0.1.jar spring-boot-starter-json-2.5.3.jar feign-core-10.12.jar fastj - son-1.2.76.jar netty-codec-4.1.66.Final.jar tomcat-embed-core-9.0.50. - jar reactor-extra-3.4.3.jar spring-cloud-starter-openfeign-3.0.3.jar - spring-cloud-openfeign-core-3.0.3.jar concurrentlinkedhashmap-lru-1.4 - .2.jar mysql-connector-java-8.0.26.jar springfox-spring-webmvc-3.0.0. - jar spring-cloud-starter-alibaba-nacos-discovery-2021.1.jar spring-bo - ot-actuator-autoconfigure-2.5.3.jar mybatis-spring-boot-starter-2.2.0 - .jar lettuce-core-6.1.4.RELEASE.jar spring-boot-starter-validation-2. - 5.3.jar spring-cloud-loadbalancer-3.0.3.jar jakarta.validation-api-2. - 0.2.jar spring-boot-starter-data-redis-2.5.3.jar spring-boot-starter- - logging-2.5.3.jar springfox-core-3.0.0.jar spring-boot-starter-2.5.3. - jar pagehelper-spring-boot-starter-1.3.1.jar xmlbeans-3.1.0.jar sprin - gfox-swagger-common-3.0.0.jar druid-spring-boot-starter-1.2.6.jar spr - ing-context-support-5.3.9.jar spring-boot-starter-cache-2.5.3.jar spr - ing-cloud-starter-loadbalancer-3.0.3.jar sentinel-core-1.8.0.jar sent - inel-reactor-adapter-1.8.0.jar commons-codec-1.15.jar classmate-1.5.1 - .jar commons-fileupload-1.4.jar jackson-datatype-jsr310-2.12.4.jar ja - karta.annotation-api-1.3.5.jar jackson-module-parameter-names-2.12.4. - jar springfox-spring-web-3.0.0.jar spring-security-crypto-5.5.1.jar m - icrometer-core-1.7.2.jar poi-4.1.2.jar tomcat-embed-websocket-9.0.50. - jar spring-security-rsa-1.0.10.RELEASE.jar sentinel-cluster-client-de - fault-1.8.0.jar httpcore-4.4.14.jar snakeyaml-1.28.jar netty-transpor - t-4.1.66.Final.jar spring-boot-starter-web-2.5.3.jar spring-cloud-con - text-3.0.3.jar spring-data-commons-2.5.3.jar httpcore-nio-4.4.14.jar - spring-cloud-circuitbreaker-sentinel-2021.1.jar sentinel-spring-webmv - c-adapter-1.8.0.jar spring-context-5.3.9.jar springfox-spring-webflux - -3.0.0.jar spring-webmvc-5.3.9.jar spring-cloud-starter-alibaba-nacos - -config-2021.1.jar spring-cloud-starter-alibaba-seata-2021.1.jar conf - ig-1.2.1.jar jackson-datatype-jdk8-2.12.4.jar spring-web-5.3.9.jar sp - ring-context-support-1.0.10.jar druid-1.2.6.jar spring-boot-starter-a - ctuator-2.5.3.jar spring-cloud-starter-alibaba-sentinel-2021.1.jar cg - lib-3.1.jar asm-4.2.jar jackson-annotations-2.12.4.jar spring-aop-5.3 - .9.jar pagehelper-spring-boot-autoconfigure-1.3.1.jar spring-boot-aut - oconfigure-2.5.3.jar commons-math3-3.6.1.jar jackson-core-2.12.4.jar - springfox-spi-3.0.0.jar spring-cloud-starter-3.0.3.jar feign-form-spr - ing-3.8.0.jar slf4j-api-1.7.32.jar reflections-0.9.11.jar poi-ooxml-4 - .1.2.jar commons-lang-2.6.jar tomcat-embed-el-9.0.50.jar jboss-loggin - g-3.4.2.Final.jar seata-spring-boot-starter-1.3.0.jar HikariCP-4.0.3. - jar spring-cloud-commons-3.0.3.jar nacos-client-2.0.3.jar log4j-to-sl - f4j-2.14.1.jar javassist-3.21.0-GA.jar LatencyUtils-2.0.3.jar simplec - lient-0.10.0.jar spring-beans-5.3.9.jar spring-expression-5.3.9.jar s - pring-boot-actuator-2.5.3.jar logback-core-1.2.4.jar pagehelper-5.2.1 - .jar evictor-1.0.0.jar spring-plugin-core-2.0.0.RELEASE.jar commons-l - ang3-3.12.0.jar commons-compress-1.19.jar spring-boot-starter-tomcat- - 2.5.3.jar sentinel-annotation-aspectj-1.8.0.jar sentinel-datasource-e - xtension-1.8.0.jar poi-ooxml-schemas-4.1.2.jar aopalliance-1.0.jar Hd - rHistogram-2.1.12.jar byte-buddy-1.10.22.jar spring-data-redis-2.5.3. - jar netty-buffer-4.1.66.Final.jar jackson-databind-2.12.4.jar bcprov- - jdk15on-1.68.jar error_prone_annotations-2.5.1.jar spring-plugin-meta - data-2.0.0.RELEASE.jar guava-20.0.jar mybatis-spring-2.0.6.jar sentin - el-transport-simple-http-1.8.0.jar netty-handler-4.1.66.Final.jar bcp - kix-jdk15on-1.68.jar spring-core-5.3.9.jar commons-io-2.11.0.jar swag - ger-annotations-2.1.2.jar spring-oxm-5.3.9.jar sentinel-parameter-flo - w-control-1.8.0.jar jsqlparser-4.0.jar logback-classic-1.2.4.jar jul- - to-slf4j-1.7.32.jar netty-all-4.1.66.Final.jar dynamic-datasource-spr - ing-boot-starter-3.4.1.jar spring-tx-5.3.9.jar mapstruct-1.3.1.Final. - jar netty-common-4.1.66.Final.jar swagger-annotations-1.6.2.jar react - or-core-3.4.8.jar spring-jdbc-5.3.9.jar log4j-api-2.14.1.jar aspectjr - t-1.9.7.jar httpclient-4.5.13.jar spring-boot-starter-aop-2.5.3.jar s - pring-jcl-5.3.9.jar feign-slf4j-10.12.jar spring-boot-2.5.3.jar swagg - er-models-1.6.2.jar springfox-swagger2-3.0.0.jar hibernate-validator- - 6.2.0.Final.jar netty-resolver-4.1.66.Final.jar spring-cloud-alibaba- - commons-2021.1.jar mybatis-3.5.7.jar curvesapi-1.06.jar protobuf-java - -3.7.1.jar springfox-schema-3.0.0.jar sentinel-spring-webflux-adapter - -1.8.0.jar seata-all-1.3.0.jar spring-boot-starter-jdbc-2.5.3.jar sen - tinel-cluster-common-default-1.8.0.jar httpasyncclient-4.1.4.jar sent - inel-cluster-server-default-1.8.0.jar mybatis-spring-boot-autoconfigu - re-2.2.0.jar caffeine-2.9.2.jar classgraph-4.8.83.jar sentinel-transp - ort-common-1.8.0.jar commons-collections4-4.4.jar spring-data-keyvalu - e-2.5.3.jar springfox-swagger-ui-3.0.0.jar spring-cloud-alibaba-senti - nel-datasource-2021.1.jar commons-pool-1.6.jar aspectjweaver-1.9.7.ja - r reactive-streams-1.0.3.jar commons-pool2-2.10.0.jar -Main-Class: com.ruoyi.system.RuoYiSystemApplication - diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-magicapi/src/main/resources/banner.txt deleted file mode 100644 index fbd45f53..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ - (_) | | - _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ -| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ -| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | -|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| - __/ | __/ | - |___/ |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-magicapi/src/main/resources/bootstrap.yml deleted file mode 100644 index 8aa01bb8..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Tomcat -server: - port: 9205 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-magic-api - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 - config: - # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -magic-api: - web: /magic/web - resource: - type: database # 配置接口存储方式，这里选择存在数据库中 - table-name: magic_api_file # 数据库中的表名 - datasource: master - #prefix: /magic-api # 前缀 -# location: classpath:magic-api -# 其它配置请参考 https://ssssssss.org/config/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-magicapi/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-magicapi/src/main/resources/logback.xml deleted file mode 100644 index 527d8f60..00000000 --- a/ruoyi-modules/ruoyi-magicapi/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 85bf5845..65165b24 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -1,100 +1,100 @@ - - - - com.ruoyi - ruoyi-modules - 3.1.0 - - 4.0.0 - - ruoyi-modules-system - - - ruoyi-modules-system系统模块 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + + cn.lynntech + lynn-modules + 3.1.0 + + 4.0.0 + + lynn-modules-system + + + lynn-modules-system系统模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + mysql + mysql-connector-java + + + + + cn.lynntech + lynn-common-datasource + + + + + cn.lynntech + lynn-common-datascope + + + + + cn.lynntech + lynn-common-log + + + + + cn.lynntech + lynn-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index a197870b..f2b14e2a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: lynn-system profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 config: # 配置中心地址 - server-addr: kubernetes.docker.internal:8848 + server-addr: lynn.server.local:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 18b2a3ed..c72cddf4 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,11 +1,11 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 开发环境配置 -ENV = 'development' - -# 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' - -# 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +# 页面标题 +VUE_APP_TITLE = 林恩低代码平台 + +# 开发环境配置 +ENV = 'development' + +# 林恩低代码平台/开发环境 +VUE_APP_BASE_API = '/dev-api' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index cb064ec8..3e8c8cee 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,8 +1,8 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 生产环境配置 -ENV = 'production' - -# 若依管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +# 页面标题 +VUE_APP_TITLE = 林恩低代码平台 + +# 生产环境配置 +ENV = 'production' + +# 林恩低代码平台/生产环境 +VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index a47af9a2..e415524a 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,10 +1,10 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -NODE_ENV = production - -# 测试环境配置 -ENV = 'staging' - -# 若依管理系统/测试环境 -VUE_APP_BASE_API = '/stage-api' +# 页面标题 +VUE_APP_TITLE = 林恩低代码平台 + +NODE_ENV = production + +# 测试环境配置 +ENV = 'staging' + +# 林恩低代码平台/测试环境 +VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 9e82cb21..4d2e5271 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,88 +1,88 @@ -{ - "name": "ruoyi", - "version": "3.1.0", - "description": "若依管理系统", - "author": "若依", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Cloud.git" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.21.0", - "clipboard": "2.0.6", - "core-js": "3.8.1", - "echarts": "4.9.0", - "element-ui": "2.15.5", - "file-saver": "2.0.4", - "fuse.js": "6.4.3", - "highlight.js": "9.18.5", - "js-beautify": "1.13.0", - "js-cookie": "2.2.1", - "jsencrypt": "3.0.0-rc.1", - "nprogress": "0.2.0", - "quill": "1.3.7", - "screenfull": "5.0.2", - "sortablejs": "1.10.2", - "vue": "2.6.12", - "vue-count-to": "1.0.13", - "vue-cropper": "0.5.5", - "vue-router": "3.4.9", - "vue-meta": "^2.4.0", - "vuedraggable": "2.24.3", - "vuex": "3.6.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "4.4.6", - "@vue/cli-plugin-eslint": "4.4.6", - "@vue/cli-service": "4.4.6", - "babel-eslint": "10.1.0", - "chalk": "4.1.0", - "connect": "3.6.6", - "eslint": "7.15.0", - "eslint-plugin-vue": "7.2.0", - "lint-staged": "10.5.3", - "runjs": "4.4.2", - "sass": "1.32.0", - "sass-loader": "10.1.0", - "script-ext-html-webpack-plugin": "2.1.5", - "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "lynn", + "version": "3.1.0", + "description": "林恩低代码开发平台", + "author": "林恩", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "keywords": [ + "vue", + "admin", + "dashboard", + "element-ui", + "boilerplate", + "admin-template", + "management-system" + ], + "repository": { + "type": "git", + "url": "https://gitee.com/y_project/RuoYi-Cloud.git" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.21.0", + "clipboard": "2.0.6", + "core-js": "3.8.1", + "echarts": "4.9.0", + "element-ui": "2.15.5", + "file-saver": "2.0.4", + "fuse.js": "6.4.3", + "highlight.js": "9.18.5", + "js-beautify": "1.13.0", + "js-cookie": "2.2.1", + "jsencrypt": "3.0.0-rc.1", + "nprogress": "0.2.0", + "quill": "1.3.7", + "screenfull": "5.0.2", + "sortablejs": "1.10.2", + "vue": "2.6.12", + "vue-count-to": "1.0.13", + "vue-cropper": "0.5.5", + "vue-router": "3.4.9", + "vue-meta": "^2.4.0", + "vuedraggable": "2.24.3", + "vuex": "3.6.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.6", + "@vue/cli-plugin-eslint": "4.4.6", + "@vue/cli-service": "4.4.6", + "babel-eslint": "10.1.0", + "chalk": "4.1.0", + "connect": "3.6.6", + "eslint": "7.15.0", + "eslint-plugin-vue": "7.2.0", + "lint-staged": "10.5.3", + "runjs": "4.4.2", + "sass": "1.32.0", + "sass-loader": "10.1.0", + "script-ext-html-webpack-plugin": "2.1.5", + "svg-sprite-loader": "5.1.1", + "vue-template-compiler": "2.6.12" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} \ No newline at end of file diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index 82f3d581..a0fab819 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -1,93 +1,128 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 37e95fda..56ab40b3 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,637 +1,642 @@ - - - - - - + + + + + + diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 255eafca..77a52368 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,215 +1,252 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue index 7ee0a797..99e75d51 100644 --- a/ruoyi-ui/src/views/register.vue +++ b/ruoyi-ui/src/views/register.vue @@ -1,208 +1,257 @@ - - - - - + + + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f119c43a..c24ba644 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -1,117 +1,117 @@ -'use strict' -const path = require('path') - -function resolve(dir) { - return path.join(__dirname, dir) -} - -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 - -const port = process.env.port || process.env.npm_config_port || 80 // 端口 - -// vue.config.js 配置说明 -//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - host: '0.0.0.0', - port: port, - open: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - } - }, - disableHostCheck: true - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - } - }, - chainWebpack(config) { - config.plugins.delete('preload') // TODO: need test - config.plugins.delete('prefetch') // TODO: need test - - // set svg-sprite-loader - config.module - .rule('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/assets/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - - config - .when(process.env.NODE_ENV !== 'development', - config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single'), - { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './', //到根目录下 - } - } - ) - } -} +'use strict' +const path = require('path') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = process.env.VUE_APP_TITLE || '林恩低代码平台' // 网页标题 + +const port = process.env.port || process.env.npm_config_port || 80 // 端口 + +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +module.exports = { + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + // webpack-dev-server 相关配置 + devServer: { + host: '0.0.0.0', + port: port, + open: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:8080`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + disableHostCheck: true + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single'), + { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './', //到根目录下 + } + } + ) + } +} diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index b8737caf..46e41510 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -1,22 +1,22 @@ - - - - com.ruoyi - ruoyi - 3.1.0 - - 4.0.0 - - - ruoyi-monitor - - - ruoyi-visual - pom - - - ruoyi-visual图形化管理模块 - - - + + + + cn.lynntech + lynn + 3.1.0 + + 4.0.0 + + + ruoyi-monitor + + + lynn-visual + pom + + + ruoyi-visual图形化管理模块 + + + diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index b4761f3e..6387c88d 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -1,75 +1,75 @@ - - - com.ruoyi - ruoyi-visual - 3.1.0 - - 4.0.0 - - ruoyi-visual-monitor - - - ruoyi-visual-monitor监控中心 - - - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - + + + cn.lynntech + lynn-visual + 3.1.0 + + 4.0.0 + + lynn-visual-monitor + + + ruoyi-visual-monitor监控中心 + + + + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index e21df182..4f57f5c3 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-monitor + name: lynn-monitor profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ruoyi-nacos:8848 + server-addr: lynn-nacos:8848 config: # 配置中心地址 - server-addr: ruoyi-nacos:8848 + server-addr: lynn-nacos:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sql/magic_api_backup.sql b/sql/magic_api_backup.sql new file mode 100644 index 00000000..aa6bf270 --- /dev/null +++ b/sql/magic_api_backup.sql @@ -0,0 +1,35 @@ +/* + Navicat Premium Data Transfer + + Source Server : local-mysql + Source Server Type : MySQL + Source Server Version : 80023 + Source Host : 127.0.0.1:3306 + Source Schema : wanfeng + + Target Server Type : MySQL + Target Server Version : 80023 + File Encoding : 65001 + + Date: 04/09/2021 00:07:12 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for magic_api_backup +-- ---------------------------- +DROP TABLE IF EXISTS `magic_api_backup`; +CREATE TABLE `magic_api_backup` ( + `id` varchar(32) NOT NULL COMMENT '原对象ID', + `create_date` bigint NOT NULL COMMENT '备份时间', + `tag` varchar(32) DEFAULT NULL COMMENT '标签', + `type` varchar(32) DEFAULT NULL COMMENT '类型', + `name` varchar(64) DEFAULT NULL COMMENT '原名称', + `content` mediumtext COMMENT '备份内容', + `create_by` varchar(64) DEFAULT NULL COMMENT '操作人', + PRIMARY KEY (`id`,`create_date`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/sql/magic_api_file.sql b/sql/magic_api_file.sql new file mode 100644 index 00000000..9000a26b --- /dev/null +++ b/sql/magic_api_file.sql @@ -0,0 +1,30 @@ +/* + Navicat Premium Data Transfer + + Source Server : local-mysql + Source Server Type : MySQL + Source Server Version : 80023 + Source Host : 127.0.0.1:3306 + Source Schema : wanfeng + + Target Server Type : MySQL + Target Server Version : 80023 + File Encoding : 65001 + + Date: 04/09/2021 00:07:03 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for magic_api_file +-- ---------------------------- +DROP TABLE IF EXISTS `magic_api_file`; +CREATE TABLE `magic_api_file` ( + `file_path` varchar(512) NOT NULL, + `file_content` mediumtext, + PRIMARY KEY (`file_path`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/sql/ry_config_20210730.sql b/sql/ry_config_20210730.sql index 243aa5c2..6b301bb2 100644 --- a/sql/ry_config_20210730.sql +++ b/sql/ry_config_20210730.sql @@ -33,14 +33,14 @@ CREATE TABLE `config_info` ( insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values (1,'application-dev.yml','DEFAULT_GROUP','spring:\n main:\n allow-bean-definition-overriding: true\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n\n#请求处理的超时时间\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','c07e6f7321493f6d5390d0a08bffb75a','2019-11-29 16:31:20','2020-12-21 15:29:24',NULL,'0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','null'), -(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\r\nspring: \r\n security:\r\n user:\r\n name: ruoyi\r\n password: 123456\r\n boot:\r\n admin:\r\n ui:\r\n title: 若依服务状态监控\r\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n ruoyi-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 系统模块接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource: \r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.gen.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 代码生成接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n\r\n# 代码生成\r\ngen: \r\n # 作者\r\n author: ruoyi\r\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\r\n packageName: com.ruoyi.system\r\n # 自动去除表前缀，默认是false\r\n autoRemovePre: false\r\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\r\n tablePrefix: sys_\r\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.job.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 定时任务接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'), -(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: \\ruoyi\\uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','null'), -(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"ruoyi-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json','null'); +(2,'lynn-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password: \n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: lynn-auth\n uri: lb://lynn-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: lynn-gen\n uri: lb://lynn-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: lynn-job\n uri: lb://lynn-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: lynn-system\n uri: lb://lynn-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: lynn-file\n uri: lb://lynn-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'), +(3,'lynn-auth-dev.yml','DEFAULT_GROUP','spring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'), +(4,'lynn-monitor-dev.yml','DEFAULT_GROUP','# spring\r\nspring: \r\n security:\r\n user:\r\n name: ruoyi\r\n password: 123456\r\n boot:\r\n admin:\r\n ui:\r\n title: 若依服务状态监控\r\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), +(5,'lynn-system-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n lynn-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 系统模块接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), +(6,'lynn-gen-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource: \r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.gen.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 代码生成接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n\r\n# 代码生成\r\ngen: \r\n # 作者\r\n author: ruoyi\r\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\r\n packageName: com.ruoyi.system\r\n # 自动去除表前缀，默认是false\r\n autoRemovePre: false\r\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\r\n tablePrefix: sys_\r\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'), +(7,'lynn-job-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ruoyi_cloud_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: lynntech\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.job.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 定时任务接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'), +(8,'lynn-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: \\ruoyi\\uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','null'), +(9,'sentinel-lynn-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"lynn-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"lynn-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"lynn-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"lynn-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json','null'); /******************************************/