用户密码支持自定义配置规则

Merge pull request !452 from magic/fix/docker-sp2

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.5</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.8</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.5-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.8-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
@@ -13,14 +13,35 @@
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
-* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
+* 本仓库为RuoYi-Cloud的Spring Boot 2 的版本，保持同步更新。
-* 后端采用Spring Boot、Spring Cloud & Alibaba。
+* 后端采用Spring Boot2、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
-* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
-* 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
 
+# 版本分支
+
+RuoYi-Cloud 后端项目提供 Spring Boot 2.x / 3.x / 4.x 多版本分支的并行维护。
+
+| 名称              | 说明                                 | 地址                                                      |
+| :---------------- | :----------------------------------- | :-------------------------------------------------------- |
+| master 默认分支   | Spring Boot 4.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud                   |
+| springboot3 分支  | Spring Boot 3.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot3  |
+| springboot2 分支  | Spring Boot 2.x (JDK 8+、 Nacos 2.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot2  |
+
+RuoYi-Cloud 前端项目提供 Vue 2.x / 3.x / JavaScript TypeScript 版本均可混用搭配
+
+| 项目名称      | **RuoYi-Cloud** | **RuoYi-Cloud-Vue3** | **RuoYi-Cloud-Vue3-TypeScript**   |
+| :---          | :---            | :---                 | :---                              |
+| **前端框架**  | Vue 2           | Vue 3                | Vue 3                             |
+| **脚本语言**  | JavaScript      | JavaScript           | TypeScript                        |
+| **构建工具**  | Vue CLI         | Vite                 | Vite                              |
+| **UI 组件库** | Element UI      | Element Plus         | Element Plus                      |
+| **状态管理**  | Vuex            | Pinia                | Pinia                             |
+| **路由管理**  | Vue Router 3    | Vue Router 4         | Vue Router 4                      |
+| **核心特点**  | 1. 技术栈经典稳定<br>2. 社区资料丰富<br>3. 当前维护重心已转移 | 1. 现代前端技术栈<br>2. 开发体验与性能更优<br>3. 官方主推的活跃版本 | 1. 类型加持，减少沟通成本<br>2. 开发时有提示，效率更高<br>3. 多人协作企业级开发项目 |
+| **仓库地址**  | [RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) | [RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3) | [RuoYi-Cloud-Vue3-TypeScript](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3/tree/typescript) |
+
 ## 系统模块
 
 ~~~
@@ -126,4 +147,4 @@ com.ruoyi
 
 ## 若依微服务交流群
 
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/已满-158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) [![加入QQ群](https://img.shields.io/badge/112869560-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Kuaw0Xdlw2Nlgn6s8h9elzuquHGxGObD&authKey=cSrQcWQ%2BzQZAFFrwxaR%2BbzcumX4WRduZnd1O6JO1dlclQMiu%2BKwxAy8t2JfNp67V&noverify=0&group_code=112869560) 点击按钮入群。

deployment/README.md

@@ -1,54 +0,0 @@
-# Kubernates 部署Ruoyi-Cloud项目
-
-本部署所用到的k8s配置均为简易版，仅作为初步入门学习使用，有不合理的地方还请见谅。
-
-### 后期考虑功能：
-* HPA自动扩缩容
-* MySQL主从、Redis集群、服务集群
-* ELK日志收集
-
-## 容器分布
-~~~
-namespace     
-├── redis              
-│       └── redis           // StatefulSet
-├── kube-ruoyi
-│       └── ruoyi-mysql     // Deployment                
-│       └── ruoyi-nacos                              
-│       └── ruoyi-nginx                               
-│       └── ruoyi-sentinel                            
-│       └── ruoyi-gateway                             
-│       └── ruoyi-auth                               
-│       └── ruoyi-system                             
-│       └── ruoyi-gen                                 
-│       └── ruoyi-job                                
-│       └── ruoyi-file                                
-│       └── ruoyi-monitor                            
-│       └── elasticsearch                            
-│       └── skywalking                                
-│       └── skywalking-ui                             
-├── minio              
-│       └── minio
-├── monitor-sa              
-│       └── node-exporter         
-│       └── prometheus-server
-│       └── monitoring-grafana                                  
-~~~
-
-## 部署顺序及要点
-1. Redis
-2. MySQL，手动Dockerfile打包镜像，初始化准备好的数据脚本。使用了Secret加密密码等配置。
-3. Nacos, 配置好MODE=standalone，使用configMap设置数据库。
-4. Sentinel
-5. Gateway，本服务需要用Dockerfile打包镜像，否则会报错。其他RuoYi服务可以直接使用spring-boot的image命令一键打包生成镜像[每个服务都有使用额外的SpringBoot配置文件（bootstrap-k8s.yml）加入到服务中，同时在原配置文件中把active换成${SPRING_PROFILES_ACTIVE:dev}后再打包，以读取deployment的env变量。启动服务前记得提前在nacos中克隆，新增服务配置以把dev改成k8s（deployment中启动的环境是SPRING_PROFILES_ACTIVE=k8s），修改好Redis地址（redis.redis）、MySQL地址(ruoyi-mysql)、Sentinel地址(ruoyi-sentinel)]
-6. Nginx，部署之前先打包好前端静态文件，使用本地磁盘方式挂载到容器 (注：我使用的是Window的DockerDesktop启动的K8s，挂载磁盘路径必须带/run/desktop/mnt/host)，修改好nginx配置ruoyi-gateway就可以启动（启动后输入localhost:30080就可以访问前端项目）。
-7. Auth
-8. System，配置好后就可以登录了
-9. Gen
-10. Job
-11. File，改成minio服务之后需要修改静态文件中读取文件的端口地址
-12. Monitor，需要修改前端静态文件中的Monitor端口地址
-13. Minio，挂载本地文件。修改ruoyi-file服务中@Primary注释改到MinioServer上以使用Minio服务（记得修改nacos配置）
-14. Elasticsearch，部署文件一并放入到了skywalking文件夹中
-15. skywalking，需要在Java服务中使用agent进行跟踪（自制agent镜像然后使用initContainers方式挂载到同一个容器，模板放到了agent-in-server文件）
-16. skywalking-ui

deployment/minio/minio-deployment.yaml

@@ -1,54 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    name: minio
-  name: minio
-  namespace: minio
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: minio
-  template:
-    metadata:
-      labels:
-        app: minio
-    spec:
-      containers:
-      - name: minio
-        image: minio/minio
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 9000
-          name: tcp
-        - containerPort: 9090
-          protocol: TCP
-          name: console
-        command:
-          - /bin/sh
-          - -c
-          - minio server /data --console-address ":9090"
-        env:
-        - name: MINIO_ACCESS_KEY
-          value: minioadmin
-        - name: MINIO_SECRET_KEY
-          value: minioadmin
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /minio/health/ready
-            port: 9000
-            scheme: HTTP
-          initialDelaySeconds: 10
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 5
-        volumeMounts:
-        - mountPath: /data
-          name: minio-data
-      volumes:
-        - name: minio-data
-          hostPath:
-            path: /run/desktop/mnt/host/c/k8sVolume/minio/data
-            type: Directory

deployment/minio/minio-namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: minio

deployment/minio/minio-svc.yaml

@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: minio
-  namespace: minio
-  labels:
-    app: minio
-spec:
-  type: NodePort
-  publishNotReadyAddresses: true
-  ports:
-    - port: 9000
-      name: tcp
-      targetPort: 9000
-    - port: 9090
-      name: console
-      targetPort: 9090
-      nodePort: 30090
-  selector:
-    app: minio

deployment/monitor/monitor-namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitor-sa

deployment/monitor/node-exporter.yaml

@@ -1,63 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: node-exporter
-  namespace: monitor-sa
-  labels:
-    name: node-exporter
-spec:
-  selector:
-    matchLabels:
-      name: node-exporter
-  template:
-    metadata:
-      labels:
-        name: node-exporter
-    spec:
-      hostPID: true
-      hostIPC: true
-      hostNetwork: true                                             # 共享宿主机网络和进程
-      containers:
-        - name: node-exporter
-          image: prom/node-exporter:v0.16.0
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 9100                                       # 容器暴露端口为9100
-          resources:
-            requests:
-              cpu: 0.15
-          securityContext:
-            privileged: true                                          # 开启特权模式
-          args:
-            - --path.procfs
-            - /host/proc
-            - --path.sysfs
-            - /host/sys
-            - --collector.filesystem.ignored-mount-points
-            - '"^/(sys|proc|dev|host|etc)($|/)"'
-          volumeMounts:                                               # 挂载宿主机目录以收集宿主机信息
-            - name: dev
-              mountPath: /host/dev
-            - name: proc
-              mountPath: /host/proc
-            - name: sys
-              mountPath: /host/sys
-            - name: rootfs
-              mountPath: /rootfs
-      tolerations:                                                  # 定义容忍度，使其可调度到默认有污点的master
-        - key: "node-role.kubernetes.io/master"
-          operator: "Exists"
-          effect: "NoSchedule"
-      volumes:                                                      # 定义存储卷
-        - name: proc
-          hostPath:
-            path: /proc
-        - name: dev
-          hostPath:
-            path: /dev
-        - name: sys
-          hostPath:
-            path: /sys
-        - name: rootfs
-          hostPath:
-            path: /

deployment/monitor/prometheus-config.yaml

@@ -1,169 +0,0 @@
-apiVersion: v1
-kind: ConfigMap #
-metadata:
-  name: prometheus-config
-  namespace: kube-system
-  labels:
-    kubernetes.io/cluster-service: "true"
-    addonmanager.kubernetes.io/mode: EnsureExists
-data:
-  prometheus.yml: |
-    rule_files:
-      - /etc/config/rules/*.rules
-
-    scrape_configs:
-      - job_name: prometheus
-        static_configs:
-          - targets:
-              - localhost:9090
-      
-      - job_name: kubernetes-nodes
-        scrape_interval: 30s
-        static_configs:
-          - targets:
-              - 192.168.73.135:9100
-              - 192.168.73.138:9100
-              - 192.168.73.139:9100
-              - 192.168.73.140:9100
-      
-      - job_name: kubernetes-apiservers
-        kubernetes_sd_configs:
-          - role: endpoints
-        relabel_configs:
-          - action: keep
-            regex: default;kubernetes;https
-            source_labels:
-              - __meta_kubernetes_namespace
-              - __meta_kubernetes_service_name
-              - __meta_kubernetes_endpoint_port_name
-        scheme: https
-        tls_config:
-          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-          insecure_skip_verify: true
-        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      
-      - job_name: kubernetes-nodes-kubelet
-        kubernetes_sd_configs:
-          - role: node
-        relabel_configs:
-          - action: labelmap
-            regex: __meta_kubernetes_node_label_(.+)
-        scheme: https
-        tls_config:
-          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-          insecure_skip_verify: true
-        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      
-      - job_name: kubernetes-nodes-cadvisor
-        kubernetes_sd_configs:
-          - role: node
-        relabel_configs:
-          - action: labelmap
-            regex: __meta_kubernetes_node_label_(.+)
-          - target_label: __metrics_path__
-            replacement: /metrics/cadvisor
-        scheme: https
-        tls_config:
-          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-          insecure_skip_verify: true
-        bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      
-      - job_name: kubernetes-service-endpoints
-        kubernetes_sd_configs:
-          - role: endpoints
-        relabel_configs:
-          - action: keep
-            regex: true
-            source_labels:
-              - __meta_kubernetes_service_annotation_prometheus_io_scrape
-          - action: replace
-            regex: (https?)
-            source_labels:
-              - __meta_kubernetes_service_annotation_prometheus_io_scheme
-            target_label: __scheme__
-          - action: replace
-            regex: (.+)
-            source_labels:
-              - __meta_kubernetes_service_annotation_prometheus_io_path
-            target_label: __metrics_path__
-          - action: replace
-            regex: ([^:]+)(?::\d+)?;(\d+)
-            replacement: $1:$2
-            source_labels:
-              - __address__
-              - __meta_kubernetes_service_annotation_prometheus_io_port
-            target_label: __address__
-          - action: labelmap
-            regex: __meta_kubernetes_service_label_(.+)
-          - action: replace
-            source_labels:
-              - __meta_kubernetes_namespace
-            target_label: kubernetes_namespace
-          - action: replace
-            source_labels:
-              - __meta_kubernetes_service_name
-            target_label: kubernetes_name
-      
-      - job_name: kubernetes-services
-        kubernetes_sd_configs:
-          - role: service
-        metrics_path: /probe
-        params:
-          module:
-            - http_2xx
-        relabel_configs:
-          - action: keep
-            regex: true
-            source_labels:
-              - __meta_kubernetes_service_annotation_prometheus_io_probe
-          - source_labels:
-              - __address__
-            target_label: __param_target
-          - replacement: blackbox
-            target_label: __address__
-          - source_labels:
-              - __param_target
-            target_label: instance
-          - action: labelmap
-            regex: __meta_kubernetes_service_label_(.+)
-          - source_labels:
-              - __meta_kubernetes_namespace
-            target_label: kubernetes_namespace
-          - source_labels:
-              - __meta_kubernetes_service_name
-            target_label: kubernetes_name
-      
-      - job_name: kubernetes-pods
-        kubernetes_sd_configs:
-          - role: pod
-        relabel_configs:
-          - action: keep
-            regex: true
-            source_labels:
-              - __meta_kubernetes_pod_annotation_prometheus_io_scrape
-          - action: replace
-            regex: (.+)
-            source_labels:
-              - __meta_kubernetes_pod_annotation_prometheus_io_path
-            target_label: __metrics_path__
-          - action: replace
-            regex: ([^:]+)(?::\d+)?;(\d+)
-            replacement: $1:$2
-            source_labels:
-              - __address__
-              - __meta_kubernetes_pod_annotation_prometheus_io_port
-            target_label: __address__
-          - action: labelmap
-            regex: __meta_kubernetes_pod_label_(.+)
-          - action: replace
-            source_labels:
-              - __meta_kubernetes_namespace
-            target_label: kubernetes_namespace
-          - action: replace
-            source_labels:
-              - __meta_kubernetes_pod_name
-            target_label: kubernetes_pod_name
-    alerting:
-      alertmanagers:
-        - static_configs:
-            - targets: ["alertmanager:80"]

deployment/mysql/db/readme.txt

@@ -1 +0,0 @@
-存放sql目录下的所有脚本，用于docker自动执行。

deployment/mysql/dockerfile

@@ -1,5 +0,0 @@
-# 基础镜像
-FROM mysql:5.7
-
-# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/

deployment/mysql/mysql-deployment.yaml

@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ruoyi-mysql #指定deployment的名字
-  namespace: kube-ruoyi
-  labels:
-    app: ruoyi-mysql-local
-spec: #规约
-  replicas: 1 #pod的副本数量，就是希望创建多少个pod的副本.可p选字段。它的默认值是1。
-  selector:  #selector 字段定义 Deployment 如何查找要管理的 Pods。必须匹配 .spec.template.metadata.labels，否则请求会被 API 拒绝。
-    matchLabels:
-      app: ruoyi-mysql-local
-  template: #Deployment Pod 模板；它和 Pod 的语法规则完全相同。 只是这里它是嵌套的，因此不需要 apiVersion 或 kind。
-    metadata:
-      labels:
-        app: ruoyi-mysql-local
-    spec: #pod模板规约
-      containers: #容器
-        - name: ruoyi-mysql #容器的名称
-          image: ruoyi/mysql:5.7 #容器使用的镜像
-          ports:
-            - containerPort: 3306
-          volumeMounts:
-            - name: mysql-local-data #pv的name
-              mountPath: /var/lib/mysql #MySQL容器的数据都是存在这个目录的，要对这个目录做数据持久化
-          env:
-            - name: MYSQL_ROOT_PASSWORD
-              valueFrom: # Read environment variables from kubernetes secrets
-                secretKeyRef:
-                  name: ruoyi-mysql-secret
-                  key: mysql-root-pass
-            - name: MYSQL_USER
-              valueFrom:
-                secretKeyRef:
-                  name: ruoyi-mysql-secret
-                  key: mysql-user
-            - name: MYSQL_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: ruoyi-mysql-secret
-                  key: mysql-password
-      volumes:
-        - name: mysql-local-data #pv的name
-          hostPath:
-            path: /run/desktop/mnt/host/c/k8sVolume/mysql/data
-            type: Directory
-      restartPolicy: Always #Deployment 中的 Pod 模板必须指定适当的标签和适当的重新启动策略。只有 .spec.template.spec.restartPolicy 等于 Always 才是被允许的，这也是在没有指定时的默认设置

deployment/mysql/mysql-pv-pvc.yaml

@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: mysql-pv
-  namespace: kube-ruoyi
-spec:
-  capacity:
-    storage: 3Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain   # 手动删除
-  storageClassName: hostpath #表明这个pv所属的storageClass
-  hostPath:
-    path: /mnt/data #节点上卷的完整路径。（必须是存在的路径，不然容器无法创建，deployment会报错）可以是目录或块设备(磁盘、分区…)。
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mysql-pvc-local
-  namespace: kube-ruoyi
-spec:
-  accessModes: #访问模式 申领在请求具有特定访问模式的存储时，使用与卷相同的访问模式约定。
-    - ReadWriteMany
-  volumeMode: Filesystem #卷模式
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: hostpath # 此处须显式设置空字符串或指定值，否则会被设置为默认的 StorageClass

deployment/mysql/mysql-secret.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: ruoyi-mysql-secret
-  namespace: kube-ruoyi
-type: Opaque #base-64加密
-data:
-  mysql-root-pass: cGFzc3dvcmQ=
-  mysql-user: YWRtaW4=
-  mysql-password: MTIzNDU2

deployment/mysql/mysql-svc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ruoyi-mysql
-  namespace: kube-ruoyi
-spec:
-  ports:
-    - port: 3306
-      nodePort: 30060
-  selector:
-    app: ruoyi-mysql-local # 该 Service 会将所有具有标签 app: mysql-labels-app暴露到一个抽象的 Service 端口上（targetPort：容器接收流量的端口；port：可任意取值的抽象的 Service 端口，其他 Pod 通过该端口访问 Service
-  type: NodePort

deployment/nacos/nacos-config.yaml

@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ruoyi-nacos-config
-  namespace: kube-ruoyi
-data:
-  application.properties: |
-    spring.datasource.platform=mysql
-    db.num=1
-    db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
-    db.user=root
-    db.password=password
-    nacos.naming.empty-service.auto-clean=true
-    nacos.naming.empty-service.clean.initial-delay-ms=50000
-    nacos.naming.empty-service.clean.period-time-ms=30000
-    management.endpoints.web.exposure.include=*
-    management.metrics.export.elastic.enabled=false
-    management.metrics.export.influx.enabled=false
-    server.tomcat.accesslog.enabled=true
-    server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
-    server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs
-    nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
-    nacos.core.auth.system.type=nacos
-    nacos.core.auth.enabled=false
-    nacos.core.auth.plugin.nacos.token.expire.seconds=18000
-    nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
-    nacos.core.auth.caching.enabled=true
-    nacos.core.auth.enable.userAgentAuthWhite=false
-    nacos.core.auth.server.identity.key=serverIdentity
-    nacos.core.auth.server.identity.value=security
-    nacos.istio.mcp.server.enabled=false

deployment/nacos/nacos-deployment.yaml

@@ -1,37 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ruoyi-nacos
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ruoyi-nacos
-  template:
-    metadata:
-      labels:
-        app: ruoyi-nacos
-    spec:
-      containers:
-        - name: ruoyi-nacos
-          image: nacos/nacos-server
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8848
-              name: client
-            - containerPort: 9848
-              name: client-rpc
-            - containerPort: 9849
-              name: raft-rpc
-          env:
-            - name: MODE
-              value: standalone
-          volumeMounts:
-            - mountPath: /home/nacos/conf/application.properties
-              name: nacos-conf
-              subPath: application.properties
-      volumes:
-        - name: nacos-conf
-          configMap:
-            name: ruoyi-nacos-config

deployment/nacos/nacos-svc.yaml

@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ruoyi-nacos
-  namespace: kube-ruoyi
-  labels:
-    app: ruoyi-nacos
-spec:
-  type: NodePort
-  publishNotReadyAddresses: true
-  ports:
-    - port: 8848
-      name: server
-      targetPort: 8848
-      nodePort: 30848
-    - port: 9848
-      name: client-rpc
-      targetPort: 9848
-    - port: 9849
-      name: raft-rpc
-      targetPort: 9849
-  selector:
-    app: ruoyi-nacos

deployment/nginx/nginx-config.yaml

@@ -1,37 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ruoyi-nginx-config
-  namespace: kube-ruoyi
-data:
-  nginx.conf: |
-    worker_processes  1;
-    events {
-        worker_connections  1024;
-    }
-    http {
-        include       mime.types;
-        default_type  application/octet-stream;
-        sendfile        on;
-        keepalive_timeout  65;
-        server {
-            listen       80;
-            server_name  localhost;
-            location / {
-                root   /home/ruoyi/projects/ruoyi-ui;
-                try_files $uri $uri/ /index.html;
-                index  index.html index.htm;
-            }
-            location /prod-api/{
-                proxy_set_header Host $http_host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header REMOTE-HOST $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_pass http://ruoyi-gateway:8080/;
-            }
-            error_page   500 502 503 504  /50x.html;
-            location = /50x.html {
-                root   html;
-            }
-        }
-    }

deployment/nginx/nginx-deployment.yaml

@@ -1,53 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ruoyi-nginx
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ruoyi-nginx
-  template:
-    metadata:
-      labels:
-        app: ruoyi-nginx
-    spec:
-      containers:
-        - name: ruoyi-nginx
-          image: nginx
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
-          volumeMounts:
-            - mountPath: /etc/nginx/nginx.conf
-              name: nginx-conf
-              subPath: nginx.conf
-            - mountPath: /home/ruoyi/projects/ruoyi-ui
-              name: local-path   #/usr/share/nginx/html 挂载到volumes中server+path
-      volumes:
-        - name: nginx-conf
-          configMap:
-            name: ruoyi-nginx-config
-        - name: local-path
-          hostPath:
-            path: /run/desktop/mnt/host/c/k8sVolume/dist
-            type: Directory
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ruoyi-nginx
-  namespace: kube-ruoyi
-  labels:
-    name: ruoyi-nginx
-spec:
-  type: NodePort
-  ports:
-    - port: 80
-      targetPort: 80
-      nodePort: 30080
-  selector:
-    app: ruoyi-nginx
-

deployment/redis/redis-config.yaml

@@ -1,58 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: redis-config
-  namespace: redis
-data:
-  redis.conf: |-
-    maxmemory 1000mb
-    maxmemory-policy allkeys-lru
-    protected-mode no 
-    tcp-backlog 511 
-    daemonize no 
-    supervised no 
-    dir /data 
-    pidfile /data/redis_6379.pid
-    port 6379
-    loglevel notice 
-    logfile "" 
-    databases 16 
-    stop-writes-on-bgsave-error yes 
-    rdbcompression yes 
-    rdbchecksum yes 
-    dbfilename dump.rdb 
-    replica-serve-stale-data yes 
-    replica-read-only no 
-    repl-diskless-sync no 
-    repl-diskless-sync-delay 5 
-    repl-disable-tcp-nodelay no 
-    replica-priority 100 
-    lazyfree-lazy-eviction no 
-    lazyfree-lazy-expire no 
-    lazyfree-lazy-server-del no 
-    replica-lazy-flush no 
-    appendonly no 
-    appendfilename "appendonly.aof" 
-    appendfsync everysec 
-    no-appendfsync-on-rewrite no 
-    auto-aof-rewrite-percentage 100 
-    auto-aof-rewrite-min-size 64mb 
-    aof-load-truncated yes 
-    aof-use-rdb-preamble yes 
-    lua-time-limit 5000 
-    slowlog-log-slower-than 10000 
-    slowlog-max-len 128 
-    latency-monitor-threshold 0 
-    notify-keyspace-events "" 
-    set-max-intset-entries 512 
-    hll-sparse-max-bytes 3000 
-    stream-node-max-bytes 4096 
-    stream-node-max-entries 100 
-    activerehashing yes 
-    client-output-buffer-limit normal 0 0 0 
-    client-output-buffer-limit replica 256mb 64mb 60 
-    client-output-buffer-limit pubsub 32mb 8mb 60 
-    hz 10 
-    dynamic-hz yes 
-    aof-rewrite-incremental-fsync yes 
-    rdb-save-incremental-fsync yes

deployment/redis/redis-namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: redis

deployment/redis/redis-stateful-set.yaml

@@ -1,98 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: redis
-  labels:
-    app: redis
-    namespace: redis
-spec:
-  serviceName: redis
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      initContainers:
-        - name: config
-          image: redis:7.0.6
-          command: [ "sh", "-c" ]
-          args:
-            - |
-              cp /tmp/redis/redis.conf /etc/redis/redis.conf
-              
-              echo "finding master..."
-              MASTER_FDQN=`hostname  -f | sed -e 's/redis-[0-9]\./redis-0./'`
-              if [ "$(redis-cli -h sentinel -p 5000 ping)" != "PONG" ]; then
-                echo "master not found, defaulting to redis-0"
-                if [ "$(hostname)" = "redis-0" ]; then
-                  echo "this is redis-0, not updating config..."
-                else
-                  echo "updating redis.conf..."
-                  echo "\nslaveof $MASTER_FDQN 6379" >> /etc/redis/redis.conf
-                fi
-              else
-                echo "sentinel found, finding master"
-                MASTER="$(redis-cli -h sentinel -p 5000 sentinel get-master-addr-by-name mymaster | grep -E '(^redis-\d{1,})|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})')"
-                echo "master found : $MASTER, updating redis.conf"
-                echo "slaveof $MASTER 6379" >> /etc/redis/redis.conf
-              fi
-          volumeMounts:
-            - name: redis-config
-              mountPath: /etc/redis/
-            - name: config
-              mountPath: /tmp/redis/
-      containers:
-        - name: redis
-          image: redis:7.0.6
-          command: [ "redis-server" ]
-          args: [ "/etc/redis/redis.conf" ]
-          ports:
-            - containerPort: 6379
-              name: redis
-          volumeMounts:
-            - name: data
-              mountPath: /data
-            - name: redis-config
-              mountPath: /etc/redis/
-          resources:
-            limits:
-              memory: 1100Mi
-            requests:
-              memory: 1100Mi
-      volumes:
-        - name: redis-config
-          emptyDir: { }
-        - name: config
-          configMap:
-            name: redis-config
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      spec:
-        storageClassName: hostpath
-        accessModes:
-          - ReadWriteOnce
-        resources:
-          requests:
-            storage: 500Mi
-
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: redis                 # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: redis
-  namespace: redis
-spec:
-  selector:
-    app: redis                 # The service exposes Pods with label `app=redis`
-  ports:
-    - name: redis-port
-      port: 6379
-      nodePort: 30079
-  type: NodePort

deployment/ruoyi-namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-ruoyi

deployment/sentinel/sentinel-deployment.yaml

@@ -1,41 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ruoyi-sentinel
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ruoyi-sentinel
-  template:
-    metadata:
-      labels:
-        app: ruoyi-sentinel
-    spec:
-      containers:
-        - name: ruoyi-sentinel
-          image: bladex/sentinel-dashboard
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8858
-          env: # Environment variables supplied to the Pod
-            - name: JAVA_TOOL_OPTIONS
-              value: "-Dserver.port=8858 -Dcsp.sentinel.dashboard.server=localhost:8858 -Dproject.name=sentinel-dashboard"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ruoyi-sentinel
-  namespace: kube-ruoyi
-  labels:
-    name: ruoyi-sentinel
-spec:
-  type: NodePort
-  ports:
-    - port: 8858
-      targetPort: 8858
-      nodePort: 30858
-  selector:
-    app: ruoyi-sentinel
-

deployment/servers/ruoyi-auth-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-auth    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-auth
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-auth
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-auth
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-auth-server
-          image: ruoyi-auth:3.6.2
-          ports:
-            - name: http
-              containerPort: 9200 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-auth
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-auth    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-auth
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-auth   # The service exposes Pods with label `app=ruoyi-auth`
-  ports: # Forward incoming connections on port 9200 to the target port 9200
-    - name: http
-      port: 9200
-      targetPort: 9200

deployment/servers/ruoyi-gateway-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-gateway    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-gateway
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-gateway
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-gateway
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-gateway-server
-          image: ruoyi-gateway:3.6.2
-          ports:
-            - name: http
-              containerPort: 8080 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-gateway
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-gateway    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-gateway
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-gateway   # The service exposes Pods with label `app=ruoyi-gateway`
-  ports: # Forward incoming connections on port 8080 to the target port 8080
-    - name: http
-      port: 8080
-      targetPort: 8080

deployment/servers/ruoyi-modules-file-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-file    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-file
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-file
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-file
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-file-server
-          image: ruoyi-modules-file:3.6.2
-          ports:
-            - name: http
-              containerPort: 9300 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-file
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-file    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-file
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-file   # The service exposes Pods with label `app=ruoyi-file`
-  ports: # Forward incoming connections on port 9300 to the target port 9300
-    - name: http
-      port: 9300
-      targetPort: 9300

deployment/servers/ruoyi-modules-gen-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-gen    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-gen
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-gen
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-gen
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-gen-server
-          image: ruoyi-modules-gen:3.6.2
-          ports:
-            - name: http
-              containerPort: 9202 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-gen
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-gen    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-gen
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-gen   # The service exposes Pods with label `app=ruoyi-gen`
-  ports: # Forward incoming connections on port 9202 to the target port 9202
-    - name: http
-      port: 9202
-      targetPort: 9202

deployment/servers/ruoyi-modules-job-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-job    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-job
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-job
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-job
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-job-server
-          image: ruoyi-modules-job:3.6.2
-          ports:
-            - name: http
-              containerPort: 9203 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-job
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-job    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-job
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-job   # The service exposes Pods with label `app=ruoyi-job`
-  ports: # Forward incoming connections on port 9203 to the target port 9203
-    - name: http
-      port: 9203
-      targetPort: 9203

deployment/servers/ruoyi-modules-system-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-system    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-system
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-system
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-system
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-system-server
-          image: ruoyi-modules-system:3.6.2
-          ports:
-            - name: http
-              containerPort: 9201 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-system
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-system    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-system
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-system   # The service exposes Pods with label `app=ruoyi-system`
-  ports: # Forward incoming connections on port 9201 to the target port 9201
-    - name: http
-      port: 9201
-      targetPort: 9201

deployment/servers/ruoyi-monitor-server-k8s-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-monitor    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-monitor
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-monitor
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-monitor
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-monitor-server
-          image: ruoyi-visual-monitor:3.6.2
-          ports:
-            - name: http
-              containerPort: 9100 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-monitor
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-monitor    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-monitor
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-monitor   # The service exposes Pods with label `app=ruoyi-monitor`
-  ports: # Forward incoming connections on port 9100 to the target port 9100
-    - name: http
-      port: 9100
-      targetPort: 9100

deployment/servers/ruoyi/gateway/bootstrap-k8s.yml

@@ -1,37 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: ${SERVER_NAME}
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-      config:
-        # 配置中心地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - ${NACOS_SHARED_CONFIGS}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 127.0.0.1:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-            dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow

deployment/servers/ruoyi/gateway/dockerfile

@@ -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/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar
-# 启动网关服务
-ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"]

deployment/servers/ruoyi/gateway/jar/readme.txt

@@ -1 +0,0 @@
-存放网关模块打包好的jar文件，用于docker启动应用。

deployment/skywalking/agent-in-server/ruoyi-modules-system-server-agent-k8s-deployment.yaml

@@ -1,73 +0,0 @@
-apiVersion: apps/v1           # API version
-kind: Deployment              # Type of kubernetes resource
-metadata:
-  name: ruoyi-system    # Name of the kubernetes resource
-  namespace: kube-ruoyi
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-system
-spec:
-  replicas: 1                 # No. of replicas/pods to run in this deployment
-  selector:
-    matchLabels: # The deployment applies to any pods matching the specified labels
-      app: ruoyi-system
-  template: # Template for creating the pods in this deployment
-    metadata:
-      labels: # Labels that will be applied to each Pod in this deployment
-        app: ruoyi-system
-    spec: # Spec for the containers that will be run in the Pods
-      containers:
-        - name: ruoyi-system-server
-          image: ruoyi-modules-system:3.6.2
-          ports:
-            - name: http
-              containerPort: 9201 # The port that the container exposes
-          env: # Environment variables supplied to the Pod
-            - name: SPRING_PROFILES_ACTIVE
-              value: k8s
-            - name: SERVER_NAME
-              value: ruoyi-system
-            - name: NACOS_SERVER
-              value: ruoyi-nacos # nacos svc name
-            - name: NACOS_PORT
-              value: "8848"
-            - name: NACOS_SHARED_CONFIGS
-              value: application-dev.yml
-            - name: JAVA_OPTS
-              value: -javaagent:/javaagent/skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=k8s::$(SERVER_NAME) -Dskywalking.collector.backend_service=skywalking:11800
-          volumeMounts:
-            - mountPath: /javaagent
-              name: agent-jar
-      volumes:
-        - emptyDir: { }
-          name: agent-jar
-      initContainers:
-        # 官网用脚本命令行+args的方式执行多条command语句
-        - command: ['sh']
-          args:
-            - "-c"
-            - |
-              cp -r /opt/skywalking-agent /javaagent
-              chown -R 65534:65534 /javaagent
-              /bin/chmod -R 777 /javaagent
-          image: skywalking-agent:8.14.0
-          imagePullPolicy: IfNotPresent
-          name: skywalking-agent
-          volumeMounts:
-            - mountPath: /javaagent
-              name: agent-jar
----
-apiVersion: v1                # API version
-kind: Service                 # Type of the kubernetes resource
-metadata:
-  name: ruoyi-system    # Name of the kubernetes resource
-  labels: # Labels that will be applied to this resource
-    app: ruoyi-system
-  namespace: kube-ruoyi
-spec:
-  type: NodePort              # The service will be exposed by opening a Port on each node and proxying it.
-  selector:
-    app: ruoyi-system   # The service exposes Pods with label `app=ruoyi-system`
-  ports: # Forward incoming connections on port 9201 to the target port 9201
-    - name: http
-      port: 9201
-      targetPort: 9201

deployment/skywalking/agent.dockerfile

@@ -1,17 +0,0 @@
-## cat Dcokerfile
-
-FROM   docker.io/library/busybox:latest AS base
-
-# 使用 ADD 下载 java-agent,你也可以使用其他下载命令，或者下载到本地，再 使用 COPY或者ADD 指令添加到 镜像里
-ADD    https://dlcdn.apache.org/skywalking/java-agent/9.0.0/apache-skywalking-java-agent-9.0.0.tgz /tmp/
-RUN    mkdir -p /opt \
-    && tar -xzf /tmp/apache-skywalking-java-agent-9.0.0.tgz -C /opt/ \
-    && rm -rf /tmp/*
-#ADD skywalking-agent.tar.gz /opt/
-RUN    mkdir -p /javaagent
-
-## java-agent 使用 方法
-## https://skywalking.apache.org/docs/skywalking-java/next/en/setup/service-agent/java-agent/readme/
-##  java -javaagent:/opt/skywalking-agent/skywalking-agent.jar -jar yourApp.jar
-##  -javaagent:/opt/skywalking-agent/skywalking-agent.jar=agent.service_name=yourAppName,collector.backend_service=127.0.0.1:11800
-##  -javaagent:/opt/skywalking-agent/skywalking-agent.jar -Dskywalking.agent.service_name=yourAppName -Dskywalking.collector.backend_service=127.0.0.1:11800

deployment/skywalking/elasticsearch-deployment.yaml

@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    name: elasticsearch
-  name: elasticsearch
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: elasticsearch
-  template:
-    metadata:
-      labels:
-        app: elasticsearch
-    spec:
-      containers:
-      - name: elasticsearch
-        image: elasticsearch:7.14.2
-        ports:
-        - containerPort: 9200
-          name: cluster-node
-        env:
-        - name: discovery.type
-          value: single-node
-        - name: TZ
-          value: Asia/Shanghai
-        - name: ES_JAVA_OPTS
-          value: -Xms512m -Xmx512m
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: elasticsearch
-  namespace: kube-ruoyi
-spec:
-  ports:
-    - port: 9220 # 和auth-server的端口冲突了，对外暴露换一个端口访问
-      targetPort: 9200
-      name: cluster-node
-  selector:
-    app: elasticsearch # 该 Service 会将所有具有标签 app: mysql-labels-app暴露到一个抽象的 Service 端口上（targetPort：容器接收流量的端口；port：可任意取值的抽象的 Service 端口，其他 Pod 通过该端口访问 Service
-  type: NodePort

deployment/skywalking/skywalking-deployment.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    name: skywalking
-  name: skywalking
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: skywalking
-  template:
-    metadata:
-      labels:
-        app: skywalking
-    spec:
-      containers:
-      - name: skywalking
-        image: apache/skywalking-oap-server
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 11800
-          name: collector
-        - containerPort: 12800
-          name: oap
-        env:
-        - name: SW_STORAGE
-          value: elasticsearch
-        - name: TZ
-          value: Asia/Shanghai
-        - name: SW_STORAGE_ES_CLUSTER_NODES
-          value: elasticsearch:9220
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: skywalking
-  namespace: kube-ruoyi
-spec:
-  ports:
-    - port: 11800
-      targetPort: 11800
-      name: collector
-    - port: 12800
-      targetPort: 12800
-      name: oap
-  selector:
-    app: skywalking # 该 Service 会将所有具有标签 app: mysql-labels-app暴露到一个抽象的 Service 端口上（targetPort：容器接收流量的端口；port：可任意取值的抽象的 Service 端口，其他 Pod 通过该端口访问 Service
-  type: NodePort

deployment/skywalking/skywalking-ui-deployment.yaml

@@ -1,42 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    name: skywalking-ui
-  name: skywalking-ui
-  namespace: kube-ruoyi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: skywalking-ui
-  template:
-    metadata:
-      labels:
-        app: skywalking-ui
-    spec:
-      containers:
-      - name: skywalking-ui
-        image:  apache/skywalking-ui
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: console
-        env:
-        - name: SW_OAP_ADDRESS
-          value: http://skywalking:12800
-        - name: TZ
-          value: Asia/Shanghai
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: skywalking-ui
-  namespace: kube-ruoyi
-spec:
-  ports:
-    - port: 8080
-      nodePort: 30088
-  selector:
-    app: skywalking-ui # 该 Service 会将所有具有标签 app: mysql-labels-app暴露到一个抽象的 Service 端口上（targetPort：容器接收流量的端口；port：可任意取值的抽象的 Service 端口，其他 Pod 通过该端口访问 Service
-  type: NodePort

docker/copy.sh

@@ -9,8 +9,8 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20240629.sql ./mysql/db
+cp ../sql/ry_20260402.sql ./mysql/db
-cp ../sql/ry_config_20250224.sql ./mysql/db
+cp ../sql/ry_config_20260311.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

docker/docker-compose.yml

@@ -2,7 +2,7 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server
+    image: nacos/nacos-server:v2.4.2
     build:
       context: ./nacos
     environment:

docker/nacos/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM nacos/nacos-server
+FROM nacos/nacos-server:v2.4.2
 # author
 MAINTAINER ruoyi
 

docker/nginx/conf/nginx.conf

@@ -29,7 +29,7 @@ http {
         }
 
         # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
+        if ($uri ~ "/actuator") {
             return 403;
         }
 

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.5</version>
+    <version>3.6.8</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.5</ruoyi.version>
+        <ruoyi.version>3.6.8</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -24,19 +24,18 @@
         <tobato.version>1.27.2</tobato.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
-        <druid.version>1.2.23</druid.version>
+        <druid.version>1.2.27</druid.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <commons.io.version>2.13.0</commons.io.version>
+        <commons.io.version>2.21.0</commons.io.version>
         <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.53</fastjson.version>
+        <fastjson.version>2.0.61</fastjson.version>
         <jjwt.version>0.9.1</jjwt.version>
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
         <springdoc.version>1.6.9</springdoc.version>
         <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
-
         <!-- override dependency version -->
-        <tomcat.version>9.0.98</tomcat.version>
+        <tomcat.version>9.0.112</tomcat.version>
         <logback.version>1.2.13</logback.version>
         <spring-framework.version>5.3.39</spring-framework.version>
     </properties>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -2,7 +2,9 @@ package com.ruoyi.system.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
@@ -26,4 +28,13 @@ public interface RemoteFileService
      */
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
+
+    /**
+     * 删除文件
+     *
+     * @param fileUrl 文件地址
+     * @return 结果
+     */
+    @DeleteMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public R<Boolean> delete(@RequestParam("fileUrl") String fileUrl);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -3,11 +3,13 @@ package com.ruoyi.system.api.domain;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.annotation.Excel.Type;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
@@ -55,8 +57,8 @@ public class SysUser extends BaseEntity
     /** 密码 */
     private String password;
 
-    /** 帐号状态（0正常 1停用） */
+    /** 账号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -67,9 +69,13 @@ public class SysUser extends BaseEntity
     private String loginIp;
 
     /** 最后登录时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
+    /** 密码最后更新时间 */
+    private Date pwdUpdateDate;
+
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -111,12 +117,7 @@ public class SysUser extends BaseEntity
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return UserConstants.isAdmin(userId);
-    }
-
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
     }
 
     public Long getDeptId()
