5 Commits 93380bd6cf ... 47e2c490e6

Autor SHA1 Nachricht Datum
  tanzy 47e2c490e6 Merge branch 'master' into develop vor 10 Monaten
  chenxiaoxiang c5d8786466 配置修改 vor 10 Monaten
  chenxiaoxiang 1a9787affd 配置修改 vor 10 Monaten
  chenxiaoxiang 48f6924221 复制jar vor 10 Monaten
  chenxiaoxiang e6bf57985b 动态sql 执行 vor 10 Monaten
27 geänderte Dateien mit 1041 neuen und 254 gelöschten Zeilen
  1. 32 0
      docker/copy-jar.sh
  2. 0 87
      docker/docker-compose-ruoyi.yml
  3. 9 96
      docker/docker-compose.yml
  4. 1 1
      docker/ruoyi/modules/file/jar/readme.txt
  5. 21 0
      ruoyi-auth/src/main/resources/bootstrap-local.yml
  6. 38 0
      ruoyi-gateway/src/main/resources/bootstrap-dev.yml
  7. 36 0
      ruoyi-gateway/src/main/resources/bootstrap-local.yml
  8. 44 0
      ruoyi-gateway/src/main/resources/bootstrap-prod.yml
  9. 3 19
      ruoyi-gateway/src/main/resources/bootstrap.yml
  10. 19 0
      ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml
  11. 22 0
      ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-local.yml
  12. 19 0
      ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml
  13. 0 17
      ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
  14. 115 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDynamicSqlController.java
  15. 102 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDynamicSql.java
  16. 78 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDynamicSqlMapper.java
  17. 71 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDynamicSqlService.java
  18. 145 0
      ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDynamicSqlServiceImpl.java
  19. 20 0
      ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml
  20. 22 0
      ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-local.yml
  21. 20 0
      ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml
  22. 0 17
      ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
  23. 99 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDynamicSqlMapper.xml
  24. 44 0
      ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml
  25. 36 0
      ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-local.yml
  26. 44 0
      ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml
  27. 1 17
      ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

+ 32 - 0
docker/copy-jar.sh

@@ -0,0 +1,32 @@
1
+#!/bin/sh
2
+
3
+# 复制项目的文件到对应docker路径,便于一键生成镜像。
4
+usage() {
5
+	echo "Usage: sh copy-jar.sh"
6
+	exit 1
7
+}
8
+
9
+
10
+
11
+# copy jar
12
+echo "begin copy ruoyi-gateway "
13
+cp ./jar/ruoyi-gateway.jar ./ruoyi/gateway/jar
14
+
15
+echo "begin copy ruoyi-auth "
16
+cp ./jar/ruoyi-auth.jar ./ruoyi/auth/jar
17
+
18
+echo "begin copy ruoyi-visual "
19
+cp ./jar/ruoyi-visual-monitor.jar  ./ruoyi/visual/monitor/jar
20
+
21
+echo "begin copy ruoyi-modules-system "
22
+cp ./jar/ruoyi-modules-system.jar ./ruoyi/modules/system/jar
23
+
24
+echo "begin copy ruoyi-modules-file "
25
+cp ./jar/ruoyi-modules-file.jar ./ruoyi/modules/file/jar
26
+
27
+echo "begin copy ruoyi-modules-job "
28
+cp ./jar/ruoyi-modules-job.jar ./ruoyi/modules/job/jar
29
+
30
+echo "begin copy ruoyi-modules-gen "
31
+cp ./jar/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar
32
+

+ 0 - 87
docker/docker-compose-ruoyi.yml

@@ -1,70 +1,5 @@
1 1
 version : '3.8'
2 2
 services:
3
-  ruoyi-nacos:
4
-    container_name: ruoyi-nacos
5
-    image: nacos/nacos-server
6
-    build:
7
-      context: ./nacos
8
-    environment:
9
-      - MODE=standalone
10
-    volumes:
11
-      - ./nacos/logs/:/home/nacos/logs
12
-      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
13
-    ports:
14
-      - "8848:8848"
15
-      - "9848:9848"
16
-      - "9849:9849"
17
-    depends_on:
18
-      - ruoyi-mysql
19
-  ruoyi-mysql:
20
-    container_name: ruoyi-mysql
21
-    image: mysql:5.7
22
-    build:
23
-      context: ./mysql
24
-    ports:
25
-      - "3306:3306"
26
-    volumes:
27
-      - ./mysql/conf:/etc/mysql/conf.d
28
-      - ./mysql/logs:/logs
29
-      - ./mysql/data:/var/lib/mysql
30
-    command: [
31
-          'mysqld',
32
-          '--innodb-buffer-pool-size=80M',
33
-          '--character-set-server=utf8mb4',
34
-          '--collation-server=utf8mb4_unicode_ci',
35
-          '--default-time-zone=+8:00',
36
-          '--lower-case-table-names=1'
37
-        ]
38
-    environment:
39
-      MYSQL_DATABASE: 'ry-cloud'
40
-      MYSQL_ROOT_PASSWORD: password
41
-  ruoyi-redis:
42
-    container_name: ruoyi-redis
43
-    image: redis
44
-    build:
45
-      context: ./redis
46
-    ports:
47
-      - "6379:6379"
48
-    volumes:
49
-      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
50
-      - ./redis/data:/data
51
-    command: redis-server /home/ruoyi/redis/redis.conf
52
-  ruoyi-nginx:
53
-    container_name: ruoyi-nginx
54
-    image: nginx
55
-    build:
56
-      context: ./nginx
57
-    ports:
58
-      - "80:80"
59
-    volumes:
60
-      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
61
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
62
-      - ./nginx/logs:/var/log/nginx
63
-      - ./nginx/conf.d:/etc/nginx/conf.d
64
-    depends_on:
65
-      - ruoyi-gateway
66
-    links:
67
-      - ruoyi-gateway
68 3
   ruoyi-gateway:
69 4
     container_name: ruoyi-gateway
70 5
     build:
@@ -72,10 +7,6 @@ services:
72 7
       dockerfile: dockerfile
73 8
     ports:
74 9
       - "8080:8080"
75
-    depends_on:
76
-      - ruoyi-redis
77
-    links:
78
-      - ruoyi-redis
79 10
   ruoyi-auth:
80 11
     container_name: ruoyi-auth
