choqy
4 years ago
parent
273c1f4fd3
commit
44ce2411b1
@ -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"]
|
||||||
@ -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"]
|
||||||
@ -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"]
|
||||||
@ -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"]
|
||||||
@ -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"]
|
||||||
@ -1,36 +1,36 @@
|
|||||||
worker_processes 1;
|
worker_processes 1;
|
||||||
|
|
||||||
events {
|
events {
|
||||||
worker_connections 1024;
|
worker_connections 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
include mime.types;
|
include mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
sendfile on;
|
sendfile on;
|
||||||
keepalive_timeout 65;
|
keepalive_timeout 65;
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
root /home/ruoyi/projects/ruoyi-ui;
|
root /home/lynn/projects/lynn-ui;
|
||||||
try_files $uri $uri/ /index.html;
|
try_files $uri $uri/ /index.html;
|
||||||
index index.html index.htm;
|
index index.html index.htm;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /prod-api/{
|
location /prod-api/{
|
||||||
proxy_set_header Host $http_host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header REMOTE-HOST $remote_addr;
|
proxy_set_header REMOTE-HOST $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_pass http://ruoyi-gateway:8080/;
|
proxy_pass http://lynn-gateway:8080/;
|
||||||
}
|
}
|
||||||
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
error_page 500 502 503 504 /50x.html;
|
||||||
location = /50x.html {
|
location = /50x.html {
|
||||||
root html;
|
root html;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}# requirepass 123456
|
}# requirepass 123456
|
||||||
@ -1,15 +1,15 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM nginx
|
FROM nginx
|
||||||
# author
|
# author
|
||||||
MAINTAINER ruoyi
|
MAINTAINER lynn
|
||||||
|
|
||||||
# 挂载目录
|
# 挂载目录
|
||||||
VOLUME /home/ruoyi/projects/ruoyi-ui
|
VOLUME /home/lynn/projects/lynn-ui
|
||||||
# 创建目录
|
# 创建目录
|
||||||
RUN mkdir -p /home/ruoyi/projects/ruoyi-ui
|
RUN mkdir -p /home/lynn/projects/lynn-ui
|
||||||
# 指定路径
|
# 指定路径
|
||||||
WORKDIR /home/ruoyi/projects/ruoyi-ui
|
WORKDIR /home/lynn/projects/lynn-ui
|
||||||
# 复制conf文件到路径
|
# 复制conf文件到路径
|
||||||
COPY ./conf/nginx.conf /etc/nginx/nginx.conf
|
COPY ./conf/nginx.conf /etc/nginx/nginx.conf
|
||||||
# 复制html文件到路径
|
# 复制html文件到路径
|
||||||
COPY ./html/dist /home/ruoyi/projects/ruoyi-ui
|
COPY ./html/dist /home/lynn/projects/lynn-ui
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
# 基础镜像
|
# 基础镜像
|
||||||
FROM redis
|
FROM redis
|
||||||
# author
|
# author
|
||||||
MAINTAINER ruoyi
|
MAINTAINER lynn
|
||||||
|
|
||||||
# 挂载目录
|
# 挂载目录
|
||||||
VOLUME /home/ruoyi/redis
|
VOLUME /home/lynn/redis
|
||||||
# 创建目录
|
# 创建目录
|
||||||
RUN mkdir -p /home/ruoyi/redis
|
RUN mkdir -p /home/lynn/redis
|
||||||
# 指定路径
|
# 指定路径
|
||||||
WORKDIR /home/ruoyi/redis
|
WORKDIR /home/lynn/redis
|
||||||
# 复制conf文件到路径
|
# 复制conf文件到路径
|
||||||
COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf
|
COPY ./conf/redis.conf /home/lynn/redis/redis.conf
|
||||||
|
|||||||
@ -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"]
|
|
||||||
@ -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
|
|
||||||
@ -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"]
|
|
||||||
@ -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"]
|
|
||||||
@ -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"]
|
|
||||||
@ -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"]
|
|
||||||
@ -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"]
|
|
||||||
@ -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"]
|
|
||||||
@ -1,22 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>lynn</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-api-system</module>
|
<module>ruoyi-api-system</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>ruoyi-api</artifactId>
|
<artifactId>lynn-api</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-api系统接口
|
ruoyi-api系统接口
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,28 +1,28 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-api</artifactId>
|
<artifactId>lynn-api</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-api-system</artifactId>
|
<artifactId>lynn-api-system</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-api-system系统接口模块
|
ruoyi-api-system系统接口模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- RuoYi Common Core-->
|
<!-- RuoYi Common Core-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>lynn-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -1,74 +1,74 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>lynn</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-auth</artifactId>
|
<artifactId>lynn-auth</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-auth认证授权中心
|
lynn-auth认证授权中心
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Web -->
|
<!-- SpringBoot Web -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
<!-- SpringBoot Actuator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Security-->
|
<!-- RuoYi Common Security-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-security</artifactId>
|
<artifactId>lynn-common-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,28 +1,28 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>lynn</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-common-log</module>
|
<module>ruoyi-common-log</module>
|
||||||
<module>ruoyi-common-core</module>
|
<module>ruoyi-common-core</module>
|
||||||
<module>ruoyi-common-redis</module>
|
<module>ruoyi-common-redis</module>
|
||||||
<module>ruoyi-common-swagger</module>
|
<module>ruoyi-common-swagger</module>
|
||||||
<module>ruoyi-common-security</module>
|
<module>ruoyi-common-security</module>
|
||||||
<module>ruoyi-common-datascope</module>
|
<module>ruoyi-common-datascope</module>
|
||||||
<module>ruoyi-common-datasource</module>
|
<module>ruoyi-common-datasource</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common通用模块
|
ruoyi-common通用模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,112 +1,112 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>lynn-common-core</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-core核心模块
|
ruoyi-common-core核心模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Openfeign -->
|
<!-- SpringCloud Openfeign -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Loadbalancer -->
|
<!-- SpringCloud Loadbalancer -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
|
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Spring Context Support -->
|
<!-- Spring Context Support -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>spring-context-support</artifactId>
|
<artifactId>spring-context-support</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Spring Web -->
|
<!-- Spring Web -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>spring-web</artifactId>
|
<artifactId>spring-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Apache Commons Pool2 -->
|
<!-- Apache Commons Pool2 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-pool2</artifactId>
|
<artifactId>commons-pool2</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Pagehelper -->
|
<!-- Pagehelper -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.pagehelper</groupId>
|
<groupId>com.github.pagehelper</groupId>
|
||||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Hibernate Validator -->
|
<!-- Hibernate Validator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-validation</artifactId>
|
<artifactId>spring-boot-starter-validation</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Jackson -->
|
<!-- Jackson -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Alibaba Fastjson -->
|
<!-- Alibaba Fastjson -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba</groupId>
|
<groupId>com.alibaba</groupId>
|
||||||
<artifactId>fastjson</artifactId>
|
<artifactId>fastjson</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Apache Lang3 -->
|
<!-- Apache Lang3 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Commons Io -->
|
<!-- Commons Io -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-io</groupId>
|
<groupId>commons-io</groupId>
|
||||||
<artifactId>commons-io</artifactId>
|
<artifactId>commons-io</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Commons Fileupload -->
|
<!-- Commons Fileupload -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-fileupload</groupId>
|
<groupId>commons-fileupload</groupId>
|
||||||
<artifactId>commons-fileupload</artifactId>
|
<artifactId>commons-fileupload</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- excel工具 -->
|
<!-- excel工具 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Java Servlet -->
|
<!-- Java Servlet -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>javax.servlet-api</artifactId>
|
<artifactId>javax.servlet-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger -->
|
<!-- Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.swagger</groupId>
|
<groupId>io.swagger</groupId>
|
||||||
<artifactId>swagger-annotations</artifactId>
|
<artifactId>swagger-annotations</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
package com.ruoyi.common.core.constant;
|
package com.ruoyi.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 服务名称
|
* 服务名称
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class ServiceNameConstants
|
public class ServiceNameConstants
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* 认证服务的serviceid
|
* 认证服务的serviceid
|
||||||
*/
|
*/
|
||||||
public static final String AUTH_SERVICE = "ruoyi-auth";
|
public static final String AUTH_SERVICE = "lynn-auth";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统模块的serviceid
|
* 系统模块的serviceid
|
||||||
*/
|
*/
|
||||||
public static final String SYSTEM_SERVICE = "ruoyi-system";
|
public static final String SYSTEM_SERVICE = "lynn-system";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件服务的serviceid
|
* 文件服务的serviceid
|
||||||
*/
|
*/
|
||||||
public static final String FILE_SERVICE = "ruoyi-file";
|
public static final String FILE_SERVICE = "lynn-file";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,27 +1,27 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-datascope</artifactId>
|
<artifactId>lynn-common-datascope</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-datascope权限范围
|
ruoyi-common-datascope权限范围
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- RuoYi Common Security -->
|
<!-- RuoYi Common Security -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-security</artifactId>
|
<artifactId>lynn-common-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@ -1,41 +1,41 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-datasource</artifactId>
|
<artifactId>lynn-common-datasource</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-datasource多数据源
|
ruoyi-common-datasource多数据源
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- Druid -->
|
<!-- Druid -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba</groupId>
|
<groupId>com.alibaba</groupId>
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
<artifactId>druid-spring-boot-starter</artifactId>
|
||||||
<version>${druid.version}</version>
|
<version>${druid.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Dynamic DataSource -->
|
<!-- Dynamic DataSource -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.baomidou</groupId>
|
<groupId>com.baomidou</groupId>
|
||||||
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
|
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
|
||||||
<version>${dynamic-ds.version}</version>
|
<version>${dynamic-ds.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Seata -->
|
<!-- SpringBoot Seata -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@ -1,27 +1,27 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
<artifactId>lynn-common-log</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-log日志记录
|
ruoyi-common-log日志记录
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- RuoYi Common Security -->
|
<!-- RuoYi Common Security -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-security</artifactId>
|
<artifactId>lynn-common-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@ -1,33 +1,33 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-redis</artifactId>
|
<artifactId>lynn-common-redis</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-redis缓存服务
|
ruoyi-common-redis缓存服务
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringBoot Boot Redis -->
|
<!-- SpringBoot Boot Redis -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Core-->
|
<!-- RuoYi Common Core-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>lynn-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@ -1,33 +1,33 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-security</artifactId>
|
<artifactId>lynn-common-security</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-security安全模块
|
ruoyi-common-security安全模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- RuoYi Api System -->
|
<!-- RuoYi Api System -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-api-system</artifactId>
|
<artifactId>lynn-api-system</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Redis-->
|
<!-- RuoYi Common Redis-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-redis</artifactId>
|
<artifactId>lynn-common-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,34 +1,34 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>lynn-common</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
<artifactId>lynn-common-swagger</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-swagger系统接口
|
ruoyi-common-swagger系统接口
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringBoot Web -->
|
<!-- SpringBoot Web -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger -->
|
<!-- Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger2</artifactId>
|
<artifactId>springfox-swagger2</artifactId>
|
||||||
<version>${swagger.fox.version}</version>
|
<version>${swagger.fox.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,88 +1,88 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-modules</artifactId>
|
<artifactId>lynn-modules</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-modules-file</artifactId>
|
<artifactId>lynn-modules-file</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-modules-file文件服务
|
lynn-modules-file文件服务
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
<!-- SpringBoot Actuator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- FastDFS -->
|
<!-- FastDFS -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.tobato</groupId>
|
<groupId>com.github.tobato</groupId>
|
||||||
<artifactId>fastdfs-client</artifactId>
|
<artifactId>fastdfs-client</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Minio -->
|
<!-- Minio -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.minio</groupId>
|
<groupId>io.minio</groupId>
|
||||||
<artifactId>minio</artifactId>
|
<artifactId>minio</artifactId>
|
||||||
<version>${minio.version}</version>
|
<version>${minio.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Api System -->
|
<!-- RuoYi Api System -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-api-system</artifactId>
|
<artifactId>lynn-api-system</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
<!-- RuoYi Common Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
<artifactId>lynn-common-swagger</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -1,100 +1,100 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-modules</artifactId>
|
<artifactId>lynn-modules</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-modules-gen</artifactId>
|
<artifactId>lynn-modules-gen</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-modules-gen代码生成
|
ruoyi-modules-gen代码生成
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
<!-- SpringBoot Actuator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger UI -->
|
<!-- Swagger UI -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
<artifactId>springfox-swagger-ui</artifactId>
|
||||||
<version>${swagger.fox.version}</version>
|
<version>${swagger.fox.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Apache Velocity -->
|
<!-- Apache Velocity -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.velocity</groupId>
|
<groupId>org.apache.velocity</groupId>
|
||||||
<artifactId>velocity</artifactId>
|
<artifactId>velocity</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Commons Collections -->
|
<!-- Commons Collections -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-collections</groupId>
|
<groupId>commons-collections</groupId>
|
||||||
<artifactId>commons-collections</artifactId>
|
<artifactId>commons-collections</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
<!-- Mysql Connector -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Log -->
|
<!-- RuoYi Common Log -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
<artifactId>lynn-common-log</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
<!-- RuoYi Common Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
<artifactId>lynn-common-swagger</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -1,100 +1,100 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-modules</artifactId>
|
<artifactId>lynn-modules</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-modules-job</artifactId>
|
<artifactId>lynn-modules-job</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-modules-job定时任务
|
ruoyi-modules-job定时任务
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
<!-- SpringBoot Actuator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger UI -->
|
<!-- Swagger UI -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
<artifactId>springfox-swagger-ui</artifactId>
|
||||||
<version>${swagger.fox.version}</version>
|
<version>${swagger.fox.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Quartz -->
|
<!-- Quartz -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
<groupId>org.quartz-scheduler</groupId>
|
||||||
<artifactId>quartz</artifactId>
|
<artifactId>quartz</artifactId>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>com.mchange</groupId>
|
<groupId>com.mchange</groupId>
|
||||||
<artifactId>c3p0</artifactId>
|
<artifactId>c3p0</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
<!-- Mysql Connector -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Log -->
|
<!-- RuoYi Common Log -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
<artifactId>lynn-common-log</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
<!-- RuoYi Common Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
<artifactId>lynn-common-swagger</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -1,126 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-modules</artifactId>
|
|
||||||
<version>3.1.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>ruoyi-magicapi</artifactId>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
ruoyi-magic-api
|
|
||||||
</description>
|
|
||||||
<properties>
|
|
||||||
<margic.api.version>1.4.1</margic.api.version>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Swagger UI -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
|
||||||
<version>${swagger.fox.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common DataSource -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-datasource</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common DataScope -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-datascope</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common Log -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- RuoYi Auth -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-auth</artifactId>
|
|
||||||
<version>3.1.0</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- magic-pai -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ssssssss</groupId>
|
|
||||||
<artifactId>magic-api-spring-boot-starter</artifactId>
|
|
||||||
<version>${margic.api.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security</groupId>
|
|
||||||
<artifactId>spring-security-core</artifactId>
|
|
||||||
<version>5.5.1</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.security</groupId>
|
|
||||||
<artifactId>spring-security-web</artifactId>
|
|
||||||
<version>5.5.1</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -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" +
|
|
||||||
" ''-' `'-' `-..-' ");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
Spring Boot Version: ${spring-boot.version}
|
|
||||||
Spring Application Name: ${spring.application.name}
|
|
||||||
_ _
|
|
||||||
(_) | |
|
|
||||||
_ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
|
|
||||||
| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
|
|
||||||
| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
|
|
||||||
|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
|
|
||||||
__/ | __/ |
|
|
||||||
|___/ |___/
|
|
||||||
@ -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/
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
|
||||||
<!-- 日志存放路径 -->
|
|
||||||
<property name="log.path" value="logs/ruoyi-magin-api" />
|
|
||||||
<!-- 日志输出格式 -->
|
|
||||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
|
||||||
|
|
||||||
<!-- 控制台输出 -->
|
|
||||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统日志输出 -->
|
|
||||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/info.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>INFO</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
|
||||||
<file>${log.path}/error.log</file>
|
|
||||||
<!-- 循环政策：基于时间创建日志文件 -->
|
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
|
||||||
<!-- 日志文件名格式 -->
|
|
||||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
|
||||||
<!-- 日志最大的历史 60天 -->
|
|
||||||
<maxHistory>60</maxHistory>
|
|
||||||
</rollingPolicy>
|
|
||||||
<encoder>
|
|
||||||
<pattern>${log.pattern}</pattern>
|
|
||||||
</encoder>
|
|
||||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
|
||||||
<!-- 过滤的级别 -->
|
|
||||||
<level>ERROR</level>
|
|
||||||
<!-- 匹配时的操作：接收（记录） -->
|
|
||||||
<onMatch>ACCEPT</onMatch>
|
|
||||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
|
||||||
<onMismatch>DENY</onMismatch>
|
|
||||||
</filter>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
|
||||||
<logger name="com.ruoyi" level="info" />
|
|
||||||
<!-- Spring日志级别控制 -->
|
|
||||||
<logger name="org.springframework" level="warn" />
|
|
||||||
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="console" />
|
|
||||||
</root>
|
|
||||||
|
|
||||||
<!--系统操作日志-->
|
|
||||||
<root level="info">
|
|
||||||
<appender-ref ref="file_info" />
|
|
||||||
<appender-ref ref="file_error" />
|
|
||||||
</root>
|
|
||||||
</configuration>
|
|
||||||
@ -1,100 +1,100 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-modules</artifactId>
|
<artifactId>lynn-modules</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-modules-system</artifactId>
|
<artifactId>lynn-modules-system</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-modules-system系统模块
|
lynn-modules-system系统模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Actuator -->
|
<!-- SpringBoot Actuator -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger UI -->
|
<!-- Swagger UI -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
<artifactId>springfox-swagger-ui</artifactId>
|
||||||
<version>${swagger.fox.version}</version>
|
<version>${swagger.fox.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Mysql Connector -->
|
<!-- Mysql Connector -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common DataSource -->
|
<!-- RuoYi Common DataSource -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-datasource</artifactId>
|
<artifactId>lynn-common-datasource</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common DataScope -->
|
<!-- RuoYi Common DataScope -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-datascope</artifactId>
|
<artifactId>lynn-common-datascope</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Log -->
|
<!-- RuoYi Common Log -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-log</artifactId>
|
<artifactId>lynn-common-log</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- RuoYi Common Swagger -->
|
<!-- RuoYi Common Swagger -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-common-swagger</artifactId>
|
<artifactId>lynn-common-swagger</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -1,11 +1,11 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 林恩低代码平台
|
||||||
|
|
||||||
# 开发环境配置
|
# 开发环境配置
|
||||||
ENV = 'development'
|
ENV = 'development'
|
||||||
|
|
||||||
# 若依管理系统/开发环境
|
# 林恩低代码平台/开发环境
|
||||||
VUE_APP_BASE_API = '/dev-api'
|
VUE_APP_BASE_API = '/dev-api'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 林恩低代码平台
|
||||||
|
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 林恩低代码平台/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/prod-api'
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 林恩低代码平台
|
||||||
|
|
||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
|
|
||||||
# 测试环境配置
|
# 测试环境配置
|
||||||
ENV = 'staging'
|
ENV = 'staging'
|
||||||
|
|
||||||
# 若依管理系统/测试环境
|
# 林恩低代码平台/测试环境
|
||||||
VUE_APP_BASE_API = '/stage-api'
|
VUE_APP_BASE_API = '/stage-api'
|
||||||
|
|||||||
@ -1,88 +1,88 @@
|
|||||||
{
|
{
|
||||||
"name": "ruoyi",
|
"name": "lynn",
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"description": "若依管理系统",
|
"description": "林恩低代码开发平台",
|
||||||
"author": "若依",
|
"author": "林恩",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vue-cli-service serve",
|
"dev": "vue-cli-service serve",
|
||||||
"build:prod": "vue-cli-service build",
|
"build:prod": "vue-cli-service build",
|
||||||
"build:stage": "vue-cli-service build --mode staging",
|
"build:stage": "vue-cli-service build --mode staging",
|
||||||
"preview": "node build/index.js --preview",
|
"preview": "node build/index.js --preview",
|
||||||
"lint": "eslint --ext .js,.vue src"
|
"lint": "eslint --ext .js,.vue src"
|
||||||
},
|
},
|
||||||
"husky": {
|
"husky": {
|
||||||
"hooks": {
|
"hooks": {
|
||||||
"pre-commit": "lint-staged"
|
"pre-commit": "lint-staged"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"src/**/*.{js,vue}": [
|
"src/**/*.{js,vue}": [
|
||||||
"eslint --fix",
|
"eslint --fix",
|
||||||
"git add"
|
"git add"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"vue",
|
"vue",
|
||||||
"admin",
|
"admin",
|
||||||
"dashboard",
|
"dashboard",
|
||||||
"element-ui",
|
"element-ui",
|
||||||
"boilerplate",
|
"boilerplate",
|
||||||
"admin-template",
|
"admin-template",
|
||||||
"management-system"
|
"management-system"
|
||||||
],
|
],
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://gitee.com/y_project/RuoYi-Cloud.git"
|
"url": "https://gitee.com/y_project/RuoYi-Cloud.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@riophae/vue-treeselect": "0.4.0",
|
"@riophae/vue-treeselect": "0.4.0",
|
||||||
"axios": "0.21.0",
|
"axios": "0.21.0",
|
||||||
"clipboard": "2.0.6",
|
"clipboard": "2.0.6",
|
||||||
"core-js": "3.8.1",
|
"core-js": "3.8.1",
|
||||||
"echarts": "4.9.0",
|
"echarts": "4.9.0",
|
||||||
"element-ui": "2.15.5",
|
"element-ui": "2.15.5",
|
||||||
"file-saver": "2.0.4",
|
"file-saver": "2.0.4",
|
||||||
"fuse.js": "6.4.3",
|
"fuse.js": "6.4.3",
|
||||||
"highlight.js": "9.18.5",
|
"highlight.js": "9.18.5",
|
||||||
"js-beautify": "1.13.0",
|
"js-beautify": "1.13.0",
|
||||||
"js-cookie": "2.2.1",
|
"js-cookie": "2.2.1",
|
||||||
"jsencrypt": "3.0.0-rc.1",
|
"jsencrypt": "3.0.0-rc.1",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"quill": "1.3.7",
|
"quill": "1.3.7",
|
||||||
"screenfull": "5.0.2",
|
"screenfull": "5.0.2",
|
||||||
"sortablejs": "1.10.2",
|
"sortablejs": "1.10.2",
|
||||||
"vue": "2.6.12",
|
"vue": "2.6.12",
|
||||||
"vue-count-to": "1.0.13",
|
"vue-count-to": "1.0.13",
|
||||||
"vue-cropper": "0.5.5",
|
"vue-cropper": "0.5.5",
|
||||||
"vue-router": "3.4.9",
|
"vue-router": "3.4.9",
|
||||||
"vue-meta": "^2.4.0",
|
"vue-meta": "^2.4.0",
|
||||||
"vuedraggable": "2.24.3",
|
"vuedraggable": "2.24.3",
|
||||||
"vuex": "3.6.0"
|
"vuex": "3.6.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vue/cli-plugin-babel": "4.4.6",
|
"@vue/cli-plugin-babel": "4.4.6",
|
||||||
"@vue/cli-plugin-eslint": "4.4.6",
|
"@vue/cli-plugin-eslint": "4.4.6",
|
||||||
"@vue/cli-service": "4.4.6",
|
"@vue/cli-service": "4.4.6",
|
||||||
"babel-eslint": "10.1.0",
|
"babel-eslint": "10.1.0",
|
||||||
"chalk": "4.1.0",
|
"chalk": "4.1.0",
|
||||||
"connect": "3.6.6",
|
"connect": "3.6.6",
|
||||||
"eslint": "7.15.0",
|
"eslint": "7.15.0",
|
||||||
"eslint-plugin-vue": "7.2.0",
|
"eslint-plugin-vue": "7.2.0",
|
||||||
"lint-staged": "10.5.3",
|
"lint-staged": "10.5.3",
|
||||||
"runjs": "4.4.2",
|
"runjs": "4.4.2",
|
||||||
"sass": "1.32.0",
|
"sass": "1.32.0",
|
||||||
"sass-loader": "10.1.0",
|
"sass-loader": "10.1.0",
|
||||||
"script-ext-html-webpack-plugin": "2.1.5",
|
"script-ext-html-webpack-plugin": "2.1.5",
|
||||||
"svg-sprite-loader": "5.1.1",
|
"svg-sprite-loader": "5.1.1",
|
||||||
"vue-template-compiler": "2.6.12"
|
"vue-template-compiler": "2.6.12"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.9",
|
"node": ">=8.9",
|
||||||
"npm": ">= 3.0.0"
|
"npm": ">= 3.0.0"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"> 1%",
|
"> 1%",
|
||||||
"last 2 versions"
|
"last 2 versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -1,93 +1,128 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
<div
|
||||||
<transition name="sidebarLogoFade">
|
class="sidebar-logo-container"
|
||||||
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
:class="{ collapse: collapse }"
|
||||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
:style="{
|
||||||
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
backgroundColor:
|
||||||
</router-link>
|
sideTheme === 'theme-dark'
|
||||||
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
? variables.menuBackground
|
||||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
: variables.menuLightBackground,
|
||||||
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
}"
|
||||||
</router-link>
|
>
|
||||||
</transition>
|
<transition name="sidebarLogoFade">
|
||||||
</div>
|
<router-link
|
||||||
</template>
|
v-if="collapse"
|
||||||
|
key="collapse"
|
||||||
<script>
|
class="sidebar-logo-link"
|
||||||
import logoImg from '@/assets/logo/logo.png'
|
to="/"
|
||||||
import variables from '@/assets/styles/variables.scss'
|
>
|
||||||
|
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||||
export default {
|
<h1
|
||||||
name: 'SidebarLogo',
|
v-else
|
||||||
props: {
|
class="sidebar-title"
|
||||||
collapse: {
|
:style="{
|
||||||
type: Boolean,
|
color:
|
||||||
required: true
|
sideTheme === 'theme-dark'
|
||||||
}
|
? variables.logoTitleColor
|
||||||
},
|
: variables.logoLightTitleColor,
|
||||||
computed: {
|
}"
|
||||||
variables() {
|
>
|
||||||
return variables;
|
{{ title }}
|
||||||
},
|
</h1>
|
||||||
sideTheme() {
|
</router-link>
|
||||||
return this.$store.state.settings.sideTheme
|
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
||||||
}
|
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||||
},
|
<h1
|
||||||
data() {
|
class="sidebar-title"
|
||||||
return {
|
:style="{
|
||||||
title: '若依管理系统',
|
color:
|
||||||
logo: logoImg
|
sideTheme === 'theme-dark'
|
||||||
}
|
? variables.logoTitleColor
|
||||||
}
|
: variables.logoLightTitleColor,
|
||||||
}
|
}"
|
||||||
</script>
|
>
|
||||||
|
{{ title }}
|
||||||
<style lang="scss" scoped>
|
</h1>
|
||||||
.sidebarLogoFade-enter-active {
|
</router-link>
|
||||||
transition: opacity 1.5s;
|
</transition>
|
||||||
}
|
</div>
|
||||||
|
</template>
|
||||||
.sidebarLogoFade-enter,
|
|
||||||
.sidebarLogoFade-leave-to {
|
<script>
|
||||||
opacity: 0;
|
import logoImg from "@/assets/logo/logo.png";
|
||||||
}
|
import variables from "@/assets/styles/variables.scss";
|
||||||
|
|
||||||
.sidebar-logo-container {
|
export default {
|
||||||
position: relative;
|
name: "SidebarLogo",
|
||||||
width: 100%;
|
props: {
|
||||||
height: 50px;
|
collapse: {
|
||||||
line-height: 50px;
|
type: Boolean,
|
||||||
background: #2b2f3a;
|
required: true,
|
||||||
text-align: center;
|
},
|
||||||
overflow: hidden;
|
},
|
||||||
|
computed: {
|
||||||
& .sidebar-logo-link {
|
variables() {
|
||||||
height: 100%;
|
return variables;
|
||||||
width: 100%;
|
},
|
||||||
|
sideTheme() {
|
||||||
& .sidebar-logo {
|
return this.$store.state.settings.sideTheme;
|
||||||
width: 32px;
|
},
|
||||||
height: 32px;
|
},
|
||||||
vertical-align: middle;
|
data() {
|
||||||
margin-right: 12px;
|
return {
|
||||||
}
|
title: "林恩低代码平台",
|
||||||
|
logo: logoImg,
|
||||||
& .sidebar-title {
|
};
|
||||||
display: inline-block;
|
},
|
||||||
margin: 0;
|
};
|
||||||
color: #fff;
|
</script>
|
||||||
font-weight: 600;
|
|
||||||
line-height: 50px;
|
<style lang="scss" scoped>
|
||||||
font-size: 14px;
|
.sidebarLogoFade-enter-active {
|
||||||
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
|
transition: opacity 1.5s;
|
||||||
vertical-align: middle;
|
}
|
||||||
}
|
|
||||||
}
|
.sidebarLogoFade-enter,
|
||||||
|
.sidebarLogoFade-leave-to {
|
||||||
&.collapse {
|
opacity: 0;
|
||||||
.sidebar-logo {
|
}
|
||||||
margin-right: 0px;
|
|
||||||
}
|
.sidebar-logo-container {
|
||||||
}
|
position: relative;
|
||||||
}
|
width: 100%;
|
||||||
</style>
|
height: 50px;
|
||||||
|
line-height: 50px;
|
||||||
|
background: #2b2f3a;
|
||||||
|
text-align: center;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
& .sidebar-logo-link {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
& .sidebar-logo {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
vertical-align: middle;
|
||||||
|
margin-right: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
& .sidebar-title {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 0;
|
||||||
|
color: #fff;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 50px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.collapse {
|
||||||
|
.sidebar-logo {
|
||||||
|
margin-right: 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,215 +1,252 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="login">
|
<div class="login">
|
||||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
<el-form
|
||||||
<h3 class="title">若依后台管理系统</h3>
|
ref="loginForm"
|
||||||
<el-form-item prop="username">
|
:model="loginForm"
|
||||||
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
|
:rules="loginRules"
|
||||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
class="login-form"
|
||||||
</el-input>
|
>
|
||||||
</el-form-item>
|
<h3 class="title">林恩低代码平台</h3>
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="username">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.password"
|
v-model="loginForm.username"
|
||||||
type="password"
|
type="text"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="密码"
|
placeholder="账号"
|
||||||
@keyup.enter.native="handleLogin"
|
>
|
||||||
>
|
<svg-icon
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
slot="prefix"
|
||||||
</el-input>
|
icon-class="user"
|
||||||
</el-form-item>
|
class="el-input__icon input-icon"
|
||||||
<el-form-item prop="code" v-if="captchaOnOff">
|
/>
|
||||||
<el-input
|
</el-input>
|
||||||
v-model="loginForm.code"
|
</el-form-item>
|
||||||
auto-complete="off"
|
<el-form-item prop="password">
|
||||||
placeholder="验证码"
|
<el-input
|
||||||
style="width: 63%"
|
v-model="loginForm.password"
|
||||||
@keyup.enter.native="handleLogin"
|
type="password"
|
||||||
>
|
auto-complete="off"
|
||||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
placeholder="密码"
|
||||||
</el-input>
|
@keyup.enter.native="handleLogin"
|
||||||
<div class="login-code">
|
>
|
||||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
<svg-icon
|
||||||
</div>
|
slot="prefix"
|
||||||
</el-form-item>
|
icon-class="password"
|
||||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
class="el-input__icon input-icon"
|
||||||
<el-form-item style="width:100%;">
|
/>
|
||||||
<el-button
|
</el-input>
|
||||||
:loading="loading"
|
</el-form-item>
|
||||||
size="medium"
|
<el-form-item prop="code" v-if="captchaOnOff">
|
||||||
type="primary"
|
<el-input
|
||||||
style="width:100%;"
|
v-model="loginForm.code"
|
||||||
@click.native.prevent="handleLogin"
|
auto-complete="off"
|
||||||
>
|
placeholder="验证码"
|
||||||
<span v-if="!loading">登 录</span>
|
style="width: 63%"
|
||||||
<span v-else>登 录 中...</span>
|
@keyup.enter.native="handleLogin"
|
||||||
</el-button>
|
>
|
||||||
<div style="float: right;" v-if="register">
|
<svg-icon
|
||||||
<router-link class="link-type" :to="'/register'">立即注册</router-link>
|
slot="prefix"
|
||||||
</div>
|
icon-class="validCode"
|
||||||
</el-form-item>
|
class="el-input__icon input-icon"
|
||||||
</el-form>
|
/>
|
||||||
<!-- 底部 -->
|
</el-input>
|
||||||
<div class="el-login-footer">
|
<div class="login-code">
|
||||||
<span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
|
<img :src="codeUrl" @click="getCode" class="login-code-img" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</el-form-item>
|
||||||
</template>
|
<el-checkbox
|
||||||
|
v-model="loginForm.rememberMe"
|
||||||
<script>
|
style="margin: 0px 0px 25px 0px"
|
||||||
import { getCodeImg } from "@/api/login";
|
>记住密码</el-checkbox
|
||||||
import Cookies from "js-cookie";
|
>
|
||||||
import { encrypt, decrypt } from '@/utils/jsencrypt'
|
<el-form-item style="width: 100%">
|
||||||
|
<el-button
|
||||||
export default {
|
:loading="loading"
|
||||||
name: "Login",
|
size="medium"
|
||||||
data() {
|
type="primary"
|
||||||
return {
|
style="width: 100%"
|
||||||
codeUrl: "",
|
@click.native.prevent="handleLogin"
|
||||||
cookiePassword: "",
|
>
|
||||||
loginForm: {
|
<span v-if="!loading">登 录</span>
|
||||||
username: "admin",
|
<span v-else>登 录 中...</span>
|
||||||
password: "admin123",
|
</el-button>
|
||||||
rememberMe: false,
|
<div style="float: right" v-if="register">
|
||||||
code: "",
|
<router-link class="link-type" :to="'/register'"
|
||||||
uuid: ""
|
>立即注册</router-link
|
||||||
},
|
>
|
||||||
loginRules: {
|
</div>
|
||||||
username: [
|
</el-form-item>
|
||||||
{ required: true, trigger: "blur", message: "请输入您的账号" }
|
</el-form>
|
||||||
],
|
<!-- 底部 -->
|
||||||
password: [
|
<div class="el-login-footer">
|
||||||
{ required: true, trigger: "blur", message: "请输入您的密码" }
|
<span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
|
||||||
],
|
</div>
|
||||||
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
</div>
|
||||||
},
|
</template>
|
||||||
loading: false,
|
|
||||||
// 验证码开关
|
<script>
|
||||||
captchaOnOff: true,
|
import { getCodeImg } from "@/api/login";
|
||||||
// 注册开关
|
import Cookies from "js-cookie";
|
||||||
register: false,
|
import { encrypt, decrypt } from "@/utils/jsencrypt";
|
||||||
redirect: undefined
|
|
||||||
};
|
export default {
|
||||||
},
|
name: "Login",
|
||||||
watch: {
|
data() {
|
||||||
$route: {
|
return {
|
||||||
handler: function(route) {
|
codeUrl: "",
|
||||||
this.redirect = route.query && route.query.redirect;
|
cookiePassword: "",
|
||||||
},
|
loginForm: {
|
||||||
immediate: true
|
username: "admin",
|
||||||
}
|
password: "admin123",
|
||||||
},
|
rememberMe: false,
|
||||||
created() {
|
code: "",
|
||||||
this.getCode();
|
uuid: "",
|
||||||
this.getCookie();
|
},
|
||||||
},
|
loginRules: {
|
||||||
methods: {
|
username: [
|
||||||
getCode() {
|
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
||||||
getCodeImg().then(res => {
|
],
|
||||||
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
password: [
|
||||||
if (this.captchaOnOff) {
|
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
||||||
this.codeUrl = "data:image/gif;base64," + res.img;
|
],
|
||||||
this.loginForm.uuid = res.uuid;
|
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
|
||||||
}
|
},
|
||||||
});
|
loading: false,
|
||||||
},
|
// 验证码开关
|
||||||
getCookie() {
|
captchaOnOff: true,
|
||||||
const username = Cookies.get("username");
|
// 注册开关
|
||||||
const password = Cookies.get("password");
|
register: false,
|
||||||
const rememberMe = Cookies.get('rememberMe')
|
redirect: undefined,
|
||||||
this.loginForm = {
|
};
|
||||||
username: username === undefined ? this.loginForm.username : username,
|
},
|
||||||
password: password === undefined ? this.loginForm.password : decrypt(password),
|
watch: {
|
||||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
$route: {
|
||||||
};
|
handler: function (route) {
|
||||||
},
|
this.redirect = route.query && route.query.redirect;
|
||||||
handleLogin() {
|
},
|
||||||
this.$refs.loginForm.validate(valid => {
|
immediate: true,
|
||||||
if (valid) {
|
},
|
||||||
this.loading = true;
|
},
|
||||||
if (this.loginForm.rememberMe) {
|
created() {
|
||||||
Cookies.set("username", this.loginForm.username, { expires: 30 });
|
this.getCode();
|
||||||
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
|
this.getCookie();
|
||||||
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
|
},
|
||||||
} else {
|
methods: {
|
||||||
Cookies.remove("username");
|
getCode() {
|
||||||
Cookies.remove("password");
|
getCodeImg().then((res) => {
|
||||||
Cookies.remove('rememberMe');
|
this.captchaOnOff =
|
||||||
}
|
res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
||||||
this.$store.dispatch("Login", this.loginForm).then(() => {
|
if (this.captchaOnOff) {
|
||||||
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
|
this.codeUrl = "data:image/gif;base64," + res.img;
|
||||||
}).catch(() => {
|
this.loginForm.uuid = res.uuid;
|
||||||
this.loading = false;
|
}
|
||||||
if (this.captchaOnOff) {
|
});
|
||||||
this.getCode();
|
},
|
||||||
}
|
getCookie() {
|
||||||
});
|
const username = Cookies.get("username");
|
||||||
}
|
const password = Cookies.get("password");
|
||||||
});
|
const rememberMe = Cookies.get("rememberMe");
|
||||||
}
|
this.loginForm = {
|
||||||
}
|
username: username === undefined ? this.loginForm.username : username,
|
||||||
};
|
password:
|
||||||
</script>
|
password === undefined ? this.loginForm.password : decrypt(password),
|
||||||
|
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
|
||||||
<style rel="stylesheet/scss" lang="scss">
|
};
|
||||||
.login {
|
},
|
||||||
display: flex;
|
handleLogin() {
|
||||||
justify-content: center;
|
this.$refs.loginForm.validate((valid) => {
|
||||||
align-items: center;
|
if (valid) {
|
||||||
height: 100%;
|
this.loading = true;
|
||||||
background-image: url("../assets/images/login-background.jpg");
|
if (this.loginForm.rememberMe) {
|
||||||
background-size: cover;
|
Cookies.set("username", this.loginForm.username, { expires: 30 });
|
||||||
}
|
Cookies.set("password", encrypt(this.loginForm.password), {
|
||||||
.title {
|
expires: 30,
|
||||||
margin: 0px auto 30px auto;
|
});
|
||||||
text-align: center;
|
Cookies.set("rememberMe", this.loginForm.rememberMe, {
|
||||||
color: #707070;
|
expires: 30,
|
||||||
}
|
});
|
||||||
|
} else {
|
||||||
.login-form {
|
Cookies.remove("username");
|
||||||
border-radius: 6px;
|
Cookies.remove("password");
|
||||||
background: #ffffff;
|
Cookies.remove("rememberMe");
|
||||||
width: 400px;
|
}
|
||||||
padding: 25px 25px 5px 25px;
|
this.$store
|
||||||
.el-input {
|
.dispatch("Login", this.loginForm)
|
||||||
height: 38px;
|
.then(() => {
|
||||||
input {
|
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
|
||||||
height: 38px;
|
})
|
||||||
}
|
.catch(() => {
|
||||||
}
|
this.loading = false;
|
||||||
.input-icon {
|
if (this.captchaOnOff) {
|
||||||
height: 39px;
|
this.getCode();
|
||||||
width: 14px;
|
}
|
||||||
margin-left: 2px;
|
});
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
.login-tip {
|
},
|
||||||
font-size: 13px;
|
},
|
||||||
text-align: center;
|
};
|
||||||
color: #bfbfbf;
|
</script>
|
||||||
}
|
|
||||||
.login-code {
|
<style rel="stylesheet/scss" lang="scss">
|
||||||
width: 33%;
|
.login {
|
||||||
height: 38px;
|
display: flex;
|
||||||
float: right;
|
justify-content: center;
|
||||||
img {
|
align-items: center;
|
||||||
cursor: pointer;
|
height: 100%;
|
||||||
vertical-align: middle;
|
background-image: url("../assets/images/login-background.jpg");
|
||||||
}
|
background-size: cover;
|
||||||
}
|
}
|
||||||
.el-login-footer {
|
.title {
|
||||||
height: 40px;
|
margin: 0px auto 30px auto;
|
||||||
line-height: 40px;
|
text-align: center;
|
||||||
position: fixed;
|
color: #707070;
|
||||||
bottom: 0;
|
}
|
||||||
width: 100%;
|
|
||||||
text-align: center;
|
.login-form {
|
||||||
color: #fff;
|
border-radius: 6px;
|
||||||
font-family: Arial;
|
background: #ffffff;
|
||||||
font-size: 12px;
|
width: 400px;
|
||||||
letter-spacing: 1px;
|
padding: 25px 25px 5px 25px;
|
||||||
}
|
.el-input {
|
||||||
.login-code-img {
|
height: 38px;
|
||||||
height: 38px;
|
input {
|
||||||
}
|
height: 38px;
|
||||||
</style>
|
}
|
||||||
|
}
|
||||||
|
.input-icon {
|
||||||
|
height: 39px;
|
||||||
|
width: 14px;
|
||||||
|
margin-left: 2px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.login-tip {
|
||||||
|
font-size: 13px;
|
||||||
|
text-align: center;
|
||||||
|
color: #bfbfbf;
|
||||||
|
}
|
||||||
|
.login-code {
|
||||||
|
width: 33%;
|
||||||
|
height: 38px;
|
||||||
|
float: right;
|
||||||
|
img {
|
||||||
|
cursor: pointer;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.el-login-footer {
|
||||||
|
height: 40px;
|
||||||
|
line-height: 40px;
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
color: #fff;
|
||||||
|
font-family: Arial;
|
||||||
|
font-size: 12px;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
}
|
||||||
|
.login-code-img {
|
||||||
|
height: 38px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -1,208 +1,257 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="register">
|
<div class="register">
|
||||||
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
|
<el-form
|
||||||
<h3 class="title">若依后台管理系统</h3>
|
ref="registerForm"
|
||||||
<el-form-item prop="username">
|
:model="registerForm"
|
||||||
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
|
:rules="registerRules"
|
||||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
class="register-form"
|
||||||
</el-input>
|
>
|
||||||
</el-form-item>
|
<h3 class="title">林恩低代码平台</h3>
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="username">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="registerForm.password"
|
v-model="registerForm.username"
|
||||||
type="password"
|
type="text"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="密码"
|
placeholder="账号"
|
||||||
@keyup.enter.native="handleRegister"
|
>
|
||||||
>
|
<svg-icon
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
slot="prefix"
|
||||||
</el-input>
|
icon-class="user"
|
||||||
</el-form-item>
|
class="el-input__icon input-icon"
|
||||||
<el-form-item prop="confirmPassword">
|
/>
|
||||||
<el-input
|
</el-input>
|
||||||
v-model="registerForm.confirmPassword"
|
</el-form-item>
|
||||||
type="password"
|
<el-form-item prop="password">
|
||||||
auto-complete="off"
|
<el-input
|
||||||
placeholder="确认密码"
|
v-model="registerForm.password"
|
||||||
@keyup.enter.native="handleRegister"
|
type="password"
|
||||||
>
|
auto-complete="off"
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
placeholder="密码"
|
||||||
</el-input>
|
@keyup.enter.native="handleRegister"
|
||||||
</el-form-item>
|
>
|
||||||
<el-form-item prop="code" v-if="captchaOnOff">
|
<svg-icon
|
||||||
<el-input
|
slot="prefix"
|
||||||
v-model="registerForm.code"
|
icon-class="password"
|
||||||
auto-complete="off"
|
class="el-input__icon input-icon"
|
||||||
placeholder="验证码"
|
/>
|
||||||
style="width: 63%"
|
</el-input>
|
||||||
@keyup.enter.native="handleRegister"
|
</el-form-item>
|
||||||
>
|
<el-form-item prop="confirmPassword">
|
||||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
<el-input
|
||||||
</el-input>
|
v-model="registerForm.confirmPassword"
|
||||||
<div class="register-code">
|
type="password"
|
||||||
<img :src="codeUrl" @click="getCode" class="register-code-img"/>
|
auto-complete="off"
|
||||||
</div>
|
placeholder="确认密码"
|
||||||
</el-form-item>
|
@keyup.enter.native="handleRegister"
|
||||||
<el-form-item style="width:100%;">
|
>
|
||||||
<el-button
|
<svg-icon
|
||||||
:loading="loading"
|
slot="prefix"
|
||||||
size="medium"
|
icon-class="password"
|
||||||
type="primary"
|
class="el-input__icon input-icon"
|
||||||
style="width:100%;"
|
/>
|
||||||
@click.native.prevent="handleRegister"
|
</el-input>
|
||||||
>
|
</el-form-item>
|
||||||
<span v-if="!loading">注 册</span>
|
<el-form-item prop="code" v-if="captchaOnOff">
|
||||||
<span v-else>注 册 中...</span>
|
<el-input
|
||||||
</el-button>
|
v-model="registerForm.code"
|
||||||
<div style="float: right;">
|
auto-complete="off"
|
||||||
<router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
|
placeholder="验证码"
|
||||||
</div>
|
style="width: 63%"
|
||||||
</el-form-item>
|
@keyup.enter.native="handleRegister"
|
||||||
</el-form>
|
>
|
||||||
<!-- 底部 -->
|
<svg-icon
|
||||||
<div class="el-register-footer">
|
slot="prefix"
|
||||||
<span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
|
icon-class="validCode"
|
||||||
</div>
|
class="el-input__icon input-icon"
|
||||||
</div>
|
/>
|
||||||
</template>
|
</el-input>
|
||||||
|
<div class="register-code">
|
||||||
<script>
|
<img :src="codeUrl" @click="getCode" class="register-code-img" />
|
||||||
import { getCodeImg, register } from "@/api/login";
|
</div>
|
||||||
|
</el-form-item>
|
||||||
export default {
|
<el-form-item style="width: 100%">
|
||||||
name: "Register",
|
<el-button
|
||||||
data() {
|
:loading="loading"
|
||||||
const equalToPassword = (rule, value, callback) => {
|
size="medium"
|
||||||
if (this.registerForm.password !== value) {
|
type="primary"
|
||||||
callback(new Error("两次输入的密码不一致"));
|
style="width: 100%"
|
||||||
} else {
|
@click.native.prevent="handleRegister"
|
||||||
callback();
|
>
|
||||||
}
|
<span v-if="!loading">注 册</span>
|
||||||
};
|
<span v-else>注 册 中...</span>
|
||||||
return {
|
</el-button>
|
||||||
codeUrl: "",
|
<div style="float: right">
|
||||||
registerForm: {
|
<router-link class="link-type" :to="'/login'"
|
||||||
username: "",
|
>使用已有账户登录</router-link
|
||||||
password: "",
|
>
|
||||||
confirmPassword: "",
|
</div>
|
||||||
code: "",
|
</el-form-item>
|
||||||
uuid: ""
|
</el-form>
|
||||||
},
|
<!-- 底部 -->
|
||||||
registerRules: {
|
<div class="el-register-footer">
|
||||||
username: [
|
<span>Copyright © 2018-2021 ruoyi.vip All Rights Reserved.</span>
|
||||||
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
</div>
|
||||||
{ min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
</div>
|
||||||
],
|
</template>
|
||||||
password: [
|
|
||||||
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
<script>
|
||||||
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
|
import { getCodeImg, register } from "@/api/login";
|
||||||
],
|
|
||||||
confirmPassword: [
|
export default {
|
||||||
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
|
name: "Register",
|
||||||
{ required: true, validator: equalToPassword, trigger: "blur" }
|
data() {
|
||||||
],
|
const equalToPassword = (rule, value, callback) => {
|
||||||
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
if (this.registerForm.password !== value) {
|
||||||
},
|
callback(new Error("两次输入的密码不一致"));
|
||||||
loading: false,
|
} else {
|
||||||
captchaOnOff: true
|
callback();
|
||||||
};
|
}
|
||||||
},
|
};
|
||||||
created() {
|
return {
|
||||||
this.getCode();
|
codeUrl: "",
|
||||||
},
|
registerForm: {
|
||||||
methods: {
|
username: "",
|
||||||
getCode() {
|
password: "",
|
||||||
getCodeImg().then(res => {
|
confirmPassword: "",
|
||||||
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
code: "",
|
||||||
if (this.captchaOnOff) {
|
uuid: "",
|
||||||
this.codeUrl = "data:image/gif;base64," + res.img;
|
},
|
||||||
this.registerForm.uuid = res.uuid;
|
registerRules: {
|
||||||
}
|
username: [
|
||||||
});
|
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
||||||
},
|
{
|
||||||
handleRegister() {
|
min: 2,
|
||||||
this.$refs.registerForm.validate(valid => {
|
max: 20,
|
||||||
if (valid) {
|
message: "用户账号长度必须介于 2 和 20 之间",
|
||||||
this.loading = true;
|
trigger: "blur",
|
||||||
register(this.registerForm).then(res => {
|
},
|
||||||
const username = this.registerForm.username;
|
],
|
||||||
this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
|
password: [
|
||||||
dangerouslyUseHTMLString: true
|
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
||||||
}).then(() => {
|
{
|
||||||
this.$router.push("/login");
|
min: 5,
|
||||||
}).catch(() => {});
|
max: 20,
|
||||||
}).catch(() => {
|
message: "用户密码长度必须介于 5 和 20 之间",
|
||||||
this.loading = false;
|
trigger: "blur",
|
||||||
if (this.captchaOnOff) {
|
},
|
||||||
this.getCode();
|
],
|
||||||
}
|
confirmPassword: [
|
||||||
})
|
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
|
||||||
}
|
{ required: true, validator: equalToPassword, trigger: "blur" },
|
||||||
});
|
],
|
||||||
}
|
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
|
||||||
}
|
},
|
||||||
};
|
loading: false,
|
||||||
</script>
|
captchaOnOff: true,
|
||||||
|
};
|
||||||
<style rel="stylesheet/scss" lang="scss">
|
},
|
||||||
.register {
|
created() {
|
||||||
display: flex;
|
this.getCode();
|
||||||
justify-content: center;
|
},
|
||||||
align-items: center;
|
methods: {
|
||||||
height: 100%;
|
getCode() {
|
||||||
background-image: url("../assets/images/login-background.jpg");
|
getCodeImg().then((res) => {
|
||||||
background-size: cover;
|
this.captchaOnOff =
|
||||||
}
|
res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
||||||
.title {
|
if (this.captchaOnOff) {
|
||||||
margin: 0px auto 30px auto;
|
this.codeUrl = "data:image/gif;base64," + res.img;
|
||||||
text-align: center;
|
this.registerForm.uuid = res.uuid;
|
||||||
color: #707070;
|
}
|
||||||
}
|
});
|
||||||
|
},
|
||||||
.register-form {
|
handleRegister() {
|
||||||
border-radius: 6px;
|
this.$refs.registerForm.validate((valid) => {
|
||||||
background: #ffffff;
|
if (valid) {
|
||||||
width: 400px;
|
this.loading = true;
|
||||||
padding: 25px 25px 5px 25px;
|
register(this.registerForm)
|
||||||
.el-input {
|
.then((res) => {
|
||||||
height: 38px;
|
const username = this.registerForm.username;
|
||||||
input {
|
this.$alert(
|
||||||
height: 38px;
|
"<font color='red'>恭喜你，您的账号 " +
|
||||||
}
|
username +
|
||||||
}
|
" 注册成功！</font>",
|
||||||
.input-icon {
|
"系统提示",
|
||||||
height: 39px;
|
{
|
||||||
width: 14px;
|
dangerouslyUseHTMLString: true,
|
||||||
margin-left: 2px;
|
}
|
||||||
}
|
)
|
||||||
}
|
.then(() => {
|
||||||
.register-tip {
|
this.$router.push("/login");
|
||||||
font-size: 13px;
|
})
|
||||||
text-align: center;
|
.catch(() => {});
|
||||||
color: #bfbfbf;
|
})
|
||||||
}
|
.catch(() => {
|
||||||
.register-code {
|
this.loading = false;
|
||||||
width: 33%;
|
if (this.captchaOnOff) {
|
||||||
height: 38px;
|
this.getCode();
|
||||||
float: right;
|
}
|
||||||
img {
|
});
|
||||||
cursor: pointer;
|
}
|
||||||
vertical-align: middle;
|
});
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
.el-register-footer {
|
};
|
||||||
height: 40px;
|
</script>
|
||||||
line-height: 40px;
|
|
||||||
position: fixed;
|
<style rel="stylesheet/scss" lang="scss">
|
||||||
bottom: 0;
|
.register {
|
||||||
width: 100%;
|
display: flex;
|
||||||
text-align: center;
|
justify-content: center;
|
||||||
color: #fff;
|
align-items: center;
|
||||||
font-family: Arial;
|
height: 100%;
|
||||||
font-size: 12px;
|
background-image: url("../assets/images/login-background.jpg");
|
||||||
letter-spacing: 1px;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
.register-code-img {
|
.title {
|
||||||
height: 38px;
|
margin: 0px auto 30px auto;
|
||||||
}
|
text-align: center;
|
||||||
</style>
|
color: #707070;
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-form {
|
||||||
|
border-radius: 6px;
|
||||||
|
background: #ffffff;
|
||||||
|
width: 400px;
|
||||||
|
padding: 25px 25px 5px 25px;
|
||||||
|
.el-input {
|
||||||
|
height: 38px;
|
||||||
|
input {
|
||||||
|
height: 38px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.input-icon {
|
||||||
|
height: 39px;
|
||||||
|
width: 14px;
|
||||||
|
margin-left: 2px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.register-tip {
|
||||||
|
font-size: 13px;
|
||||||
|
text-align: center;
|
||||||
|
color: #bfbfbf;
|
||||||
|
}
|
||||||
|
.register-code {
|
||||||
|
width: 33%;
|
||||||
|
height: 38px;
|
||||||
|
float: right;
|
||||||
|
img {
|
||||||
|
cursor: pointer;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.el-register-footer {
|
||||||
|
height: 40px;
|
||||||
|
line-height: 40px;
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
color: #fff;
|
||||||
|
font-family: Arial;
|
||||||
|
font-size: 12px;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
}
|
||||||
|
.register-code-img {
|
||||||
|
height: 38px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -1,22 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>lynn</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-monitor</module>
|
<module>ruoyi-monitor</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>ruoyi-visual</artifactId>
|
<artifactId>lynn-visual</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-visual图形化管理模块
|
ruoyi-visual图形化管理模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,75 +1,75 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>cn.lynntech</groupId>
|
||||||
<artifactId>ruoyi-visual</artifactId>
|
<artifactId>lynn-visual</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-visual-monitor</artifactId>
|
<artifactId>lynn-visual-monitor</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-visual-monitor监控中心
|
ruoyi-visual-monitor监控中心
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- SpringBoot Admin -->
|
<!-- SpringBoot Admin -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.codecentric</groupId>
|
<groupId>de.codecentric</groupId>
|
||||||
<artifactId>spring-boot-admin-starter-server</artifactId>
|
<artifactId>spring-boot-admin-starter-server</artifactId>
|
||||||
<version>${spring-boot-admin.version}</version>
|
<version>${spring-boot-admin.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos Config -->
|
<!-- SpringCloud Alibaba Nacos Config -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Sentinel -->
|
<!-- SpringCloud Alibaba Sentinel -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot Web -->
|
<!-- SpringBoot Web -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Spring Security -->
|
<!-- Spring Security -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
<artifactId>spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<finalName>${project.artifactId}</finalName>
|
<finalName>${project.artifactId}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>repackage</goal>
|
<goal>repackage</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -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;
|
||||||
@ -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;
|
||||||
Loading…
Reference in new issue