@@ -247,6 +248,16 @@ public class SysUser extends BaseEntity
         this.loginDate = loginDate;
     }
 
+    public Date getPwdUpdateDate()
+    {
+        return pwdUpdateDate;
+    }
+
+    public void setPwdUpdateDate(Date pwdUpdateDate)
+    {
+        this.pwdUpdateDate = pwdUpdateDate;
+    }
+
     public SysDept getDept()
     {
         return dept;
@@ -296,6 +307,7 @@ public class SysUser extends BaseEntity
     {
         this.roleId = roleId;
     }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -312,6 +324,7 @@ public class SysUser extends BaseEntity
             .append("delFlag", getDelFlag())
             .append("loginIp", getLoginIp())
             .append("loginDate", getLoginDate())
+            .append("pwdUpdateDate", getPwdUpdateDate())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java

@@ -30,6 +30,12 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             {
                 return R.fail("上传文件失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<Boolean> delete(String fileUrl)
+            {
+                return R.fail("删除文件失败:" + throwable.getMessage());
+            }
         };
     }
 }

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
+import com.ruoyi.auth.form.UnLockBody;
 import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.JwtUtils;
@@ -75,4 +76,14 @@ public class TokenController
         sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
         return R.ok();
     }
+
+    /**
+     * 解锁屏幕
+     */
+    @PostMapping("/unlockscreen")
+    public R<?> unlockScreen(@RequestBody UnLockBody unLockBody)
+    {
+        sysLoginService.unlock(unLockBody.getPassword());
+        return R.ok();
+    }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/UnLockBody.java