81 12
     build:
@@ -83,10 +14,6 @@ services:
83 14
       dockerfile: dockerfile
84 15
     ports:
85 16
       - "9200:9200"
86
-    depends_on:
87
-      - ruoyi-redis
88
-    links:
89
-      - ruoyi-redis
90 17
   ruoyi-modules-system:
91 18
     container_name: ruoyi-modules-system
92 19
     build:
@@ -94,12 +21,6 @@ services:
94 21
       dockerfile: dockerfile
95 22
     ports:
96 23
       - "9201:9201"
97
-    depends_on:
98
-      - ruoyi-redis
99
-      - ruoyi-mysql
100
-    links:
101
-      - ruoyi-redis
102
-      - ruoyi-mysql
103 24
   ruoyi-modules-gen:
104 25
     container_name: ruoyi-modules-gen
105 26
     build:
@@ -107,10 +28,6 @@ services:
107 28
       dockerfile: dockerfile
108 29
     ports:
109 30
       - "9202:9202"
110
-    depends_on:
111
-      - ruoyi-mysql
112
-    links:
113
-      - ruoyi-mysql
114 31
   ruoyi-modules-job:
115 32
     container_name: ruoyi-modules-job
116 33
     build:
@@ -118,10 +35,6 @@ services:
118 35
       dockerfile: dockerfile
119 36
     ports:
120 37
       - "9203:9203"
121
-    depends_on:
122
-      - ruoyi-mysql
123
-    links:
124
-      - ruoyi-mysql
125 38
   ruoyi-modules-file:
126 39
     container_name: ruoyi-modules-file
127 40
     build:

+ 9 - 96
docker/docker-compose.yml

@@ -1,140 +1,53 @@
1
-version : '3.8'
1
+version : '2.2'
2 2
 services:
3
-  ruoyi-nacos:
4
-    container_name: ruoyi-nacos
5
-    image: nacos/nacos-server
6
-    build:
7
-      context: ./nacos
8
-    environment:
9
-      - MODE=standalone
10
-    volumes:
11
-      - ./nacos/logs/:/home/nacos/logs
12
-      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
13
-    ports:
14
-      - "8848:8848"
15
-      - "9848:9848"
16
-      - "9849:9849"
17
-    depends_on:
18
-      - ruoyi-mysql
19
-  ruoyi-mysql:
20
-    container_name: ruoyi-mysql
21
-    image: mysql:5.7
22
-    build:
23
-      context: ./mysql
24
-    ports:
25
-      - "3306:3306"
26
-    volumes:
27
-      - ./mysql/conf:/etc/mysql/conf.d
28
-      - ./mysql/logs:/logs
29
-      - ./mysql/data:/var/lib/mysql
30
-    command: [
31
-          'mysqld',
32
-          '--innodb-buffer-pool-size=80M',
33
-          '--character-set-server=utf8mb4',
34
-          '--collation-server=utf8mb4_unicode_ci',
35
-          '--default-time-zone=+8:00',
36
-          '--lower-case-table-names=1'
37
-        ]
38
-    environment:
39
-      MYSQL_DATABASE: 'ry-cloud'
40
-      MYSQL_ROOT_PASSWORD: password
41
-  ruoyi-redis:
42
-    container_name: ruoyi-redis
43
-    image: redis
44
-    build:
45
-      context: ./redis
46
-    ports:
47
-      - "6379:6379"
48
-    volumes:
49
-      - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf
50
-      - ./redis/data:/data
51
-    command: redis-server /home/ruoyi/redis/redis.conf
52
-  ruoyi-nginx:
53
-    container_name: ruoyi-nginx
54
-    image: nginx
55
-    build:
56
-      context: ./nginx
57
-    ports:
58
-      - "80:80"
59
-    volumes:
60
-      - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
61
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
62
-      - ./nginx/logs:/var/log/nginx
63
-      - ./nginx/conf.d:/etc/nginx/conf.d
64
-    depends_on:
65
-      - ruoyi-gateway
66
-    links:
67
-      - ruoyi-gateway
68 3
   ruoyi-gateway:
69 4
     container_name: ruoyi-gateway
70 5
     build:
71 6
       context: ./ruoyi/gateway
72 7
       dockerfile: dockerfile
73 8
     ports:
74
-      - "8080:8080"
75
-    depends_on:
76
-      - ruoyi-redis
77
-    links:
78
-      - ruoyi-redis
9
+      - "38080:8080"
79 10
   ruoyi-auth:
80 11
     container_name: ruoyi-auth
81 12
     build:
82 13
       context: ./ruoyi/auth
83 14
       dockerfile: dockerfile
84 15
     ports:
85
-      - "9200:9200"
86
-    depends_on:
87
-      - ruoyi-redis
88
-    links:
89
-      - ruoyi-redis
16
+      - "39200:9200"
90 17
   ruoyi-modules-system:
91 18
     container_name: ruoyi-modules-system
92 19
     build:
93 20
       context: ./ruoyi/modules/system
94 21
       dockerfile: dockerfile
95 22
     ports:
96
-      - "9201:9201"
97
-    depends_on:
98
-      - ruoyi-redis
99
-      - ruoyi-mysql
100
-    links:
101
-      - ruoyi-redis
102
-      - ruoyi-mysql
23
+      - "39201:9201"
103 24
   ruoyi-modules-gen:
104 25
     container_name: ruoyi-modules-gen
105 26
     build:
106 27
       context: ./ruoyi/modules/gen
107 28
       dockerfile: dockerfile
108 29
     ports:
109
-      - "9202:9202"
110
-    depends_on:
111
-      - ruoyi-mysql
112
-    links:
113
-      - ruoyi-mysql
30
+      - "39202:9202"
114 31
   ruoyi-modules-job:
115 32
     container_name: ruoyi-modules-job
116 33
     build:
117 34
       context: ./ruoyi/modules/job
118 35
       dockerfile: dockerfile
119 36
     ports:
120
-      - "9203:9203"
121
-    depends_on:
122
-      - ruoyi-mysql
123
-    links:
124
-      - ruoyi-mysql
37
+      - "39203:9203"
125 38
   ruoyi-modules-file:
126 39
     container_name: ruoyi-modules-file
127 40
     build:
128 41
       context: ./ruoyi/modules/file