@@ -0,0 +1,24 @@
+package com.ruoyi.auth.form;
+
+/**
+ * 系统解锁对象
+ * 
+ * @author ruoyi
+ */
+public class UnLockBody
+{
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -113,11 +113,40 @@ public class SysLoginService
         remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
     }
 
+    /**
+     * 退出
+     */
     public void logout(String loginName)
     {
         recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
     }
 
+    /**
+     * 解锁
+     */
+    public void unlock(String password)
+    {
+        String username = SecurityUtils.getUsername();
+        // 或密码为空 错误
+        if (StringUtils.isEmpty(password))
+        {
+            throw new ServiceException("密码不能为空");
+        }
+        // 查询用户信息
+        R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
+
+        if (R.FAIL == userResult.getCode())
+        {
+            throw new ServiceException(userResult.getMsg());
+        }
+
+        SysUser user = userResult.getData().getSysUser();
+        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
+        {
+            throw new ServiceException("密码错误，请重新输入");
+        }
+    }
+
     /**
      * 注册
      */
@@ -143,6 +172,7 @@ public class SysLoginService
         SysUser sysUser = new SysUser();
         sysUser.setUserName(username);
         sysUser.setNickName(username);
+        sysUser.setPwdUpdateDate(DateUtils.getNowDate());
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
         R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 

ruoyi-auth/src/main/resources/bootstrap-k8s.yml

@@ -1,22 +0,0 @@
-# Tomcat
-server: 
-  port: 9200
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: ${SERVER_NAME}
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-      config:
-        # 配置中心地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - ${NACOS_SHARED_CONFIGS}

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: ${SPRING_PROFILES_ACTIVE:dev}
+    active: dev
   cloud:
     nacos:
       discovery:

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -87,6 +87,16 @@ public class Constants
      */
     public static final String LOGIN_FAIL = "Error";
 
+    /**
+     * 所有权限标识
+     */
+    public static final String ALL_PERMISSION = "*:*:*";
+
+    /**
+     * 管理员角色权限标识
+     */
+    public static final String SUPER_ADMIN = "admin";
+
     /**
      * 当前记录起始索引
      */
@@ -120,7 +130,7 @@ public class Constants
     /**
      * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
      */
-    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
+    public static final String[] JSON_WHITELIST_STR = { "com.ruoyi" };
 
     /**
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
@@ -132,4 +142,35 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
+
+    /**
+     * 部门相关常量
+     */
+    public static class Dept
+    {
+        /**
+         * 全部数据权限
+         */
+        public static final String DATA_SCOPE_ALL = "1";
+
+        /**
+         * 自定数据权限
+         */
+        public static final String DATA_SCOPE_CUSTOM = "2";
+
+        /**
+         * 部门数据权限
+         */
+        public static final String DATA_SCOPE_DEPT = "3";
+
+        /**
+         * 部门及以下数据权限
+         */
+        public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+        /**
+         * 仅本人数据权限
+         */
+        public static final String DATA_SCOPE_SELF = "5";
+    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java

@@ -31,6 +31,9 @@ public class GenConstants
     /** 上级菜单名称字段 */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
+    /** 生成详情页开关 */
+    public static final String GEN_VIEW = "genView";
+
     /** 数据库字符串类型 */
     public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java

@@ -80,4 +80,9 @@ public class UserConstants
     public static final int PASSWORD_MIN_LENGTH = 5;
 
     public static final int PASSWORD_MAX_LENGTH = 20;
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -53,7 +53,7 @@ public class SecurityContextHolder
 
     public static Long getUserId()
     {
-        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
+        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), null);
     }
 
     public static void setUserId(String account)

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java