129 42
       dockerfile: dockerfile
130 43
     ports:
131
-      - "9300:9300"
44
+      - "39300:9300"
132 45
     volumes:
133
-    - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
46
+      - ./ruoyi/uploadPath:/home/ruoyi/uploadPath
134 47
   ruoyi-visual-monitor:
135 48
     container_name: ruoyi-visual-monitor
136 49
     build:
137 50
       context: ./ruoyi/visual/monitor
138 51
       dockerfile: dockerfile
139 52
     ports:
140
-      - "9100:9100"
53
+      - "39100:9100"

+ 1 - 1
docker/ruoyi/modules/file/jar/readme.txt

@@ -1 +1 @@
1
-存放文件服务打包好的jar文件,用于docker启动应用。
1
+麓忙路脜脦脛录镁路镁脦帽麓貌掳眉潞脙碌脛jar脦脛录镁拢卢脫脙脫脷docker脝么露炉脫娄脫脙隆拢

+ 21 - 0
ruoyi-auth/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,21 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
11
+      config:
12
+        # 配置中心地址
13
+        server-addr: 192.168.3.222:8848
14
+        username: nacos
15
+        password: nacos
16
+        # 配置文件格式
17
+        file-extension: yml
18
+        # 共享配置
19
+        shared-configs:
20
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563

+ 38 - 0
ruoyi-gateway/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,38 @@
1
+# Tomcat
2
+server:
3
+  port: 38080
4
+
5
+# Spring
6
+spring:
7
+  cloud:
8
+    nacos:
9
+      discovery:
10
+        # 服务注册地址
11
+        server-addr: 192.168.3.222:8848
12
+        username: nacos
13
+        password: nacos
14
+      config:
15
+        # 配置中心地址
16
+        username: nacos
17
+        password: nacos
18
+        server-addr: 192.168.3.222:8848
19
+        # 配置文件格式
20
+        file-extension: yml
21
+        # 共享配置
22
+        shared-configs:
23
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
24
+    sentinel:
25
+      # 取消控制台懒加载
26
+      eager: true
27
+      transport:
28
+        # 控制台地址
29
+        dashboard: 192.168.3.222:8718
30
+      # nacos配置持久化
31
+      datasource:
32
+        ds1:
33
+          nacos:
34
+            server-addr: 192.168.3.222:8848
35
+            dataId: sentinel-ruoyi-gateway
36
+            groupId: DEFAULT_GROUP
37
+            data-type: json
38
+            rule-type: gw-flow

+ 36 - 0
ruoyi-gateway/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,36 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
11
+      config:
12
+        # 配置中心地址
13
+        username: nacos
14
+        password: nacos
15
+        server-addr: 192.168.3.222:8848
16
+        # 配置文件格式
17
+        file-extension: yml
18
+        # 共享配置
19
+        shared-configs:
20
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
22
+    sentinel:
23
+      # 取消控制台懒加载
24
+      eager: true
25
+      transport:
26
+        # 控制台地址
27
+        dashboard: 192.168.3.222:8718
28
+      # nacos配置持久化
29
+      datasource:
30
+        ds1:
31
+          nacos:
32
+            server-addr: 192.168.3.222:8848
33
+            dataId: sentinel-ruoyi-gateway
34
+            groupId: DEFAULT_GROUP
35
+            data-type: json
36
+            rule-type: gw-flow

+ 44 - 0
ruoyi-gateway/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,44 @@
1
+# Tomcat
2
+server:
3
+  port: 38080
4
+
5
+# Spring
6
+spring:
7
+  application:
8
+    # 应用名称
9
+    name: ruoyi-gateway
10
+  profiles:
11
+    # 环境配置
12
+    active: dev
13
+  cloud:
14
+    nacos:
15
+      discovery:
16
+        # 服务注册地址
17
+        server-addr: 192.168.3.222:8848
18
+        username: nacos
19
+        password: nacos
20
+      config:
21
+        # 配置中心地址
22
+        username: nacos
23
+        password: nacos
24
+        server-addr: 192.168.3.222:8848
25
+        # 配置文件格式
26
+        file-extension: yml
27
+        # 共享配置
28
+        shared-configs:
29
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
30
+    sentinel:
31
+      # 取消控制台懒加载
32
+      eager: true
33
+      transport:
34
+        # 控制台地址
35
+        dashboard: 192.168.3.222:8718
36
+      # nacos配置持久化
37
+      datasource:
38
+        ds1:
39
+          nacos:
40
+            server-addr: 192.168.3.222:8848
41
+            dataId: sentinel-ruoyi-gateway
42
+            groupId: DEFAULT_GROUP
43
+            data-type: json
44
+            rule-type: gw-flow

+ 3 - 19
ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
1 1
 # Tomcat
2 2
 server:
3
-  port: 8080
3
+  port: 38080
4 4
 
5 5
 # Spring
6 6
 spring:
@@ -9,24 +9,8 @@ spring:
9 9
     name: ruoyi-gateway
10 10
   profiles:
11 11
     # 环境配置
12
-    active: dev
13
-  cloud:
14
-    nacos:
15
-      discovery:
16
-        # 服务注册地址
17
-        server-addr: 192.168.3.222:8848
18
-        username: nacos
19
-        password: nacos
20
-      config:
21
-        # 配置中心地址
22
-        username: nacos
23
-        password: nacos
24
-        server-addr: 192.168.3.222:8848
25
-        # 配置文件格式
26
-        file-extension: yml
27
-        # 共享配置
28
-        shared-configs:
29
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
12
+    active: local
13
+
30 14
     sentinel:
31 15
       # 取消控制台懒加载
32 16
       eager: true

+ 19 - 0
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,19 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+      config:
11
+        # 配置中心地址
12
+        username: nacos
13
+        password: nacos
14
+        server-addr: 192.168.3.222:8848
15
+        # 配置文件格式
16
+        file-extension: yml
17
+        # 共享配置
18
+        shared-configs:
19
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 22 - 0
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,22 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
11
+      config:
12
+        # 配置中心地址
13
+        username: nacos
14
+        password: nacos
15
+        server-addr: 192.168.3.222:8848
16
+        # 配置文件格式
17
+        file-extension: yml
18
+        # 共享配置
19
+        shared-configs:
20
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
22
+