@@ -3,7 +3,7 @@ package com.ruoyi.common.core.exception.file;
 import java.util.Arrays;
 
 /**
- * 文件上传 误异常类
+ * 文件上传无效扩展名异常类
  * 
  * @author ruoyi
  */

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -136,6 +136,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return new Date(time);
     }
 
+    /**
+     * 计算相差天数
+     */
+    public static int differentDaysByMillisecond(Date date1, Date date2)
+    {
+        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+    }
+
     /**
      * 计算时间差
      *

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -114,20 +114,20 @@ public class FileUtils
     }
 
     /**
-     * 检查文件是否可下载
+     * 校验文件路径合法性（安全性与扩展名）
      * 
-     * @param resource 需要下载的文件
+     * @param fileUrl 待校验的文件地址
      * @return true 正常 false 非法
      */
-    public static boolean checkAllowDownload(String resource)
+    public static boolean validateFilePath(String fileUrl)
     {
         // 禁止目录上跳级别
-        if (StringUtils.contains(resource, ".."))
+        if (StringUtils.contains(fileUrl, ".."))
         {
             return false;
         }
         // 判断是否在允许下载的文件规则内
-        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource));
+        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(fileUrl));
     }
 
     /**

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelSheet.java

@@ -0,0 +1,85 @@
+package com.ruoyi.common.core.utils.poi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 多 Sheet 导出时的数据信息
+ *
+ * 使用示例：
+ * <pre>
+ *   List<ExcelSheet<?>> sheets = new ArrayList<>();
+ *   sheets.add(new ExcelSheet<>("参数数据", configList, Config.class, "参数信息"));
+ *   sheets.add(new ExcelSheet<>("岗位数据", postList, Post.class, "岗位信息"));
+ *   return ExcelUtil.exportMultiSheet(sheets);
+ * </pre>
+ * 
+ * @author ruoyi
+ */
+public class ExcelSheet<T>
+{
+    /** Sheet 名称 */
+    private String sheetName;
+
+    /** 导出数据集合 */
+    private List<T> list;
+
+    /** 数据对应的实体 Class */
+    private Class<T> clazz;
+
+    /** Sheet 顶部大标题（可为空） */
+    private String title;
+
+    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz)
+    {
+        this(sheetName, list, clazz, "");
+    }
+
+    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz, String title)
+    {
+        this.sheetName = sheetName;
+        this.list = list != null ? list : new ArrayList<>();
+        this.clazz = clazz;
+        this.title = title != null ? title : "";
+    }
+
+    public String getSheetName()
+    {
+        return sheetName;
+    }
+
+    public List<T> getList()
+    {
+        return list;
+    }
+
+    public Class<T> getClazz()
+    {
+        return clazz;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+
+    public void setSheetName(String sheetName)
+    {
+        this.sheetName = sheetName;
+    }
+
+    public void setList(List<T> list)
+    {
+        this.list = list;
+    }
+
+    public void setClazz(Class<T> clazz)
+    {
+        this.clazz = clazz;
+    }
+
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+}

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -73,10 +73,17 @@ public class ExcelUtil<T>
 {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
+    public static final String SEPARATOR = ",";
+
     public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
 
     public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
 
+    /**
+     * 单元格样式缓存
+     */
+    private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();
+
     /**
      * Excel sheet最大行数，默认65536
      */
@@ -145,23 +152,18 @@ public class ExcelUtil<T>
     /**
      * 对象的子列表方法
      */
-    private Method subMethod;
+    private Map<String, Method> subMethods;
 
     /**
      * 对象的子列表属性
      */
-    private List<Field> subFields;
+    private Map<String, List<Field>> subFieldsMap;
 
     /**
      * 统计列表
      */
     private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
 
-    /**
-     * 数字格式
-     */
-    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
-
     /**
      * 实体对象
      */
@@ -228,7 +230,10 @@ public class ExcelUtil<T>
             int titleLastCol = this.fields.size() - 1;
             if (isSubList())
             {
-                titleLastCol = titleLastCol + subFields.size() - 1;
+                for (List<Field> currentSubFields : subFieldsMap.values())
+                {
+                    titleLastCol = titleLastCol + currentSubFields.size() - 1;
+                }
             }
             Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
             titleRow.setHeightInPoints(30);
@@ -248,16 +253,17 @@ public class ExcelUtil<T>
         {
             Row subRow = sheet.createRow(rownum);
             int column = 0;
-            int subFieldSize = subFields != null ? subFields.size() : 0;
             for (Object[] objects : fields)
             {
                 Field field = (Field) objects[0];
                 Excel attr = (Excel) objects[1];
+                CellStyle cellStyle = styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()));
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
                     Cell cell = subRow.createCell(column);
                     cell.setCellValue(attr.name());
-                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+                    cell.setCellStyle(cellStyle);
+                    int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
                     if (subFieldSize > 1)
                     {
                         CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
@@ -269,7 +275,7 @@ public class ExcelUtil<T>
                 {
                     Cell cell = subRow.createCell(column++);
                     cell.setCellValue(attr.name());
-                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+                    cell.setCellStyle(cellStyle);
                 }
             }
             rownum++;
@@ -341,7 +347,11 @@ public class ExcelUtil<T>
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
             // 获取表头
             Row heard = sheet.getRow(titleNum);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            if (heard == null)
+            {
+                throw new UtilException("文件标题行为空，请检查Excel文件格式");
+            }
+            for (int i = 0; i < heard.getLastCellNum(); i++)
             {
                 Cell cell = heard.getCell(i);
                 if (StringUtils.isNotNull(cell))
@@ -349,10 +359,6 @@ public class ExcelUtil<T>
                     String value = this.getCellValue(heard, i).toString();
                     cellMap.put(value, i);
                 }
-                else
-                {
-                    cellMap.put(null, i);
-                }
             }
             // 有数据时才处理 得到类的所有field.
             List<Object[]> fields = this.getFields();
@@ -390,7 +396,7 @@ public class ExcelUtil<T>
                     if (String.class == fieldType)
                     {
                         String s = Convert.toStr(val);
-                        if (StringUtils.endsWith(s, ".0"))
+                        if (s.matches("^\\d+\\.0$"))
                         {
                             val = StringUtils.substringBefore(s, ".0");
                         }
@@ -496,6 +502,82 @@ public class ExcelUtil<T>
         exportExcel(response);
     }
 
+    /**
+     * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，直接输出到 HttpServletResponse
+     *
+     * @param response HTTP 响应
+     * @param sheets   Sheet 描述列表
+     */
+    public static void exportMultiSheet(HttpServletResponse response, List<ExcelSheet<?>> sheets)
+    {
+        if (sheets == null || sheets.isEmpty())
+        {
+            return;
+        }
+        SXSSFWorkbook wb = buildWorkbook(sheets);
+        try
+        {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            wb.write(response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("多Sheet导出Excel异常{}", e.getMessage());
+        }
+        finally
+        {
+            IOUtils.closeQuietly(wb);
+        }
+    }
+
+    /**
+     * 构建多 Sheet Workbook —— 创建 SXSSFWorkbook 并将所有 Sheet 数据写入
+     *
+     * @param sheets Sheet 描述列表
+     * @return 已写入所有 Sheet 数据的 SXSSFWorkbook
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private static SXSSFWorkbook buildWorkbook(List<ExcelSheet<?>> sheets)
+    {
+        SXSSFWorkbook wb = new SXSSFWorkbook(500);
+        for (ExcelSheet<?> excelSheet : sheets)
+        {
+            ExcelUtil util = new ExcelUtil(excelSheet.getClazz());
+            util.initWithWorkbook(wb, excelSheet.getList(), excelSheet.getSheetName(), excelSheet.getTitle());
+            util.writeSheet();
+        }
+        return wb;
+    }
+
+    /**
+     * 使用外部传入的 Workbook 初始化（多 Sheet 导出专用）
+     * 与 init() 的区别：不新建 Workbook，而是在已有 wb 上追加新 Sheet
+     *
+     * @param wb        已有工作簿
+     * @param list      数据集合
+     * @param sheetName Sheet 名称
+     * @param title     大标题（可为空）
+     */
+    public void initWithWorkbook(SXSSFWorkbook wb, List<T> list, String sheetName, String title)
+    {
+        if (list == null)
+        {
+            list = new ArrayList<T>();
+        }
+        this.list      = list;
+        this.sheetName = sheetName;
+        this.title     = title != null ? title : "";
+        this.type      = Type.EXPORT;
+        this.rownum    = 0;
+        this.wb        = wb;
+        this.sheet     = wb.createSheet(sheetName);
+        createExcelField();
+        this.styles    = createStyles(wb);
+        createTitle();
+        createSubHead();
+    }
+
     /**
      * 对list数据源将其里面的数据导入到excel表单
      *
@@ -565,7 +647,8 @@ public class ExcelUtil<T>
                 Excel excel = (Excel) os[1];
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
-                    for (Field subField : subFields)
+                    List<Field> currentSubFields = subFieldsMap.get(field.getName());
+                    for (Field subField : currentSubFields)
                     {
                         Excel subExcel = subField.getAnnotation(Excel.class);
                         this.createHeadCell(subExcel, row, column++);
@@ -578,7 +661,7 @@ public class ExcelUtil<T>
             }
             if (Type.EXPORT.equals(type))
             {
-                fillExcelData(index, row);
+                fillExcelData(index);
                 addStatisticsRow();
             }
         }
@@ -588,10 +671,9 @@ public class ExcelUtil<T>
      * 填充excel数据
      * 
      * @param index 序号
-     * @param row 单元格行
      */
     @SuppressWarnings("unchecked")
-    public void fillExcelData(int index, Row row)
+    public void fillExcelData(int index)
     {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
@@ -599,7 +681,7 @@ public class ExcelUtil<T>
 
         for (int i = startNo; i < endNo; i++)
         {
-            row = sheet.createRow(currentRowNum);
+            Row row = sheet.createRow(currentRowNum);
             T vo = (T) list.get(i);
             int column = 0;
             int maxSubListSize = getCurrentMaxSubListSize(vo);
@@ -612,6 +694,7 @@ public class ExcelUtil<T>
                     try
                     {
                         Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
+                        List<Field> currentSubFields = subFieldsMap.get(field.getName());
                         if (subList != null && !subList.isEmpty())
                         {
                             int subIndex = 0;
@@ -624,15 +707,15 @@ public class ExcelUtil<T>
                                 }
 
                                 int subColumn = column;
-                                for (Field subField : subFields)
+                                for (Field subField : currentSubFields)
                                 {
                                     Excel subExcel = subField.getAnnotation(Excel.class);
                                     addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
                                 }
                                 subIndex++;
                             }
-                            column += subFields.size();
                         }
+                        column += currentSubFields.size();
                     }
                     catch (Exception e)
                     {
@@ -724,6 +807,7 @@ public class ExcelUtil<T>
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setDataFormat(dataFormat.getFormat("######0.00"));
         Font totalFont = wb.createFont();
         totalFont.setFontName("Arial");
         totalFont.setFontHeightInPoints((short) 10);
@@ -984,7 +1068,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
-                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
+                if (isSubListValue(vo) && getListCellValue(vo) > 1 && attr.needMerge())
                 {
                     if (subMergedLastRowNum >= subMergedFirstRowNum)
                     {
@@ -1000,7 +1084,7 @@ public class ExcelUtil<T>
                 String separator = attr.separator();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
+                    cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1030,6 +1114,28 @@ public class ExcelUtil<T>
         return cell;
     }
 
+    /**
+     * 使用自定义格式，同时避免样式污染
+     * 
+     * @param cellStyle 从此样式复制
+     * @param format 格式匹配的字符串
+     * @return 格式化后CellStyle对象
+     */
+    private CellStyle createCellStyle(CellStyle cellStyle, String format)
+    {
+        String key = cellStyle.getIndex() + "|" + format;
+        CellStyle cached = cellStyleCache.get(key);
+        if (cached != null)
+        {
+            return cached;
+        }
+        CellStyle style = wb.createCellStyle();
+        style.cloneStyleFrom(cellStyle);
+        style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));
+        cellStyleCache.put(key, style);
+        return style;
+    }
+
     /**
      * 设置 POI XSSFSheet 单元格提示或选择框
      * 
@@ -1081,18 +1187,36 @@ public class ExcelUtil<T>
     public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
     {
         String hideSheetName = "combo_" + firstCol + "_" + endCol;
-        Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
+        Sheet hideSheet = null;
-        for (int i = 0; i < textlist.length; i++)
+        String hideSheetDataName = hideSheetName + "_data";
+        Name name = wb.getName(hideSheetDataName);
+        if (name != null)
         {
-            hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
+            // 名称已存在，尝试从名称的引用中找到sheet名称
+            String refersToFormula = name.getRefersToFormula();
+            if (StringUtils.isNotEmpty(refersToFormula) && refersToFormula.contains("!"))
+            {
+                String sheetNameFromFormula = refersToFormula.substring(0, refersToFormula.indexOf("!"));
+                hideSheet = wb.getSheet(sheetNameFromFormula);
+            }
         }
-        // 创建名称，可被其他单元格引用
+
-        Name name = wb.createName();
+        if (hideSheet == null)
-        name.setNameName(hideSheetName + "_data");
+        {
-        name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
+            hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
+            for (int i = 0; i < textlist.length; i++)
+            {
+                hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
+            }
+            // 创建名称，可被其他单元格引用
+            name = wb.createName();
+            name.setNameName(hideSheetDataName);
+            name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
+        }
+
         DataValidationHelper helper = sheet.getDataValidationHelper();
         // 加载下拉列表内容
-        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");
+        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetDataName);
         // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 数据有效性对象
@@ -1130,7 +1254,7 @@ public class ExcelUtil<T>
     public static String convertByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1167,7 +1291,7 @@ public class ExcelUtil<T>
     public static String reverseByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1255,7 +1379,7 @@ public class ExcelUtil<T>
             {
                 cell = row.createCell(key);
                 cell.setCellStyle(styles.get("total"));
-                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+                cell.setCellValue(statistics.get(key));
             }
             statistics.clear();
         }
@@ -1330,6 +1454,8 @@ public class ExcelUtil<T>
     {
         List<Object[]> fields = new ArrayList<Object[]>();
         List<Field> tempFields = new ArrayList<>();
+        subFieldsMap = new HashMap<>();
+        subMethods = new HashMap<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
         if (StringUtils.isNotEmpty(includeFields))
@@ -1377,10 +1503,11 @@ public class ExcelUtil<T>
             }
             if (Collection.class.isAssignableFrom(field.getType()))
             {
-                subMethod = getSubMethod(field.getName(), clazz);
+                String fieldName = field.getName();
+                subMethods.put(fieldName, getSubMethod(fieldName, clazz));
                 ParameterizedType pt = (ParameterizedType) field.getGenericType();
                 Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+                subFieldsMap.put(fieldName, FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class));
             }
         }
 
@@ -1449,7 +1576,8 @@ public class ExcelUtil<T>
         {
             this.sheet = wb.createSheet();
             this.createTitle();
-            wb.setSheetName(index, sheetName + index);
+            int actualIndex = wb.getSheetIndex(this.sheet);
+            wb.setSheetName(actualIndex, sheetName + index);
         }
     }
 
@@ -1574,7 +1702,7 @@ public class ExcelUtil<T>
      */
     public boolean isSubList()
     {
-        return StringUtils.isNotNull(subFields) && subFields.size() > 0;
+        return !StringUtils.isEmpty(subFieldsMap);
     }
 
     /**
@@ -1582,24 +1710,32 @@ public class ExcelUtil<T>
      */
     public boolean isSubListValue(T vo)
     {
-        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
+        return !StringUtils.isEmpty(subFieldsMap) && getListCellValue(vo) > 0;
     }
 
     /**
      * 获取集合的值
      */
-    public Collection<?> getListCellValue(Object obj)
+    public int getListCellValue(Object obj)
     {
-        Object value;
+        Collection<?> value;
+        int max = 0;
         try
         {
-            value = subMethod.invoke(obj, new Object[] {});
+            for (String s : subMethods.keySet())
+            {
+                value = (Collection<?>) subMethods.get(s).invoke(obj);
+                if (value.size() > max)
+                {
+                    max = value.size();
+                }
+            }
         }
         catch (Exception e)
         {
-            return new ArrayList<Object>();
+            return 0;
         }
-        return (Collection<?>) value;
+        return max;
     }
 
     /**

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java

@@ -343,25 +343,25 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
         final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
         // time_low
         builder.append(digits(mostSigBits >> 32, 8));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }
         // time_mid
         builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple)
+        if (!isSimple)
         {
             builder.append('-');
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -7,12 +7,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.PageUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.sql.SqlUtil;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
 
 /**
  * web层通用数据处理
@@ -48,6 +53,19 @@ public class BaseController
         PageUtils.startPage();
     }
 
+    /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
     /**
      * 清理分页的线程变量
      */

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

@@ -16,15 +16,25 @@ import java.lang.annotation.Target;
 @Documented
 public @interface DataScope
 {
+    /**
+     * 用户表的别名
+     */
+    public String userAlias() default "";
+
     /**
      * 部门表的别名
      */
     public String deptAlias() default "";
 
     /**
-     * 用户表的别名
+     * 用户字段名
      */
-    public String userAlias() default "";
+    public String userField() default "user_id";
+
+    /**
+     * 部门字段名
+     */
+    public String deptField() default "dept_id";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -6,6 +6,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
+import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.text.Convert;
@@ -26,31 +27,6 @@ import com.ruoyi.system.api.model.LoginUser;
 @Component
 public class DataScopeAspect
 {
-    /**
-     * 全部数据权限
-     */
-    public static final String DATA_SCOPE_ALL = "1";
-
-    /**
-     * 自定数据权限
-     */
-    public static final String DATA_SCOPE_CUSTOM = "2";
-
-    /**
-     * 部门数据权限
-     */
-    public static final String DATA_SCOPE_DEPT = "3";
-
-    /**
-     * 部门及以下数据权限
-     */
-    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-    /**
-     * 仅本人数据权限
-     */
-    public static final String DATA_SCOPE_SELF = "5";
-
     /**
      * 数据权限过滤关键字
      */
@@ -74,7 +50,7 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);
             }
         }
     }