+ 19 - 0
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+      config:
11
+        # 配置中心地址
12
+        username: nacos
13
+        password: nacos
14
+        server-addr: 192.168.3.222:8848
15
+        # 配置文件格式
16
+        file-extension: yml
17
+        # 共享配置
18
+        shared-configs:
19
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 0 - 17
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -10,20 +10,3 @@ spring:
10 10
   profiles:
11 11
     # 环境配置
12 12
     active: dev
13
-  cloud:
14
-    nacos:
15
-      discovery:
16
-        # 服务注册地址
17
-        server-addr: 192.168.3.222:8848
18
-        username: nacos
19
-        password: nacos
20
-      config:
21
-        # 配置中心地址
22
-        server-addr: 192.168.3.222:8848
23
-        username: nacos
24
-        password: nacos
25
-        # 配置文件格式
26
-        file-extension: yml
27
-        # 共享配置
28
-        shared-configs:
29
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 115 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDynamicSqlController.java

@@ -0,0 +1,115 @@
1
+package com.ruoyi.system.controller;
2
+
3
+import java.util.List;
4
+import java.io.IOException;
5
+import java.util.Map;
6
+import javax.servlet.http.HttpServletResponse;
7
+import org.springframework.beans.factory.annotation.Autowired;
8
+import org.springframework.web.bind.annotation.GetMapping;
9
+import org.springframework.web.bind.annotation.PostMapping;
10
+import org.springframework.web.bind.annotation.PutMapping;
11
+import org.springframework.web.bind.annotation.DeleteMapping;
12
+import org.springframework.web.bind.annotation.PathVariable;
13
+import org.springframework.web.bind.annotation.RequestBody;
14
+import org.springframework.web.bind.annotation.RequestMapping;
15
+import org.springframework.web.bind.annotation.RestController;
16
+import com.ruoyi.common.log.annotation.Log;
17
+import com.ruoyi.common.log.enums.BusinessType;
18
+import com.ruoyi.common.security.annotation.RequiresPermissions;
19
+import com.ruoyi.system.domain.SysDynamicSql;
20
+import com.ruoyi.system.service.ISysDynamicSqlService;
21
+import com.ruoyi.common.core.web.controller.BaseController;
22
+import com.ruoyi.common.core.web.domain.AjaxResult;
23
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
24
+import com.ruoyi.common.core.web.page.TableDataInfo;
25
+
26
+/**
27
+ * 动态sql执行configController
28
+ *
29
+ * @author ruoyi
30
+ * @date 2025-06-20
31
+ */
32
+@RestController
33
+@RequestMapping("/sql")
34
+public class SysDynamicSqlController extends BaseController
35
+{
36
+    @Autowired
37
+    private ISysDynamicSqlService sysDynamicSqlService;
38
+
39
+    /**
40
+     * 查询动态sql执行config列表
41
+     */
42
+    @RequiresPermissions("system:sql:list")
43
+    @GetMapping("/list")
44
+    public TableDataInfo list(SysDynamicSql sysDynamicSql)
45
+    {
46
+        startPage();
47
+        List<SysDynamicSql> list = sysDynamicSqlService.selectSysDynamicSqlList(sysDynamicSql);
48
+        return getDataTable(list);
49
+    }
50
+
51
+    /**
52
+     * 导出动态sql执行config列表
53
+     */
54
+    @RequiresPermissions("system:sql:export")
55
+    @Log(title = "动态sql执行config", businessType = BusinessType.EXPORT)
56
+    @PostMapping("/export")
57
+    public void export(HttpServletResponse response, SysDynamicSql sysDynamicSql)
58
+    {
59
+        List<SysDynamicSql> list = sysDynamicSqlService.selectSysDynamicSqlList(sysDynamicSql);
60
+        ExcelUtil<SysDynamicSql> util = new ExcelUtil<SysDynamicSql>(SysDynamicSql.class);
61
+        util.exportExcel(response, list, "动态sql执行config数据");
62
+    }
63
+
64
+    /**
65
+     * 获取动态sql执行config详细信息
66
+     */
67
+    @RequiresPermissions("system:sql:query")
68
+    @GetMapping(value = "/{id}")
69
+    public AjaxResult getInfo(@PathVariable("id") Long id)
70
+    {
71
+        return success(sysDynamicSqlService.selectSysDynamicSqlById(id));
72
+    }
73
+
74
+    /**
75
+     * 新增动态sql执行config
76
+     */
77
+    @RequiresPermissions("system:sql:add")
78
+    @Log(title = "动态sql执行config", businessType = BusinessType.INSERT)
79
+    @PostMapping
80
+    public AjaxResult add(@RequestBody SysDynamicSql sysDynamicSql)
81
+    {
82
+        return toAjax(sysDynamicSqlService.insertSysDynamicSql(sysDynamicSql));
83
+    }
84
+
85
+    /**
86
+     * 修改动态sql执行config
87
+     */
88
+    @RequiresPermissions("system:sql:edit")
89
+    @Log(title = "动态sql执行config", businessType = BusinessType.UPDATE)
90
+    @PutMapping
91
+    public AjaxResult edit(@RequestBody SysDynamicSql sysDynamicSql)
92
+    {
93
+        return toAjax(sysDynamicSqlService.updateSysDynamicSql(sysDynamicSql));
94
+    }
95
+
96
+    /**
97
+     * 删除动态sql执行config
98
+     */
99
+    @RequiresPermissions("system:sql:remove")
100
+    @Log(title = "动态sql执行config", businessType = BusinessType.DELETE)
101
+    @DeleteMapping("/{ids}")
102
+    public AjaxResult remove(@PathVariable Long[] ids)
103
+    {
104
+        return toAjax(sysDynamicSqlService.deleteSysDynamicSqlByIds(ids));
105
+    }
106
+
107
+    /**
108
+     * 删除动态sql执行config
109
+     */
110
+    @PostMapping("/executeSqlByKeyAndParam/{sqlKey}")
111
+    public AjaxResult executeSqlByKeyAndParam(@PathVariable(name = "sqlKey") String sqlkey,@RequestBody Map<String, Object> params)
112
+    {
113
+        return success(sysDynamicSqlService.executeSqlByKeyAndParam(sqlkey,params));
114
+    }
115
+}

+ 102 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDynamicSql.java