@@ -88,13 +64,13 @@ public class DataScopeAspect
      * @param userAlias 用户别名
      * @param permission 权限字符
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String userAlias, String deptAlias, String userField, String deptField, String permission)
     {
         StringBuilder sqlString = new StringBuilder();
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -107,46 +83,46 @@ public class DataScopeAspect
             {
                 continue;
             }
-            if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
                 continue;
             }
-            if (DATA_SCOPE_ALL.equals(dataScope))
+            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))
             {
                 sqlString = new StringBuilder();
                 conditions.add(dataScope);
                 break;
             }
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))
             {
                 if (scopeCustomIds.size() > 1)
                 {
                     // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, deptField, String.join(",", scopeCustomIds)));
                 }
                 else
                 {
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, deptField, role.getRoleId()));
                 }
             }
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.{} = {} ", deptAlias, deptField, user.getDeptId()));
             }
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, deptField, user.getDeptId(), user.getDeptId()));
             }
-            else if (DATA_SCOPE_SELF.equals(dataScope))
+            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.{} = {} ", userAlias, userField, user.getUserId()));
                 }
                 else
                 {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+                    sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
                 }
             }
             conditions.add(dataScope);
@@ -155,7 +131,7 @@ public class DataScopeAspect
         // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
         if (StringUtils.isEmpty(conditions))
         {
-            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+            sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
         }
 
         if (StringUtils.isNotBlank(sqlString.toString()))

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -48,6 +48,9 @@ public class LogAspect
     /** 计算操作消耗时间 */
     private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
 
+    /** 参数最大长度限制 */
+    private static final int PARAM_MAX_LENGTH = 2000;
+
     @Autowired
     private AsyncLogService asyncLogService;
 
@@ -166,16 +169,16 @@ public class LogAspect
      */
     private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
     {
-        Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
         String requestMethod = operLog.getRequestMethod();
+        Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
         if (StringUtils.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name()))
         {
             String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
-            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+            operLog.setOperParam(params);
         }
         else
         {
-            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));
+            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, PARAM_MAX_LENGTH));
         }
     }
 
@@ -184,7 +187,7 @@ public class LogAspect
      */
     private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
     {
-        String params = "";
+        StringBuilder params = new StringBuilder();
         if (paramsArray != null && paramsArray.length > 0)
         {
             for (Object o : paramsArray)
@@ -194,15 +197,20 @@ public class LogAspect
                     try
                     {
                         String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
-                        params += jsonObj.toString() + " ";
+                        params.append(jsonObj).append(" ");
+                        if (params.length() >= PARAM_MAX_LENGTH)
+                        {
+                            return StringUtils.substring(params.toString(), 0, PARAM_MAX_LENGTH);
+                        }
                     }
                     catch (Exception e)
                     {
+                        log.error("请求参数拼装异常 msg:{}, 参数:{}", e.getMessage(), paramsArray, e);
                     }
                 }
             }
         }
-        return params.trim();
+        return params.toString();
     }
 
     /**

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java

@@ -56,16 +56,8 @@ public class PreAuthorizeAspect
         // 注解鉴权
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         checkMethodAnnotation(signature.getMethod());
-        try
+        // 执行原有逻辑
-        {
+        return joinPoint.proceed();
-            // 执行原有逻辑
-            Object obj = joinPoint.proceed();
-            return obj;
-        }
-        catch (Throwable e)
-        {
-            throw e;
-        }
     }
 
     /**

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.TokenConstants;
+import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -79,6 +80,16 @@ public class SecurityUtils
         return token;
     }
 
+    /**
+     * 是否为管理员
+     * 
+     * @return 结果
+     */
+    public static boolean isAdmin()
+    {
+        return isAdmin(getUserId());
+    }
+
     /**
      * 是否为管理员
      * 
@@ -87,7 +98,7 @@ public class SecurityUtils
      */
     public static boolean isAdmin(Long userId)
     {
-        return userId != null && 1L == userId;
+        return UserConstants.isAdmin(userId);
     }
 
     /**

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -17,10 +17,10 @@
 
     <dependencies>
 
-        <!-- RuoYi Common Security -->
+        <!-- RuoYi Common Core -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
+            <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
     </dependencies>

ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java

@@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.sensitive.annotation.Sensitive;
 import com.ruoyi.common.sensitive.enums.DesensitizedType;
-import com.ruoyi.system.api.model.LoginUser;
 
 /**
  * 数据脱敏序列化过滤
@@ -55,9 +55,9 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
     {
         try
         {
-            LoginUser securityUser = SecurityUtils.getLoginUser();
+            Long userId = SecurityContextHolder.getUserId();
             // 管理员不脱敏
-            return !securityUser.getSysUser().isAdmin();
+            return !UserConstants.isAdmin(userId);
         }
         catch (Exception e)
         {

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java

@@ -1,87 +0,0 @@
-package com.ruoyi.gateway.filter;
-
-import java.util.Collections;
-import java.util.List;
-import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.OrderedGatewayFilter;
-import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
-import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
-import org.springframework.http.HttpMethod;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-/**
- * 获取body请求数据（解决流不能重复读取问题）
- * 
- * @author ruoyi
- */
-@Component
-public class CacheRequestFilter extends AbstractGatewayFilterFactory<CacheRequestFilter.Config>
-{
-    public CacheRequestFilter()
-    {
-        super(Config.class);
-    }
-
-    @Override
-    public String name()
-    {
-        return "CacheRequestFilter";
-    }
-
-    @Override
-    public GatewayFilter apply(Config config)
-    {
-        CacheRequestGatewayFilter cacheRequestGatewayFilter = new CacheRequestGatewayFilter();
-        Integer order = config.getOrder();
-        if (order == null)
-        {
-            return cacheRequestGatewayFilter;
-        }
-        return new OrderedGatewayFilter(cacheRequestGatewayFilter, order);
-    }
-
-    public static class CacheRequestGatewayFilter implements GatewayFilter
-    {
-        @Override
-        public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
-        {
-            // GET DELETE 不过滤
-            HttpMethod method = exchange.getRequest().getMethod();
-            if (method == null || method == HttpMethod.GET || method == HttpMethod.DELETE)
-            {
-                return chain.filter(exchange);
-            }
-            return ServerWebExchangeUtils.cacheRequestBodyAndRequest(exchange, (serverHttpRequest) -> {
-                if (serverHttpRequest == exchange.getRequest())
-                {
-                    return chain.filter(exchange);
-                }
-                return chain.filter(exchange.mutate().request(serverHttpRequest).build());
-            });
-        }
-    }
-
-    @Override
-    public List<String> shortcutFieldOrder()
-    {
-        return Collections.singletonList("order");
-    }
-
-    static class Config
-    {
-        private Integer order;
-
-        public Integer getOrder()
-        {
-            return order;
-        }
-
-        public void setOrder(Integer order)
-        {
-            this.order = order;
-        }
-    }
-}