@@ -0,0 +1,102 @@
1
+package com.ruoyi.system.domain;
2
+
3
+import org.apache.commons.lang3.builder.ToStringBuilder;
4
+import org.apache.commons.lang3.builder.ToStringStyle;
5
+import com.ruoyi.common.core.annotation.Excel;
6
+import com.ruoyi.common.core.web.domain.BaseEntity;
7
+
8
+/**
9
+ * 动态sql执行config对象 sys_dynamic_sql
10
+ *
11
+ * @author ruoyi
12
+ * @date 2025-06-20
13
+ */
14
+public class SysDynamicSql extends BaseEntity
15
+{
16
+    private static final long serialVersionUID = 1L;
17
+
18
+    /**  */
19
+    private Long id;
20
+
21
+    /** sql key */
22
+    @Excel(name = "sql key")
23
+    private String sqlKey;
24
+
25
+    /** 内容 */
26
+    @Excel(name = "内容")
27
+    private String sqlContent;
28
+
29
+    /** 说没 */
30
+    @Excel(name = "说没")
31
+    private String description;
32
+
33
+    /** 参数配置 */
34
+    @Excel(name = "参数配置")
35
+    private String paramsConfig;
36
+
37
+    public void setId(Long id)
38
+    {
39
+        this.id = id;
40
+    }
41
+
42
+    public Long getId()
43
+    {
44
+        return id;
45
+    }
46
+
47
+    public void setSqlKey(String sqlKey)
48
+    {
49
+        this.sqlKey = sqlKey;
50
+    }
51
+
52
+    public String getSqlKey()
53
+    {
54
+        return sqlKey;
55
+    }
56
+
57
+    public void setSqlContent(String sqlContent)
58
+    {
59
+        this.sqlContent = sqlContent;
60
+    }
61
+
62
+    public String getSqlContent()
63
+    {
64
+        return sqlContent;
65
+    }
66
+
67
+    public void setDescription(String description)
68
+    {
69
+        this.description = description;
70
+    }
71
+
72
+    public String getDescription()
73
+    {
74
+        return description;
75
+    }
76
+
77
+    public void setParamsConfig(String paramsConfig)
78
+    {
79
+        this.paramsConfig = paramsConfig;
80
+    }
81
+
82
+    public String getParamsConfig()
83
+    {
84
+        return paramsConfig;
85
+    }
86
+
87
+    @Override
88
+    public String toString() {
89
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
90
+                .append("id", getId())
91
+                .append("sqlKey", getSqlKey())
92
+                .append("sqlContent", getSqlContent())
93
+                .append("description", getDescription())
94
+                .append("createBy", getCreateBy())
95
+                .append("createTime", getCreateTime())
96
+                .append("updateBy", getUpdateBy())
97
+                .append("updateTime", getUpdateTime())
98
+                .append("remark", getRemark())
99
+                .append("paramsConfig", getParamsConfig())
100
+                .toString();
101
+    }
102
+}

+ 78 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDynamicSqlMapper.java

@@ -0,0 +1,78 @@
1
+package com.ruoyi.system.mapper;
2
+
3
+import java.util.List;
4
+import java.util.Map;
5
+
6
+import com.ruoyi.system.domain.SysDynamicSql;
7
+import org.apache.ibatis.annotations.Param;
8
+import org.apache.ibatis.annotations.Select;
9
+
10
+/**
11
+ * 动态sql执行configMapper接口
12
+ *
13
+ * @author ruoyi
14
+ * @date 2025-06-20
15
+ */
16
+public interface SysDynamicSqlMapper
17
+{
18
+    /**
19
+     * 查询动态sql执行config
20
+     *
21
+     * @param id 动态sql执行config主键
22
+     * @return 动态sql执行config
23
+     */
24
+    public SysDynamicSql selectSysDynamicSqlById(Long id);
25
+
26
+    /**
27
+     * 查询动态sql执行config列表
28
+     *
29
+     * @param sysDynamicSql 动态sql执行config
30
+     * @return 动态sql执行config集合
31
+     */
32
+    public List<SysDynamicSql> selectSysDynamicSqlList(SysDynamicSql sysDynamicSql);
33
+
34
+    /**
35
+     * 新增动态sql执行config
36
+     *
37
+     * @param sysDynamicSql 动态sql执行config
38
+     * @return 结果
39
+     */
40
+    public int insertSysDynamicSql(SysDynamicSql sysDynamicSql);
41
+
42
+    /**
43
+     * 修改动态sql执行config
44
+     *
45
+     * @param sysDynamicSql 动态sql执行config
46
+     * @return 结果
47
+     */
48
+    public int updateSysDynamicSql(SysDynamicSql sysDynamicSql);
49
+
50
+    /**
51
+     * 删除动态sql执行config
52
+     *
53
+     * @param id 动态sql执行config主键
54
+     * @return 结果
55
+     */
56
+    public int deleteSysDynamicSqlById(Long id);
57
+
58
+    /**
59
+     * 批量删除动态sql执行config
60
+     *
61
+     * @param ids 需要删除的数据主键集合
62
+     * @return 结果
63
+     */
64
+    public int deleteSysDynamicSqlByIds(Long[] ids);
65
+
66
+    SysDynamicSql selectBySqlKey(String sqlKey);
67
+
68
+    /**
69
+     * 动态执行sql
70
+     * @param sql
71
+     * @param params
72
+     * @return
73
+     */
74
+    @Select("${sql}")
75
+    List<Map<String, Object>> executeDynamicSelect(@Param("sql") String sql,
76
+                                                   @Param("params") Map<String, Object> params);
77
+
78
+}

+ 71 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDynamicSqlService.java