ruoyi-gateway/src/main/resources/bootstrap-k8s.yml

@@ -1,37 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: ${SERVER_NAME}
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-      config:
-        # 配置中心地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - ${NACOS_SHARED_CONFIGS}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 127.0.0.1:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-            dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: ruoyi-gateway
   profiles:
     # 环境配置
-    active: ${SPRING_PROFILES_ACTIVE:dev}
+    active: dev
   cloud:
     nacos:
       discovery:

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java

@@ -0,0 +1,46 @@
+package com.ruoyi.file.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.DispatcherType;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.ruoyi.file.filter.RefererFilter;
+
+/**
+ * Filter配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class FilterConfig
+{
+    /**
+     * 资源映射路径 前缀
+     */
+    @Value("${file.prefix}")
+    public String localFilePrefix;
+    
+    @Value("${referer.allowed-domains}")
+    private String allowedDomains;
+    
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Bean
+    @ConditionalOnProperty(value = "referer.enabled", havingValue = "true")
+    public FilterRegistrationBean refererFilterRegistration()
+    {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        registration.setFilter(new RefererFilter());
+        registration.addUrlPatterns(localFilePrefix + "/*");
+        registration.setName("refererFilter");
+        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+        Map<String, String> initParameters = new HashMap<String, String>();
+        initParameters.put("allowedDomains", allowedDomains);
+        registration.setInitParameters(initParameters);
+        return registration;
+    }
+}

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -3,10 +3,12 @@ package com.ruoyi.file.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.FileUtils;
 import com.ruoyi.file.service.ISysFileService;
 import com.ruoyi.system.api.domain.SysFile;
@@ -45,4 +47,26 @@ public class SysFileController
             return R.fail(e.getMessage());
         }
     }
+
+    /**
+     * 文件删除请求
+     */
+    @DeleteMapping("delete")
+    public R<Boolean> delete(String fileUrl)
+    {
+        try
+        {
+            if (!FileUtils.validateFilePath(fileUrl))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许删除。 ", fileUrl));
+            }
+            sysFileService.deleteFile(fileUrl);
+            return R.ok();
+        }
+        catch (Exception e)
+        {
+            log.error("删除文件失败", e);
+            return R.fail(e.getMessage());
+        }
+    }
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java

@@ -0,0 +1,77 @@
+package com.ruoyi.file.filter;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 防盗链过滤器
+ * 
+ * @author ruoyi
+ */
+public class RefererFilter implements Filter
+{
+    /**
+     * 允许的域名列表
+     */
+    public List<String> allowedDomains;
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException
+    {
+        String domains = filterConfig.getInitParameter("allowedDomains");
+        this.allowedDomains = Arrays.asList(domains.split(","));
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException
+    {
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse resp = (HttpServletResponse) response;
+
+        String referer = req.getHeader("Referer");
+
+        // 如果Referer为空，拒绝访问
+        if (referer == null || referer.isEmpty())
+        {
+            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied: Referer header is required");
+            return;
+        }
+
+        // 检查Referer是否在允许的域名列表中
+        boolean allowed = false;
+        for (String domain : allowedDomains)
+        {
+            if (referer.contains(domain))
+            {
+                allowed = true;
+                break;
+            }
+        }
+
+        // 根据检查结果决定是否放行
+        if (allowed)
+        {
+            chain.doFilter(request, response);
+        }
+        else
+        {
+            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied: Referer '" + referer + "' is not allowed");
+        }
+    }
+
+    @Override
+    public void destroy()
+    {
+
+    }
+}

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -1,11 +1,11 @@
 package com.ruoyi.file.service;
 
 import java.io.InputStream;
-import com.alibaba.nacos.common.utils.IoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.nacos.common.utils.IoUtils;
 import com.github.tobato.fastdfs.domain.fdfs.StorePath;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
 import com.ruoyi.common.core.utils.file.FileTypeUtils;
@@ -53,4 +53,24 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
             IoUtils.closeQuietly(inputStream);
         }
     }
+
+    /**
+     * FastDFS文件删除接口
+     * 
+     * @param fileUrl 文件访问URL
+     * @throws Exception
+     */
+    @Override
+    public void deleteFile(String fileUrl) throws Exception
+    {
+        try
+        {
+            StorePath storePath = StorePath.parseFromUrl(fileUrl);
+            storageClient.deleteFile(storePath.getGroup(), storePath.getPath());
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("FastDfs Failed to delete file: ", e);
+        }
+    }
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java

@@ -17,4 +17,12 @@ public interface ISysFileService
      * @throws Exception
      */
     public String uploadFile(MultipartFile file) throws Exception;
+
+    /**
+     * 文件删除接口
+     * 
+     * @param fileUrl 文件访问URL
+     * @throws Exception
+     */
+    public void deleteFile(String fileUrl) throws Exception;
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.file.FileUtils;
 import com.ruoyi.file.utils.FileUploadUtils;
 
 /**
@@ -47,4 +49,17 @@ public class LocalSysFileServiceImpl implements ISysFileService
         String url = domain + localFilePrefix + name;
         return url;
     }
+
+    /**
+     * 本地文件删除接口
+     * 
+     * @param fileUrl 文件访问URL
+     * @throws Exception
+     */
+    @Override
+    public void deleteFile(String fileUrl) throws Exception
+    {
+        String localFile = StringUtils.substringAfter(fileUrl, localFilePrefix);
+        FileUtils.deleteFile(localFilePath + localFile);
+    }
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@@ -5,10 +5,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.nacos.common.utils.IoUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.file.config.MinioConfig;
 import com.ruoyi.file.utils.FileUploadUtils;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
+import io.minio.RemoveObjectArgs;
 
 /**
  * Minio 文件存储
@@ -57,4 +59,24 @@ public class MinioSysFileServiceImpl implements ISysFileService
             IoUtils.closeQuietly(inputStream);
         }
     }
+
+    /**
+     * Minio文件删除接口
+     * 
+     * @param fileUrl 文件访问URL
+     * @throws Exception
+     */
+    @Override
+    public void deleteFile(String fileUrl) throws Exception
+    {
+        try
+        {
+            String minioFile = StringUtils.substringAfter(fileUrl, minioConfig.getBucketName());
+            client.removeObject(RemoveObjectArgs.builder().bucket(minioConfig.getBucketName()).object(minioFile).build());
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("Minio Failed to delete file", e);
+        }
+    }
 }

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-k8s.yml

@@ -1,23 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: ${SERVER_NAME}
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-      config:
-        # 配置中心地址
-        server-addr: ${NACOS_SERVER}:${NACOS_PORT}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - ${NACOS_SHARED_CONFIGS}
-

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: ruoyi-file
   profiles:
     # 环境配置
-    active: ${SPRING_PROFILES_ACTIVE:dev}
+    active: dev
   cloud:
     nacos:
       discovery:

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.5</version>
+        <version>3.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -57,7 +58,7 @@ public class GenController extends BaseController
     }
 
     /**
-     * 修改代码生成业务
+     * 获取代码生成信息
      */
     @RequiresPermissions("tool:gen:query")
     @GetMapping(value = "/{tableId}")
@@ -104,12 +105,12 @@ public class GenController extends BaseController
     @RequiresPermissions("tool:gen:import")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
-    public AjaxResult importTableSave(String tables)
+    public AjaxResult importTableSave(@RequestParam("tables") String tables, @RequestParam("tplWebType") String tplWebType)
     {
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
         List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
-        genTableService.importGenTable(tableList);
+        genTableService.importGenTable(tableList, tplWebType);
         return success();
     }
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -41,7 +41,7 @@ public class GenTable extends BaseEntity
     /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
     private String tplCategory;
 
-    /** 前端类型（element-ui模版 element-plus模版） */
+    /** 前端类型（element-ui模版 element-plus模版 element-plus-typescript模版） */
     private String tplWebType;
 
     /** 生成包路径 */
@@ -64,6 +64,9 @@ public class GenTable extends BaseEntity
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
+    /** 表单布局（单列 双列 三列） */
+    private Integer formColNum;
+
     /** 生成代码方式（0zip压缩包 1自定义路径） */
     private String genType;
 
@@ -98,6 +101,9 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
+    /** 是否生成详情页 */
+    private boolean isView;
+
     public Long getTableId()
     {
         return tableId;
@@ -228,6 +234,16 @@ public class GenTable extends BaseEntity
         this.functionAuthor = functionAuthor;
     }
 
+    public Integer getFormColNum()
+    {
+        return formColNum;
+    }
+
+    public void setFormColNum(Integer formColNum)
+    {
+        this.formColNum = formColNum;
+    }
+
     public String getGenType()
     {
         return genType;
@@ -267,6 +283,7 @@ public class GenTable extends BaseEntity
     {
         this.subTable = subTable;
     }
+
     public List<GenTableColumn> getColumns()
     {
         return columns;
@@ -337,6 +354,16 @@ public class GenTable extends BaseEntity
         this.parentMenuName = parentMenuName;
     }
 
+    public boolean isView()
+    {
+        return isView;
+    }
+
+    public void setView(boolean isView)
+    {
+        this.isView = isView;
+    }
+
     public boolean isSub()
     {
         return isSub(this.tplCategory);
@@ -346,6 +373,7 @@ public class GenTable extends BaseEntity
     {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
     }
+
     public boolean isTree()
     {
         return isTree(this.tplCategory);