@@ -0,0 +1,71 @@
1
+package com.ruoyi.system.service;
2
+
3
+import java.util.List;
4
+import java.util.Map;
5
+
6
+import com.ruoyi.system.domain.SysDynamicSql;
7
+
8
+/**
9
+ * 动态sql执行configService接口
10
+ *
11
+ * @author ruoyi
12
+ * @date 2025-06-20
13
+ */
14
+public interface ISysDynamicSqlService
15
+{
16
+    /**
17
+     * 查询动态sql执行config
18
+     *
19
+     * @param id 动态sql执行config主键
20
+     * @return 动态sql执行config
21
+     */
22
+    public SysDynamicSql selectSysDynamicSqlById(Long id);
23
+
24
+    /**
25
+     * 查询动态sql执行config列表
26
+     *
27
+     * @param sysDynamicSql 动态sql执行config
28
+     * @return 动态sql执行config集合
29
+     */
30
+    public List<SysDynamicSql> selectSysDynamicSqlList(SysDynamicSql sysDynamicSql);
31
+
32
+    /**
33
+     * 新增动态sql执行config
34
+     *
35
+     * @param sysDynamicSql 动态sql执行config
36
+     * @return 结果
37
+     */
38
+    public int insertSysDynamicSql(SysDynamicSql sysDynamicSql);
39
+
40
+    /**
41
+     * 修改动态sql执行config
42
+     *
43
+     * @param sysDynamicSql 动态sql执行config
44
+     * @return 结果
45
+     */
46
+    public int updateSysDynamicSql(SysDynamicSql sysDynamicSql);
47
+
48
+    /**
49
+     * 批量删除动态sql执行config
50
+     *
51
+     * @param ids 需要删除的动态sql执行config主键集合
52
+     * @return 结果
53
+     */
54
+    public int deleteSysDynamicSqlByIds(Long[] ids);
55
+
56
+    /**
57
+     * 删除动态sql执行config信息
58
+     *
59
+     * @param id 动态sql执行config主键
60
+     * @return 结果
61
+     */
62
+    public int deleteSysDynamicSqlById(Long id);
63
+
64
+    /**
65
+     * 根据 sqlkey 执行
66
+     * @param sqlkey
67
+     * @param params
68
+     * @return
69
+     */
70
+    List<Map<String, Object>> executeSqlByKeyAndParam(String sqlkey, Map<String, Object> params);
71
+}

+ 145 - 0
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDynamicSqlServiceImpl.java

@@ -0,0 +1,145 @@
1
+package com.ruoyi.system.service.impl;
2
+
3
+import java.util.List;
4
+import java.util.Map;
5
+import java.util.regex.Matcher;
6
+import java.util.regex.Pattern;
7
+
8
+import com.ruoyi.common.core.utils.DateUtils;
9
+import org.springframework.beans.factory.annotation.Autowired;
10
+import org.springframework.stereotype.Service;
11
+import com.ruoyi.system.mapper.SysDynamicSqlMapper;
12
+import com.ruoyi.system.domain.SysDynamicSql;
13
+import com.ruoyi.system.service.ISysDynamicSqlService;
14
+
15
+/**
16
+ * 动态sql执行configService业务层处理
17
+ *
18
+ * @author ruoyi
19
+ * @date 2025-06-20
20
+ */
21
+@Service
22
+public class SysDynamicSqlServiceImpl implements ISysDynamicSqlService
23
+{
24
+    @Autowired
25
+    private SysDynamicSqlMapper sysDynamicSqlMapper;
26
+
27
+    /**
28
+     * 查询动态sql执行config
29
+     *
30
+     * @param id 动态sql执行config主键
31
+     * @return 动态sql执行config
32
+     */
33
+    @Override
34
+    public SysDynamicSql selectSysDynamicSqlById(Long id)
35
+    {
36
+        return sysDynamicSqlMapper.selectSysDynamicSqlById(id);
37
+    }
38
+
39
+    /**
40
+     * 查询动态sql执行config列表
41
+     *
42
+     * @param sysDynamicSql 动态sql执行config
43
+     * @return 动态sql执行config
44
+     */
45
+    @Override
46
+    public List<SysDynamicSql> selectSysDynamicSqlList(SysDynamicSql sysDynamicSql)
47
+    {
48
+        return sysDynamicSqlMapper.selectSysDynamicSqlList(sysDynamicSql);
49
+    }
50
+
51
+    /**
52
+     * 新增动态sql执行config
53
+     *
54
+     * @param sysDynamicSql 动态sql执行config
55
+     * @return 结果
56
+     */
57
+    @Override
58
+    public int insertSysDynamicSql(SysDynamicSql sysDynamicSql)
59
+    {
60
+        sysDynamicSql.setCreateTime(DateUtils.getNowDate());
61
+        return sysDynamicSqlMapper.insertSysDynamicSql(sysDynamicSql);
62
+    }
63
+
64
+    /**
65
+     * 修改动态sql执行config
66
+     *
67
+     * @param sysDynamicSql 动态sql执行config
68
+     * @return 结果
69
+     */
70
+    @Override
71
+    public int updateSysDynamicSql(SysDynamicSql sysDynamicSql)
72
+    {
73
+        sysDynamicSql.setUpdateTime(DateUtils.getNowDate());
74
+        return sysDynamicSqlMapper.updateSysDynamicSql(sysDynamicSql);
75
+    }
76
+
77
+    /**
78
+     * 批量删除动态sql执行config
79
+     *
80
+     * @param ids 需要删除的动态sql执行config主键
81
+     * @return 结果
82
+     */
83
+    @Override
84
+    public int deleteSysDynamicSqlByIds(Long[] ids)
85
+    {
86
+        return sysDynamicSqlMapper.deleteSysDynamicSqlByIds(ids);
87
+    }
88
+
89
+    /**
90
+     * 删除动态sql执行config信息
91
+     *
92
+     * @param id 动态sql执行config主键
93
+     * @return 结果
94
+     */
95
+    @Override
96
+    public int deleteSysDynamicSqlById(Long id)
97
+    {
98
+        return sysDynamicSqlMapper.deleteSysDynamicSqlById(id);
99
+    }
100
+
101
+
102
+    @Override
103
+    public List<Map<String, Object>> executeSqlByKeyAndParam(String sqlkey, Map<String, Object> params) {
104
+        // 预处理SQL,将参数替换为MyBatis的参数格式
105
+        SysDynamicSql sysDynamicSql = sysDynamicSqlMapper.selectBySqlKey(sqlkey);
106
+        if (sysDynamicSql == null) {
107
+            return null;
108
+        }
109
+        String processedSql = processSqlWithParams(sysDynamicSql.getSqlContent(), params);
110
+        return sysDynamicSqlMapper.executeDynamicSelect(processedSql, params);
111
+    }
112
+
113
+    private String processSqlWithParams(String sql, Map<String, Object> params) {
114
+        if (sql == null || params == null || params.isEmpty()) {
115
+            return sql;
116
+        }
117
+
118
+        // 处理命名参数格式(如 :paramName 或 ${paramName})
119
+        Pattern pattern = Pattern.compile("(:\\w+|\\$\\{\\w+\\})");
120
+        Matcher matcher = pattern.matcher(sql);
121
+        StringBuffer sb = new StringBuffer();
122
+
123
+        while (matcher.find()) {
124
+            String placeholder = matcher.group(1);
125
+            String paramName;
126
+
127
+            if (placeholder.startsWith(":")) {
128
+                paramName = placeholder.substring(1); // 去掉冒号
129
+            } else {
130
+                paramName = placeholder.substring(2, placeholder.length() - 1); // 去掉 ${ 和 }
131
+            }
132
+
133
+            if (params.containsKey(paramName)) {
134
+                // 替换为 MyBatis 参数格式 #{params.paramName}
135
+                matcher.appendReplacement(sb, "#{params." + paramName + "}");
136
+            } else {
137
+                // 参数不存在,保留原样(或可以抛出异常)
138
+                matcher.appendReplacement(sb, placeholder);
139
+            }
140
+        }
141
+        matcher.appendTail(sb);
142
+
143
+        return sb.toString();
144
+    }
145
+}

+ 20 - 0
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,20 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+      config:
11
+        # 配置中心地址
12
+        username: nacos
13
+        password: nacos
14
+        server-addr: 192.168.3.222:8848
15
+        # 配置文件格式
16
+        file-extension: yml
17
+        # 共享配置
18
+        shared-configs:
19
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
20
+

+ 22 - 0
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,22 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
11
+      config:
12
+        # 配置中心地址
13
+        username: nacos
14
+        password: nacos
15
+        server-addr: 192.168.3.222:8848
16
+        # 配置文件格式
17
+        file-extension: yml
18
+        # 共享配置
19
+        shared-configs:
20
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
22
+

+ 20 - 0
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,20 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+      config:
11
+        # 配置中心地址
12
+        username: nacos
13
+        password: nacos
14
+        server-addr: 192.168.3.222:8848
15
+        # 配置文件格式
16
+        file-extension: yml
17
+        # 共享配置
18
+        shared-configs:
19
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
20
+

+ 0 - 17
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -10,20 +10,3 @@ spring:
10 10
   profiles:
11 11
     # 环境配置
12 12
     active: dev
13
-  cloud:
14
-    nacos:
15
-      discovery:
16
-        # 服务注册地址
17
-        server-addr: 192.168.3.222:8848
18
-        username: nacos
19
-        password: nacos
20
-      config:
21
-        username: nacos
22
-        password: nacos
23
-        # 配置中心地址
24
-        server-addr: 192.168.3.222:8848
25
-        # 配置文件格式
26
-        file-extension: yml
27
-        # 共享配置
28
-        shared-configs:
29
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

+ 99 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDynamicSqlMapper.xml

@@ -0,0 +1,99 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="com.ruoyi.system.mapper.SysDynamicSqlMapper">
6
+
7
+    <resultMap type="SysDynamicSql" id="SysDynamicSqlResult">
8
+        <result property="id"    column="id"    />
9
+        <result property="sqlKey"    column="sql_key"    />
10
+        <result property="sqlContent"    column="sql_content"    />
11
+        <result property="description"    column="description"    />
12
+        <result property="createBy"    column="create_by"    />
13
+        <result property="createTime"    column="create_time"    />
14
+        <result property="updateBy"    column="update_by"    />
15
+        <result property="updateTime"    column="update_time"    />
16
+        <result property="remark"    column="remark"    />
17
+        <result property="paramsConfig"    column="params_config"    />
18
+    </resultMap>
19
+
20
+    <sql id="selectSysDynamicSqlVo">
21
+        select id, sql_key, sql_content, description, create_by, create_time, update_by, update_time, remark, params_config from sys_dynamic_sql
22
+    </sql>
23
+
24
+    <select id="selectSysDynamicSqlList" parameterType="SysDynamicSql" resultMap="SysDynamicSqlResult">
25
+        <include refid="selectSysDynamicSqlVo"/>
26
+        <where>
27
+            <if test="sqlKey != null  and sqlKey != ''"> and sql_key = #{sqlKey}</if>
28
+            <if test="sqlContent != null  and sqlContent != ''"> and sql_content = #{sqlContent}</if>
29
+            <if test="description != null  and description != ''"> and description = #{description}</if>
30
+            <if test="paramsConfig != null  and paramsConfig != ''"> and params_config = #{paramsConfig}</if>
31
+        </where>
32
+    </select>
33
+
34
+    <select id="selectSysDynamicSqlById" parameterType="Long" resultMap="SysDynamicSqlResult">
35
+        <include refid="selectSysDynamicSqlVo"/>
36
+        where id = #{id}
37
+    </select>
38
+
39
+    <insert id="insertSysDynamicSql" parameterType="SysDynamicSql" useGeneratedKeys="true" keyProperty="id">
40
+        insert into sys_dynamic_sql
41
+        <trim prefix="(" suffix=")" suffixOverrides=",">
42
+            <if test="sqlKey != null and sqlKey != ''">sql_key,</if>
43
+            <if test="sqlContent != null and sqlContent != ''">sql_content,</if>
44
+            <if test="description != null">description,</if>
45
+            <if test="createBy != null">create_by,</if>
46
+            <if test="createTime != null">create_time,</if>
47
+            <if test="updateBy != null">update_by,</if>
48
+            <if test="updateTime != null">update_time,</if>
49
+            <if test="remark != null">remark,</if>
50
+            <if test="paramsConfig != null">params_config,</if>
51
+        </trim>
52
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
53
+            <if test="sqlKey != null and sqlKey != ''">#{sqlKey},</if>
54
+            <if test="sqlContent != null and sqlContent != ''">#{sqlContent},</if>
55
+            <if test="description != null">#{description},</if>
56
+            <if test="createBy != null">#{createBy},</if>
57
+            <if test="createTime != null">#{createTime},</if>
58
+            <if test="updateBy != null">#{updateBy},</if>
59
+            <if test="updateTime != null">#{updateTime},</if>
60
+            <if test="remark != null">#{remark},</if>
61
+            <if test="paramsConfig != null">#{paramsConfig},</if>
62
+        </trim>
63
+    </insert>
64
+
65
+    <update id="updateSysDynamicSql" parameterType="SysDynamicSql">
66
+        update sys_dynamic_sql
67
+        <trim prefix="SET" suffixOverrides=",">
68
+            <if test="sqlKey != null and sqlKey != ''">sql_key = #{sqlKey},</if>
69
+            <if test="sqlContent != null and sqlContent != ''">sql_content = #{sqlContent},</if>
70
+            <if test="description != null">description = #{description},</if>
71
+            <if test="createBy != null">create_by = #{createBy},</if>
72
+            <if test="createTime != null">create_time = #{createTime},</if>
73
+            <if test="updateBy != null">update_by = #{updateBy},</if>
74
+            <if test="updateTime != null">update_time = #{updateTime},</if>
75
+            <if test="remark != null">remark = #{remark},</if>
76
+            <if test="paramsConfig != null">params_config = #{paramsConfig},</if>
77
+        </trim>
78
+        where id = #{id}
79
+    </update>
80
+
81
+    <delete id="deleteSysDynamicSqlById" parameterType="Long">
82
+        delete from sys_dynamic_sql where id = #{id}
83
+    </delete>
84
+
85
+    <delete id="deleteSysDynamicSqlByIds" parameterType="String">
86
+        delete from sys_dynamic_sql where id in
87
+        <foreach item="id" collection="array" open="(" separator="," close=")">
88
+            #{id}
89
+        </foreach>
90
+    </delete>
91
+
92
+    <select id="selectBySqlKey" parameterType="String" resultMap="SysDynamicSqlResult">
93
+        <include refid="selectSysDynamicSqlVo"/>
94
+        <where>
95
+            <if test="sqlKey != null  and sqlKey != ''"> and sql_key = #{sqlKey}</if>
96
+        </where>
97
+        limit 1
98
+    </select>
99
+</mapper>

+ 44 - 0
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,44 @@
1
+# Tomcat
2
+server:
3
+  port: 38080
4
+
5
+# Spring
6
+spring:
7
+  application:
8
+    # 应用名称
9
+    name: ruoyi-gateway
10
+  profiles:
11
+    # 环境配置
12
+    active: dev
13
+  cloud:
14
+    nacos:
15
+      discovery:
16
+        # 服务注册地址
17
+        server-addr: 192.168.3.222:8848
18
+        username: nacos
19
+        password: nacos
20
+      config:
21
+        # 配置中心地址
22
+        username: nacos
23
+        password: nacos
24
+        server-addr: 192.168.3.222:8848
25
+        # 配置文件格式
26
+        file-extension: yml
27
+        # 共享配置
28
+        shared-configs:
29
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
30
+    sentinel:
31
+      # 取消控制台懒加载
32
+      eager: true
33
+      transport:
34
+        # 控制台地址
35
+        dashboard: 192.168.3.222:8718
36
+      # nacos配置持久化
37
+      datasource:
38
+        ds1:
39
+          nacos:
40
+            server-addr: 192.168.3.222:8848
41
+            dataId: sentinel-ruoyi-gateway
42
+            groupId: DEFAULT_GROUP
43
+            data-type: json
44
+            rule-type: gw-flow

+ 36 - 0
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,36 @@
1
+# Spring
2
+spring:
3
+  cloud:
4
+    nacos:
5
+      discovery:
6
+        # 服务注册地址
7
+        server-addr: 192.168.3.222:8848
8
+        username: nacos
9
+        password: nacos
10
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
11
+      config:
12
+        # 配置中心地址
13
+        username: nacos
14
+        password: nacos
15
+        server-addr: 192.168.3.222:8848
16
+        # 配置文件格式
17
+        file-extension: yml
18
+        # 共享配置
19
+        shared-configs:
20
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
21
+        namespace: 98847e88-f851-4d7e-91ff-954bb08e2563
22
+    sentinel:
23
+      # 取消控制台懒加载
24
+      eager: true
25
+      transport:
26
+        # 控制台地址
27
+        dashboard: 192.168.3.222:8718
28
+      # nacos配置持久化
29
+      datasource:
30
+        ds1:
31
+          nacos:
32
+            server-addr: 192.168.3.222:8848
33
+            dataId: sentinel-ruoyi-gateway
34
+            groupId: DEFAULT_GROUP
35
+            data-type: json
36
+            rule-type: gw-flow

+ 44 - 0
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,44 @@
1
+# Tomcat
2
+server:
3
+  port: 38080
4
+
5
+# Spring
6
+spring:
7
+  application:
8
+    # 应用名称
9
+    name: ruoyi-gateway
10
+  profiles:
11
+    # 环境配置
12
+    active: dev
13
+  cloud:
14
+    nacos:
15
+      discovery:
16
+        # 服务注册地址
17
+        server-addr: 192.168.3.222:8848
18
+        username: nacos
19
+        password: nacos
20
+      config:
21
+        # 配置中心地址
22
+        username: nacos
23
+        password: nacos
24
+        server-addr: 192.168.3.222:8848
25
+        # 配置文件格式
26
+        file-extension: yml
27
+        # 共享配置
28
+        shared-configs:
29
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
30
+    sentinel:
31
+      # 取消控制台懒加载
32
+      eager: true
33
+      transport:
34
+        # 控制台地址
35
+        dashboard: 192.168.3.222:8718
36
+      # nacos配置持久化
37
+      datasource:
38
+        ds1:
39
+          nacos:
40
+            server-addr: 192.168.3.222:8848
41
+            dataId: sentinel-ruoyi-gateway
42
+            groupId: DEFAULT_GROUP
43
+            data-type: json
44
+            rule-type: gw-flow

+ 1 - 17
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -10,20 +10,4 @@ spring:
10 10
   profiles:
11 11
     # 环境配置
12 12
     active: dev
13
-  cloud:
14
-    nacos:
15
-      discovery:
16
-        # 服务注册地址
17
-        server-addr: 192.168.3.222:8848
18
-        username: nacos
19
-        password: nacos
20
-      config:
21
-        # 配置中心地址
22
-        server-addr: 192.168.3.222:8848
23
-        username: nacos
24
-        password: nacos
25
-        # 配置文件格式
26
-        file-extension: yml
27
-        # 共享配置
28
-        shared-configs:
29
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
13
+