From 6b226a0b194d0f971bfec8807e04c6cb2c308d2b Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Sun, 15 Aug 2021 22:41:48 +0800
Subject: [PATCH 01/60] =?UTF-8?q?jar=20=E5=8C=85=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 35 +++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  4 +--
 ruoyi-oss/pom.xml                             |  4 +++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c31108c6..8a5fd1195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.6</druid.version>
         <knife4j.version>3.0.3</knife4j.version>
+        <swagger-annotations.version>1.5.22</swagger-annotations.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
@@ -28,10 +29,12 @@
         <hutool.version>5.7.6</hutool.version>
         <feign.version>3.0.3</feign.version>
         <feign-okhttp.version>11.0</feign-okhttp.version>
+        <okio.version>1.17.2</okio.version>
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
         <redisson.version>3.16.1</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <datasource.version>3.4.1</datasource.version>
+        <wildfly-common.version>1.5.2.Final</wildfly-common.version>
 
         <!-- OSS 配置 -->
         <qiniu.version>7.8.0</qiniu.version>
@@ -70,6 +73,19 @@
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- 指定 swagger-annotations 版本冲突-->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger-annotations.version}</version>
             </dependency>
 
             <!-- excel工具 -->
@@ -127,6 +143,17 @@
                 <groupId>io.github.openfeign</groupId>
                 <artifactId>feign-okhttp</artifactId>
                 <version>${feign-okhttp.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.github.openfeign</groupId>
+                        <artifactId>feign-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
             </dependency>
 
             <dependency>
@@ -151,6 +178,14 @@
                 <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
                 <version>${lock4j.version}</version>
             </dependency>
+
+            <!-- undertow 中的wildfly-common包冲突处理 -->
+            <dependency>
+                <groupId>org.wildfly.common</groupId>
+                <artifactId>wildfly-common</artifactId>
+                <version>${wildfly-common.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 6491c8557..fc490d61c 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -10,7 +10,7 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
           username: root
           password: root
         # 从库数据源
@@ -72,7 +72,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 192.168.64.128
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 6fd1bd7d0..ce0c7b200 100644
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -46,6 +46,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

From 04a1571dc80cc858165e3c0846a4073ad5578d84 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Mon, 16 Aug 2021 00:02:43 +0800
Subject: [PATCH 02/60] =?UTF-8?q?1=E3=80=81jar=20=E5=8C=85=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E5=A4=84=E7=90=86=202=E3=80=81=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20oss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                    | 25 ++++++++++++++++------
 ruoyi-admin/pom.xml                        |  3 ++-
 ruoyi-admin/src/main/resources/logback.xml | 18 ++++++++--------
 ruoyi-common/pom.xml                       |  4 ++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a5fd1195..06ddcd5b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.4.3</mybatis-plus.version>
         <hutool.version>5.7.6</hutool.version>
+        <guava.version>29.0-jre</guava.version>
         <feign.version>3.0.3</feign.version>
         <feign-okhttp.version>11.0</feign-okhttp.version>
         <okio.version>1.17.2</okio.version>
@@ -73,12 +74,6 @@
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
                 <version>${knife4j.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <!-- 指定 swagger-annotations 版本冲突-->
@@ -133,6 +128,12 @@
                 <version>${hutool.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -167,6 +168,18 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 
+            <!-- redis 缓存操作 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-data-redis</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.lettuce</groupId>
+                        <artifactId>lettuce-core</artifactId>
+                    </exclusion>
+                </exclusions>
+                <version>${spring-boot.version}</version>
+            </dependency>
             <!--redisson-->
             <dependency>
                 <groupId>org.redisson</groupId>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index ba0ad3252..7891a8532 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -42,10 +42,11 @@
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-oss</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!-- 代码生成-->
         <dependency>
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index c939785e6..663eef0c5 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -2,8 +2,8 @@
 <configuration>
     <property name="log.path" value="./logs"/>
     <property name="console.log.pattern"
-              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %green([%thread]) %boldMagenta(%logger{36}) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n"/>
 
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
@@ -31,7 +31,7 @@
             <level>INFO</level>
         </filter>
     </appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -54,7 +54,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -76,7 +76,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -90,7 +90,7 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.ruoyi" level="info" />
 	<!-- Spring日志级别控制  -->
@@ -99,16 +99,16 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
         <appender-ref ref="file_console" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
\ No newline at end of file
+</configuration>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 016c4576d..11f4e290d 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -46,6 +46,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <!-- JSON工具类 -->
         <dependency>

From eb7253fc61dfc2de0f3088f11b8099c6171a8a9c Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Mon, 16 Aug 2021 00:03:53 +0800
Subject: [PATCH 03/60] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=90=8E=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/store/modules/permission.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index 81026f367..db07272df 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -21,12 +21,12 @@ const permission = {
       state.defaultRoutes = constantRoutes.concat(routes)
     },
     SET_TOPBAR_ROUTES: (state, routes) => {
-      // 顶部导航菜单默认添加统计报表栏指向首页
+      // 顶部导航菜单默认添加仪表盘栏指向首页
       const index = [{
         path: 'index',
-        meta: { title: '统计报表', icon: 'dashboard'}
+        meta: { title: '仪表盘', icon: 'dashboard'}
       }]
-      state.topbarRouters = routes.concat(index);
+      state.topbarRouters = index.concat(routes);
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
       state.sidebarRouters = routes

From ad708ff3a6ed4ac501e8d4948a53533d28d5030e Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Wed, 18 Aug 2021 22:34:46 +0800
Subject: [PATCH 04/60] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-prod.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 2640bc0eb..99225faf7 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -10,7 +10,7 @@ spring:
         # 主库数据源
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true
           username: root
           password: root
         # 从库数据源
@@ -72,7 +72,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: 172.30.0.48
+    host: 172.17.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -123,7 +123,7 @@ spring:
       # Spring Boot Admin Client 客户端的相关配置
       client:
         # 设置 Spring Boot Admin Server 地址
-        url: http://172.30.0.90:9090/admin
+        url: http://172.17.0.1:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
@@ -147,7 +147,7 @@ management:
 cloud-storage:
   # minio配置
   minio:
-    endpoint: http://172.30.0.54:9000
+    endpoint: http://172.17.0.1:9000
     accessKey: ruoyi
     secretKey: ruoyi123
     bucketName: ruoyi

From fd7b9fa137b56d0245a88f28befae4d508b0d341 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Thu, 19 Aug 2021 17:50:20 +0800
Subject: [PATCH 05/60] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E6=8E=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D=E3=80=81?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=202=E3=80=81=E8=B6=85=E7=AE=A1=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E3=80=81=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/login.vue             | 4 ++--
 ruoyi-ui/src/views/system/role/index.vue | 1 +
 ruoyi-ui/src/views/system/user/index.vue | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index a87cb9df6..a91f1a209 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -65,8 +65,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 53d4f8d29..042badfd2 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -112,6 +112,7 @@
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
+            :disabled="scope.row.roleId === 1"
             active-value="0"
             inactive-value="1"
             @change="handleStatusChange(scope.row)"
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 1b9722065..5beb02506 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -150,6 +150,7 @@
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
+                :disabled="scope.row.userId === 1"
                 active-value="0"
                 inactive-value="1"
                 @change="handleStatusChange(scope.row)"

From 67b7f93f6fc773ecf18fe9e9ad0429211d24beff Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Fri, 20 Aug 2021 18:42:47 +0800
Subject: [PATCH 06/60] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f2f64e1b..a34db942c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <feign-okhttp.version>11.2</feign-okhttp.version>
         <okhttp.version>4.9.1</okhttp.version>
         <spring-boot-admin.version>2.5.0</spring-boot-admin.version>
-        <okio.version>1.17.2</okio.version>
+        <okio.version>2.8.0</okio.version>
         <redisson.version>3.16.1</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <dynamic-ds.version>3.4.1</dynamic-ds.version>
@@ -97,6 +97,12 @@
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.poi</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- velocity代码生成使用模板 -->
@@ -345,6 +351,7 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>local</profiles.active>
                 <logging.level>debug</logging.level>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
         </profile>
         <profile>
@@ -353,6 +360,7 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
                 <logging.level>debug</logging.level>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -364,6 +372,7 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <logging.level>warn</logging.level>
+                <endpoints.include>health,info</endpoints.include>
             </properties>
         </profile>
 

From 4f4d33d750324eb757c5346bf8d5b8b9841ca22a Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Sat, 21 Aug 2021 21:58:50 +0800
Subject: [PATCH 07/60] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20tab=20->=204space?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/java/service.java.vm    | 62 +++++++++----------
 .../src/main/resources/vm/java/vo.java.vm     | 16 ++---
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 0041c398c..1cba5626b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -18,43 +18,43 @@ import java.util.List;
  * @date ${datetime}
  */
 public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+    /**
+     * 查询单个
+     * @return
+     */
+    ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
 
 #if($table.crud || $table.sub)
-	/**
-	 * 查询列表
-	 */
+    /**
+     * 查询列表
+     */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo);
 #end
 
-	/**
-	 * 查询列表
-	 */
-	List<${ClassName}Vo> queryList(${ClassName}Bo bo);
+    /**
+     * 查询列表
+     */
+    List<${ClassName}Vo> queryList(${ClassName}Bo bo);
 
-	/**
-	 * 根据新增业务对象插入${functionName}
-	 * @param bo ${functionName}新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(${ClassName}Bo bo);
+    /**
+     * 根据新增业务对象插入${functionName}
+     * @param bo ${functionName}新增业务对象
+     * @return
+     */
+    Boolean insertByBo(${ClassName}Bo bo);
 
-	/**
-	 * 根据编辑业务对象修改${functionName}
-	 * @param bo ${functionName}编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(${ClassName}Bo bo);
+    /**
+     * 根据编辑业务对象修改${functionName}
+     * @param bo ${functionName}编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(${ClassName}Bo bo);
 
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index e97cd2467..16036b582 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -25,13 +25,13 @@ import java.util.Date;
 @ExcelIgnoreUnannotated
 public class ${ClassName}Vo {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
+    /**
      *  $pkColumn.columnComment
      */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private ${pkColumn.javaType} ${pkColumn.javaField};
+    @ApiModelProperty("$pkColumn.columnComment")
+    private ${pkColumn.javaType} ${pkColumn.javaField};
 
 #foreach ($column in $columns)
 #if($column.isList && $column.isPk!=1)
@@ -48,13 +48,13 @@ public class ${ClassName}Vo {
     @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "${column.dictType}")
 #elseif($parentheseIndex != -1)
-	@ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
-	@ExcelProperty(value = "${comment}")
+    @ExcelProperty(value = "${comment}")
 #end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
+    @ApiModelProperty("$column.columnComment")
+    private $column.javaType $column.javaField;
 
 #end
 #end

From 86359034e434e30e81805b00bcb617e562b56109 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Tue, 7 Sep 2021 08:10:03 +0800
Subject: [PATCH 08/60] =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8hutool=E5=B7=A5=E5=85=B7=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/TreeSelect.java  | 50 -------------
 .../com/ruoyi/common/utils/TreeUtils.java     | 24 ++++++
 .../ruoyi/system/service/ISysDeptService.java | 12 +--
 .../ruoyi/system/service/ISysMenuService.java | 12 +--
 .../service/impl/SysDeptServiceImpl.java      | 75 +++----------------
 .../service/impl/SysMenuServiceImpl.java      | 41 +++-------
 6 files changed, 48 insertions(+), 166 deletions(-)
 delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
 create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
deleted file mode 100644
index 2049486fc..000000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.common.core.domain;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Treeselect树结构实体类
- * 
- * @author ruoyi
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class TreeSelect implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 节点ID */
-    private Long id;
-
-    /** 节点名称 */
-    private String label;
-
-    /** 子节点 */
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<TreeSelect> children;
-
-    public TreeSelect(SysDept dept)
-    {
-        this.id = dept.getDeptId();
-        this.label = dept.getDeptName();
-        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
-    }
-
-    public TreeSelect(SysMenu menu)
-    {
-        this.id = menu.getMenuId();
-        this.label = menu.getMenuName();
-        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
-    }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
new file mode 100644
index 000000000..4d4ba820b
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
@@ -0,0 +1,24 @@
+package com.ruoyi.common.utils;
+
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNodeConfig;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+
+import java.util.List;
+
+public class TreeUtils {
+
+    public static final TreeNodeConfig DEFAULT_TREE_NODE_CONFIG = new TreeNodeConfig();
+
+    static
+    {
+        DEFAULT_TREE_NODE_CONFIG.setNameKey("label");
+    }
+
+    public static <T> List<Tree<Long>> build(List<T> list, NodeParser<T, Long> nodeParser)
+    {
+        Long parentId = 0L;
+        return TreeUtil.build(list, parentId, DEFAULT_TREE_NODE_CONFIG, nodeParser);
+    }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
index f518ff5fa..df67ed8ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 
 import java.util.List;
@@ -20,21 +20,13 @@ public interface ISysDeptService extends IService<SysDept> {
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
-    /**
-     * 构建前端所需要树结构
-     *
-     * @param depts 部门列表
-     * @return 树结构列表
-     */
-    public List<SysDept> buildDeptTree(List<SysDept> depts);
-
     /**
      * 构建前端所需要下拉树结构
      *
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
+    public List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts);
 
     /**
      * 根据角色ID查询部门树信息
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
index 391cf1901..2fa4a9861 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.system.domain.vo.RouterVo;
 
@@ -63,21 +63,13 @@ public interface ISysMenuService extends IService<SysMenu> {
      */
     public List<RouterVo> buildMenus(List<SysMenu> menus);
 
-    /**
-     * 构建前端所需要树结构
-     *
-     * @param menus 菜单列表
-     * @return 树结构列表
-     */
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus);
-
     /**
      * 构建前端所需要下拉树结构
      *
      * @param menus 菜单列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
+    public List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus);
 
     /**
      * 根据菜单ID查询信息
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 4a887029f..5096b458b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -1,17 +1,18 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TreeUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -19,10 +20,8 @@ import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 部门管理 服务实现
@@ -50,32 +49,6 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
         return baseMapper.selectDeptList(dept);
     }
 
-    /**
-     * 构建前端所需要树结构
-     *
-     * @param depts 部门列表
-     * @return 树结构列表
-     */
-    @Override
-    public List<SysDept> buildDeptTree(List<SysDept> depts) {
-        List<SysDept> returnList = new ArrayList<SysDept>();
-        List<Long> tempList = new ArrayList<Long>();
-        for (SysDept dept : depts) {
-            tempList.add(dept.getDeptId());
-        }
-		for (SysDept dept : depts) {
-			// 如果是顶级节点, 遍历该父节点的所有子节点
-			if (!tempList.contains(dept.getParentId())) {
-				recursionFn(depts, dept);
-				returnList.add(dept);
-			}
-		}
-        if (returnList.isEmpty()) {
-            returnList = depts;
-        }
-        return returnList;
-    }
-
     /**
      * 构建前端所需要下拉树结构
      *
@@ -83,9 +56,14 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
-        List<SysDept> deptTrees = buildDeptTree(depts);
-        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    public List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts)
+    {
+        return TreeUtils.build(depts, (dept, tree) -> {
+            tree.setId(dept.getDeptId());
+            tree.setParentId(dept.getParentId());
+            tree.setName(dept.getDeptName());
+            tree.setWeight(dept.getOrderNum());
+        });
     }
 
     /**
@@ -254,37 +232,4 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
         return baseMapper.deleteById(deptId);
     }
 
-    /**
-     * 递归列表
-     */
-    private void recursionFn(List<SysDept> list, SysDept t) {
-        // 得到子节点列表
-        List<SysDept> childList = getChildList(list, t);
-        t.setChildren(childList);
-        for (SysDept tChild : childList) {
-            if (hasChild(list, tChild)) {
-                recursionFn(list, tChild);
-            }
-        }
-    }
-
-    /**
-     * 得到子节点列表
-     */
-    private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
-        List<SysDept> tlist = new ArrayList<SysDept>();
-		for (SysDept n : list) {
-			if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
-				tlist.add(n);
-			}
-		}
-        return tlist;
-    }
-
-    /**
-     * 判断是否有子节点
-     */
-    private boolean hasChild(List<SysDept> list, SysDept t) {
-        return getChildList(list, t).size() > 0;
-    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index a46d62c21..a4dbc9bee 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -1,15 +1,16 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TreeUtils;
 import com.ruoyi.system.domain.SysRoleMenu;
 import com.ruoyi.system.domain.vo.MetaVo;
 import com.ruoyi.system.domain.vo.RouterVo;
@@ -21,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -169,32 +169,6 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
         return routers;
     }
 
-    /**
-     * 构建前端所需要树结构
-     *
-     * @param menus 菜单列表
-     * @return 树结构列表
-     */
-    @Override
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        List<Long> tempList = new ArrayList<Long>();
-        for (SysMenu dept : menus) {
-            tempList.add(dept.getMenuId());
-        }
-		for (SysMenu menu : menus) {
-			// 如果是顶级节点, 遍历该父节点的所有子节点
-			if (!tempList.contains(menu.getParentId())) {
-				recursionFn(menus, menu);
-				returnList.add(menu);
-			}
-		}
-        if (returnList.isEmpty()) {
-            returnList = menus;
-        }
-        return returnList;
-    }
-
     /**
      * 构建前端所需要下拉树结构
      *
@@ -202,9 +176,14 @@ public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu,
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
-        List<SysMenu> menuTrees = buildMenuTree(menus);
-        return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    public List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus)
+    {
+        return TreeUtils.build(menus, (menu, tree) -> {
+            tree.setId(menu.getMenuId());
+            tree.setParentId(menu.getParentId());
+            tree.setName(menu.getMenuName());
+            tree.setWeight(menu.getOrderNum());
+        });
     }
 
     /**

From a5c951fbd8100b3a7a1b521fde2bd45a7701eb5a Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Tue, 7 Sep 2021 08:13:34 +0800
Subject: [PATCH 09/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ISC(=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=A8=A1=E5=9D=97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  10 +-
 ruoyi-admin/pom.xml                           |   6 +
 .../ruoyi/common/constant/IscConstants.java   |  11 +
 .../com/ruoyi/common/utils/FullPathUtils.java |  87 ++++
 ruoyi-isc/pom.xml                             |  21 +
 .../controller/IscServiceCateController.java  | 140 ++++++
 .../isc/controller/IscServiceController.java  | 112 +++++
 .../java/com/ruoyi/isc/domain/IscService.java | 132 ++++++
 .../com/ruoyi/isc/domain/IscServiceCate.java  | 101 ++++
 .../com/ruoyi/isc/domain/bo/IscServiceBo.java | 132 ++++++
 .../ruoyi/isc/domain/bo/IscServiceCateBo.java |  71 +++
 .../ruoyi/isc/domain/vo/IscServiceCateVo.java |  84 ++++
 .../com/ruoyi/isc/domain/vo/IscServiceVo.java | 139 ++++++
 .../isc/mapper/IscServiceCateMapper.java      |  16 +
 .../ruoyi/isc/mapper/IscServiceMapper.java    |  16 +
 .../isc/service/IIscServiceCateService.java   |  67 +++
 .../ruoyi/isc/service/IIscServiceService.java |  56 +++
 .../impl/IscServiceCateServiceImpl.java       | 158 +++++++
 .../service/impl/IscServiceServiceImpl.java   | 127 +++++
 .../mapper/isc/IscServiceCateMapper.xml       |  22 +
 .../resources/mapper/isc/IscServiceMapper.xml |  31 ++
 ruoyi-ui/src/api/isc/cate.js                  |  52 ++
 ruoyi-ui/src/api/isc/service.js               |  44 ++
 ruoyi-ui/src/views/isc/cate/index.vue         | 314 ++++++++++++
 ruoyi-ui/src/views/isc/service/index.vue      | 446 ++++++++++++++++++
 sql/isc.sql                                   | 217 +++++++++
 26 files changed, 2611 insertions(+), 1 deletion(-)
 create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
 create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/FullPathUtils.java
 create mode 100644 ruoyi-isc/pom.xml
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
 create mode 100644 ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
 create mode 100644 ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
 create mode 100644 ruoyi-ui/src/api/isc/cate.js
 create mode 100644 ruoyi-ui/src/api/isc/service.js
 create mode 100644 ruoyi-ui/src/views/isc/cate/index.vue
 create mode 100644 ruoyi-ui/src/views/isc/service/index.vue
 create mode 100644 sql/isc.sql

diff --git a/pom.xml b/pom.xml
index a34db942c..7dcbfcc50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,13 +261,20 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <!-- demo模块 -->
+            <!-- oss模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-oss</artifactId>
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
+            <!-- isc模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-isc</artifactId>
+                <version>${ruoyi-vue-plus.version}</version>
+            </dependency>
+
             <!-- demo模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -288,6 +295,7 @@
         <module>ruoyi-demo</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-oss</module>
+        <module>ruoyi-isc</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 4b2807305..79196245e 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -54,6 +54,12 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <!--  isc模块  -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-isc</artifactId>
+        </dependency>
+
         <!--  demo模块  -->
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
new file mode 100644
index 000000000..6a15e6334
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -0,0 +1,11 @@
+package com.ruoyi.common.constant;
+
+public class IscConstants {
+
+    /** 待审核 */
+    public static final String AUDIT_WAIT = "0";
+
+    /** 待审核 */
+    public static final String ONLINE_STATUS_ON = "1";
+
+}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FullPathUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FullPathUtils.java
new file mode 100644
index 000000000..861ecf311
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FullPathUtils.java
@@ -0,0 +1,87 @@
+package com.ruoyi.common.utils;
+
+public final class FullPathUtils {
+
+    public static final int FULL_PATH_LENGTH = 30;
+    public static final int FULL_PATH_LEVEL_LENGTH = 3;
+    public static final char REPEAT_CHAR = '0';
+    public static final char REPEAT_CHAR_MAX = '9';
+
+    /**
+     * 生成 FULL_PATH
+     *
+     * @param parentFullPath 父级full_path (可空)
+     * @param maxFullPath    同级最大 full_path（可空）
+     * @return
+     */
+    public static String genFullPath(String parentFullPath, String maxFullPath)
+    {
+        int maxNum = 0;
+        String parentPath = StringUtils.EMPTY;
+        if (StringUtils.isNotBlank(maxFullPath))
+        {
+            int start = maxFullPath.length() - FULL_PATH_LEVEL_LENGTH;
+            int end = maxFullPath.length() - 1;
+            int temp = 0;
+            while (start > -1)
+            {
+                temp = Integer.parseInt(maxFullPath.substring(start, end));
+                if (temp > 0)
+                {
+                    parentPath = maxFullPath.substring(0, start);
+                    break;
+                }
+                end = start;
+                start -= FULL_PATH_LEVEL_LENGTH;
+            }
+            maxNum = temp;
+        } else if (StringUtils.isNotBlank(parentFullPath))
+        {
+            parentPath = getParentPath(parentFullPath);
+        }
+        int repeat = FULL_PATH_LENGTH - parentPath.length() - FULL_PATH_LEVEL_LENGTH;
+        String suffix = StringUtils.repeat(REPEAT_CHAR, repeat);
+        return String.format("%s%03d%s", parentPath, ++maxNum, suffix);
+    }
+
+    /**
+     * 根据FULL_PATH 获取最大 子FULL_PATH
+     *
+     * @param fullPath
+     */
+    public static String genMaxFullPath(String fullPath)
+    {
+        String parentPath = StringUtils.EMPTY;
+        if (StringUtils.isNotBlank(fullPath))
+        {
+            parentPath = getParentPath(fullPath);
+        }
+        int repeat = FULL_PATH_LENGTH - parentPath.length();
+        String suffix = StringUtils.repeat(REPEAT_CHAR_MAX, repeat);
+        return parentPath + suffix;
+    }
+
+    /**
+     * 获取父 Path
+     *
+     * @param fullPath
+     * @return
+     */
+    private static String getParentPath(String fullPath)
+    {
+        int temp;
+        int start = fullPath.length() - FULL_PATH_LEVEL_LENGTH;
+        int end = fullPath.length() - 1;
+        while (start > -1)
+        {
+            temp = Integer.parseInt(fullPath.substring(start, end));
+            if (temp > 0)
+            {
+                return fullPath.substring(0, end);
+            }
+            end = start;
+            start -= FULL_PATH_LEVEL_LENGTH;
+        }
+        return StringUtils.EMPTY;
+    }
+}
diff --git a/ruoyi-isc/pom.xml b/ruoyi-isc/pom.xml
new file mode 100644
index 000000000..10478d172
--- /dev/null
+++ b/ruoyi-isc/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-isc</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
new file mode 100644
index 000000000..ef4c9d224
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
@@ -0,0 +1,140 @@
+package com.ruoyi.isc.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.utils.TreeUtils;
+import com.ruoyi.isc.domain.IscServiceCate;
+import lombok.RequiredArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.isc.domain.vo.IscServiceCateVo;
+import com.ruoyi.isc.domain.bo.IscServiceCateBo;
+import com.ruoyi.isc.service.IIscServiceCateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 服务分类Controller
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+@Validated
+@Api(value = "服务分类控制器", tags = {"服务分类管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/isc/cate")
+public class IscServiceCateController extends BaseController {
+
+    private final IIscServiceCateService cateService;
+
+    /**
+     * 查询服务分类列表
+     */
+    @ApiOperation("查询服务分类列表")
+    @PreAuthorize("@ss.hasPermi('isc:cate:list')")
+    @GetMapping("/list")
+    public AjaxResult<List<IscServiceCateVo>> list(@Validated IscServiceCateBo bo)
+    {
+        List<IscServiceCateVo> list = cateService.queryList(bo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取分类下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect()
+    {
+        List<IscServiceCate> cates = cateService.selectCateList();
+        return AjaxResult.success(TreeUtils.build(cates, (cate, tree) -> {
+            tree.setId(cate.getCateId());
+            tree.setParentId(cate.getParentId());
+            tree.setName(cate.getCateName());
+            tree.setWeight(cate.getOrderNum());
+            tree.putExtra("fullPath", cate.getFullPath());
+        }));
+    }
+
+    /**
+     * 导出服务分类列表
+     */
+    @ApiOperation("导出服务分类列表")
+    @PreAuthorize("@ss.hasPermi('isc:cate:export')")
+    @Log(title = "服务分类", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IscServiceCateBo bo, HttpServletResponse response)
+    {
+        List<IscServiceCateVo> list = cateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "服务分类", IscServiceCateVo.class, response);
+    }
+
+    /**
+     * 获取服务分类详细信息
+     */
+    @ApiOperation("获取服务分类详细信息")
+    @PreAuthorize("@ss.hasPermi('isc:cate:query')")
+    @GetMapping("/{cateId}")
+    public AjaxResult<IscServiceCateVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("cateId") Long cateId)
+    {
+        return AjaxResult.success(cateService.queryById(cateId));
+    }
+
+    /**
+     * 新增服务分类
+     */
+    @ApiOperation("新增服务分类")
+    @PreAuthorize("@ss.hasPermi('isc:cate:add')")
+    @Log(title = "服务分类", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IscServiceCateBo bo)
+    {
+        return toAjax(cateService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改服务分类
+     */
+    @ApiOperation("修改服务分类")
+    @PreAuthorize("@ss.hasPermi('isc:cate:edit')")
+    @Log(title = "服务分类", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IscServiceCateBo bo)
+    {
+        return toAjax(cateService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除服务分类
+     */
+    @ApiOperation("删除服务分类")
+    @PreAuthorize("@ss.hasPermi('isc:cate:remove')")
+    @Log(title = "服务分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{cateIds}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] cateIds)
+    {
+        return toAjax(cateService.deleteWithValidByIds(Arrays.asList(cateIds), true) ? 1 : 0);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
new file mode 100644
index 000000000..2b5ad9fd3
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
@@ -0,0 +1,112 @@
+package com.ruoyi.isc.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.isc.domain.vo.IscServiceVo;
+import com.ruoyi.isc.domain.bo.IscServiceBo;
+import com.ruoyi.isc.service.IIscServiceService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 服务信息Controller
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+@Validated
+@Api(value = "服务信息控制器", tags = {"服务信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/isc/service")
+public class IscServiceController extends BaseController {
+
+    private final IIscServiceService iIscServiceService;
+
+    /**
+     * 查询服务信息列表
+     */
+    @ApiOperation("查询服务信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:service:list')")
+    @GetMapping("/list")
+    public TableDataInfo<IscServiceVo> list(@Validated IscServiceBo bo) {
+        return iIscServiceService.queryPageList(bo);
+    }
+
+    /**
+     * 导出服务信息列表
+     */
+    @ApiOperation("导出服务信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:service:export')")
+    @Log(title = "服务信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IscServiceBo bo, HttpServletResponse response) {
+        List<IscServiceVo> list = iIscServiceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "服务信息", IscServiceVo.class, response);
+    }
+
+    /**
+     * 获取服务信息详细信息
+     */
+    @ApiOperation("获取服务信息详细信息")
+    @PreAuthorize("@ss.hasPermi('isc:service:query')")
+    @GetMapping("/{serviceId}")
+    public AjaxResult<IscServiceVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("serviceId") Long serviceId) {
+        return AjaxResult.success(iIscServiceService.queryById(serviceId));
+    }
+
+    /**
+     * 新增服务信息
+     */
+    @ApiOperation("新增服务信息")
+    @PreAuthorize("@ss.hasPermi('isc:service:add')")
+    @Log(title = "服务信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IscServiceBo bo) {
+        return toAjax(iIscServiceService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改服务信息
+     */
+    @ApiOperation("修改服务信息")
+    @PreAuthorize("@ss.hasPermi('isc:service:edit')")
+    @Log(title = "服务信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IscServiceBo bo) {
+        return toAjax(iIscServiceService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除服务信息
+     */
+    @ApiOperation("删除服务信息")
+    @PreAuthorize("@ss.hasPermi('isc:service:remove')")
+    @Log(title = "服务信息" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{serviceIds}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] serviceIds) {
+        return toAjax(iIscServiceService.deleteWithValidByIds(Arrays.asList(serviceIds), true) ? 1 : 0);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
new file mode 100644
index 000000000..8eb1fd211
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
@@ -0,0 +1,132 @@
+package com.ruoyi.isc.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 服务信息对象 isc_service
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("isc_service")
+public class IscService implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 服务ID
+     */
+    @TableId(value = "service_id")
+    private Long serviceId;
+
+    /**
+     * 服务名称
+     */
+    private String serviceName;
+
+    /**
+     * 服务地址
+     */
+    private String serviceAddr;
+
+    /**
+     * 探活地址
+     */
+    private String probeActiveAddr;
+
+    /**
+     * 请求方式（默认GET）
+     */
+    private String requestMethod;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 跨域标志（Y是 N否）
+     */
+    private String corsFlag;
+
+    /**
+     * 隐藏参数
+     */
+    private String hiddenParams;
+
+    /**
+     * 是否在线（0离线 1在线）
+     */
+    private String onlineStatus;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    private String status;
+
+    /**
+     * JSON文档
+     */
+    private String apiDoc;
+
+    /**
+     * 审核意见
+     */
+    private String auditMind;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    private String enabled;
+
+    /**
+     * 服务分类全路径
+     */
+    private String cateFullPath;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
new file mode 100644
index 000000000..0abc1fd75
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
@@ -0,0 +1,101 @@
+package com.ruoyi.isc.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 服务分类对象 isc_service_cate
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("isc_service_cate")
+public class IscServiceCate implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 分类ID
+     */
+    @TableId(value = "cate_id")
+    private Long cateId;
+
+    /**
+     * 父分类ID
+     */
+    private Long parentId;
+
+    /**
+     * 分类名称
+     */
+    private String cateName;
+
+    /**
+     * 搜索全路径
+     */
+    private String fullPath;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    private String enabled;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 显示顺序
+     */
+    private Long orderNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 子分类
+     */
+    @TableField(exist = false)
+    private List<SysMenu> children = new ArrayList<SysMenu>();
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
new file mode 100644
index 000000000..8a2aa60b6
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
@@ -0,0 +1,132 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 服务信息业务对象 isc_service
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("服务信息业务对象")
+public class IscServiceBo extends BaseEntity {
+
+    /**
+     * 服务名称
+     */
+    @ApiModelProperty(value = "服务名称", required = true)
+    @NotBlank(message = "服务名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String serviceName;
+
+    /**
+     * 服务地址
+     */
+    @ApiModelProperty(value = "服务地址", required = true)
+    @NotBlank(message = "服务地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String serviceAddr;
+
+    /**
+     * 探活地址
+     */
+    @ApiModelProperty(value = "探活地址", required = true)
+    @NotBlank(message = "探活地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String probeActiveAddr;
+
+    /**
+     * 请求方式（默认GET）
+     */
+    @ApiModelProperty(value = "请求方式（默认GET）", required = true)
+    @NotBlank(message = "请求方式（默认GET）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String requestMethod;
+
+    /**
+     * 跨域标志（Y是 N否）
+     */
+    @ApiModelProperty(value = "跨域标志（Y是 N否）", required = true)
+    @NotBlank(message = "跨域标志（Y是 N否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String corsFlag;
+
+    /**
+     * 隐藏参数
+     */
+    @ApiModelProperty(value = "隐藏参数")
+    private String hiddenParams;
+
+    /**
+     * 是否在线（0离线 1在线）
+     */
+    @ApiModelProperty(value = "是否在线（0离线 1在线）")
+    private String onlineStatus;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ApiModelProperty(value = "审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * JSON文档
+     */
+    @ApiModelProperty(value = "JSON文档", required = true)
+    @NotBlank(message = "JSON文档不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String apiDoc;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    @ApiModelProperty(value = "服务状态（0启用 1停用）", required = true)
+    @NotBlank(message = "服务状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enabled;
+
+    /**
+     * 服务分类
+     */
+    @ApiModelProperty(value = "服务分类", required = true)
+    @NotNull(message = "服务分类不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cateFullPath;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户ID", required = true)
+    private Long userId;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
new file mode 100644
index 000000000..5cc7b1df3
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
@@ -0,0 +1,71 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.TreeEntity;
+
+/**
+ * 服务分类业务对象 isc_service_cate
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("服务分类业务对象")
+public class IscServiceCateBo extends TreeEntity {
+
+    /**
+     * 分类ID
+     */
+    @ApiModelProperty(value = "分类ID")
+    private Long cateId;
+
+    /**
+     * 分类名称
+     */
+    @ApiModelProperty(value = "分类名称")
+    private String cateName;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    @ApiModelProperty(value = "服务状态（0启用 1停用）", required = true)
+    @NotBlank(message = "服务状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enabled;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
new file mode 100644
index 000000000..78322128b
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
@@ -0,0 +1,84 @@
+package com.ruoyi.isc.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 服务分类视图对象 isc_service_cate
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+@Data
+@ApiModel("服务分类视图对象")
+@ExcelIgnoreUnannotated
+public class IscServiceCateVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  分类ID
+     */
+    @ApiModelProperty("分类ID")
+    private Long cateId;
+
+    /**
+     * 父分类ID
+     */
+    @ExcelProperty(value = "父分类ID")
+    @ApiModelProperty("父分类ID")
+    private Long parentId;
+
+    /**
+     * 分类名称
+     */
+    @ExcelProperty(value = "分类名称")
+    @ApiModelProperty("分类名称")
+    private String cateName;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    @ExcelProperty(value = "服务状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ApiModelProperty("服务状态（0启用 1停用）")
+    private String enabled;
+
+    /**
+     * 显示顺序
+     */
+    @ExcelProperty(value = "显示顺序")
+    @ApiModelProperty("显示顺序")
+    private Long orderNum;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新者")
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
new file mode 100644
index 000000000..cde19b64b
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
@@ -0,0 +1,139 @@
+package com.ruoyi.isc.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 服务信息视图对象 isc_service
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+@Data
+@ApiModel("服务信息视图对象")
+@ExcelIgnoreUnannotated
+public class IscServiceVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  服务ID
+     */
+    @ApiModelProperty("服务ID")
+    private Long serviceId;
+
+    /**
+     * 服务名称
+     */
+    @ExcelProperty(value = "服务名称")
+    @ApiModelProperty("服务名称")
+    private String serviceName;
+
+    /**
+     * 服务地址
+     */
+    @ExcelProperty(value = "服务地址")
+    @ApiModelProperty("服务地址")
+    private String serviceAddr;
+
+    /**
+     * 探活地址
+     */
+    @ExcelProperty(value = "探活地址")
+    @ApiModelProperty("探活地址")
+    private String probeActiveAddr;
+
+    /**
+     * 请求方式（默认GET）
+     */
+    @ExcelProperty(value = "请求方式")
+    @ApiModelProperty("请求方式（默认GET）")
+    private String requestMethod;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+     * 跨域标志（Y是 N否）
+     */
+    @ExcelProperty(value = "跨域标志")
+    @ApiModelProperty("跨域标志（Y是 N否）")
+    private String corsFlag;
+
+    /**
+     * 隐藏参数
+     */
+    @ExcelProperty(value = "隐藏参数")
+    @ApiModelProperty("隐藏参数")
+    private String hiddenParams;
+
+    /**
+     * JSON文档
+     */
+    @ApiModelProperty("JSON文档")
+    private String apiDoc;
+
+    /**
+     * 是否在线（0离线 1在线）
+     */
+    @ExcelProperty(value = "是否在线", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "isc_online_status")
+    @ApiModelProperty("是否在线（0离线 1在线）")
+    private String onlineStatus;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_audit_status")
+    @ApiModelProperty("审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * 服务状态（0启用 1停用）
+     */
+    @ExcelProperty(value = "服务状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ApiModelProperty("服务状态（0启用 1停用）")
+    private String enabled;
+
+    /**
+     * 服务分类
+     */
+    @ApiModelProperty("服务分类")
+    private String cateFullPath;
+
+    /**
+     * 服务分类名称
+     */
+    @ExcelProperty(value = "服务分类名称")
+    @ApiModelProperty("服务分类名称")
+    private String cateName;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private String updateTime;
+
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
new file mode 100644
index 000000000..7a48fb445
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.mapper;
+
+import com.ruoyi.isc.domain.IscServiceCate;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 服务分类Mapper接口
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+public interface IscServiceCateMapper extends BaseMapperPlus<IscServiceCate> {
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
new file mode 100644
index 000000000..b0bcaac36
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.mapper;
+
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 服务信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+public interface IscServiceMapper extends BaseMapperPlus<IscService> {
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
new file mode 100644
index 000000000..ef594999c
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
@@ -0,0 +1,67 @@
+package com.ruoyi.isc.service;
+
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.isc.domain.IscServiceCate;
+import com.ruoyi.isc.domain.vo.IscServiceCateVo;
+import com.ruoyi.isc.domain.bo.IscServiceCateBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 服务分类Service接口
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+public interface IIscServiceCateService extends IServicePlus<IscServiceCate, IscServiceCateVo> {
+    /**
+     * 查询单个
+     * @return
+     */
+    IscServiceCateVo queryById(Long cateId);
+
+
+    /**
+     * 查询列表
+     */
+    List<IscServiceCateVo> queryList(IscServiceCateBo bo);
+
+    /**
+     * 根据新增业务对象插入服务分类
+     * @param bo 服务分类新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IscServiceCateBo bo);
+
+    /**
+     * 根据编辑业务对象修改服务分类
+     * @param bo 服务分类编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IscServiceCateBo bo);
+
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取分类信息
+     * @return 分类列表
+     */
+    List<IscServiceCate> selectCateList();
+
+    /**
+     * 批量获取分类名称
+     * @param fullPathList
+     * @return
+     */
+    Map<String, String> batchCateName(Set<String> fullPathList);
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
new file mode 100644
index 000000000..6ce05c419
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.isc.service;
+
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.vo.IscServiceVo;
+import com.ruoyi.isc.domain.bo.IscServiceBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 服务信息Service接口
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+public interface IIscServiceService extends IServicePlus<IscService, IscServiceVo> {
+    /**
+     * 查询单个
+     * @return
+     */
+    IscServiceVo queryById(Long serviceId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<IscServiceVo> queryPageList(IscServiceBo bo);
+
+    /**
+     * 查询列表
+     */
+    List<IscServiceVo> queryList(IscServiceBo bo);
+
+    /**
+     * 根据新增业务对象插入服务信息
+     * @param bo 服务信息新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IscServiceBo bo);
+
+    /**
+     * 根据编辑业务对象修改服务信息
+     * @param bo 服务信息编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IscServiceBo bo);
+
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
new file mode 100644
index 000000000..06d581d40
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
@@ -0,0 +1,158 @@
+package com.ruoyi.isc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.FullPathUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.isc.domain.bo.IscServiceCateBo;
+import com.ruoyi.isc.domain.vo.IscServiceCateVo;
+import com.ruoyi.isc.domain.IscServiceCate;
+import com.ruoyi.isc.mapper.IscServiceCateMapper;
+import com.ruoyi.isc.service.IIscServiceCateService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 服务分类Service业务层处理
+ *
+ * @author wenchao gong
+ * @date 2021-08-22
+ */
+@Service
+public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMapper, IscServiceCate, IscServiceCateVo> implements IIscServiceCateService {
+
+    @Override
+    public IscServiceCateVo queryById(Long cateId){
+        return getVoById(cateId);
+    }
+
+
+    @Override
+    public List<IscServiceCateVo> queryList(IscServiceCateBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<IscServiceCate> buildQueryWrapper(IscServiceCateBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IscServiceCate> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCateName()), IscServiceCate::getCateName, bo.getCateName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnabled()), IscServiceCate::getEnabled, bo.getEnabled());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IscServiceCateBo bo) {
+        IscServiceCate add = BeanUtil.toBean(bo, IscServiceCate.class);
+        validEntityBeforeSave(add);
+        add.setFullPath(getFullPath(bo.getParentId()));
+        return save(add);
+    }
+
+    /**
+     * 通过父ID生成 FULL_PATH
+     * @param parentId
+     * @return
+     */
+    private String getFullPath(Long parentId)
+    {
+        final boolean isRoot = parentId == 0L;
+        IscServiceCate cate = getOne(Wrappers.<IscServiceCate>lambdaQuery()
+                .select(IscServiceCate::getCateId, IscServiceCate::getFullPath)
+                .eq(isRoot, IscServiceCate::getParentId, 0L).and(!isRoot, w -> w
+                        .eq(IscServiceCate::getParentId, parentId)
+                        .or()
+                        .eq(IscServiceCate::getCateId, parentId))
+                .orderByDesc(IscServiceCate::getFullPath)
+                .last("LIMIT 1"));
+        String parentFullPath = null;
+        String maxFullPath = null;
+        if(Objects.nonNull(cate)){
+            if(cate.getCateId().intValue() == parentId)
+            {
+                parentFullPath = cate.getFullPath();
+            }else{
+                maxFullPath = cate.getFullPath();
+            }
+        }
+        final String fullPath = FullPathUtils.genFullPath(parentFullPath, maxFullPath);
+        return fullPath;
+    }
+
+    @Override
+    public Boolean updateByBo(IscServiceCateBo bo) {
+        IscServiceCate update = BeanUtil.toBean(bo, IscServiceCate.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IscServiceCate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+
+    @Override
+    public List<IscServiceCate> selectCateList()
+    {
+        return list(Wrappers.<IscServiceCate>lambdaQuery()
+                .eq(IscServiceCate::getEnabled, UserConstants.DICT_NORMAL)
+                .orderByAsc(IscServiceCate::getParentId)
+                .orderByAsc(IscServiceCate::getOrderNum));
+    }
+
+    @Override
+    public Map<String, String> batchCateName(Set<String> fullPathList)
+    {
+        Map<String, String> results = new HashMap<>();
+        if(CollectionUtils.isEmpty(fullPathList)) {
+            return results;
+        }
+        final List<IscServiceCate> list = list(Wrappers.<IscServiceCate>lambdaQuery()
+                .select(IscServiceCate::getCateId, IscServiceCate::getCateName, IscServiceCate::getFullPath, IscServiceCate::getParentId)
+                .in(IscServiceCate::getFullPath, fullPathList));
+        Map<Long, String> cateNameMap = batchCateName(list);
+        for (IscServiceCate cate : list)
+        {
+            results.put(cate.getFullPath(), cateNameMap.get(cate.getCateId()));
+        }
+        return results;
+    }
+
+    private Map<Long, String> batchCateName(List<IscServiceCate> list) {
+        Map<Long, String> results = new HashMap<>();
+        final Set<Long> parentIds = list.stream().filter(m -> m.getParentId() != 0L).map(IscServiceCate::getParentId).collect(Collectors.toSet());
+        if(CollectionUtils.isNotEmpty(parentIds)) {
+            final List<IscServiceCate> parentList = list(Wrappers.<IscServiceCate>lambdaQuery()
+                    .select(IscServiceCate::getCateId, IscServiceCate::getCateName, IscServiceCate::getFullPath, IscServiceCate::getParentId)
+                    .in(IscServiceCate::getCateId, parentIds));
+            results.putAll(batchCateName(parentList));
+        }
+        for (IscServiceCate cate : list)
+        {
+            final String parentName = results.get(cate.getParentId());
+            if(StringUtils.isBlank(parentName)) {
+                results.put(cate.getCateId(), cate.getCateName());
+            }else{
+                results.put(cate.getCateId(), String.format("%s/%s", parentName, cate.getCateName()));
+            }
+        }
+        return results;
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
new file mode 100644
index 000000000..2361eeffd
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -0,0 +1,127 @@
+package com.ruoyi.isc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.IscConstants;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.FullPathUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.bo.IscServiceBo;
+import com.ruoyi.isc.domain.vo.IscServiceVo;
+import com.ruoyi.isc.mapper.IscServiceMapper;
+import com.ruoyi.isc.service.IIscServiceCateService;
+import com.ruoyi.isc.service.IIscServiceService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 服务信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-08-22
+ */
+@Service
+public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, IscService, IscServiceVo> implements IIscServiceService {
+
+    @Resource
+    private IIscServiceCateService cateService;
+
+    @Override
+    public IscServiceVo queryById(Long serviceId)
+    {
+        return getVoById(serviceId);
+    }
+
+    @Override
+    public TableDataInfo<IscServiceVo> queryPageList(IscServiceBo bo)
+    {
+        PagePlus<IscService, IscServiceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        genVoInfo(result.getRecordsVo());
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<IscServiceVo> queryList(IscServiceBo bo)
+    {
+        final List<IscServiceVo> results = listVo(buildQueryWrapper(bo));
+        return results;
+    }
+
+    private void genVoInfo(List<IscServiceVo> results)
+    {
+        if (CollectionUtils.isNotEmpty(results))
+        {
+            Map<String, String> cateNameMap = cateService.batchCateName(results.stream()
+                    .map(IscServiceVo::getCateFullPath).collect(Collectors.toSet()));
+            for (IscServiceVo result : results)
+            {
+                result.setCateName(cateNameMap.get(result.getCateFullPath()));
+            }
+        }
+    }
+
+    private LambdaQueryWrapper<IscService> buildQueryWrapper(IscServiceBo bo)
+    {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IscService> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getServiceName()), IscService::getServiceName, bo.getServiceName());
+        lqw.eq(StringUtils.isNotBlank(bo.getOnlineStatus()), IscService::getOnlineStatus, bo.getOnlineStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IscService::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnabled()), IscService::getEnabled, bo.getEnabled());
+        lqw.ge(StringUtils.isNotBlank(bo.getCateFullPath()), IscService::getCateFullPath, bo.getCateFullPath());
+        lqw.le(StringUtils.isNotBlank(bo.getCateFullPath()), IscService::getCateFullPath, FullPathUtils.genMaxFullPath(bo.getCateFullPath()));
+        lqw.eq(bo.getUserId() != null, IscService::getUserId, bo.getUserId());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IscServiceBo bo)
+    {
+        IscService add = BeanUtil.toBean(bo, IscService.class);
+        validEntityBeforeSave(add);
+        add.setUserId(SecurityUtils.getUserId());
+        add.setOnlineStatus(IscConstants.ONLINE_STATUS_ON);
+        add.setStatus(IscConstants.AUDIT_WAIT);
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(IscServiceBo bo)
+    {
+        IscService update = BeanUtil.toBean(bo, IscService.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IscService entity)
+    {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid)
+    {
+        if (isValid)
+        {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
new file mode 100644
index 000000000..930f4e20e
--- /dev/null
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.isc.mapper.IscServiceCateMapper">
+
+    <resultMap type="com.ruoyi.isc.domain.IscServiceCate" id="IscServiceCateResult">
+        <result property="cateId" column="cate_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="cateName" column="cate_name"/>
+        <result property="enabled" column="enabled"/>
+        <result property="createBy" column="create_by"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
new file mode 100644
index 000000000..df021ab28
--- /dev/null
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.isc.mapper.IscServiceMapper">
+
+    <resultMap type="com.ruoyi.isc.domain.IscService" id="IscServiceResult">
+        <result property="serviceId" column="service_id"/>
+        <result property="serviceName" column="service_name"/>
+        <result property="serviceAddr" column="service_addr"/>
+        <result property="probeActiveAddr" column="probe_active_addr"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="remark" column="remark"/>
+        <result property="corsFlag" column="cors_flag"/>
+        <result property="hiddenParams" column="hidden_params"/>
+        <result property="onlineStatus" column="online_status"/>
+        <result property="status" column="status"/>
+        <result property="apiDoc" column="api_doc"/>
+        <result property="auditMind" column="audit_mind"/>
+        <result property="enabled" column="enabled"/>
+        <result property="cateFullPath" column="cate_full_path"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/ruoyi-ui/src/api/isc/cate.js b/ruoyi-ui/src/api/isc/cate.js
new file mode 100644
index 000000000..7c503e4d8
--- /dev/null
+++ b/ruoyi-ui/src/api/isc/cate.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询服务分类列表
+export function listCate(query) {
+  return request({
+    url: '/isc/cate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询服务分类详细
+export function getCate(cateId) {
+  return request({
+    url: '/isc/cate/' + cateId,
+    method: 'get'
+  })
+}
+
+// 新增服务分类
+export function addCate(data) {
+  return request({
+    url: '/isc/cate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改服务分类
+export function updateCate(data) {
+  return request({
+    url: '/isc/cate',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除服务分类
+export function delCate(cateId) {
+  return request({
+    url: '/isc/cate/' + cateId,
+    method: 'delete'
+  })
+}
+
+// 查询服务分类下拉树结构
+export function treeselect() {
+  return request({
+    url: '/isc/cate/treeselect',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/isc/service.js b/ruoyi-ui/src/api/isc/service.js
new file mode 100644
index 000000000..e181459bc
--- /dev/null
+++ b/ruoyi-ui/src/api/isc/service.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询服务信息列表
+export function listService(query) {
+  return request({
+    url: '/isc/service/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询服务信息详细
+export function getService(serviceId) {
+  return request({
+    url: '/isc/service/' + serviceId,
+    method: 'get'
+  })
+}
+
+// 新增服务信息
+export function addService(data) {
+  return request({
+    url: '/isc/service',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改服务信息
+export function updateService(data) {
+  return request({
+    url: '/isc/service',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除服务信息
+export function delService(serviceId) {
+  return request({
+    url: '/isc/service/' + serviceId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue
new file mode 100644
index 000000000..451ee6d75
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/cate/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="分类名称" prop="cateName">
+        <el-input
+          v-model="queryParams.cateName"
+          placeholder="请输入分类名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="服务状态" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
+          <el-option
+            v-for="dict in enabledOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['isc:cate:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="cateList"
+      row-key="cateId"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="分类名称" align="center" prop="cateName"  width="160"/>
+      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat" />
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <el-table-column label="更新者" align="center" prop="updateBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:cate:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['isc:cate:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['isc:cate:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改服务分类对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父分类" prop="parentId">
+          <treeselect v-model="form.parentId" :options="cateOptions" :normalizer="normalizer" placeholder="请选择父分类ID" />
+        </el-form-item>
+        <el-form-item label="分类名称" prop="cateName">
+          <el-input v-model="form.cateName" placeholder="请输入分类名称" />
+        </el-form-item>
+        <el-form-item label="服务状态" prop="enabled">
+          <el-radio-group v-model="form.enabled">
+            <el-radio
+              v-for="dict in enabledOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="显示顺序" prop="orderNum">
+          <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCate, getCate, delCate, addCate, updateCate } from "@/api/isc/cate";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Cate",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 服务分类表格数据
+      cateList: [],
+      // 服务分类树选项
+      cateOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 服务状态字典
+      enabledOptions: [],
+      // 查询参数
+      queryParams: {
+        cateName: null,
+        enabled: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentId: [
+          { required: true, message: "父分类不能为空", trigger: "change" }
+        ],
+        cateName: [
+          { required: true, message: "分类名称不能为空", trigger: "change" },
+          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+        ],
+        enabled: [
+          { required: true, message: "服务状态不能为空", trigger: "change" }
+        ],
+        orderNum: [
+          { required: true, message: "显示顺序不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.enabledOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询服务分类列表 */
+    getList() {
+      this.loading = true;
+      listCate(this.queryParams).then(response => {
+        this.cateList = this.handleTree(response.data, "cateId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换服务分类数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.cateId,
+        label: node.cateName,
+        children: node.children
+      };
+    },
+	/** 查询服务分类下拉树结构 */
+    getTreeselect() {
+      listCate().then(response => {
+        this.cateOptions = [];
+        const data = { cateId: 0, cateName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "cateId", "parentId");
+        this.cateOptions.push(data);
+      });
+    },
+    // 服务状态字典翻译
+    enabledFormat(row, column) {
+      return this.selectDictLabel(this.enabledOptions, row.enabled);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cateId: null,
+        parentId: 0,
+        cateName: null,
+        enabled: "0",
+        createBy: null,
+        orderNum: 99,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        delFlag: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.cateId) {
+        this.form.parentId = row.cateId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加服务分类";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+	  this.loading = true;
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.cateId;
+      }
+      getCate(row.cateId).then(response => {
+	    this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改服务分类";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+		  this.buttonLoading = true;
+          if (this.form.cateId != null) {
+            updateCate(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addCate(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$confirm('是否确认删除服务分类编号为"' + row.cateId + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+		  this.loading = true;
+          return delCate(row.cateId);
+        }).then(() => {
+		  this.loading = false;
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).finally(() => {
+              this.loading = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
new file mode 100644
index 000000000..d3647593d
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="服务名称" prop="serviceName">
+        <el-input
+          v-model="queryParams.serviceName"
+          placeholder="请输入服务名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否在线" prop="onlineStatus">
+        <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
+          <el-option
+            v-for="dict in onlineStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务状态" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
+          <el-option
+            v-for="dict in enabledOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务分类" prop="cateFullPath">
+        <treeselect v-model="queryParams.cateFullPath" :options="cateOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务分类" style="width:215px"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['isc:service:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['isc:service:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['isc:service:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:service:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="服务ID" align="center" prop="serviceId" v-if="false"/>
+      <el-table-column label="服务名称" align="center" prop="serviceName" />
+      <el-table-column label="服务分类" align="center" prop="cateName" />
+      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat" />
+      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat" />
+      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:service:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['isc:service:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改服务信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="服务分类" prop="cateFullPath">
+          <treeselect v-model="form.cateFullPath" :options="cateOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务分类" />
+        </el-form-item>
+        <el-form-item label="服务名称" prop="serviceName">
+          <el-input v-model="form.serviceName" placeholder="请输入服务名称" />
+        </el-form-item>
+        <el-form-item label="服务地址" prop="serviceAddr">
+          <el-input v-model="form.serviceAddr" placeholder="请输入服务地址" />
+        </el-form-item>
+        <el-form-item label="探活地址" prop="probeActiveAddr">
+          <el-input v-model="form.probeActiveAddr" placeholder="请输入探活地址" />
+        </el-form-item>
+        <el-form-item label="请求方式" prop="requestMethod">
+          <el-input v-model="form.requestMethod" placeholder="请输入请求方式" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="跨域标志">
+          <el-radio-group v-model="form.corsFlag">
+            <el-radio
+              v-for="dict in corsFlagOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="隐藏参数" prop="hiddenParams">
+          <el-input v-model="form.hiddenParams" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="JSON文档" prop="apiDoc">
+          <el-input v-model="form.apiDoc" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listService, getService, delService, addService, updateService } from "@/api/isc/service";
+import { treeselect } from "@/api/isc/cate";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { downLoadExcel } from "@/utils/download";
+
+export default {
+  name: "Service",
+  components: { Treeselect },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务信息表格数据
+      serviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 跨域标志字典
+      corsFlagOptions: [],
+      // 是否在线字典
+      onlineStatusOptions: [],
+      // 审核状态字典
+      statusOptions: [],
+      // 服务状态字典
+      enabledOptions: [],
+      //服务分类
+      cateOptions:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        serviceName: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        enabled: undefined,
+        cateFullPath: undefined,
+        userId: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        serviceName: [
+          { required: true, message: "服务名称不能为空", trigger: "blur" }
+        ],
+        serviceAddr: [
+          { required: true, message: "服务地址不能为空", trigger: "blur" }
+        ],
+        probeActiveAddr: [
+          { required: true, message: "探活地址不能为空", trigger: "blur" }
+        ],
+        requestMethod: [
+          { required: true, message: "请求方式不能为空", trigger: "blur" }
+        ],
+        corsFlag: [
+          { required: true, message: "跨域标志不能为空", trigger: "blur" }
+        ],
+        apiDoc: [
+          { required: true, message: "JSON文档不能为空", trigger: "blur" }
+        ],
+        enabled: [
+          { required: true, message: "服务状态不能为空", trigger: "blur" }
+        ],
+        cateFullPath: [
+          { required: true, message: "服务分类不能为空", trigger: "change" }
+        ],
+        userId: [
+          { required: true, message: "用户ID不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("sys_yes_no").then(response => {
+      this.corsFlagOptions = response.data;
+    });
+    this.getDicts("isc_online_status").then(response => {
+      this.onlineStatusOptions = response.data;
+    });
+    this.getDicts("sys_audit_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.enabledOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询服务信息列表 */
+    getList() {
+      this.loading = true;
+      listService(this.queryParams).then(response => {
+        this.serviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 跨域标志字典翻译
+    corsFlagFormat(row, column) {
+      return this.selectDictLabel(this.corsFlagOptions, row.corsFlag);
+    },
+    // 是否在线字典翻译
+    onlineStatusFormat(row, column) {
+      return this.selectDictLabel(this.onlineStatusOptions, row.onlineStatus);
+    },
+    // 审核状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 服务状态字典翻译
+    enabledFormat(row, column) {
+      return this.selectDictLabel(this.enabledOptions, row.enabled);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        serviceId: undefined,
+        serviceName: undefined,
+        serviceAddr: undefined,
+        probeActiveAddr: undefined,
+        requestMethod: undefined,
+        remark: undefined,
+        corsFlag: "0",
+        hiddenParams: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        apiDoc: undefined,
+        auditMind: undefined,
+        enabled: "0",
+        cateFullPath: undefined,
+        userId: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+      Time: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.serviceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加服务信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const serviceId = row.serviceId || this.ids
+      getService(serviceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改服务信息";
+      });
+    },
+    /** 查询服务分类树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.cateOptions = response.data;
+      });
+    },
+    //树节点转换
+    normalizer(node) {
+      return {
+        id: node.fullPath,
+        label: node.label,
+        children: node.children,
+      }
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.serviceId != null) {
+            updateService(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addService(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const serviceIds = row.serviceId || this.ids;
+      this.$confirm('是否确认删除服务信息编号为"' + serviceIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.loading = true;
+          return delService(serviceIds);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).finally(() => {
+          this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      downLoadExcel('/isc/service/export', this.queryParams);
+    }
+  }
+};
+</script>
diff --git a/sql/isc.sql b/sql/isc.sql
new file mode 100644
index 000000000..675151f5b
--- /dev/null
+++ b/sql/isc.sql
@@ -0,0 +1,217 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for isc_app_service
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_app_service`;
+CREATE TABLE `isc_app_service`  (
+  `service_app_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
+  `service_id` bigint NULL DEFAULT NULL COMMENT '服务ID',
+  `application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
+  `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
+  `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
+  `apply_type` char(1)  DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
+  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+  `virtual_addr` varchar(255)  DEFAULT NULL COMMENT '虚拟地址',
+  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间',
+  `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
+  `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
+  `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
+  `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
+  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+  PRIMARY KEY (`service_app_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
+
+-- ----------------------------
+-- Records of isc_app_service
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_app_service_apply
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_app_service_apply`;
+CREATE TABLE `isc_app_service_apply`  (
+  `apply_id` bigint NOT NULL AUTO_INCREMENT COMMENT '申请ID',
+  `service_app_id` bigint NOT NULL COMMENT '应用服务ID',
+  `apply_type` char(1)  DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
+  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+  `audit_mind` varchar(255)  DEFAULT NULL COMMENT '审核意见',
+  `renewal_duration` int NULL DEFAULT NULL COMMENT '续期时长（单位月）',
+  `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
+  `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
+  `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
+  `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
+  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`apply_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务申请信息';
+
+-- ----------------------------
+-- Records of isc_app_service_apply
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_application
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_application`;
+CREATE TABLE `isc_application`  (
+  `application_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用ID',
+  `application_name` varchar(255) NOT NULL COMMENT '应用名称',
+  `access_key` varchar(32) NOT NULL COMMENT '应用密钥',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`application_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用信息';
+
+-- ----------------------------
+-- Records of isc_application
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_service
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_service`;
+CREATE TABLE `isc_service`  (
+  `service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '服务ID',
+  `service_name` varchar(255) NOT NULL COMMENT '服务名称',
+  `service_addr` varchar(255) NOT NULL COMMENT '服务地址',
+  `probe_active_addr` varchar(255)  DEFAULT NULL COMMENT '探活地址',
+  `request_method` varchar(10)  DEFAULT NULL COMMENT '请求方式（默认GET）',
+  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
+  `cors_flag` char(1)  DEFAULT NULL COMMENT '跨域标志（Y是 N否）',
+  `hidden_params` varchar(500)  DEFAULT NULL COMMENT '隐藏参数',
+  `api_doc` text  COMMENT 'JSON文档',
+  `online_status` char(1) DEFAULT NULL COMMENT '是否在线（0离线 1在线）',
+  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+  `audit_mind` varchar(255)  DEFAULT NULL COMMENT '审核意见',
+  `enabled` char(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
+  `cate_full_path` varchar(30)  DEFAULT NULL COMMENT '服务分类全路径',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+  PRIMARY KEY (`service_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务信息';
+
+-- ----------------------------
+-- Records of isc_service
+-- ----------------------------
+BEGIN;
+INSERT INTO `isc_service` VALUES (1, '测试', 'https://www.baidu.com/', 'https://www.baidu.com/', 'GET', NULL, 'Y', NULL, '{}', '1', '0', NULL, '0', '001000000000000000000000000000', 1, 'admin', '2021-09-05 22:47:41', 'admin', '2021-09-05 22:47:41', '0');
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_service_cate
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_service_cate`;
+CREATE TABLE `isc_service_cate`  (
+  `cate_id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类ID',
+  `parent_id` bigint NULL DEFAULT NULL COMMENT '父分类ID',
+  `cate_name` varchar(64)  DEFAULT NULL COMMENT '分类名称',
+  `full_path` varchar(30)  DEFAULT NULL COMMENT '搜索全路径',
+  `enabled` char(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
+  `order_num` int NULL DEFAULT 0 COMMENT '显示顺序',
+  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`cate_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 COMMENT = '服务分类';
+
+-- ----------------------------
+-- Records of isc_service_cate
+-- ----------------------------
+BEGIN;
+INSERT INTO `isc_service_cate` VALUES (10, 0, 'API服务', '001000000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:35:13', 'admin', '2021-09-04 23:35:13', '0', NULL), (11, 0, '地图服务', '002000000000000000000000000000', '0', 20, 'admin', '2021-09-04 23:35:37', 'admin', '2021-09-04 23:35:37', '0', NULL), (12, 0, '数据服务', '003000000000000000000000000000', '0', 30, 'admin', '2021-09-04 23:36:01', 'admin', '2021-09-04 23:36:01', '0', NULL), (13, 11, 'WFS服务', '002001000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:36:26', 'admin', '2021-09-04 23:36:26', '0', NULL);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_service_log_count
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_service_log_count`;
+CREATE TABLE `isc_service_log_count`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+  `service_id` bigint NOT NULL COMMENT '服务ID',
+  `count_date` date NOT NULL COMMENT '统计日期',
+  `total_num` bigint NOT NULL COMMENT '调用次数',
+  `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务每日统计';
+
+-- ----------------------------
+-- Records of isc_service_log_count
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_service_log_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_service_log_detail`;
+CREATE TABLE `isc_service_log_detail`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+  `service_id` bigint NOT NULL COMMENT '服务ID',
+  `application_id` bigint NOT NULL COMMENT '应用ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `request_ip` varchar(64)  DEFAULT NULL COMMENT '调用IP',
+  `begin_time` timestamp(0) NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '结束时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `remark` varchar(500)  DEFAULT NULL COMMENT '备注信息',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务调用日志';
+
+-- ----------------------------
+-- Records of isc_service_log_detail
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for isc_service_log_user_count
+-- ----------------------------
+DROP TABLE IF EXISTS `isc_service_log_user_count`;
+CREATE TABLE `isc_service_log_user_count`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+  `service_id` bigint NOT NULL COMMENT '服务ID',
+  `application_id` bigint NOT NULL COMMENT '应用ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `count_date` date NULL DEFAULT NULL COMMENT '统计日期',
+  `total_num` bigint NULL DEFAULT NULL COMMENT '调用次数',
+  `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务日志用户统计';
+
+-- ----------------------------
+-- Records of isc_service_log_user_count
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+SET FOREIGN_KEY_CHECKS = 1;

From 4ca9d2e8aa2a0eddad4f6cc7876dbc98753f8a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E6=96=87=E8=B6=85?=
 <80003818@sfmail.sf-express.com>
Date: Tue, 7 Sep 2021 11:30:18 +0800
Subject: [PATCH 10/60] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yml  | 134 ++++++++++++++++++
 ruoyi-admin/src/main/resources/spy.properties |  26 ++--
 2 files changed, 147 insertions(+), 13 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/application-local.yml

diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
new file mode 100644
index 000000000..0be1c6911
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -0,0 +1,134 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: true
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      datasource:
+        # 主库数据源
+        master:
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          username: root
+          password: root
+        # 从库数据源
+        slave:
+          lazy: true
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url:
+          username:
+          password:
+      druid:
+        # 初始连接数
+        initialSize: 5
+        # 最小连接池数量
+        minIdle: 10
+        # 最大连接池数量
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        # 配置一个连接在池中最大生存的时间，单位是毫秒
+        maxEvictableIdleTimeMillis: 900000
+        # 配置检测连接是否有效
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 注意这个值和druid原生不一致，默认启动了stat
+        filters: stat
+
+--- # druid 配置
+spring:
+  datasource:
+    druid:
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+
+--- # redis 配置
+spring:
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl: false
+
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000
+
+--- # 监控配置
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
+        # 增加客户端开关
+        enabled: true
+        # 设置 Spring Boot Admin Server 地址
+        url: http://localhost:9090/admin
+        instance:
+          prefer-ip: true # 注册实例时，优先使用 IP
+        username: ruoyi
+        password: 123456
diff --git a/ruoyi-admin/src/main/resources/spy.properties b/ruoyi-admin/src/main/resources/spy.properties
index b361dbbef..3af094c2a 100644
--- a/ruoyi-admin/src/main/resources/spy.properties
+++ b/ruoyi-admin/src/main/resources/spy.properties
@@ -1,26 +1,26 @@
-# p6spy ���ܷ�����������ļ�
+# p6spy \u6027\u80FD\u5206\u6790\u63D2\u4EF6\u914D\u7F6E\u6587\u4EF6
 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# �Զ�����־��ӡ
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#��־���������̨
+#\u65E5\u5FD7\u8F93\u51FA\u5230\u63A7\u5236\u53F0
 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# ʹ����־ϵͳ��¼ sql
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# ���� p6spy driver ����
+# \u8BBE\u7F6E p6spy driver \u4EE3\u7406
 #deregisterdrivers=true
-# ȡ��JDBC URLǰ׺
+# \u53D6\u6D88JDBC URL\u524D\u7F00
 useprefix=true
-# ���ü�¼ Log ����,��ȥ���Ľ������error,info,batch,debug,statement,commit,rollback,result,resultset.
+# \u914D\u7F6E\u8BB0\u5F55 Log \u4F8B\u5916,\u53EF\u53BB\u6389\u7684\u7ED3\u679C\u96C6\u6709error,info,batch,debug,statement,commit,rollback,result,resultset.
 excludecategories=info,debug,result,commit,resultset
-# ���ڸ�ʽ
+# \u65E5\u671F\u683C\u5F0F
 dateformat=yyyy-MM-dd HH:mm:ss
-# ʵ�������ɶ��
+# \u5B9E\u9645\u9A71\u52A8\u53EF\u591A\u4E2A
 #driverlist=org.h2.Driver
-# �Ƿ�����SQL��¼
+# \u662F\u5426\u5F00\u542F\u6162SQL\u8BB0\u5F55
 outagedetection=true
-# ��SQL��¼��׼ 2 ��
+# \u6162SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
 outagedetectioninterval=2
-# �Ƿ���� Log
+# \u662F\u5426\u8FC7\u6EE4 Log
 filter=true
-# ���� Log ʱ���ų��ı����б����Զ��ŷָ�
+# \u8FC7\u6EE4 Log \u65F6\u6240\u6392\u9664\u7684\u8868\u540D\u5217\u8868\uFF0C\u4EE5\u9017\u53F7\u5206\u9694
 exclude=QRTZ_

From 2fc4a9db205e0e3e8f2bf724e9baea4686b84a51 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Tue, 7 Sep 2021 22:47:48 +0800
Subject: [PATCH 11/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/isc/domain/bo/IscServiceBo.java |  7 ++++
 .../com/ruoyi/isc/domain/vo/IscServiceVo.java |  9 ++---
 .../service/impl/IscServiceServiceImpl.java   |  1 +
 ruoyi-ui/src/views/isc/service/index.vue      | 37 ++++++++++++-------
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
index 8a2aa60b6..2254e9fa9 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
@@ -24,6 +24,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @ApiModel("服务信息业务对象")
 public class IscServiceBo extends BaseEntity {
 
+    /**
+     * 服务ID
+     */
+    @ApiModelProperty(value = "服务ID", required = true)
+    @NotNull(message = "服务ID不能为空", groups = { EditGroup.class })
+    private Long serviceId;
+
     /**
      * 服务名称
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
index cde19b64b..1eb67f1de 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
@@ -67,14 +67,14 @@ public class IscServiceVo {
     /**
      * 跨域标志（Y是 N否）
      */
-    @ExcelProperty(value = "跨域标志")
+    @ExcelProperty(value = "跨域标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
     @ApiModelProperty("跨域标志（Y是 N否）")
     private String corsFlag;
 
     /**
      * 隐藏参数
      */
-    @ExcelProperty(value = "隐藏参数")
     @ApiModelProperty("隐藏参数")
     private String hiddenParams;
 
@@ -117,7 +117,7 @@ public class IscServiceVo {
     /**
      * 服务分类名称
      */
-    @ExcelProperty(value = "服务分类名称")
+    @ExcelProperty(value = "服务分类")
     @ApiModelProperty("服务分类名称")
     private String cateName;
 
@@ -133,7 +133,6 @@ public class IscServiceVo {
      */
     @ExcelProperty(value = "更新时间")
     @ApiModelProperty("更新时间")
-    private String updateTime;
-
+    private Date updateTime;
 
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 2361eeffd..65d69bd29 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -56,6 +56,7 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     public List<IscServiceVo> queryList(IscServiceBo bo)
     {
         final List<IscServiceVo> results = listVo(buildQueryWrapper(bo));
+        genVoInfo(results);
         return results;
     }
 
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index d3647593d..fde9d000b 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -98,14 +98,14 @@
 
     <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="服务ID" align="center" prop="serviceId" v-if="false"/>
-      <el-table-column label="服务名称" align="center" prop="serviceName" />
-      <el-table-column label="服务分类" align="center" prop="cateName" />
-      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat" />
-      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat" />
-      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" >
+      <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
+      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat"  width="100"/>
+      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat"  width="100"/>
+      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat"  width="100"/>
+      <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime"  width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
@@ -154,7 +154,13 @@
           <el-input v-model="form.probeActiveAddr" placeholder="请输入探活地址" />
         </el-form-item>
         <el-form-item label="请求方式" prop="requestMethod">
-          <el-input v-model="form.requestMethod" placeholder="请输入请求方式" />
+          <el-radio-group v-model="form.requestMethod">
+            <el-radio
+              v-for="dict in requestMethodOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -225,6 +231,8 @@ export default {
       statusOptions: [],
       // 服务状态字典
       enabledOptions: [],
+      // 服务状态字典
+      requestMethodOptions: [],
       //服务分类
       cateOptions:[],
       // 查询参数
@@ -235,8 +243,7 @@ export default {
         onlineStatus: undefined,
         status: undefined,
         enabled: undefined,
-        cateFullPath: undefined,
-        userId: undefined,
+        cateFullPath: undefined
       },
       // 表单参数
       form: {},
@@ -287,6 +294,9 @@ export default {
     this.getDicts("sys_normal_disable").then(response => {
       this.enabledOptions = response.data;
     });
+    this.getDicts("isc_request_method").then(response => {
+      this.requestMethodOptions = response.data;
+    });
   },
   methods: {
     /** 查询服务信息列表 */
@@ -326,9 +336,9 @@ export default {
         serviceName: undefined,
         serviceAddr: undefined,
         probeActiveAddr: undefined,
-        requestMethod: undefined,
+        requestMethod: 'GET',
         remark: undefined,
-        corsFlag: "0",
+        corsFlag: 'Y',
         hiddenParams: undefined,
         onlineStatus: undefined,
         status: undefined,
@@ -340,7 +350,6 @@ export default {
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-      Time: undefined,
         updateTime: undefined,
         delFlag: undefined
       };

From 43fff0ad229d5ecdd08223ae5f6e6f08c7a87fe8 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Tue, 7 Sep 2021 23:18:02 +0800
Subject: [PATCH 12/60] =?UTF-8?q?=E5=8D=87=E7=BA=A73.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-local.yml | 2 +-
 ruoyi-isc/pom.xml                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
index 0be1c6911..72485783d 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -38,7 +38,7 @@ spring:
         # 配置一个连接在池中最大生存的时间，单位是毫秒
         maxEvictableIdleTimeMillis: 900000
         # 配置检测连接是否有效
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
diff --git a/ruoyi-isc/pom.xml b/ruoyi-isc/pom.xml
index 10478d172..e994e24fa 100644
--- a/ruoyi-isc/pom.xml
+++ b/ruoyi-isc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From a59f2c2e4bbd529cdb142f3d430b14e89295bf65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E6=96=87=E8=B6=85?=
 <80003818@sfmail.sf-express.com>
Date: Wed, 8 Sep 2021 15:21:42 +0800
Subject: [PATCH 13/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IscApplicationController.java  | 113 ++++++++++++++++++
 .../com/ruoyi/isc/domain/IscApplication.java  |  82 +++++++++++++
 .../com/ruoyi/isc/domain/IscServiceCate.java  |   4 +-
 .../ruoyi/isc/domain/bo/IscApplicationBo.java |  68 +++++++++++
 .../ruoyi/isc/domain/bo/IscServiceCateBo.java |  12 +-
 .../ruoyi/isc/domain/vo/IscApplicationVo.java |  67 +++++++++++
 .../ruoyi/isc/domain/vo/IscServiceCateVo.java |   6 +-
 .../isc/mapper/IscApplicationMapper.java      |  14 +++
 .../isc/service/IIscApplicationService.java   |  56 +++++++++
 .../impl/IscApplicationServiceImpl.java       |  89 ++++++++++++++
 .../mapper/isc/IscApplicationMapper.xml       |  21 ++++
 .../mapper/isc/IscServiceCateMapper.xml       |   4 +-
 .../resources/mapper/isc/IscServiceMapper.xml |   4 +-
 ruoyi-ui/src/views/isc/cate/index.vue         |  14 +--
 sql/isc.sql                                   |  25 +++-
 15 files changed, 555 insertions(+), 24 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
 create mode 100644 ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
new file mode 100644
index 000000000..1041bb632
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
@@ -0,0 +1,113 @@
+package com.ruoyi.isc.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.isc.domain.bo.IscApplicationBo;
+import com.ruoyi.isc.domain.vo.IscApplicationVo;
+import com.ruoyi.isc.service.IIscApplicationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 应用信息Controller
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+@Validated
+@Api(value = "应用信息控制器", tags = {"应用信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/isc/application")
+public class IscApplicationController extends BaseController {
+
+    private final IIscApplicationService iIscApplicationService;
+
+    /**
+     * 查询应用信息列表
+     */
+    @ApiOperation("查询应用信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:application:list')")
+    @GetMapping("/list")
+    public TableDataInfo<IscApplicationVo> list(@Validated(QueryGroup.class) IscApplicationBo bo) {
+        return iIscApplicationService.queryPageList(bo);
+    }
+
+    /**
+     * 导出应用信息列表
+     */
+    @ApiOperation("导出应用信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:application:export')")
+    @Log(title = "应用信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IscApplicationBo bo, HttpServletResponse response) {
+        List<IscApplicationVo> list = iIscApplicationService.queryList(bo);
+        ExcelUtil.exportExcel(list, "应用信息", IscApplicationVo.class, response);
+    }
+
+    /**
+     * 获取应用信息详细信息
+     */
+    @ApiOperation("获取应用信息详细信息")
+    @PreAuthorize("@ss.hasPermi('isc:application:query')")
+    @GetMapping("/{applicationId}")
+    public AjaxResult<IscApplicationVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("applicationId") Long applicationId) {
+        return AjaxResult.success(iIscApplicationService.queryById(applicationId));
+    }
+
+    /**
+     * 新增应用信息
+     */
+    @ApiOperation("新增应用信息")
+    @PreAuthorize("@ss.hasPermi('isc:application:add')")
+    @Log(title = "应用信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IscApplicationBo bo) {
+        return toAjax(iIscApplicationService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改应用信息
+     */
+    @ApiOperation("修改应用信息")
+    @PreAuthorize("@ss.hasPermi('isc:application:edit')")
+    @Log(title = "应用信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IscApplicationBo bo) {
+        return toAjax(iIscApplicationService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除应用信息
+     */
+    @ApiOperation("删除应用信息")
+    @PreAuthorize("@ss.hasPermi('isc:application:remove')")
+    @Log(title = "应用信息" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{applicationIds}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] applicationIds) {
+        return toAjax(iIscApplicationService.deleteWithValidByIds(Arrays.asList(applicationIds), true) ? 1 : 0);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
new file mode 100644
index 000000000..8305042a8
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
@@ -0,0 +1,82 @@
+package com.ruoyi.isc.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 应用信息对象 isc_application
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("isc_application")
+public class IscApplication implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 应用ID
+     */
+    @TableId(value = "application_id")
+    private Long applicationId;
+
+    /**
+     * 应用名称
+     */
+    private String applicationName;
+
+    /**
+     * 应用密钥
+     */
+    private String accessKey;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
index 0abc1fd75..ab00eafc7 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
@@ -5,10 +5,10 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -48,7 +48,7 @@ public class IscServiceCate implements Serializable {
     private String fullPath;
 
     /**
-     * 服务状态（0启用 1停用）
+     * 启用状态（0启用 1停用）
      */
     private String enabled;
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
new file mode 100644
index 000000000..cf0b87ecd
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
@@ -0,0 +1,68 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 应用信息业务对象 isc_application
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("应用信息业务对象")
+public class IscApplicationBo extends BaseEntity {
+
+    /**
+     * 应用ID
+     */
+    @ApiModelProperty(value = "应用ID")
+    private Long applicationId;
+
+    /**
+     * 应用名称
+     */
+    @ApiModelProperty(value = "应用名称", required = true)
+    @NotBlank(message = "应用名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String applicationName;
+
+    /**
+     * 应用密钥
+     */
+    @ApiModelProperty(value = "应用密钥", required = true)
+    private String accessKey;
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
index 5cc7b1df3..8b5c2e12c 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
@@ -1,16 +1,14 @@
 package com.ruoyi.isc.domain.bo;
 
+import com.ruoyi.common.core.domain.TreeEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.TreeEntity;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 服务分类业务对象 isc_service_cate
@@ -37,10 +35,10 @@ public class IscServiceCateBo extends TreeEntity {
     private String cateName;
 
     /**
-     * 服务状态（0启用 1停用）
+     * 启用状态（0启用 1停用）
      */
-    @ApiModelProperty(value = "服务状态（0启用 1停用）", required = true)
-    @NotBlank(message = "服务状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    @ApiModelProperty(value = "启用状态（0启用 1停用）", required = true)
+    @NotBlank(message = "启用状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enabled;
 
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
new file mode 100644
index 000000000..dcaf94f64
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
@@ -0,0 +1,67 @@
+package com.ruoyi.isc.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+
+/**
+ * 应用信息视图对象 isc_application
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+@Data
+@ApiModel("应用信息视图对象")
+@ExcelIgnoreUnannotated
+public class IscApplicationVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  应用ID
+     */
+    @ApiModelProperty("应用ID")
+    private Long applicationId;
+
+    /**
+     * 应用名称
+     */
+    @ExcelProperty(value = "应用名称")
+    @ApiModelProperty("应用名称")
+    private String applicationName;
+
+    /**
+     * 应用密钥
+     */
+    @ExcelProperty(value = "应用密钥")
+    @ApiModelProperty("应用密钥")
+    private String accessKey;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新者")
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
index 78322128b..f360e03fd 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
@@ -45,11 +45,11 @@ public class IscServiceCateVo {
     private String cateName;
 
     /**
-     * 服务状态（0启用 1停用）
+     * 启用状态（0启用 1停用）
      */
-    @ExcelProperty(value = "服务状态", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")
-    @ApiModelProperty("服务状态（0启用 1停用）")
+    @ApiModelProperty("启用状态（0启用 1停用）")
     private String enabled;
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
new file mode 100644
index 000000000..12af14d1e
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.isc.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.isc.domain.IscApplication;
+
+/**
+ * 应用信息Mapper接口
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+public interface IscApplicationMapper extends BaseMapperPlus<IscApplication> {
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
new file mode 100644
index 000000000..f01cec619
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.isc.service;
+
+import com.ruoyi.isc.domain.IscApplication;
+import com.ruoyi.isc.domain.vo.IscApplicationVo;
+import com.ruoyi.isc.domain.bo.IscApplicationBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 应用信息Service接口
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+public interface IIscApplicationService extends IServicePlus<IscApplication, IscApplicationVo> {
+    /**
+     * 查询单个
+     * @return
+     */
+    IscApplicationVo queryById(Long applicationId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<IscApplicationVo> queryPageList(IscApplicationBo bo);
+
+    /**
+     * 查询列表
+     */
+    List<IscApplicationVo> queryList(IscApplicationBo bo);
+
+    /**
+     * 根据新增业务对象插入应用信息
+     * @param bo 应用信息新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IscApplicationBo bo);
+
+    /**
+     * 根据编辑业务对象修改应用信息
+     * @param bo 应用信息编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IscApplicationBo bo);
+
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
new file mode 100644
index 000000000..3c4550381
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
@@ -0,0 +1,89 @@
+package com.ruoyi.isc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.domain.IscApplication;
+import com.ruoyi.isc.domain.bo.IscApplicationBo;
+import com.ruoyi.isc.domain.vo.IscApplicationVo;
+import com.ruoyi.isc.mapper.IscApplicationMapper;
+import com.ruoyi.isc.service.IIscApplicationService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 应用信息Service业务层处理
+ *
+ * @author wenchao gong
+ * @date 2021-09-08
+ */
+@Service
+public class IscApplicationServiceImpl extends ServicePlusImpl<IscApplicationMapper, IscApplication, IscApplicationVo> implements IIscApplicationService {
+
+    @Override
+    public IscApplicationVo queryById(Long applicationId){
+        return getVoById(applicationId);
+    }
+
+    @Override
+    public TableDataInfo<IscApplicationVo> queryPageList(IscApplicationBo bo) {
+        PagePlus<IscApplication, IscApplicationVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<IscApplicationVo> queryList(IscApplicationBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<IscApplication> buildQueryWrapper(IscApplicationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IscApplication> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), IscApplication::getApplicationName, bo.getApplicationName());
+        lqw.eq(StringUtils.isNotBlank(bo.getAccessKey()), IscApplication::getAccessKey, bo.getAccessKey());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IscApplicationBo bo) {
+        IscApplication add = BeanUtil.toBean(bo, IscApplication.class);
+        validEntityBeforeSave(add);
+        add.setAccessKey(IdUtil.simpleUUID());
+        add.setUserId(SecurityUtils.getUserId());
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(IscApplicationBo bo) {
+        IscApplication update = BeanUtil.toBean(bo, IscApplication.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IscApplication entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml
new file mode 100644
index 000000000..607808cf4
--- /dev/null
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.isc.mapper.IscApplicationMapper">
+
+    <resultMap type="com.ruoyi.isc.domain.IscApplication" id="IscApplicationResult">
+        <result property="applicationId" column="application_id"/>
+        <result property="applicationName" column="application_name"/>
+        <result property="accessKey" column="access_key"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
index 930f4e20e..c08b45e9d 100644
--- a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.isc.mapper.IscServiceCateMapper">
 
     <resultMap type="com.ruoyi.isc.domain.IscServiceCate" id="IscServiceCateResult">
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
index df021ab28..e7924dd40 100644
--- a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.isc.mapper.IscServiceMapper">
 
     <resultMap type="com.ruoyi.isc.domain.IscService" id="IscServiceResult">
diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue
index 451ee6d75..dc380256d 100644
--- a/ruoyi-ui/src/views/isc/cate/index.vue
+++ b/ruoyi-ui/src/views/isc/cate/index.vue
@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="服务状态" prop="enabled">
-        <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
+      <el-form-item label="启用状态" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
           <el-option
             v-for="dict in enabledOptions"
             :key="dict.dictValue"
@@ -48,7 +48,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column label="分类名称" align="center" prop="cateName"  width="160"/>
-      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat" />
+      <el-table-column label="启用状态" align="center" prop="enabled" :formatter="enabledFormat" />
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
       <el-table-column label="更新者" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
@@ -93,7 +93,7 @@
         <el-form-item label="分类名称" prop="cateName">
           <el-input v-model="form.cateName" placeholder="请输入分类名称" />
         </el-form-item>
-        <el-form-item label="服务状态" prop="enabled">
+        <el-form-item label="启用状态" prop="enabled">
           <el-radio-group v-model="form.enabled">
             <el-radio
               v-for="dict in enabledOptions"
@@ -143,7 +143,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 服务状态字典
+      // 启用状态字典
       enabledOptions: [],
       // 查询参数
       queryParams: {
@@ -162,7 +162,7 @@ export default {
           { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
         ],
         enabled: [
-          { required: true, message: "服务状态不能为空", trigger: "change" }
+          { required: true, message: "启用状态不能为空", trigger: "change" }
         ],
         orderNum: [
           { required: true, message: "显示顺序不能为空", trigger: "change" }
@@ -205,7 +205,7 @@ export default {
         this.cateOptions.push(data);
       });
     },
-    // 服务状态字典翻译
+    // 启用状态字典翻译
     enabledFormat(row, column) {
       return this.selectDictLabel(this.enabledOptions, row.enabled);
     },
diff --git a/sql/isc.sql b/sql/isc.sql
index 675151f5b..0ef994b57 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -131,7 +131,7 @@ CREATE TABLE `isc_service_cate`  (
   `parent_id` bigint NULL DEFAULT NULL COMMENT '父分类ID',
   `cate_name` varchar(64)  DEFAULT NULL COMMENT '分类名称',
   `full_path` varchar(30)  DEFAULT NULL COMMENT '搜索全路径',
-  `enabled` char(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
+  `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
   `order_num` int NULL DEFAULT 0 COMMENT '显示顺序',
   `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
@@ -214,4 +214,27 @@ CREATE TABLE `isc_service_log_user_count`  (
 BEGIN;
 COMMIT;
 
+BEGIN;
+INSERT INTO `sys_menu` VALUES (1607, '服务分类', 1606, 1, 'cate', 'isc/cate/index', 1, 0, 'C', '0', '0', 'isc:cate:list', '#', 'admin', '2021-09-08 13:59:21', 'admin', '2021-09-08 14:02:25', '服务分类菜单');
+INSERT INTO `sys_menu` VALUES (1608, '服务分类查询', 1607, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:cate:query', '#', 'admin', '2021-09-08 13:59:21', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1609, '服务分类新增', 1607, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:cate:add', '#', 'admin', '2021-09-08 13:59:21', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1610, '服务分类修改', 1607, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:cate:edit', '#', 'admin', '2021-09-08 13:59:21', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1611, '服务分类删除', 1607, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:cate:remove', '#', 'admin', '2021-09-08 13:59:21', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1612, '服务分类导出', 1607, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:cate:export', '#', 'admin', '2021-09-08 13:59:21', '', NULL, '');
+
+INSERT INTO `sys_menu` VALUES (1619, '服务信息', 1606, 1, 'service', 'isc/service/index', 1, 0, 'C', '0', '0', 'isc:service:list', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '服务信息菜单');
+INSERT INTO `sys_menu` VALUES (1620, '服务信息查询', 1619, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:service:query', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1621, '服务信息新增', 1619, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:service:add', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1622, '服务信息修改', 1619, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:service:edit', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1623, '服务信息删除', 1619, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:service:remove', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1624, '服务信息导出', 1619, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:service:export', '#', 'admin', '2021-09-08 14:04:29', '', NULL, '');
+
+INSERT INTO `sys_menu` VALUES (1625, '应用信息', 1606, 1, 'application', 'isc/application/index', 1, 0, 'C', '0', '0', 'isc:application:list', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '应用信息菜单');
+INSERT INTO `sys_menu` VALUES (1626, '应用信息查询', 1625, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:application:query', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1627, '应用信息新增', 1625, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:application:add', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1628, '应用信息修改', 1625, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:application:edit', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1629, '应用信息删除', 1625, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:application:remove', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1630, '应用信息导出', 1625, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:application:export', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+COMMIT;
+
 SET FOREIGN_KEY_CHECKS = 1;

From ea42d0b6aa5321b246e419c8a44ee3cfaf773d2e Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Wed, 8 Sep 2021 17:44:34 +0800
Subject: [PATCH 14/60] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/IscAppServiceController.java   | 113 +++++
 .../com/ruoyi/isc/domain/IscAppService.java   | 122 ++++++
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  | 129 ++++++
 .../com/ruoyi/isc/domain/bo/IscServiceBo.java |  14 +-
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  | 108 +++++
 .../ruoyi/isc/mapper/IscAppServiceMapper.java |  16 +
 .../isc/service/IIscAppServiceService.java    |  56 +++
 .../impl/IscAppServiceServiceImpl.java        |  88 ++++
 .../impl/IscApplicationServiceImpl.java       |   2 +
 .../service/impl/IscServiceServiceImpl.java   |   3 +-
 .../mapper/isc/IscAppServiceMapper.xml        |  29 ++
 ruoyi-ui/src/api/isc/application.js           |  44 ++
 ruoyi-ui/src/api/isc/appservice.js            |  44 ++
 ruoyi-ui/src/router/index.js                  |  13 +
 ruoyi-ui/src/views/isc/application/index.vue  | 304 +++++++++++++
 ruoyi-ui/src/views/isc/appservice/index.vue   | 411 ++++++++++++++++++
 ruoyi-ui/src/views/isc/service/index.vue      |   6 +-
 sql/isc.sql                                   |   7 +
 18 files changed, 1492 insertions(+), 17 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
 create mode 100644 ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
 create mode 100644 ruoyi-ui/src/api/isc/application.js
 create mode 100644 ruoyi-ui/src/api/isc/appservice.js
 create mode 100644 ruoyi-ui/src/views/isc/application/index.vue
 create mode 100644 ruoyi-ui/src/views/isc/appservice/index.vue

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
new file mode 100644
index 000000000..24c412947
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
@@ -0,0 +1,113 @@
+package com.ruoyi.isc.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.isc.domain.vo.IscAppServiceVo;
+import com.ruoyi.isc.domain.bo.IscAppServiceBo;
+import com.ruoyi.isc.service.IIscAppServiceService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 应用服务Controller
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+@Validated
+@Api(value = "应用服务控制器", tags = {"应用服务管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/isc/appservice")
+public class IscAppServiceController extends BaseController {
+
+    private final IIscAppServiceService iIscAppServiceService;
+
+    /**
+     * 查询应用服务列表
+     */
+    @ApiOperation("查询应用服务列表")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:list')")
+    @GetMapping("/list")
+    public TableDataInfo<IscAppServiceVo> list(@Validated(QueryGroup.class) IscAppServiceBo bo) {
+        return iIscAppServiceService.queryPageList(bo);
+    }
+
+    /**
+     * 导出应用服务列表
+     */
+    @ApiOperation("导出应用服务列表")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:export')")
+    @Log(title = "应用服务", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IscAppServiceBo bo, HttpServletResponse response) {
+        List<IscAppServiceVo> list = iIscAppServiceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "应用服务", IscAppServiceVo.class, response);
+    }
+
+    /**
+     * 获取应用服务详细信息
+     */
+    @ApiOperation("获取应用服务详细信息")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:query')")
+    @GetMapping("/{serviceAppId}")
+    public AjaxResult<IscAppServiceVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("serviceAppId") Long serviceAppId) {
+        return AjaxResult.success(iIscAppServiceService.queryById(serviceAppId));
+    }
+
+    /**
+     * 新增应用服务
+     */
+    @ApiOperation("新增应用服务")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:add')")
+    @Log(title = "应用服务", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IscAppServiceBo bo) {
+        return toAjax(iIscAppServiceService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改应用服务
+     */
+    @ApiOperation("修改应用服务")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:edit')")
+    @Log(title = "应用服务", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IscAppServiceBo bo) {
+        return toAjax(iIscAppServiceService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除应用服务
+     */
+    @ApiOperation("删除应用服务")
+    @PreAuthorize("@ss.hasPermi('isc:appservice:remove')")
+    @Log(title = "应用服务" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{serviceAppIds}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] serviceAppIds) {
+        return toAjax(iIscAppServiceService.deleteWithValidByIds(Arrays.asList(serviceAppIds), true) ? 1 : 0);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
new file mode 100644
index 000000000..2a4e21d0d
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
@@ -0,0 +1,122 @@
+package com.ruoyi.isc.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 应用服务对象 isc_app_service
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("isc_app_service")
+public class IscAppService implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 应用服务ID
+     */
+    @TableId(value = "service_app_id")
+    private Long serviceAppId;
+
+    /**
+     * 服务ID
+     */
+    private Long serviceId;
+
+    /**
+     * 应用ID
+     */
+    private Long applicationId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 启用状态（0启用 1停用）
+     */
+    private String enabled;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    private String status;
+
+    /**
+     * 虚拟地址
+     */
+    private String virtualAddr;
+
+    /**
+     * 到期时间
+     */
+    private Date endTime;
+
+    /**
+     * 天配额
+     */
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    private Long quotaSeconds;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
new file mode 100644
index 000000000..0f331f243
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -0,0 +1,129 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 应用服务业务对象 isc_app_service
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("应用服务业务对象")
+public class IscAppServiceBo extends BaseEntity {
+
+    /**
+     * 应用服务ID
+     */
+    @ApiModelProperty(value = "应用服务ID")
+    private Long serviceAppId;
+
+    /**
+     * 服务ID
+     */
+    @ApiModelProperty(value = "服务ID", required = true)
+    @NotNull(message = "服务ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long serviceId;
+
+    /**
+     * 应用ID
+     */
+    @ApiModelProperty(value = "应用ID", required = true)
+    @NotNull(message = "应用ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long applicationId;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 启用状态（0启用 1停用）
+     */
+    @ApiModelProperty(value = "启用状态（0启用 1停用）", required = true)
+    @NotBlank(message = "启用状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enabled;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    @ApiModelProperty(value = "申请类型(0申请 1续期)")
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ApiModelProperty(value = "审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * 到期时间
+     */
+    @ApiModelProperty(value = "到期时间")
+    private Date endTime;
+
+    /**
+     * 天配额
+     */
+    @ApiModelProperty(value = "天配额")
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    @ApiModelProperty(value = "小时配额")
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    @ApiModelProperty(value = "分钟配额")
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    @ApiModelProperty(value = "秒配额")
+    private Long quotaSeconds;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
index 2254e9fa9..b6eab36e8 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
@@ -1,16 +1,15 @@
 package com.ruoyi.isc.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 服务信息业务对象 isc_service
@@ -105,13 +104,6 @@ public class IscServiceBo extends BaseEntity {
     @NotNull(message = "服务分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cateFullPath;
 
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty(value = "用户ID", required = true)
-    private Long userId;
-
-
     /**
      * 分页大小
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
new file mode 100644
index 000000000..acfb95381
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -0,0 +1,108 @@
+package com.ruoyi.isc.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+
+/**
+ * 应用服务视图对象 isc_app_service
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+@Data
+@ApiModel("应用服务视图对象")
+@ExcelIgnoreUnannotated
+public class IscAppServiceVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  应用服务ID
+     */
+    @ApiModelProperty("应用服务ID")
+    private Long serviceAppId;
+
+    /**
+     * 服务ID
+     */
+    @ExcelProperty(value = "服务ID")
+    @ApiModelProperty("服务ID")
+    private Long serviceId;
+
+    /**
+     * 应用ID
+     */
+    @ExcelProperty(value = "应用ID")
+    @ApiModelProperty("应用ID")
+    private Long applicationId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /**
+     * 启用状态（0启用 1停用）
+     */
+    @ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ApiModelProperty("启用状态（0启用 1停用）")
+    private String enabled;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    @ExcelProperty(value = "申请类型(0申请 1续期)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "isc_apply_type")
+    @ApiModelProperty("申请类型(0申请 1续期)")
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_audit_status")
+    @ApiModelProperty("审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * 虚拟地址
+     */
+    @ExcelProperty(value = "虚拟地址")
+    @ApiModelProperty("虚拟地址")
+    private String virtualAddr;
+
+    /**
+     * 到期时间
+     */
+    @ExcelProperty(value = "到期时间")
+    @ApiModelProperty("到期时间")
+    private Date endTime;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新者")
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
new file mode 100644
index 000000000..2e0d5d22f
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.mapper;
+
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 应用服务Mapper接口
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+public interface IscAppServiceMapper extends BaseMapperPlus<IscAppService> {
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
new file mode 100644
index 000000000..41087fdd5
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.isc.service;
+
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.domain.vo.IscAppServiceVo;
+import com.ruoyi.isc.domain.bo.IscAppServiceBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 应用服务Service接口
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAppServiceVo> {
+    /**
+     * 查询单个
+     * @return
+     */
+    IscAppServiceVo queryById(Long serviceAppId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<IscAppServiceVo> queryPageList(IscAppServiceBo bo);
+
+    /**
+     * 查询列表
+     */
+    List<IscAppServiceVo> queryList(IscAppServiceBo bo);
+
+    /**
+     * 根据新增业务对象插入应用服务
+     * @param bo 应用服务新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IscAppServiceBo bo);
+
+    /**
+     * 根据编辑业务对象修改应用服务
+     * @param bo 应用服务编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IscAppServiceBo bo);
+
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
new file mode 100644
index 000000000..98e10b198
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -0,0 +1,88 @@
+package com.ruoyi.isc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.isc.domain.bo.IscAppServiceBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceVo;
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.mapper.IscAppServiceMapper;
+import com.ruoyi.isc.service.IIscAppServiceService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 应用服务Service业务层处理
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
+@Service
+public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMapper, IscAppService, IscAppServiceVo> implements IIscAppServiceService {
+
+    @Override
+    public IscAppServiceVo queryById(Long serviceAppId){
+        return getVoById(serviceAppId);
+    }
+
+    @Override
+    public TableDataInfo<IscAppServiceVo> queryPageList(IscAppServiceBo bo) {
+        PagePlus<IscAppService, IscAppServiceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<IscAppServiceVo> queryList(IscAppServiceBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<IscAppService> buildQueryWrapper(IscAppServiceBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IscAppService> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getServiceId() != null, IscAppService::getServiceId, bo.getServiceId());
+        lqw.eq(bo.getApplicationId() != null, IscAppService::getApplicationId, bo.getApplicationId());
+        lqw.eq(bo.getUserId() != null, IscAppService::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnabled()), IscAppService::getEnabled, bo.getEnabled());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IscAppService::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IscAppServiceBo bo) {
+        IscAppService add = BeanUtil.toBean(bo, IscAppService.class);
+        validEntityBeforeSave(add);
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(IscAppServiceBo bo) {
+        IscAppService update = BeanUtil.toBean(bo, IscAppService.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IscAppService entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
index 3c4550381..8d15afcd0 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
@@ -51,6 +51,8 @@ public class IscApplicationServiceImpl extends ServicePlusImpl<IscApplicationMap
         LambdaQueryWrapper<IscApplication> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), IscApplication::getApplicationName, bo.getApplicationName());
         lqw.eq(StringUtils.isNotBlank(bo.getAccessKey()), IscApplication::getAccessKey, bo.getAccessKey());
+        Long userId = SecurityUtils.getUserId();
+        lqw.eq(!SecurityUtils.isAdmin(userId), IscApplication::getUserId, userId);
         return lqw;
     }
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 65d69bd29..efa0efe0f 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -83,7 +83,8 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
         lqw.eq(StringUtils.isNotBlank(bo.getEnabled()), IscService::getEnabled, bo.getEnabled());
         lqw.ge(StringUtils.isNotBlank(bo.getCateFullPath()), IscService::getCateFullPath, bo.getCateFullPath());
         lqw.le(StringUtils.isNotBlank(bo.getCateFullPath()), IscService::getCateFullPath, FullPathUtils.genMaxFullPath(bo.getCateFullPath()));
-        lqw.eq(bo.getUserId() != null, IscService::getUserId, bo.getUserId());
+        Long userId = SecurityUtils.getUserId();
+        lqw.eq(!SecurityUtils.isAdmin(userId), IscService::getUserId, userId);
         return lqw;
     }
 
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
new file mode 100644
index 000000000..8c8a4c9eb
--- /dev/null
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.isc.mapper.IscAppServiceMapper">
+
+    <resultMap type="com.ruoyi.isc.domain.IscAppService" id="IscAppServiceResult">
+        <result property="serviceAppId" column="service_app_id"/>
+        <result property="serviceId" column="service_id"/>
+        <result property="applicationId" column="application_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="enabled" column="enabled"/>
+        <result property="applyType" column="apply_type"/>
+        <result property="status" column="status"/>
+        <result property="virtualAddr" column="virtual_addr"/>
+        <result property="endTime" column="end_time"/>
+        <result property="quotaDays" column="quota_days"/>
+        <result property="quotaHours" column="quota_hours"/>
+        <result property="quotaMinutes" column="quota_minutes"/>
+        <result property="quotaSeconds" column="quota_seconds"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/ruoyi-ui/src/api/isc/application.js b/ruoyi-ui/src/api/isc/application.js
new file mode 100644
index 000000000..538b255e3
--- /dev/null
+++ b/ruoyi-ui/src/api/isc/application.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询应用信息列表
+export function listApplication(query) {
+  return request({
+    url: '/isc/application/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用信息详细
+export function getApplication(applicationId) {
+  return request({
+    url: '/isc/application/' + applicationId,
+    method: 'get'
+  })
+}
+
+// 新增应用信息
+export function addApplication(data) {
+  return request({
+    url: '/isc/application',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应用信息
+export function updateApplication(data) {
+  return request({
+    url: '/isc/application',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应用信息
+export function delApplication(applicationId) {
+  return request({
+    url: '/isc/application/' + applicationId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/isc/appservice.js b/ruoyi-ui/src/api/isc/appservice.js
new file mode 100644
index 000000000..180648fef
--- /dev/null
+++ b/ruoyi-ui/src/api/isc/appservice.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询应用服务列表
+export function listAppservice(query) {
+  return request({
+    url: '/isc/appservice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用服务详细
+export function getAppservice(serviceAppId) {
+  return request({
+    url: '/isc/appservice/' + serviceAppId,
+    method: 'get'
+  })
+}
+
+// 新增应用服务
+export function addAppservice(data) {
+  return request({
+    url: '/isc/appservice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应用服务
+export function updateAppservice(data) {
+  return request({
+    url: '/isc/appservice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应用服务
+export function delAppservice(serviceAppId) {
+  return request({
+    url: '/isc/appservice/' + serviceAppId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 381264eeb..c4c8d05bd 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -162,6 +162,19 @@ export const constantRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
       }
     ]
+  },
+  {
+    path: '/isc/app-service',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index/:applicationId(\\d+)',
+        component: (resolve) => require(['@/views/isc/appservice/index'], resolve),
+        name: 'Appservice',
+        meta: { title: '应用服务', activeMenu: '/isc/application'}
+      }
+    ]
   }
 ]
 
diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
new file mode 100644
index 000000000..66dcda684
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="应用名称" prop="applicationName">
+        <el-input
+          v-model="queryParams.applicationName"
+          placeholder="请输入应用名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应用密钥" prop="accessKey">
+        <el-input
+          v-model="queryParams.accessKey"
+          placeholder="请输入应用密钥"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['isc:application:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['isc:application:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['isc:application:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:application:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true"/>
+      <el-table-column label="应用名称" align="center" prop="applicationName" >
+        <template slot-scope="scope">
+          <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" class="link-type">
+            <span>{{ scope.row.applicationName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="应用密钥" align="center" prop="accessKey" />
+      <el-table-column label="更新者" align="center" prop="updateBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:application:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['isc:application:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改应用信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="应用名称" prop="applicationName">
+          <el-input v-model="form.applicationName" placeholder="请输入应用名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/isc/application";
+
+export default {
+  name: "Application",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 应用信息表格数据
+      applicationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applicationName: undefined,
+        accessKey: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        applicationName: [
+          { required: true, message: "应用名称不能为空", trigger: "blur" }
+        ],
+        accessKey: [
+          { required: true, message: "应用密钥不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询应用信息列表 */
+    getList() {
+      this.loading = true;
+      listApplication(this.queryParams).then(response => {
+        this.applicationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        applicationId: undefined,
+        applicationName: undefined,
+        accessKey: undefined,
+        userId: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.applicationId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加应用信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const applicationId = row.applicationId || this.ids
+      getApplication(applicationId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改应用信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.applicationId != null) {
+            updateApplication(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addApplication(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const applicationIds = row.applicationId || this.ids;
+      this.$confirm('是否确认删除应用信息编号为"' + applicationIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.loading = true;
+          return delApplication(applicationIds);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).finally(() => {
+          this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.downLoadExcel('/isc/application/export', this.queryParams);
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
new file mode 100644
index 000000000..6479c594d
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -0,0 +1,411 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="服务ID" prop="serviceId">
+        <el-input
+          v-model="queryParams.serviceId"
+          placeholder="请输入服务ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应用ID" prop="applicationId">
+        <el-input
+          v-model="queryParams.applicationId"
+          placeholder="请输入应用ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
+          <el-option
+            v-for="dict in enabledOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['isc:appservice:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['isc:appservice:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['isc:appservice:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:appservice:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="appserviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="应用服务ID" align="center" prop="serviceAppId" v-if="false"/>
+      <el-table-column label="服务ID" align="center" prop="serviceId" />
+      <el-table-column label="启用状态" align="center" prop="enabled">
+        <template slot-scope="scope">
+          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请类型" align="center" prop="applyType">
+        <template slot-scope="scope">
+          <dict-tag :options="applyTypeOptions" :value="scope.row.applyType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="虚拟地址" align="center" prop="virtualAddr" />
+      <el-table-column label="到期时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新者" align="center" prop="updateBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:appservice:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['isc:appservice:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改应用服务对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="服务ID" prop="serviceId">
+          <el-input v-model="form.serviceId" placeholder="请输入服务ID" />
+        </el-form-item>
+        <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="启用状态">
+          <el-radio-group v-model="form.enabled">
+            <el-radio
+              v-for="dict in enabledOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="到期时间" prop="endTime">
+          <el-date-picker clearable size="small"
+            v-model="form.endTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择到期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="天配额" prop="quotaDays">
+          <el-input v-model="form.quotaDays" placeholder="请输入天配额" />
+        </el-form-item>
+        <el-form-item label="小时配额" prop="quotaHours">
+          <el-input v-model="form.quotaHours" placeholder="请输入小时配额" />
+        </el-form-item>
+        <el-form-item label="分钟配额" prop="quotaMinutes">
+          <el-input v-model="form.quotaMinutes" placeholder="请输入分钟配额" />
+        </el-form-item>
+        <el-form-item label="秒配额" prop="quotaSeconds">
+          <el-input v-model="form.quotaSeconds" placeholder="请输入秒配额" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppservice, getAppservice, delAppservice, addAppservice, updateAppservice } from "@/api/isc/appservice";
+
+export default {
+  name: "Appservice",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 应用服务表格数据
+      appserviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 启用状态字典
+      enabledOptions: [],
+      // 申请类型字典
+      applyTypeOptions: [],
+      // 审核状态字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        serviceId: undefined,
+        applicationId: undefined,
+        userId: undefined,
+        enabled: undefined,
+        status: undefined,
+      },
+      applicationId: undefined,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        serviceId: [
+          { required: true, message: "服务ID不能为空", trigger: "blur" }
+        ],
+        applicationId: [
+          { required: true, message: "应用ID不能为空", trigger: "blur" }
+        ],
+        enabled: [
+          { required: true, message: "启用状态不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    const applicationId = this.$route.params && this.$route.params.applicationId;
+    this.form.applicationId = applicationId;
+    this.queryParams.applicationId = applicationId;
+    this.getList(applicationId);
+    this.getDicts("sys_normal_disable").then(response => {
+      this.enabledOptions = response.data;
+    });
+    this.getDicts("isc_apply_type").then(response => {
+      this.applyTypeOptions = response.data;
+    });
+    this.getDicts("sys_audit_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询应用服务列表 */
+    getList() {
+      this.loading = true;
+      listAppservice(this.queryParams).then(response => {
+        this.appserviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        serviceAppId: undefined,
+        serviceId: undefined,
+        applicationId: this.applicationId,
+        userId: undefined,
+        enabled: "0",
+        applyType: undefined,
+        status: [],
+        virtualAddr: undefined,
+        endTime: undefined,
+        quotaDays: undefined,
+        quotaHours: undefined,
+        quotaMinutes: undefined,
+        quotaSeconds: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.serviceAppId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加应用服务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const serviceAppId = row.serviceAppId || this.ids
+      getAppservice(serviceAppId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.form.status = this.form.status.split(",");
+        this.open = true;
+        this.title = "修改应用服务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          this.form.status = this.form.status.join(",");
+          if (this.form.serviceAppId != null) {
+            updateAppservice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addAppservice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const serviceAppIds = row.serviceAppId || this.ids;
+      this.$confirm('是否确认删除应用服务编号为"' + serviceAppIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.loading = true;
+          return delAppservice(serviceAppIds);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).finally(() => {
+          this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.downLoadExcel('/isc/appservice/export', this.queryParams);
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index fde9d000b..4c1db3159 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -272,10 +272,7 @@ export default {
         ],
         cateFullPath: [
           { required: true, message: "服务分类不能为空", trigger: "change" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
+        ]
       }
     };
   },
@@ -346,7 +343,6 @@ export default {
         auditMind: undefined,
         enabled: "0",
         cateFullPath: undefined,
-        userId: undefined,
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
diff --git a/sql/isc.sql b/sql/isc.sql
index 0ef994b57..6401cabdc 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -235,6 +235,13 @@ INSERT INTO `sys_menu` VALUES (1627, '应用信息新增', 1625, 2, '#', '', 1,
 INSERT INTO `sys_menu` VALUES (1628, '应用信息修改', 1625, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:application:edit', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1629, '应用信息删除', 1625, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:application:remove', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1630, '应用信息导出', 1625, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:application:export', '#', 'admin', '2021-09-08 14:10:06', '', NULL, '');
+
+INSERT INTO `sys_menu` VALUES (1631, '应用服务', 1625, 1, 'appservice', 'isc/appservice/index', 1, 0, 'F', '0', '0', 'isc:appservice:list', '#', 'admin', '2021-09-08 16:11:57', 'admin', '2021-09-08 16:22:10', '应用服务菜单');
+INSERT INTO `sys_menu` VALUES (1632, '应用服务查询', 1631, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:query', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1633, '应用服务新增', 1631, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:add', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1634, '应用服务修改', 1631, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:edit', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1635, '应用服务删除', 1631, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:remove', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1636, '应用服务导出', 1631, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:export', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

From bb02108ab0d06459230ada618e751d368cb3f748 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Wed, 8 Sep 2021 20:46:01 +0800
Subject: [PATCH 15/60] =?UTF-8?q?author=20=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/utils/TreeUtils.java     | 6 ++++++
 .../com/ruoyi/isc/controller/IscApplicationController.java  | 2 +-
 .../com/ruoyi/isc/controller/IscServiceCateController.java  | 2 +-
 .../java/com/ruoyi/isc/controller/IscServiceController.java | 2 +-
 .../src/main/java/com/ruoyi/isc/domain/IscApplication.java  | 2 +-
 .../src/main/java/com/ruoyi/isc/domain/IscService.java      | 2 +-
 .../src/main/java/com/ruoyi/isc/domain/IscServiceCate.java  | 2 +-
 .../main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java | 2 +-
 .../src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java | 2 +-
 .../main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java | 2 +-
 .../main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java | 2 +-
 .../main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java | 2 +-
 .../java/com/ruoyi/isc/mapper/IscApplicationMapper.java     | 2 +-
 .../java/com/ruoyi/isc/mapper/IscServiceCateMapper.java     | 2 +-
 .../main/java/com/ruoyi/isc/mapper/IscServiceMapper.java    | 2 +-
 .../java/com/ruoyi/isc/service/IIscApplicationService.java  | 2 +-
 .../java/com/ruoyi/isc/service/IIscServiceCateService.java  | 2 +-
 .../main/java/com/ruoyi/isc/service/IIscServiceService.java | 2 +-
 .../ruoyi/isc/service/impl/IscApplicationServiceImpl.java   | 2 +-
 .../ruoyi/isc/service/impl/IscServiceCateServiceImpl.java   | 2 +-
 .../com/ruoyi/isc/service/impl/IscServiceServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/isc/IscAppServiceMapper.xml   | 4 ++--
 22 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
index 4d4ba820b..c145b4d71 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
@@ -7,6 +7,12 @@ import cn.hutool.core.lang.tree.parser.NodeParser;
 
 import java.util.List;
 
+/**
+ * 树结构工具类
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-08
+ */
 public class TreeUtils {
 
     public static final TreeNodeConfig DEFAULT_TREE_NODE_CONFIG = new TreeNodeConfig();
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
index 1041bb632..e743203c0 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * 应用信息Controller
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 @Validated
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
index ef4c9d224..d9862599a 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 服务分类Controller
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Validated
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
index 2b5ad9fd3..1e3ec6979 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 服务信息Controller
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Validated
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
index 8305042a8..fb57b868a 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 /**
  * 应用信息对象 isc_application
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 @Data
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
index 8eb1fd211..e6ae66828 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 /**
  * 服务信息对象 isc_service
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Data
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
index ab00eafc7..195c1d90d 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 服务分类对象 isc_service_cate
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Data
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
index cf0b87ecd..1ad040acb 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
 /**
  * 应用信息业务对象 isc_application
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
index b6eab36e8..0ec2e8b2b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 /**
  * 服务信息业务对象 isc_service
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
index 8b5c2e12c..4582e7c96 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
 /**
  * 服务分类业务对象 isc_service_cate
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
index dcaf94f64..bfe4503b6 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * 应用信息视图对象 isc_application
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 @Data
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
index f360e03fd..d7de8ce86 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
@@ -14,7 +14,7 @@ import java.util.Date;
 /**
  * 服务分类视图对象 isc_service_cate
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Data
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
index 12af14d1e..23bd1a174 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
@@ -6,7 +6,7 @@ import com.ruoyi.isc.domain.IscApplication;
 /**
  * 应用信息Mapper接口
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 public interface IscApplicationMapper extends BaseMapperPlus<IscApplication> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
index 7a48fb445..201d6fdcc 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.CacheNamespace;
 /**
  * 服务分类Mapper接口
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 public interface IscServiceCateMapper extends BaseMapperPlus<IscServiceCate> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
index b0bcaac36..d3969891e 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.CacheNamespace;
 /**
  * 服务信息Mapper接口
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 public interface IscServiceMapper extends BaseMapperPlus<IscService> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
index f01cec619..76989913f 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 应用信息Service接口
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 public interface IIscApplicationService extends IServicePlus<IscApplication, IscApplicationVo> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
index ef594999c..7161c5f8c 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
@@ -14,7 +14,7 @@ import java.util.Set;
 /**
  * 服务分类Service接口
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 public interface IIscServiceCateService extends IServicePlus<IscServiceCate, IscServiceCateVo> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
index 6ce05c419..0edf8b342 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 服务信息Service接口
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 public interface IIscServiceService extends IServicePlus<IscService, IscServiceVo> {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
index 8d15afcd0..50544c401 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 应用信息Service业务层处理
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-09-08
  */
 @Service
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
index 06d581d40..20028edb1 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 /**
  * 服务分类Service业务层处理
  *
- * @author wenchao gong
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Service
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index efa0efe0f..1b929a538 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 /**
  * 服务信息Service业务层处理
  *
- * @author ruoyi
+ * @author Wenchao Gong
  * @date 2021-08-22
  */
 @Service
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
index 8c8a4c9eb..721e5180a 100644
--- a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.isc.mapper.IscAppServiceMapper">
 
     <resultMap type="com.ruoyi.isc.domain.IscAppService" id="IscAppServiceResult">

From b3a9ad0af59e4bd07e903b427d55e02ac05af8d8 Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Wed, 8 Sep 2021 23:51:31 +0800
Subject: [PATCH 16/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A0=91=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/constant/IscConstants.java   |  3 +
 .../controller/IscAppServiceController.java   | 26 +++++--
 .../controller/IscServiceCateController.java  | 11 +--
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  6 --
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  |  8 ++-
 .../isc/service/IIscAppServiceService.java    |  8 +++
 .../isc/service/IIscServiceCateService.java   | 25 +++++--
 .../ruoyi/isc/service/IIscServiceService.java | 30 +++++++-
 .../impl/IscAppServiceServiceImpl.java        | 44 +++++++++++-
 .../impl/IscServiceCateServiceImpl.java       | 57 +++++++++++++++
 .../service/impl/IscServiceServiceImpl.java   | 30 ++++++++
 ruoyi-ui/src/api/isc/appservice.js            |  8 +++
 ruoyi-ui/src/views/isc/application/index.vue  |  2 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   | 71 ++++++++++---------
 14 files changed, 265 insertions(+), 64 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index 6a15e6334..eedaef59d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -5,6 +5,9 @@ public class IscConstants {
     /** 待审核 */
     public static final String AUDIT_WAIT = "0";
 
+    /** 审核通过 */
+    public static final String AUDIT_PASS = "1";
+
     /** 待审核 */
     public static final String ONLINE_STATUS_ON = "1";
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
index 24c412947..4bc679579 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import cn.hutool.core.lang.tree.Tree;
+import com.ruoyi.isc.domain.IscServiceCate;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -40,7 +42,7 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/isc/appservice")
 public class IscAppServiceController extends BaseController {
 
-    private final IIscAppServiceService iIscAppServiceService;
+    private final IIscAppServiceService appServiceService;
 
     /**
      * 查询应用服务列表
@@ -49,7 +51,7 @@ public class IscAppServiceController extends BaseController {
     @PreAuthorize("@ss.hasPermi('isc:appservice:list')")
     @GetMapping("/list")
     public TableDataInfo<IscAppServiceVo> list(@Validated(QueryGroup.class) IscAppServiceBo bo) {
-        return iIscAppServiceService.queryPageList(bo);
+        return appServiceService.queryPageList(bo);
     }
 
     /**
@@ -60,7 +62,7 @@ public class IscAppServiceController extends BaseController {
     @Log(title = "应用服务", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(@Validated IscAppServiceBo bo, HttpServletResponse response) {
-        List<IscAppServiceVo> list = iIscAppServiceService.queryList(bo);
+        List<IscAppServiceVo> list = appServiceService.queryList(bo);
         ExcelUtil.exportExcel(list, "应用服务", IscAppServiceVo.class, response);
     }
 
@@ -72,7 +74,7 @@ public class IscAppServiceController extends BaseController {
     @GetMapping("/{serviceAppId}")
     public AjaxResult<IscAppServiceVo> getInfo(@NotNull(message = "主键不能为空")
                                                   @PathVariable("serviceAppId") Long serviceAppId) {
-        return AjaxResult.success(iIscAppServiceService.queryById(serviceAppId));
+        return AjaxResult.success(appServiceService.queryById(serviceAppId));
     }
 
     /**
@@ -84,7 +86,7 @@ public class IscAppServiceController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IscAppServiceBo bo) {
-        return toAjax(iIscAppServiceService.insertByBo(bo) ? 1 : 0);
+        return toAjax(appServiceService.insertByBo(bo) ? 1 : 0);
     }
 
     /**
@@ -96,7 +98,7 @@ public class IscAppServiceController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IscAppServiceBo bo) {
-        return toAjax(iIscAppServiceService.updateByBo(bo) ? 1 : 0);
+        return toAjax(appServiceService.updateByBo(bo) ? 1 : 0);
     }
 
     /**
@@ -108,6 +110,16 @@ public class IscAppServiceController extends BaseController {
     @DeleteMapping("/{serviceAppIds}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
                                        @PathVariable Long[] serviceAppIds) {
-        return toAjax(iIscAppServiceService.deleteWithValidByIds(Arrays.asList(serviceAppIds), true) ? 1 : 0);
+        return toAjax(appServiceService.deleteWithValidByIds(Arrays.asList(serviceAppIds), true) ? 1 : 0);
+    }
+
+    /**
+     * 获取应用服务下拉树列表
+     */
+    @GetMapping("/treeselect/{applicationId}")
+    @ApiOperation("获取应用服务下拉树列表")
+    public AjaxResult<List<Tree<Long>>> treeselect(@NotNull(message = "应用主键不能为空") @PathVariable Long applicationId)
+    {
+        return AjaxResult.success(appServiceService.genAppServiceTree(applicationId));
     }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
index d9862599a..15b57cd13 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
@@ -64,16 +64,11 @@ public class IscServiceCateController extends BaseController {
      * 获取分类下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect()
+    @ApiOperation("获取分类下拉树列表")
+    public AjaxResult<List<Tree<Long>>> treeselect()
     {
         List<IscServiceCate> cates = cateService.selectCateList();
-        return AjaxResult.success(TreeUtils.build(cates, (cate, tree) -> {
-            tree.setId(cate.getCateId());
-            tree.setParentId(cate.getParentId());
-            tree.setName(cate.getCateName());
-            tree.setWeight(cate.getOrderNum());
-            tree.putExtra("fullPath", cate.getFullPath());
-        }));
+        return AjaxResult.success(cateService.genCateTree(cates));
     }
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index 0f331f243..340edd465 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -46,12 +46,6 @@ public class IscAppServiceBo extends BaseEntity {
     @NotNull(message = "应用ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long applicationId;
 
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
     /**
      * 启用状态（0启用 1停用）
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
index acfb95381..5310f1574 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -34,10 +34,16 @@ public class IscAppServiceVo {
     /**
      * 服务ID
      */
-    @ExcelProperty(value = "服务ID")
     @ApiModelProperty("服务ID")
     private Long serviceId;
 
+    /**
+     * 服务名称
+     */
+    @ExcelProperty(value = "服务名称")
+    @ApiModelProperty("服务名称")
+    private String serviceName;
+
     /**
      * 应用ID
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
index 41087fdd5..9c0c04300 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.isc.service;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.vo.IscAppServiceVo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
@@ -53,4 +54,11 @@ public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAp
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 构造 应用服务树结构
+     * @param applicationId 应用ID
+     * @return 应用服务树结构 （标识服务是否存在）
+     */
+    List<Tree<Long>> genAppServiceTree(Long applicationId);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
index 7161c5f8c..6f40e00bd 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
@@ -1,10 +1,11 @@
 package com.ruoyi.isc.service;
 
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.isc.domain.IscServiceCate;
-import com.ruoyi.isc.domain.vo.IscServiceCateVo;
-import com.ruoyi.isc.domain.bo.IscServiceCateBo;
+import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.IscServiceCate;
+import com.ruoyi.isc.domain.bo.IscServiceCateBo;
+import com.ruoyi.isc.domain.vo.IscServiceCateVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -64,4 +65,20 @@ public interface IIscServiceCateService extends IServicePlus<IscServiceCate, Isc
      * @return
      */
     Map<String, String> batchCateName(Set<String> fullPathList);
+
+    /**
+     * 组装 服务分类 树结构
+     * @param cates 所有分类
+     * @return 树结构信息
+     */
+    List<Tree<Long>> genCateTree(List<IscServiceCate> cates);
+
+    /**
+     * 组装 服务分类 树结构
+     * @param cates       所有分类
+     * @param serviceList 可用服务列表
+     * @param exitsIds    已存在服务ID集合
+     * @return 树结构信息
+     */
+    List<Tree<Long>> genCateTree(List<IscServiceCate> cates, List<IscService> serviceList, Set<Long> exitsIds);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
index 0edf8b342..dc125d83f 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
@@ -1,13 +1,17 @@
 package com.ruoyi.isc.service;
 
-import com.ruoyi.isc.domain.IscService;
-import com.ruoyi.isc.domain.vo.IscServiceVo;
-import com.ruoyi.isc.domain.bo.IscServiceBo;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.bo.IscServiceBo;
+import com.ruoyi.isc.domain.vo.IscServiceVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 服务信息Service接口
@@ -53,4 +57,24 @@ public interface IIscServiceService extends IServicePlus<IscService, IscServiceV
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 通过服务ID集合 查询服务名称map
+     * @param serviceIds 服务ID集合
+     * @return 服务名称map
+     */
+    Map<Long, String> getNameMap(Collection<Long> serviceIds);
+
+    /**
+     * 组装 服务树结构
+     * @return 服务树结构
+     */
+    List<Tree<Long>> genServiceTree();
+
+    /**
+     * 组装 服务树结构
+     * @param exitsIds 已存在服务ID集合
+     * @return 服务树结构
+     */
+    List<Tree<Long>> genServiceTree(Set<Long> exitsIds);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index 98e10b198..f3b9483bc 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -1,10 +1,15 @@
 package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.tree.Tree;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.service.IIscServiceService;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,9 +20,12 @@ import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.mapper.IscAppServiceMapper;
 import com.ruoyi.isc.service.IIscAppServiceService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 应用服务Service业务层处理
@@ -28,6 +36,8 @@ import java.util.Collection;
 @Service
 public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMapper, IscAppService, IscAppServiceVo> implements IIscAppServiceService {
 
+    @Resource
+    private IIscServiceService serviceService;
     @Override
     public IscAppServiceVo queryById(Long serviceAppId){
         return getVoById(serviceAppId);
@@ -36,20 +46,41 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     @Override
     public TableDataInfo<IscAppServiceVo> queryPageList(IscAppServiceBo bo) {
         PagePlus<IscAppService, IscAppServiceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        genServiceName(result.getRecordsVo());
         return PageUtils.buildDataInfo(result);
     }
 
     @Override
     public List<IscAppServiceVo> queryList(IscAppServiceBo bo) {
-        return listVo(buildQueryWrapper(bo));
+        final List<IscAppServiceVo> results = listVo(buildQueryWrapper(bo));
+        genServiceName(results);
+        return results;
+    }
+
+    /**
+     * 组装服务名称
+     * @param results 应用服务列表
+     */
+    private void genServiceName(List<IscAppServiceVo> results)
+    {
+        if(CollectionUtil.isEmpty(results)) {
+            return;
+        }
+        Set<Long> serviceIds = results.stream().map(IscAppServiceVo::getServiceId).collect(Collectors.toSet());
+        Map<Long, String> nameMap = serviceService.getNameMap(serviceIds);
+        for (IscAppServiceVo result : results)
+        {
+            result.setServiceName(nameMap.get(result.getServiceId()));
+        }
     }
 
     private LambdaQueryWrapper<IscAppService> buildQueryWrapper(IscAppServiceBo bo) {
         Map<String, Object> params = bo.getParams();
+        Long userId = SecurityUtils.getUserId();
         LambdaQueryWrapper<IscAppService> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getServiceId() != null, IscAppService::getServiceId, bo.getServiceId());
         lqw.eq(bo.getApplicationId() != null, IscAppService::getApplicationId, bo.getApplicationId());
-        lqw.eq(bo.getUserId() != null, IscAppService::getUserId, bo.getUserId());
+        lqw.eq(!SecurityUtils.isAdmin(userId), IscAppService::getUserId, userId);
         lqw.eq(StringUtils.isNotBlank(bo.getEnabled()), IscAppService::getEnabled, bo.getEnabled());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IscAppService::getStatus, bo.getStatus());
         return lqw;
@@ -85,4 +116,13 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         }
         return removeByIds(ids);
     }
+
+    @Override
+    public List<Tree<Long>> genAppServiceTree(Long applicationId)
+    {
+        List<Long> serviceIds = listObjs(Wrappers.<IscAppService>lambdaQuery()
+                .select(IscAppService::getServiceId)
+                .eq(IscAppService::getApplicationId, applicationId), o -> (Long) o);
+        return serviceService.genServiceTree(CollectionUtil.newHashSet(serviceIds));
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
index 20028edb1..64ec9ecb6 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
@@ -1,10 +1,14 @@
 package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.FullPathUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TreeUtils;
+import com.ruoyi.isc.domain.IscService;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,6 +31,12 @@ import java.util.stream.Collectors;
 @Service
 public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMapper, IscServiceCate, IscServiceCateVo> implements IIscServiceCateService {
 
+    public static final String FIELD_FULL_PATH = "fullPath";
+    public static final String FIELD_NODE_TYPE = "type";
+    public static final int NODE_TYPE_SERVICE = 1;
+    public static final int NODE_TYPE_CATE = 0;
+    public static final String FIELD_NODE_EXIST = "exist";
+
     @Override
     public IscServiceCateVo queryById(Long cateId){
         return getVoById(cateId);
@@ -135,6 +145,53 @@ public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMap
         return results;
     }
 
+    @Override
+    public List<Tree<Long>> genCateTree(List<IscServiceCate> cates)
+    {
+        return genCateTree(cates, null, CollectionUtil.newHashSet());
+    }
+
+    @Override
+    public List<Tree<Long>> genCateTree(List<IscServiceCate> cates, List<IscService> serviceList, Set<Long> exitsIds)
+    {
+        boolean isServiceTree = Objects.nonNull(serviceList);
+        final Map<String, List<IscService>> cateServiceMap = isServiceTree ? serviceList.stream()
+                .collect(Collectors.groupingBy(IscService::getCateFullPath)) : null;
+
+        return TreeUtils.build(cates, (cate, tree) -> {
+            tree.setId(cate.getCateId());
+            tree.setParentId(cate.getParentId());
+            tree.setName(cate.getCateName());
+            tree.setWeight(cate.getOrderNum());
+            tree.putExtra(FIELD_FULL_PATH, cate.getFullPath());
+            if(isServiceTree) {
+                tree.putExtra(FIELD_NODE_TYPE, NODE_TYPE_CATE);
+                List<IscService> services = cateServiceMap.get(cate.getFullPath());
+                if(CollectionUtil.isEmpty(services)) {
+                    return;
+                }
+                for (int index = 0; index < services.size(); index++)
+                {
+                    IscService service = services.get(index);
+                    List<Tree<Long>> children = tree.getChildren();
+                    if(Objects.isNull(children)) {
+                        children = CollectionUtil.newArrayList();
+                        tree.setChildren(children);
+                    }
+                    final Tree<Long> child = new Tree<>(TreeUtils.DEFAULT_TREE_NODE_CONFIG);
+                    child.setId(service.getServiceId());
+                    child.setName(service.getServiceName());
+                    child.setWeight(index);
+                    child.setParent(tree);
+                    child.setParentId(tree.getId());
+                    child.putExtra(FIELD_NODE_TYPE, NODE_TYPE_SERVICE);
+                    child.putExtra(FIELD_NODE_EXIST, exitsIds.contains(service.getServiceId()));
+                    children.add(child);
+                }
+            }
+        });
+    }
+
     private Map<Long, String> batchCateName(List<IscServiceCate> list) {
         Map<Long, String> results = new HashMap<>();
         final Set<Long> parentIds = list.stream().filter(m -> m.getParentId() != 0L).map(IscServiceCate::getParentId).collect(Collectors.toSet());
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 1b929a538..5bb969f6a 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -1,10 +1,13 @@
 package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.constant.IscConstants;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -24,6 +27,7 @@ import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -126,4 +130,30 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
         }
         return removeByIds(ids);
     }
+
+    @Override
+    public Map<Long, String> getNameMap(Collection<Long> serviceIds)
+    {
+        return list(Wrappers.<IscService>lambdaQuery()
+                .select(IscService::getServiceId, IscService::getServiceName)
+                .in(IscService::getServiceId, serviceIds)).stream()
+                .collect(Collectors.toMap(IscService::getServiceId, IscService::getServiceName));
+    }
+
+    @Override
+    public List<Tree<Long>> genServiceTree()
+    {
+        return genServiceTree(CollectionUtil.newHashSet());
+    }
+
+    @Override
+    public List<Tree<Long>> genServiceTree(Set<Long> exitsIds)
+    {
+        List<IscService> serviceList = list(Wrappers.<IscService>lambdaQuery()
+                .select(IscService::getServiceId, IscService::getServiceName, IscService::getCateFullPath)
+                .eq(IscService::getStatus, IscConstants.AUDIT_PASS)
+                .eq(IscService::getEnabled, UserConstants.DICT_NORMAL)
+                .orderByDesc(IscService::getUpdateTime));
+        return cateService.genCateTree(cateService.selectCateList(), serviceList, exitsIds);
+    }
 }
diff --git a/ruoyi-ui/src/api/isc/appservice.js b/ruoyi-ui/src/api/isc/appservice.js
index 180648fef..0f86ce555 100644
--- a/ruoyi-ui/src/api/isc/appservice.js
+++ b/ruoyi-ui/src/api/isc/appservice.js
@@ -42,3 +42,11 @@ export function delAppservice(serviceAppId) {
     method: 'delete'
   })
 }
+
+// 获取应用服务下拉树列表
+export function treeselect(applicationId) {
+  return request({
+    url: '/isc/appservice/treeselect/' + applicationId,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 66dcda684..3d64af5c1 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -74,7 +74,7 @@
 
     <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true"/>
+      <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true" width="50"/>
       <el-table-column label="应用名称" align="center" prop="applicationName" >
         <template slot-scope="scope">
           <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" class="link-type">
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 6479c594d..a907a381f 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -1,32 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="服务ID" prop="serviceId">
+      <el-form-item label="应用名称">
         <el-input
-          v-model="queryParams.serviceId"
-          placeholder="请输入服务ID"
+          v-model="applicationName"
+          disabled
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="应用ID" prop="applicationId">
-        <el-input
-          v-model="queryParams.applicationId"
-          placeholder="请输入应用ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="启用状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
@@ -104,7 +87,7 @@
     <el-table v-loading="loading" :data="appserviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应用服务ID" align="center" prop="serviceAppId" v-if="false"/>
-      <el-table-column label="服务ID" align="center" prop="serviceId" />
+      <el-table-column label="服务名称" align="center" prop="serviceName" />
       <el-table-column label="启用状态" align="center" prop="enabled">
         <template slot-scope="scope">
           <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
@@ -163,11 +146,8 @@
     <!-- 添加或修改应用服务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="服务ID" prop="serviceId">
-          <el-input v-model="form.serviceId" placeholder="请输入服务ID" />
-        </el-form-item>
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
+        <el-form-item label="服务" prop="serviceId">
+          <treeselect v-model="form.serviceId" :options="appServiceOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务" style="width:215px"/>
         </el-form-item>
         <el-form-item label="启用状态">
           <el-radio-group v-model="form.enabled">
@@ -208,10 +188,13 @@
 </template>
 
 <script>
-import { listAppservice, getAppservice, delAppservice, addAppservice, updateAppservice } from "@/api/isc/appservice";
-
+import { listAppservice, getAppservice, delAppservice, addAppservice, updateAppservice, treeselect } from "@/api/isc/appservice";
+import { getApplication } from "@/api/isc/application";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Appservice",
+  components: { Treeselect },
   data() {
     return {
       // 按钮loading
@@ -242,17 +225,17 @@ export default {
       applyTypeOptions: [],
       // 审核状态字典
       statusOptions: [],
+      // 应用服务树
+      appServiceOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        serviceId: undefined,
         applicationId: undefined,
-        userId: undefined,
         enabled: undefined,
         status: undefined,
       },
-      applicationId: undefined,
+      applicationName: undefined,
       // 表单参数
       form: {},
       // 表单校验
@@ -283,6 +266,8 @@ export default {
     this.getDicts("sys_audit_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.getApplicationName(applicationId);
+    this.getTreeselect(applicationId);
   },
   methods: {
     /** 查询应用服务列表 */
@@ -294,6 +279,29 @@ export default {
         this.loading = false;
       });
     },
+    /** 获取应用信息 */
+    getApplicationName(applicationId) {
+      getApplication(applicationId).then(response => {
+        this.applicationName = response.data.applicationName;
+      });
+    },
+    /** 获取应用服务分类树结构 */
+    getTreeselect(applicationId) {
+      treeselect(applicationId).then(response => {
+        this.appServiceOptions = response.data;
+      });
+    },
+    //树节点转换
+    normalizer(node) {
+      const data = {
+        id: node.id,
+        label: node.label,
+        children: node.children,
+        disabled: true
+      }
+      console.log(data)
+      return 
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -305,7 +313,6 @@ export default {
         serviceAppId: undefined,
         serviceId: undefined,
         applicationId: this.applicationId,
-        userId: undefined,
         enabled: "0",
         applyType: undefined,
         status: [],

From fea697a6a9ae42176d88ffedfbcc9a3d0a40c36f Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Thu, 9 Sep 2021 11:14:46 +0800
Subject: [PATCH 17/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/TreeUtils.java     | 112 +++++++++++++++++-
 .../impl/IscServiceCateServiceImpl.java       |  28 +++--
 ruoyi-ui/src/views/isc/application/index.vue  |   2 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   |  39 +++---
 4 files changed, 141 insertions(+), 40 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
index c145b4d71..73246dbe4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeUtils.java
@@ -1,11 +1,15 @@
 package com.ruoyi.common.utils;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.lang.tree.parser.NodeParser;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 树结构工具类
@@ -13,18 +17,116 @@ import java.util.List;
  * @author Wenchao Gong
  * @date 2021-09-08
  */
-public class TreeUtils {
+public class TreeUtils
+{
 
     public static final TreeNodeConfig DEFAULT_TREE_NODE_CONFIG = new TreeNodeConfig();
+    public static final long DEFAULT_PARENT_ID = 0L;
+    public static final String FIELD_NODE_EXIST = "exist";
 
-    static
-    {
+    static {
         DEFAULT_TREE_NODE_CONFIG.setNameKey("label");
     }
 
+    /**
+     * 设置默认 parentId
+     *
+     * @param list
+     * @param nodeParser
+     * @param <T>
+     * @return
+     */
     public static <T> List<Tree<Long>> build(List<T> list, NodeParser<T, Long> nodeParser)
     {
-        Long parentId = 0L;
-        return TreeUtil.build(list, parentId, DEFAULT_TREE_NODE_CONFIG, nodeParser);
+        return TreeUtil.build(list, DEFAULT_PARENT_ID, DEFAULT_TREE_NODE_CONFIG, nodeParser);
+    }
+
+
+    /**
+     * 树构建
+     *
+     * @param <T>            转换的实体 为数据源里的对象类型
+     * @param <E>            ID类型
+     * @param list           源数据集合
+     * @param parentId       最顶层父id值 一般为 0 之类
+     * @param nodeParser     转换器
+     * @param needExistField 是否需要 已存在字段
+     * @return List
+     */
+    public static <T, E> List<Tree<E>> build(List<T> list, E parentId, NodeParser<T, E> nodeParser,
+                                             boolean needExistField)
+    {
+        final List<Tree<E>> treeList = CollUtil.newArrayList();
+        final TreeNodeConfig treeNodeConfig = DEFAULT_TREE_NODE_CONFIG;
+        Tree<E> tree;
+        for (T obj : list) {
+            tree = new Tree<>(treeNodeConfig);
+            nodeParser.parse(obj, tree);
+            treeList.add(tree);
+        }
+
+        List<Tree<E>> finalTreeList = CollUtil.newArrayList();
+        for (Tree<E> node : treeList) {
+            if (ObjectUtil.equals(parentId, node.getParentId())) {
+                finalTreeList.add(node);
+                innerBuild(treeList, node, 0, treeNodeConfig.getDeep(), needExistField);
+            }
+        }
+        // 内存每层已经排过了 这是最外层排序
+        finalTreeList = finalTreeList.stream().sorted().collect(Collectors.toList());
+        return finalTreeList;
+    }
+
+    /**
+     * 递归处理
+     *
+     * @param treeNodes      数据集合
+     * @param parentNode     当前节点
+     * @param deep           已递归深度
+     * @param maxDeep        最大递归深度 可能为null即不限制
+     * @param needExistField 是否需要 已存在字段
+     */
+    private static <T> void innerBuild(List<Tree<T>> treeNodes, Tree<T> parentNode, int deep, Integer maxDeep,
+                                       boolean needExistField)
+    {
+        if (CollUtil.isEmpty(treeNodes)) {
+            return;
+        }
+        //maxDeep 可能为空
+        if (maxDeep != null && deep >= maxDeep) {
+            return;
+        }
+        // 每层排序 TreeNodeMap 实现了Comparable接口
+        treeNodes = treeNodes.stream().sorted().collect(Collectors.toList());
+        for (Tree<T> childNode : treeNodes) {
+            if (parentNode.getId().equals(childNode.getParentId())) {
+                List<Tree<T>> children = parentNode.getChildren();
+                if (children == null) {
+                    children = CollUtil.newArrayList();
+                    parentNode.setChildren(children);
+                }
+                children.add(childNode);
+                childNode.setParent(parentNode);
+                if (needExistField) {
+                    Object pobj = parentNode.get(FIELD_NODE_EXIST);
+                    boolean exist = pobj == null ? true : (boolean) pobj;
+                    if (exist && !CollectionUtils.isEmpty(children)) {
+                        long count = children.stream().filter(t -> {
+                            Object obj = t.get(FIELD_NODE_EXIST);
+                            if (obj != null) {
+                                return !(boolean) obj;
+                            } else {
+                                return false;
+                            }
+                        }).count();
+                        if (count > 0) {
+                            exist = false;
+                        }
+                    }
+                    parentNode.put(FIELD_NODE_EXIST, exist);
+                }
+                innerBuild(treeNodes, childNode, deep + 1, maxDeep, needExistField);
+            }
+        }
     }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
index 64ec9ecb6..ec38e68c6 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
@@ -3,21 +3,22 @@ package com.ruoyi.isc.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.utils.FullPathUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.TreeUtils;
 import com.ruoyi.isc.domain.IscService;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.isc.domain.IscServiceCate;
 import com.ruoyi.isc.domain.bo.IscServiceCateBo;
 import com.ruoyi.isc.domain.vo.IscServiceCateVo;
-import com.ruoyi.isc.domain.IscServiceCate;
 import com.ruoyi.isc.mapper.IscServiceCateMapper;
 import com.ruoyi.isc.service.IIscServiceCateService;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -35,7 +36,6 @@ public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMap
     public static final String FIELD_NODE_TYPE = "type";
     public static final int NODE_TYPE_SERVICE = 1;
     public static final int NODE_TYPE_CATE = 0;
-    public static final String FIELD_NODE_EXIST = "exist";
 
     @Override
     public IscServiceCateVo queryById(Long cateId){
@@ -158,7 +158,7 @@ public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMap
         final Map<String, List<IscService>> cateServiceMap = isServiceTree ? serviceList.stream()
                 .collect(Collectors.groupingBy(IscService::getCateFullPath)) : null;
 
-        return TreeUtils.build(cates, (cate, tree) -> {
+        NodeParser<IscServiceCate, Long> parser = (cate, tree) -> {
             tree.setId(cate.getCateId());
             tree.setParentId(cate.getParentId());
             tree.setName(cate.getCateName());
@@ -166,8 +166,10 @@ public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMap
             tree.putExtra(FIELD_FULL_PATH, cate.getFullPath());
             if(isServiceTree) {
                 tree.putExtra(FIELD_NODE_TYPE, NODE_TYPE_CATE);
+                boolean exist = true;
                 List<IscService> services = cateServiceMap.get(cate.getFullPath());
                 if(CollectionUtil.isEmpty(services)) {
+                    tree.putExtra(TreeUtils.FIELD_NODE_EXIST, true);
                     return;
                 }
                 for (int index = 0; index < services.size(); index++)
@@ -182,14 +184,18 @@ public class IscServiceCateServiceImpl extends ServicePlusImpl<IscServiceCateMap
                     child.setId(service.getServiceId());
                     child.setName(service.getServiceName());
                     child.setWeight(index);
-                    child.setParent(tree);
-                    child.setParentId(tree.getId());
                     child.putExtra(FIELD_NODE_TYPE, NODE_TYPE_SERVICE);
-                    child.putExtra(FIELD_NODE_EXIST, exitsIds.contains(service.getServiceId()));
+                    boolean contains = exitsIds.contains(service.getServiceId());
+                    child.putExtra(TreeUtils.FIELD_NODE_EXIST, contains);
                     children.add(child);
+                    if(exist && !contains) {
+                        exist = false;
+                    }
                 }
+                tree.putExtra(TreeUtils.FIELD_NODE_EXIST, exist);
             }
-        });
+        };
+        return TreeUtils.build(cates, TreeUtils.DEFAULT_PARENT_ID, parser, isServiceTree);
     }
 
     private Map<Long, String> batchCateName(List<IscServiceCate> list) {
diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 3d64af5c1..02b337d36 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -74,7 +74,7 @@
 
     <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true" width="50"/>
+      <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true" width="80"/>
       <el-table-column label="应用名称" align="center" prop="applicationName" >
         <template slot-scope="scope">
           <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" class="link-type">
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index a907a381f..1d6d97910 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -146,8 +146,10 @@
     <!-- 添加或修改应用服务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="服务" prop="serviceId">
-          <treeselect v-model="form.serviceId" :options="appServiceOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务" style="width:215px"/>
+        <el-form-item label="服务名称" prop="serviceId">
+          <!-- :disable-branch-nodes="true" 只能选叶子节点 -->
+          <treeselect v-model="form.serviceId" :options="appServiceOptions" :show-count="true" :normalizer="normalizer" 
+            :disable-branch-nodes="true" placeholder="请选择服务" style="width:215px"/>
         </el-form-item>
         <el-form-item label="启用状态">
           <el-radio-group v-model="form.enabled">
@@ -166,17 +168,17 @@
             placeholder="选择到期时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="天配额" prop="quotaDays">
-          <el-input v-model="form.quotaDays" placeholder="请输入天配额" />
+        <el-form-item label="日配额" prop="quotaDays">
+          <el-input-number v-model="form.quotaDays" step="1000" placeholder="请输入日配额" />
         </el-form-item>
         <el-form-item label="小时配额" prop="quotaHours">
-          <el-input v-model="form.quotaHours" placeholder="请输入小时配额" />
+          <el-input-number v-model="form.quotaHours" step="100" placeholder="请输入小时配额" />
         </el-form-item>
         <el-form-item label="分钟配额" prop="quotaMinutes">
-          <el-input v-model="form.quotaMinutes" placeholder="请输入分钟配额" />
+          <el-input-number v-model="form.quotaMinutes" step="10" placeholder="请输入分钟配额" />
         </el-form-item>
         <el-form-item label="秒配额" prop="quotaSeconds">
-          <el-input v-model="form.quotaSeconds" placeholder="请输入秒配额" />
+          <el-input-number v-model="form.quotaSeconds" placeholder="请输入秒配额" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -231,11 +233,12 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        applicationId: undefined,
         enabled: undefined,
         status: undefined,
+        applicationId: undefined
       },
       applicationName: undefined,
+      applicationId: undefined,
       // 表单参数
       form: {},
       // 表单校验
@@ -243,9 +246,6 @@ export default {
         serviceId: [
           { required: true, message: "服务ID不能为空", trigger: "blur" }
         ],
-        applicationId: [
-          { required: true, message: "应用ID不能为空", trigger: "blur" }
-        ],
         enabled: [
           { required: true, message: "启用状态不能为空", trigger: "blur" }
         ],
@@ -254,7 +254,7 @@ export default {
   },
   created() {
     const applicationId = this.$route.params && this.$route.params.applicationId;
-    this.form.applicationId = applicationId;
+    this.applicationId = applicationId;
     this.queryParams.applicationId = applicationId;
     this.getList(applicationId);
     this.getDicts("sys_normal_disable").then(response => {
@@ -293,14 +293,13 @@ export default {
     },
     //树节点转换
     normalizer(node) {
-      const data = {
+      return {
         id: node.id,
         label: node.label,
         children: node.children,
-        disabled: true
-      }
-      console.log(data)
-      return 
+        isDisabled: node.exist,
+        type: node.type
+      };
     },
     // 取消按钮
     cancel() {
@@ -316,17 +315,11 @@ export default {
         enabled: "0",
         applyType: undefined,
         status: [],
-        virtualAddr: undefined,
         endTime: undefined,
         quotaDays: undefined,
         quotaHours: undefined,
         quotaMinutes: undefined,
         quotaSeconds: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined,
-        delFlag: undefined
       };
       this.resetForm("form");
     },

From cdffaecbe813032f65d49a210cbf8da766619a2a Mon Sep 17 00:00:00 2001
From: wenchaogong <hanyedxing2012@163.com>
Date: Thu, 9 Sep 2021 12:07:20 +0800
Subject: [PATCH 18/60] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AESQL?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/isc.sql | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sql/isc.sql b/sql/isc.sql
index 6401cabdc..ea61c388c 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -242,6 +242,22 @@ INSERT INTO `sys_menu` VALUES (1633, '应用服务新增', 1631, 2, '#', '', 1,
 INSERT INTO `sys_menu` VALUES (1634, '应用服务修改', 1631, 3, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:edit', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1635, '应用服务删除', 1631, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:remove', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1636, '应用服务导出', 1631, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:export', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
+
+INSERT INTO  VALUES (100, '审核状态', 'sys_audit_status', '0', 'admin', '2021-08-21 21:21:58', 'admin', '2021-08-21 21:21:58', '审核状态列表');
+INSERT INTO  VALUES (101, '在线状态', 'isc_online_status', '0', 'admin', '2021-08-21 21:24:28', 'admin', '2021-08-21 21:24:28', '在线状态列表');
+INSERT INTO  VALUES (102, '申请类型', 'isc_apply_type', '0', 'admin', '2021-08-21 21:25:26', 'admin', '2021-08-21 21:25:26', '申请类型列表');
+INSERT INTO  VALUES (103, '请求方法', 'isc_request_method', '0', 'admin', '2021-09-07 22:12:58', 'admin', '2021-09-07 22:12:58', 'GET/POST');
+
+INSERT INTO `sys_dict_data` VALUES (100, 0, '待审核', '0', 'sys_audit_status', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:26:36', 'admin', '2021-08-21 21:26:36', NULL);
+INSERT INTO `sys_dict_data` VALUES (101, 1, '通过', '1', 'sys_audit_status', NULL, 'success', 'N', '0', 'admin', '2021-08-21 21:27:02', 'admin', '2021-08-21 21:27:02', NULL);
+INSERT INTO `sys_dict_data` VALUES (102, 2, '驳回', '2', 'sys_audit_status', NULL, 'warning', 'N', '0', 'admin', '2021-08-21 21:27:24', 'admin', '2021-08-21 21:27:24', NULL);
+INSERT INTO `sys_dict_data` VALUES (103, 0, '离线', '0', 'isc_online_status', NULL, 'info', 'N', '0', 'admin', '2021-08-21 21:28:56', 'admin', '2021-08-21 21:28:56', NULL);
+INSERT INTO `sys_dict_data` VALUES (104, 1, '在线', '1', 'isc_online_status', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:29:15', 'admin', '2021-08-21 21:29:15', NULL);
+INSERT INTO `sys_dict_data` VALUES (105, 0, '申请', '0', 'isc_apply_type', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:30:26', 'admin', '2021-08-21 21:30:26', NULL);
+INSERT INTO `sys_dict_data` VALUES (106, 1, '续期', '1', 'isc_apply_type', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:30:42', 'admin', '2021-08-21 21:30:42', NULL);
+INSERT INTO `sys_dict_data` VALUES (107, 1, 'GET', 'GET', 'isc_request_method', NULL, 'primary', 'N', '0', 'admin', '2021-09-07 22:13:22', 'admin', '2021-09-07 22:13:56', NULL);
+INSERT INTO `sys_dict_data` VALUES (108, 2, 'POST', 'POST', 'isc_request_method', NULL, 'info', 'N', '0', 'admin', '2021-09-07 22:13:40', 'admin', '2021-09-07 22:13:40', NULL);
+
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

From 3ca291d6651aec5b3e6eb773d51187c063182b47 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Thu, 9 Sep 2021 18:00:31 +0800
Subject: [PATCH 19/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/constant/IscConstants.java   |  10 +
 .../com/ruoyi/common/enums/BusinessType.java  |   9 +-
 .../IscAppServiceApplyController.java         |  86 ++++
 .../controller/IscAppServiceController.java   |  41 +-
 .../com/ruoyi/isc/domain/IscAppService.java   |  11 +-
 .../ruoyi/isc/domain/IscAppServiceApply.java  | 112 ++++++
 .../isc/domain/bo/IscAppServiceApplyBo.java   | 113 ++++++
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  22 +-
 .../isc/domain/vo/IscAppServiceApplyVo.java   | 127 ++++++
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  |  26 +-
 .../isc/mapper/IscAppServiceApplyMapper.java  |  16 +
 .../service/IIscAppServiceApplyService.java   |  56 +++
 .../isc/service/IIscAppServiceService.java    |  15 +-
 .../isc/service/IIscApplicationService.java   |  14 +-
 .../impl/IscAppServiceApplyServiceImpl.java   | 131 +++++++
 .../impl/IscAppServiceServiceImpl.java        |  94 ++++-
 .../impl/IscApplicationServiceImpl.java       |  15 +
 .../service/impl/IscServiceServiceImpl.java   |   4 +
 .../mapper/isc/IscAppServiceApplyMapper.xml   |  27 ++
 .../mapper/isc/IscAppServiceMapper.xml        |   2 +-
 ruoyi-ui/src/api/isc/appservice.js            |   8 +-
 ruoyi-ui/src/api/isc/serviceapply.js          |  44 +++
 ruoyi-ui/src/views/isc/application/index.vue  |   4 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   | 142 ++++---
 ruoyi-ui/src/views/isc/cate/index.vue         |   2 +-
 ruoyi-ui/src/views/isc/serviceapply/index.vue | 368 ++++++++++++++++++
 sql/isc.sql                                   |  25 +-
 27 files changed, 1391 insertions(+), 133 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
 create mode 100644 ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
 create mode 100644 ruoyi-ui/src/api/isc/serviceapply.js
 create mode 100644 ruoyi-ui/src/views/isc/serviceapply/index.vue

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index eedaef59d..34bda0baa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -11,4 +11,14 @@ public class IscConstants {
     /** 待审核 */
     public static final String ONLINE_STATUS_ON = "1";
 
+    /** 申请类型 申请服务 */
+    public static final String APPLY_TYPE_APPLY = "0";
+
+    /** 申请类型 服务续期 */
+    public static final String APPLY_TYPE_RENEWAL = "1";
+
+    /** 申请类型 申请修改 */
+    public static final String APPLY_TYPE_MODIFY = "2";
+
+
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
index 2e17c4a5d..d0d280069 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
@@ -2,7 +2,7 @@ package com.ruoyi.common.enums;
 
 /**
  * 业务操作类型
- * 
+ *
  * @author ruoyi
  */
 public enum BusinessType
@@ -51,9 +51,14 @@ public enum BusinessType
      * 生成代码
      */
     GENCODE,
-    
+
     /**
      * 清空数据
      */
     CLEAN,
+
+    /**
+     * 审核
+     */
+    AUDIT
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
new file mode 100644
index 000000000..0fbb2d481
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
@@ -0,0 +1,86 @@
+package com.ruoyi.isc.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
+import com.ruoyi.isc.service.IIscAppServiceApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 应用服务申请信息Controller
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+@Validated
+@Api(value = "应用服务申请信息控制器", tags = {"应用服务申请信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/isc/serviceapply")
+public class IscAppServiceApplyController extends BaseController {
+
+    private final IIscAppServiceApplyService iIscAppServiceApplyService;
+
+    /**
+     * 查询应用服务申请信息列表
+     */
+    @ApiOperation("查询应用服务申请信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:serviceapply:list')")
+    @GetMapping("/list")
+    public TableDataInfo<IscAppServiceApplyVo> list(@Validated(QueryGroup.class) IscAppServiceApplyBo bo) {
+        return iIscAppServiceApplyService.queryPageList(bo);
+    }
+
+    /**
+     * 导出应用服务申请信息列表
+     */
+    @ApiOperation("导出应用服务申请信息列表")
+    @PreAuthorize("@ss.hasPermi('isc:serviceapply:export')")
+    @Log(title = "应用服务申请信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IscAppServiceApplyBo bo, HttpServletResponse response) {
+        List<IscAppServiceApplyVo> list = iIscAppServiceApplyService.queryList(bo);
+        ExcelUtil.exportExcel(list, "应用服务申请信息", IscAppServiceApplyVo.class, response);
+    }
+
+    /**
+     * 获取应用服务申请信息详细信息
+     */
+    @ApiOperation("获取应用服务申请信息详细信息")
+    @PreAuthorize("@ss.hasPermi('isc:serviceapply:query')")
+    @GetMapping("/{applyId}")
+    public AjaxResult<IscAppServiceApplyVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("applyId") Long applyId) {
+        return AjaxResult.success(iIscAppServiceApplyService.queryById(applyId));
+    }
+
+    /**
+     * 应用服务申请信息审核
+     */
+    @ApiOperation("应用服务申请信息审核")
+    @PreAuthorize("@ss.hasPermi('isc:serviceapply:audit')")
+    @Log(title = "应用服务申请信息审核", businessType = BusinessType.AUDIT)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> audit(@Validated(EditGroup.class) @RequestBody IscAppServiceApplyBo bo) {
+        return toAjax(iIscAppServiceApplyService.updateByBo(bo) ? 1 : 0);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
index 4bc679579..833e750ab 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
@@ -1,33 +1,32 @@
 package com.ruoyi.isc.controller;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
 import cn.hutool.core.lang.tree.Tree;
-import com.ruoyi.isc.domain.IscServiceCate;
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.isc.domain.vo.IscAppServiceVo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceVo;
 import com.ruoyi.isc.service.IIscAppServiceService;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 应用服务Controller
@@ -71,10 +70,10 @@ public class IscAppServiceController extends BaseController {
      */
     @ApiOperation("获取应用服务详细信息")
     @PreAuthorize("@ss.hasPermi('isc:appservice:query')")
-    @GetMapping("/{serviceAppId}")
+    @GetMapping("/{appServiceId}")
     public AjaxResult<IscAppServiceVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("serviceAppId") Long serviceAppId) {
-        return AjaxResult.success(appServiceService.queryById(serviceAppId));
+                                                  @PathVariable("appServiceId") Long appServiceId) {
+        return AjaxResult.success(appServiceService.queryById(appServiceId));
     }
 
     /**
@@ -107,10 +106,10 @@ public class IscAppServiceController extends BaseController {
     @ApiOperation("删除应用服务")
     @PreAuthorize("@ss.hasPermi('isc:appservice:remove')")
     @Log(title = "应用服务" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{serviceAppIds}")
+    @DeleteMapping("/{appServiceIds}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] serviceAppIds) {
-        return toAjax(appServiceService.deleteWithValidByIds(Arrays.asList(serviceAppIds), true) ? 1 : 0);
+                                       @PathVariable Long[] appServiceIds) {
+        return toAjax(appServiceService.deleteWithValidByIds(Arrays.asList(appServiceIds), true) ? 1 : 0);
     }
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
index 2a4e21d0d..4c8a8d1b3 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
 
 /**
  * 应用服务对象 isc_app_service
@@ -26,8 +26,8 @@ public class IscAppService implements Serializable {
     /**
      * 应用服务ID
      */
-    @TableId(value = "service_app_id")
-    private Long serviceAppId;
+    @TableId(value = "app_service_id")
+    private Long appServiceId;
 
     /**
      * 服务ID
@@ -119,4 +119,9 @@ public class IscAppService implements Serializable {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
new file mode 100644
index 000000000..76fcd14c7
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
@@ -0,0 +1,112 @@
+package com.ruoyi.isc.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 应用服务申请信息对象 isc_app_service_apply
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("isc_app_service_apply")
+public class IscAppServiceApply implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 申请ID
+     */
+    @TableId(value = "apply_id")
+    private Long applyId;
+
+    /**
+     * 应用服务ID
+     */
+    private Long appServiceId;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    private String status;
+
+    /**
+     * 审核意见
+     */
+    private String auditMind;
+
+    /**
+     * 续期时长（单位月）
+     */
+    private Long renewalDuration;
+
+    /**
+     * 天配额
+     */
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    private Long quotaSeconds;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
new file mode 100644
index 000000000..c0a055bd8
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
@@ -0,0 +1,113 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 应用服务申请信息业务对象 isc_app_service_apply
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("应用服务申请信息业务对象")
+public class IscAppServiceApplyBo extends BaseEntity {
+
+    /**
+     * 申请ID
+     */
+    @ApiModelProperty(value = "申请ID")
+    private Long applyId;
+
+    /**
+     * 应用服务ID
+     */
+    @ApiModelProperty(value = "应用服务ID", required = true)
+    @NotNull(message = "应用服务ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long appServiceId;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    @ApiModelProperty(value = "申请类型(0申请 1续期)")
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ApiModelProperty(value = "审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * 续期时长（单位月）
+     */
+    @ApiModelProperty(value = "续期时长（单位月）")
+    private Long renewalDuration;
+
+    /**
+     * 天配额
+     */
+    @ApiModelProperty(value = "天配额")
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    @ApiModelProperty(value = "小时配额")
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    @ApiModelProperty(value = "分钟配额")
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    @ApiModelProperty(value = "秒配额")
+    private Long quotaSeconds;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index 340edd465..5fb254b01 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -1,19 +1,17 @@
 package com.ruoyi.isc.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
 /**
  * 应用服务业务对象 isc_app_service
  *
@@ -30,7 +28,7 @@ public class IscAppServiceBo extends BaseEntity {
      * 应用服务ID
      */
     @ApiModelProperty(value = "应用服务ID")
-    private Long serviceAppId;
+    private Long appServiceId;
 
     /**
      * 服务ID
@@ -53,12 +51,6 @@ public class IscAppServiceBo extends BaseEntity {
     @NotBlank(message = "启用状态（0启用 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enabled;
 
-    /**
-     * 申请类型(0申请 1续期)
-     */
-    @ApiModelProperty(value = "申请类型(0申请 1续期)")
-    private String applyType;
-
     /**
      * 审核状态（0待审核 1审核通过 2驳回）
      */
@@ -95,6 +87,12 @@ public class IscAppServiceBo extends BaseEntity {
     @ApiModelProperty(value = "秒配额")
     private Long quotaSeconds;
 
+    /**
+     * 续期时长（单位月）
+     */
+    @NotNull(message = "续期时长不能为空", groups = { AddGroup.class })
+    private Long renewalDuration;
+
 
     /**
      * 分页大小
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
new file mode 100644
index 000000000..f6a42ad47
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
@@ -0,0 +1,127 @@
+package com.ruoyi.isc.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 应用服务申请信息视图对象 isc_app_service_apply
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+@Data
+@ApiModel("应用服务申请信息视图对象")
+@ExcelIgnoreUnannotated
+public class IscAppServiceApplyVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  申请ID
+     */
+    @ApiModelProperty("申请ID")
+    private Long applyId;
+
+    /**
+     * 应用服务ID
+     */
+    @ApiModelProperty("应用服务ID")
+    private Long appServiceId;
+
+    /**
+     * 应用名称
+     */
+    @ExcelProperty(value = "应用名称")
+    @ApiModelProperty("应用名称")
+    private String applicationName;
+
+    /**
+     * 服务名称
+     */
+    @ExcelProperty(value = "服务名称")
+    @ApiModelProperty("服务名称")
+    private String serviceName;
+
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    @ExcelProperty(value = "申请类型(0申请 1续期)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "isc_apply_type")
+    @ApiModelProperty("申请类型(0申请 1续期)")
+    private String applyType;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_audit_status")
+    @ApiModelProperty("审核状态（0待审核 1审核通过 2驳回）")
+    private String status;
+
+    /**
+     * 续期时长（单位月）
+     */
+    @ExcelProperty(value = "续期时长", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "单=位月")
+    @ApiModelProperty("续期时长（单位月）")
+    private Long renewalDuration;
+
+    /**
+     * 天配额
+     */
+    @ExcelProperty(value = "天配额")
+    @ApiModelProperty("天配额")
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    @ExcelProperty(value = "小时配额")
+    @ApiModelProperty("小时配额")
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    @ExcelProperty(value = "分钟配额")
+    @ApiModelProperty("分钟配额")
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    @ExcelProperty(value = "秒配额")
+    @ApiModelProperty("秒配额")
+    private Long quotaSeconds;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新者")
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
index 5310f1574..782ad2cfe 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -29,7 +29,7 @@ public class IscAppServiceVo {
      *  应用服务ID
      */
     @ApiModelProperty("应用服务ID")
-    private Long serviceAppId;
+    private Long appServiceId;
 
     /**
      * 服务ID
@@ -96,6 +96,30 @@ public class IscAppServiceVo {
     @ApiModelProperty("到期时间")
     private Date endTime;
 
+    /**
+     * 天配额
+     */
+    @ApiModelProperty(value = "天配额")
+    private Long quotaDays;
+
+    /**
+     * 小时配额
+     */
+    @ApiModelProperty(value = "小时配额")
+    private Long quotaHours;
+
+    /**
+     * 分钟配额
+     */
+    @ApiModelProperty(value = "分钟配额")
+    private Long quotaMinutes;
+
+    /**
+     * 秒配额
+     */
+    @ApiModelProperty(value = "秒配额")
+    private Long quotaSeconds;
+
     /**
      * 更新者
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
new file mode 100644
index 000000000..0e4ea03d7
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.mapper;
+
+import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 应用服务申请信息Mapper接口
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+public interface IscAppServiceApplyMapper extends BaseMapperPlus<IscAppServiceApply> {
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
new file mode 100644
index 000000000..994773a18
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.isc.service;
+
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 应用服务申请信息Service接口
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+public interface IIscAppServiceApplyService extends IServicePlus<IscAppServiceApply, IscAppServiceApplyVo> {
+    /**
+     * 查询单个
+     * @return
+     */
+    IscAppServiceApplyVo queryById(Long applyId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<IscAppServiceApplyVo> queryPageList(IscAppServiceApplyBo bo);
+
+    /**
+     * 查询列表
+     */
+    List<IscAppServiceApplyVo> queryList(IscAppServiceApplyBo bo);
+
+    /**
+     * 根据新增业务对象插入应用服务申请信息
+     * @param bo 应用服务申请信息新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IscAppServiceApplyBo bo);
+
+    /**
+     * 根据编辑业务对象修改应用服务申请信息
+     * @param bo 应用服务申请信息编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IscAppServiceApplyBo bo);
+
+    /**
+     * 校验并删除数据
+     * @param ids 主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
index 9c0c04300..9fce813a9 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
@@ -1,11 +1,11 @@
 package com.ruoyi.isc.service;
 
 import cn.hutool.core.lang.tree.Tree;
-import com.ruoyi.isc.domain.IscAppService;
-import com.ruoyi.isc.domain.vo.IscAppServiceVo;
-import com.ruoyi.isc.domain.bo.IscAppServiceBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.domain.bo.IscAppServiceBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -21,7 +21,7 @@ public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAp
      * 查询单个
      * @return
      */
-    IscAppServiceVo queryById(Long serviceAppId);
+    IscAppServiceVo queryById(Long appServiceId);
 
     /**
      * 查询列表
@@ -61,4 +61,11 @@ public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAp
      * @return 应用服务树结构 （标识服务是否存在）
      */
     List<Tree<Long>> genAppServiceTree(Long applicationId);
+
+    /**
+     * 通过 Id集合 返回列表
+     * @param ids 应用服务ID
+     * @return 应用服务列表
+     */
+    List<IscAppService> getAppServiceListByIds(Collection<Long> ids);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
index 76989913f..4294390aa 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
@@ -1,13 +1,14 @@
 package com.ruoyi.isc.service;
 
-import com.ruoyi.isc.domain.IscApplication;
-import com.ruoyi.isc.domain.vo.IscApplicationVo;
-import com.ruoyi.isc.domain.bo.IscApplicationBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.isc.domain.IscApplication;
+import com.ruoyi.isc.domain.bo.IscApplicationBo;
+import com.ruoyi.isc.domain.vo.IscApplicationVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应用信息Service接口
@@ -53,4 +54,11 @@ public interface IIscApplicationService extends IServicePlus<IscApplication, Isc
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 通过应用ID集合批量查询 应用名称
+     * @param applicationIds 应用ID集合
+     * @return 应用名称Map
+     */
+    Map<Long, String> getNameMap(Collection<Long> applicationIds);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
new file mode 100644
index 000000000..0dae5dcb7
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -0,0 +1,131 @@
+package com.ruoyi.isc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
+import com.ruoyi.isc.mapper.IscAppServiceApplyMapper;
+import com.ruoyi.isc.service.IIscAppServiceApplyService;
+import com.ruoyi.isc.service.IIscAppServiceService;
+import com.ruoyi.isc.service.IIscApplicationService;
+import com.ruoyi.isc.service.IIscServiceService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 应用服务申请信息Service业务层处理
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+@Service
+public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppServiceApplyMapper, IscAppServiceApply, IscAppServiceApplyVo> implements IIscAppServiceApplyService {
+
+    @Resource
+    private IIscAppServiceService appServiceService;
+    @Resource
+    private IIscApplicationService applicationService;
+    @Resource
+    private IIscServiceService serviceService;
+
+    @Override
+    public IscAppServiceApplyVo queryById(Long applyId){
+        return getVoById(applyId);
+    }
+
+    @Override
+    public TableDataInfo<IscAppServiceApplyVo> queryPageList(IscAppServiceApplyBo bo) {
+        PagePlus<IscAppServiceApply, IscAppServiceApplyVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        genServiceNameAndApplicationName(result.getRecordsVo());
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<IscAppServiceApplyVo> queryList(IscAppServiceApplyBo bo) {
+        List<IscAppServiceApplyVo> results = listVo(buildQueryWrapper(bo));
+        genServiceNameAndApplicationName(results);
+        return results;
+    }
+
+    /**
+     * 组装服务、应用名称
+     * @param list 申请记录
+     */
+    private void genServiceNameAndApplicationName(List<IscAppServiceApplyVo> list)
+    {
+        if(CollectionUtil.isEmpty(list)) {
+            return;
+        }
+        Set<Long> appServiceIds = list.stream().map(IscAppServiceApplyVo::getAppServiceId).collect(Collectors.toSet());
+        List<IscAppService> appServiceList = appServiceService.getAppServiceListByIds(appServiceIds);
+        if(CollectionUtil.isEmpty(appServiceList)) {
+            return;
+        }
+        Map<Long, IscAppService> appServiceMap = appServiceList.stream()
+            .collect(Collectors.toMap(IscAppService::getAppServiceId, Function.identity()));
+        Map<Long, String> serviceNameMap = serviceService.getNameMap(appServiceList.stream()
+            .map(IscAppService::getServiceId).collect(Collectors.toSet()));
+        Map<Long, String> applicationNameMap = applicationService.getNameMap(appServiceList.stream()
+            .map(IscAppService::getApplicationId).collect(Collectors.toSet()));
+        for (IscAppServiceApplyVo vo : list) {
+            IscAppService appService = appServiceMap.get(vo.getAppServiceId());
+            if(Objects.isNull(appService)) {
+                continue;
+            }
+            vo.setServiceName(serviceNameMap.get(appService.getServiceId()));
+            vo.setApplicationName(applicationNameMap.get(appService.getApplicationId()));
+        }
+    }
+
+    private LambdaQueryWrapper<IscAppServiceApply> buildQueryWrapper(IscAppServiceApplyBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IscAppServiceApply> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getApplyType()), IscAppServiceApply::getApplyType, bo.getApplyType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IscAppServiceApply::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IscAppServiceApplyBo bo) {
+        IscAppServiceApply add = BeanUtil.toBean(bo, IscAppServiceApply.class);
+        validEntityBeforeSave(add);
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(IscAppServiceApplyBo bo) {
+        IscAppServiceApply update = BeanUtil.toBean(bo, IscAppServiceApply.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IscAppServiceApply entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index f3b9483bc..c5995713b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -2,29 +2,33 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.isc.domain.IscService;
-import com.ruoyi.isc.service.IIscServiceService;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.ruoyi.common.constant.IscConstants;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceVo;
-import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.mapper.IscAppServiceMapper;
+import com.ruoyi.isc.service.IIscAppServiceApplyService;
 import com.ruoyi.isc.service.IIscAppServiceService;
+import com.ruoyi.isc.service.IIscServiceService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -38,9 +42,12 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
 
     @Resource
     private IIscServiceService serviceService;
+    @Resource
+    private IIscAppServiceApplyService applyService;
+
     @Override
-    public IscAppServiceVo queryById(Long serviceAppId){
-        return getVoById(serviceAppId);
+    public IscAppServiceVo queryById(Long appServiceId){
+        return getVoById(appServiceId);
     }
 
     @Override
@@ -90,13 +97,20 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     public Boolean insertByBo(IscAppServiceBo bo) {
         IscAppService add = BeanUtil.toBean(bo, IscAppService.class);
         validEntityBeforeSave(add);
-        return save(add);
+        add.setStatus(IscConstants.AUDIT_WAIT);
+        add.setApplyType(IscConstants.APPLY_TYPE_APPLY);
+        add.setUserId(SecurityUtils.getUserId());
+        boolean result = save(add);
+        addApplyRecord(bo, IscConstants.APPLY_TYPE_APPLY, add.getAppServiceId());
+        return result;
     }
 
     @Override
     public Boolean updateByBo(IscAppServiceBo bo) {
         IscAppService update = BeanUtil.toBean(bo, IscAppService.class);
         validEntityBeforeSave(update);
+        update.setStatus(IscConstants.AUDIT_WAIT);
+        addApplyRecord(bo, IscConstants.APPLY_TYPE_RENEWAL, bo.getAppServiceId());
         return updateById(update);
     }
 
@@ -106,7 +120,13 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
      * @param entity 实体类数据
      */
     private void validEntityBeforeSave(IscAppService entity){
-        //TODO 做一些数据校验,如唯一约束
+        //判断是否有申请未审核
+        if(Objects.nonNull(entity.getAppServiceId())){
+            long count = applyService.count(Wrappers.<IscAppServiceApply>lambdaQuery()
+                .eq(IscAppServiceApply::getAppServiceId, entity.getAppServiceId())
+                .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT));
+            Assert.isFalse(SqlHelper.retBool(count), () -> new ServiceException("有申请未审核, 不能再申请"));
+        }
     }
 
     @Override
@@ -125,4 +145,42 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
                 .eq(IscAppService::getApplicationId, applicationId), o -> (Long) o);
         return serviceService.genServiceTree(CollectionUtil.newHashSet(serviceIds));
     }
+
+    @Override
+    public List<IscAppService> getAppServiceListByIds(Collection<Long> ids)
+    {
+        return list(Wrappers.<IscAppService>lambdaQuery()
+            .select(IscAppService::getAppServiceId, IscAppService::getApplicationId, IscAppService::getServiceId)
+            .in(IscAppService::getAppServiceId, ids));
+    }
+
+    /**
+     * 添加 服务申请记录
+     * @param appService   应用服务信息
+     * @param applyType    申请类型
+     * @param appServiceId 应用服务ID
+     * @return 是否添加成功
+     */
+    private Boolean addApplyRecord(IscAppServiceBo appService, String applyType, Long appServiceId) {
+        IscAppServiceApplyBo entity = new IscAppServiceApplyBo();
+        entity.setAppServiceId(appServiceId);
+        entity.setApplyType(applyType);
+        entity.setStatus(IscConstants.AUDIT_WAIT);
+        entity.setRemark(appService.getRemark());
+        switch (applyType) {
+            case IscConstants.APPLY_TYPE_APPLY:
+                entity.setRenewalDuration(appService.getRenewalDuration());
+            case IscConstants.APPLY_TYPE_MODIFY:
+                entity.setQuotaDays(appService.getQuotaDays());
+                entity.setQuotaHours(appService.getQuotaHours());
+                entity.setQuotaMinutes(appService.getQuotaMinutes());
+                entity.setQuotaSeconds(appService.getQuotaSeconds());
+                break;
+            case IscConstants.APPLY_TYPE_RENEWAL:
+                entity.setRenewalDuration(appService.getRenewalDuration());
+                break;
+            default:
+        }
+        return applyService.insertByBo(entity);
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
index 50544c401..3a466a11b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 应用信息Service业务层处理
@@ -88,4 +91,16 @@ public class IscApplicationServiceImpl extends ServicePlusImpl<IscApplicationMap
         }
         return removeByIds(ids);
     }
+
+    @Override
+    public Map<Long, String> getNameMap(Collection<Long> applicationIds)
+    {
+        if(CollectionUtil.isEmpty(applicationIds)) {
+            return MapUtil.empty();
+        }
+        return list(Wrappers.<IscApplication>lambdaQuery()
+            .select(IscApplication::getApplicationId, IscApplication::getApplicationName)
+            .in(IscApplication::getApplicationId, applicationIds)).stream()
+            .collect(Collectors.toMap(IscApplication::getApplicationId, IscApplication::getApplicationName));
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 5bb969f6a..49ec72bcc 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.isc.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -134,6 +135,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     @Override
     public Map<Long, String> getNameMap(Collection<Long> serviceIds)
     {
+        if(CollectionUtil.isEmpty(serviceIds)) {
+            return MapUtil.empty();
+        }
         return list(Wrappers.<IscService>lambdaQuery()
                 .select(IscService::getServiceId, IscService::getServiceName)
                 .in(IscService::getServiceId, serviceIds)).stream()
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
new file mode 100644
index 000000000..6951d02aa
--- /dev/null
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.isc.mapper.IscAppServiceApplyMapper">
+
+    <resultMap type="com.ruoyi.isc.domain.IscAppServiceApply" id="IscAppServiceApplyResult">
+        <result property="applyId" column="apply_id"/>
+        <result property="appServiceId" column="app_service_id"/>
+        <result property="applyType" column="apply_type"/>
+        <result property="status" column="status"/>
+        <result property="auditMind" column="audit_mind"/>
+        <result property="renewalDuration" column="renewal_duration"/>
+        <result property="quotaDays" column="quota_days"/>
+        <result property="quotaHours" column="quota_hours"/>
+        <result property="quotaMinutes" column="quota_minutes"/>
+        <result property="quotaSeconds" column="quota_seconds"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
index 721e5180a..57b2d3127 100644
--- a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.ruoyi.isc.mapper.IscAppServiceMapper">
 
     <resultMap type="com.ruoyi.isc.domain.IscAppService" id="IscAppServiceResult">
-        <result property="serviceAppId" column="service_app_id"/>
+        <result property="appServiceId" column="app_service_id"/>
         <result property="serviceId" column="service_id"/>
         <result property="applicationId" column="application_id"/>
         <result property="userId" column="user_id"/>
diff --git a/ruoyi-ui/src/api/isc/appservice.js b/ruoyi-ui/src/api/isc/appservice.js
index 0f86ce555..6e3abdba3 100644
--- a/ruoyi-ui/src/api/isc/appservice.js
+++ b/ruoyi-ui/src/api/isc/appservice.js
@@ -10,9 +10,9 @@ export function listAppservice(query) {
 }
 
 // 查询应用服务详细
-export function getAppservice(serviceAppId) {
+export function getAppservice(appServiceId) {
   return request({
-    url: '/isc/appservice/' + serviceAppId,
+    url: '/isc/appservice/' + appServiceId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateAppservice(data) {
 }
 
 // 删除应用服务
-export function delAppservice(serviceAppId) {
+export function delAppservice(appServiceId) {
   return request({
-    url: '/isc/appservice/' + serviceAppId,
+    url: '/isc/appservice/' + appServiceId,
     method: 'delete'
   })
 }
diff --git a/ruoyi-ui/src/api/isc/serviceapply.js b/ruoyi-ui/src/api/isc/serviceapply.js
new file mode 100644
index 000000000..ea0291535
--- /dev/null
+++ b/ruoyi-ui/src/api/isc/serviceapply.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询应用服务申请信息列表
+export function listServiceapply(query) {
+  return request({
+    url: '/isc/serviceapply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应用服务申请信息详细
+export function getServiceapply(applyId) {
+  return request({
+    url: '/isc/serviceapply/' + applyId,
+    method: 'get'
+  })
+}
+
+// 新增应用服务申请信息
+export function addServiceapply(data) {
+  return request({
+    url: '/isc/serviceapply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应用服务申请信息
+export function updateServiceapply(data) {
+  return request({
+    url: '/isc/serviceapply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应用服务申请信息
+export function delServiceapply(applyId) {
+  return request({
+    url: '/isc/serviceapply/' + applyId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 02b337d36..9c9977c40 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -75,7 +75,7 @@
     <el-table v-loading="loading" :data="applicationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true" width="80"/>
-      <el-table-column label="应用名称" align="center" prop="applicationName" >
+      <el-table-column label="应用名称" align="left" prop="applicationName" >
         <template slot-scope="scope">
           <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" class="link-type">
             <span>{{ scope.row.applicationName }}</span>
@@ -86,7 +86,7 @@
       <el-table-column label="更新者" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 1d6d97910..779b48da3 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -46,7 +46,18 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['isc:appservice:add']"
-        >新增</el-button>
+        >申请</el-button>
+      </el-col>
+        <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-time"
+          size="mini"
+          :disabled="single"
+          @click="handleRenewal"
+          v-hasPermi="['isc:appservice:edit']"
+        >续期</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -58,7 +69,7 @@
           @click="handleUpdate"
           v-hasPermi="['isc:appservice:edit']"
         >修改</el-button>
-      </el-col>
+        </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -86,37 +97,39 @@
 
     <el-table v-loading="loading" :data="appserviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="应用服务ID" align="center" prop="serviceAppId" v-if="false"/>
-      <el-table-column label="服务名称" align="center" prop="serviceName" />
-      <el-table-column label="启用状态" align="center" prop="enabled">
-        <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请类型" align="center" prop="applyType">
-        <template slot-scope="scope">
-          <dict-tag :options="applyTypeOptions" :value="scope.row.applyType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="status">
+      <el-table-column label="应用服务ID" align="center" prop="appServiceId" v-if="false"/>
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <el-table-column label="虚拟地址" align="left" prop="virtualAddr" />
+      <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="虚拟地址" align="center" prop="virtualAddr" />
-      <el-table-column label="到期时间" align="center" prop="endTime" width="180">
+      <el-table-column label="到期时间" align="center" prop="endTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新者" align="center" prop="updateBy" />
+      <el-table-column label="启用状态" align="center" prop="enabled" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新者" align="center" prop="updateBy" width="100"/>
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-time"
+            @click="handleRenewal(scope.row)"
+            v-hasPermi="['isc:appservice:edit']"
+          >续期</el-button>
           <el-button
             size="mini"
             type="text"
@@ -148,10 +161,17 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="服务名称" prop="serviceId">
           <!-- :disable-branch-nodes="true" 只能选叶子节点 -->
-          <treeselect v-model="form.serviceId" :options="appServiceOptions" :show-count="true" :normalizer="normalizer" 
-            :disable-branch-nodes="true" placeholder="请选择服务" style="width:215px"/>
+          <treeselect 
+            v-model="form.serviceId" 
+            :options="appServiceOptions" 
+            :show-count="true" 
+            :normalizer="normalizer" 
+            :disable-branch-nodes="true" 
+            :disabled="this.applyType !== 0"
+            placeholder="请选择服务" 
+            style="width:215px"/>
         </el-form-item>
-        <el-form-item label="启用状态">
+        <el-form-item label="启用状态" v-if="this.applyType === 0">
           <el-radio-group v-model="form.enabled">
             <el-radio
               v-for="dict in enabledOptions"
@@ -160,26 +180,31 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="到期时间" prop="endTime">
-          <el-date-picker clearable size="small"
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择到期时间">
-          </el-date-picker>
+        <el-form-item label="申请时长" prop="renewalDuration" v-if="this.applyType === 0 || this.applyType === 1">
+          <el-select v-model="form.renewalDuration" placeholder="请选择申请时长" clearable size="small">
+            <el-option key="1" label="1(月)" value="1"/>
+            <el-option key="3" label="3(月)" value="3"/>
+            <el-option key="6" label="6(月)" value="6"/>
+            <el-option key="9" label="9(月)" value="9"/>
+            <el-option key="12" label="1(年)" value="12"/>
+            <el-option key="24" label="2(年)" value="24"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="日配额" prop="quotaDays">
-          <el-input-number v-model="form.quotaDays" step="1000" placeholder="请输入日配额" />
+        <el-form-item label="日配额" prop="quotaDays" v-if="this.applyType === 0 || this.applyType === 2">
+          <el-input-number v-model="form.quotaDays" :step="1000" placeholder="请输入日配额" />
         </el-form-item>
-        <el-form-item label="小时配额" prop="quotaHours">
-          <el-input-number v-model="form.quotaHours" step="100" placeholder="请输入小时配额" />
+        <el-form-item label="小时配额" prop="quotaHours" v-if="this.applyType === 0 || this.applyType === 2">
+          <el-input-number v-model="form.quotaHours" :step="100" placeholder="请输入小时配额" />
         </el-form-item>
-        <el-form-item label="分钟配额" prop="quotaMinutes">
-          <el-input-number v-model="form.quotaMinutes" step="10" placeholder="请输入分钟配额" />
+        <el-form-item label="分钟配额" prop="quotaMinutes" v-if="this.applyType === 0 || this.applyType === 2">
+          <el-input-number v-model="form.quotaMinutes" :step="10" placeholder="请输入分钟配额" />
         </el-form-item>
-        <el-form-item label="秒配额" prop="quotaSeconds">
+        <el-form-item label="秒配额" prop="quotaSeconds" v-if="this.applyType === 0 || this.applyType === 2">
           <el-input-number v-model="form.quotaSeconds" placeholder="请输入秒配额" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -223,8 +248,6 @@ export default {
       open: false,
       // 启用状态字典
       enabledOptions: [],
-      // 申请类型字典
-      applyTypeOptions: [],
       // 审核状态字典
       statusOptions: [],
       // 应用服务树
@@ -239,6 +262,7 @@ export default {
       },
       applicationName: undefined,
       applicationId: undefined,
+      applyType: undefined,
       // 表单参数
       form: {},
       // 表单校验
@@ -249,6 +273,9 @@ export default {
         enabled: [
           { required: true, message: "启用状态不能为空", trigger: "blur" }
         ],
+        renewalDuration: [
+          { required: true, message: "申请时长不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -260,9 +287,6 @@ export default {
     this.getDicts("sys_normal_disable").then(response => {
       this.enabledOptions = response.data;
     });
-    this.getDicts("isc_apply_type").then(response => {
-      this.applyTypeOptions = response.data;
-    });
     this.getDicts("sys_audit_status").then(response => {
       this.statusOptions = response.data;
     });
@@ -309,13 +333,12 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        serviceAppId: undefined,
+        appServiceId: undefined,
         serviceId: undefined,
         applicationId: this.applicationId,
         enabled: "0",
-        applyType: undefined,
         status: [],
-        endTime: undefined,
+        renewalDuration: undefined,
         quotaDays: undefined,
         quotaHours: undefined,
         quotaMinutes: undefined,
@@ -335,13 +358,15 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.serviceAppId)
+      this.ids = selection.map(item => item.appServiceId)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.applyType = 0;
+      this.getTreeselect(this.applicationId);
       this.open = true;
       this.title = "添加应用服务";
     },
@@ -349,8 +374,9 @@ export default {
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const serviceAppId = row.serviceAppId || this.ids
-      getAppservice(serviceAppId).then(response => {
+      this.applyType = 2;
+      const appServiceId = row.appServiceId || this.ids
+      getAppservice(appServiceId).then(response => {
         this.loading = false;
         this.form = response.data;
         this.form.status = this.form.status.split(",");
@@ -358,13 +384,27 @@ export default {
         this.title = "修改应用服务";
       });
     },
+    /** 续期按钮操作 */
+    handleRenewal(row) {
+      this.loading = true;
+      this.reset();
+      this.applyType = 1;
+      const appServiceId = row.appServiceId || this.ids
+      getAppservice(appServiceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.form.status = this.form.status.split(",");
+        this.open = true;
+        this.title = "应用服务续期";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
           this.form.status = this.form.status.join(",");
-          if (this.form.serviceAppId != null) {
+          if (this.form.appServiceId != null) {
             updateAppservice(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
@@ -386,14 +426,14 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const serviceAppIds = row.serviceAppId || this.ids;
-      this.$confirm('是否确认删除应用服务编号为"' + serviceAppIds + '"的数据项?', "警告", {
+      const appServiceIds = row.appServiceId || this.ids;
+      this.$confirm('是否确认删除应用服务编号为"' + appServiceIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           this.loading = true;
-          return delAppservice(serviceAppIds);
+          return delAppservice(appServiceIds);
         }).then(() => {
           this.loading = false;
           this.getList();
diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue
index dc380256d..a15183644 100644
--- a/ruoyi-ui/src/views/isc/cate/index.vue
+++ b/ruoyi-ui/src/views/isc/cate/index.vue
@@ -53,7 +53,7 @@
       <el-table-column label="更新者" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
new file mode 100644
index 000000000..7be4d3cdf
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -0,0 +1,368 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="申请类型" prop="applyType">
+        <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable size="small">
+          <el-option
+            v-for="dict in applyTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['isc:serviceapply:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['isc:serviceapply:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['isc:serviceapply:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:serviceapply:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceapplyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="申请ID" align="center" prop="applyId" v-if="false"/>
+      <el-table-column label="应用名称" align="left" prop="applicationName" />
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <el-table-column label="申请类型" align="center" prop="applyType" width="80">
+        <template slot-scope="scope">
+          <dict-tag :options="applyTypeOptions" :value="scope.row.applyType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="status" width="80">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="续期时长(月)" align="center" prop="renewalDuration" width="100"/>
+      <el-table-column label="天配额" align="center" prop="quotaDays" width="80"/>
+      <el-table-column label="小时配额" align="center" prop="quotaHours" width="80"/>
+      <el-table-column label="分钟配额" align="center" prop="quotaMinutes" width="80"/>
+      <el-table-column label="秒配额" align="center" prop="quotaSeconds" width="70"/>
+      <el-table-column label="更新者" align="center" prop="updateBy" width="100"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:serviceapply:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['isc:serviceapply:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改应用服务申请信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="应用服务ID" prop="appServiceId">
+          <el-input v-model="form.appServiceId" placeholder="请输入应用服务ID" />
+        </el-form-item>
+        <el-form-item label="续期时长" prop="renewalDuration">
+          <el-input v-model="form.renewalDuration" placeholder="请输入续期时长" />
+        </el-form-item>
+        <el-form-item label="天配额" prop="quotaDays">
+          <el-input v-model="form.quotaDays" placeholder="请输入天配额" />
+        </el-form-item>
+        <el-form-item label="小时配额" prop="quotaHours">
+          <el-input v-model="form.quotaHours" placeholder="请输入小时配额" />
+        </el-form-item>
+        <el-form-item label="分钟配额" prop="quotaMinutes">
+          <el-input v-model="form.quotaMinutes" placeholder="请输入分钟配额" />
+        </el-form-item>
+        <el-form-item label="秒配额" prop="quotaSeconds">
+          <el-input v-model="form.quotaSeconds" placeholder="请输入秒配额" />
+        </el-form-item>
+        <el-form-item label="创建者" prop="createBy">
+          <el-input v-model="form.createBy" placeholder="请输入创建者" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker clearable size="small"
+            v-model="form.createTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新者" prop="updateBy">
+          <el-input v-model="form.updateBy" placeholder="请输入更新者" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-date-picker clearable size="small"
+            v-model="form.updateTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="删除标志" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listServiceapply, getServiceapply, delServiceapply, addServiceapply, updateServiceapply } from "@/api/isc/serviceapply";
+
+export default {
+  name: "Serviceapply",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 应用服务申请信息表格数据
+      serviceapplyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 申请类型(0申请 1续期)字典
+      applyTypeOptions: [],
+      // 审核状态字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyType: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        appServiceId: [
+          { required: true, message: "应用服务ID不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("isc_apply_type").then(response => {
+      this.applyTypeOptions = response.data;
+    });
+    this.getDicts("sys_audit_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询应用服务申请信息列表 */
+    getList() {
+      this.loading = true;
+      listServiceapply(this.queryParams).then(response => {
+        this.serviceapplyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        applyId: undefined,
+        appServiceId: undefined,
+        applyType: undefined,
+        status: "0",
+        auditMind: undefined,
+        renewalDuration: undefined,
+        quotaDays: undefined,
+        quotaHours: undefined,
+        quotaMinutes: undefined,
+        quotaSeconds: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.applyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加应用服务申请信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const applyId = row.applyId || this.ids
+      getServiceapply(applyId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改应用服务申请信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.applyId != null) {
+            updateServiceapply(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addServiceapply(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const applyIds = row.applyId || this.ids;
+      this.$confirm('是否确认删除应用服务申请信息编号为"' + applyIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.loading = true;
+          return delServiceapply(applyIds);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.msgSuccess("删除成功");
+      }).finally(() => {
+          this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.downLoadExcel('/isc/serviceapply/export', this.queryParams);
+    }
+  }
+};
+</script>
diff --git a/sql/isc.sql b/sql/isc.sql
index ea61c388c..1bc7057a5 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `isc_app_service`;
 CREATE TABLE `isc_app_service`  (
-  `service_app_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
+  `app_service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
   `service_id` bigint NULL DEFAULT NULL COMMENT '服务ID',
   `application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
   `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
@@ -24,7 +24,7 @@ CREATE TABLE `isc_app_service`  (
   `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  PRIMARY KEY (`service_app_id`) USING BTREE
+  PRIMARY KEY (`app_service_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
 
 -- ----------------------------
@@ -39,7 +39,7 @@ COMMIT;
 DROP TABLE IF EXISTS `isc_app_service_apply`;
 CREATE TABLE `isc_app_service_apply`  (
   `apply_id` bigint NOT NULL AUTO_INCREMENT COMMENT '申请ID',
-  `service_app_id` bigint NOT NULL COMMENT '应用服务ID',
+  `app_service_id` bigint NOT NULL COMMENT '应用服务ID',
   `apply_type` char(1)  DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
   `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
   `audit_mind` varchar(255)  DEFAULT NULL COMMENT '审核意见',
@@ -243,10 +243,15 @@ INSERT INTO `sys_menu` VALUES (1634, '应用服务修改', 1631, 3, '#', '', 1,
 INSERT INTO `sys_menu` VALUES (1635, '应用服务删除', 1631, 4, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:remove', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1636, '应用服务导出', 1631, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:appservice:export', '#', 'admin', '2021-09-08 16:11:57', '', NULL, '');
 
-INSERT INTO  VALUES (100, '审核状态', 'sys_audit_status', '0', 'admin', '2021-08-21 21:21:58', 'admin', '2021-08-21 21:21:58', '审核状态列表');
-INSERT INTO  VALUES (101, '在线状态', 'isc_online_status', '0', 'admin', '2021-08-21 21:24:28', 'admin', '2021-08-21 21:24:28', '在线状态列表');
-INSERT INTO  VALUES (102, '申请类型', 'isc_apply_type', '0', 'admin', '2021-08-21 21:25:26', 'admin', '2021-08-21 21:25:26', '申请类型列表');
-INSERT INTO  VALUES (103, '请求方法', 'isc_request_method', '0', 'admin', '2021-09-07 22:12:58', 'admin', '2021-09-07 22:12:58', 'GET/POST');
+INSERT INTO `sys_menu` VALUES (1637, '服务申请', 1606, 1, 'serviceapply', 'isc/serviceapply/index', 1, 0, 'C', '0', '0', 'isc:serviceapply:list', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '服务申请菜单');
+INSERT INTO `sys_menu` VALUES (1638, '服务申请信息查询', 1637, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:query', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1639, '服务申请信息审核', 1637, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:audit', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1640, '服务申请信息导出', 1637, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:export', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
+
+INSERT INTO `sys_dict_type` VALUES (100, '审核状态', 'sys_audit_status', '0', 'admin', '2021-08-21 21:21:58', 'admin', '2021-08-21 21:21:58', '审核状态列表');
+INSERT INTO `sys_dict_type` VALUES (101, '在线状态', 'isc_online_status', '0', 'admin', '2021-08-21 21:24:28', 'admin', '2021-08-21 21:24:28', '在线状态列表');
+INSERT INTO `sys_dict_type` VALUES (102, '申请类型', 'isc_apply_type', '0', 'admin', '2021-08-21 21:25:26', 'admin', '2021-08-21 21:25:26', '申请类型列表');
+INSERT INTO `sys_dict_type` VALUES (103, '请求方法', 'isc_request_method', '0', 'admin', '2021-09-07 22:12:58', 'admin', '2021-09-07 22:12:58', 'GET/POST');
 
 INSERT INTO `sys_dict_data` VALUES (100, 0, '待审核', '0', 'sys_audit_status', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:26:36', 'admin', '2021-08-21 21:26:36', NULL);
 INSERT INTO `sys_dict_data` VALUES (101, 1, '通过', '1', 'sys_audit_status', NULL, 'success', 'N', '0', 'admin', '2021-08-21 21:27:02', 'admin', '2021-08-21 21:27:02', NULL);
@@ -255,9 +260,9 @@ INSERT INTO `sys_dict_data` VALUES (103, 0, '离线', '0', 'isc_online_status',
 INSERT INTO `sys_dict_data` VALUES (104, 1, '在线', '1', 'isc_online_status', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:29:15', 'admin', '2021-08-21 21:29:15', NULL);
 INSERT INTO `sys_dict_data` VALUES (105, 0, '申请', '0', 'isc_apply_type', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:30:26', 'admin', '2021-08-21 21:30:26', NULL);
 INSERT INTO `sys_dict_data` VALUES (106, 1, '续期', '1', 'isc_apply_type', NULL, 'primary', 'N', '0', 'admin', '2021-08-21 21:30:42', 'admin', '2021-08-21 21:30:42', NULL);
-INSERT INTO `sys_dict_data` VALUES (107, 1, 'GET', 'GET', 'isc_request_method', NULL, 'primary', 'N', '0', 'admin', '2021-09-07 22:13:22', 'admin', '2021-09-07 22:13:56', NULL);
-INSERT INTO `sys_dict_data` VALUES (108, 2, 'POST', 'POST', 'isc_request_method', NULL, 'info', 'N', '0', 'admin', '2021-09-07 22:13:40', 'admin', '2021-09-07 22:13:40', NULL);
-
+INSERT INTO `sys_dict_data` VALUES (107, 2, '修改', '2', 'isc_apply_type', NULL, 'primary', 'N', '0', 'admin', '2021-09-09 17:00:48', 'admin', '2021-09-09 17:00:48', NULL);
+INSERT INTO `sys_dict_data` VALUES (108, 1, 'GET', 'GET', 'isc_request_method', NULL, 'primary', 'N', '0', 'admin', '2021-09-07 22:13:22', 'admin', '2021-09-07 22:13:56', NULL);
+INSERT INTO `sys_dict_data` VALUES (109, 2, 'POST', 'POST', 'isc_request_method', NULL, 'info', 'N', '0', 'admin', '2021-09-07 22:13:40', 'admin', '2021-09-07 22:13:40', NULL);
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

From ec36b7a5c4f497c88c9a8868a5248fb462fb6e8b Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Thu, 9 Sep 2021 23:29:34 +0800
Subject: [PATCH 20/60] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/constant/IscConstants.java   |   3 +
 .../IscAppServiceApplyController.java         |   7 +-
 .../isc/domain/bo/IscAppServiceApplyBo.java   |   6 -
 .../com/ruoyi/isc/domain/bo/IscAuditBo.java   |  50 ++++
 .../service/IIscAppServiceApplyService.java   |   8 +
 .../impl/IscAppServiceApplyServiceImpl.java   |  35 ++-
 ruoyi-ui/src/api/isc/serviceapply.js          |  23 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   |   4 +-
 ruoyi-ui/src/views/isc/cate/index.vue         |  10 +-
 ruoyi-ui/src/views/isc/service/index.vue      |  18 +-
 ruoyi-ui/src/views/isc/serviceapply/index.vue | 251 ++++++++----------
 11 files changed, 241 insertions(+), 174 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index 34bda0baa..bbfe503ea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -8,6 +8,9 @@ public class IscConstants {
     /** 审核通过 */
     public static final String AUDIT_PASS = "1";
 
+    /** 审核驳回 */
+    public static final String AUDIT_REJECT = "2";
+
     /** 待审核 */
     public static final String ONLINE_STATUS_ON = "1";
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
index 0fbb2d481..7da1fdbbb 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
@@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
 import com.ruoyi.isc.service.IIscAppServiceApplyService;
 import io.swagger.annotations.Api;
@@ -79,8 +80,8 @@ public class IscAppServiceApplyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('isc:serviceapply:audit')")
     @Log(title = "应用服务申请信息审核", businessType = BusinessType.AUDIT)
     @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> audit(@Validated(EditGroup.class) @RequestBody IscAppServiceApplyBo bo) {
-        return toAjax(iIscAppServiceApplyService.updateByBo(bo) ? 1 : 0);
+    @PutMapping("/audit")
+    public AjaxResult<Void> audit(@Validated @RequestBody IscAuditBo bo) {
+        return toAjax(iIscAppServiceApplyService.audit(bo) ? 1 : 0);
     }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
index c0a055bd8..27d151064 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
@@ -79,12 +79,6 @@ public class IscAppServiceApplyBo extends BaseEntity {
     @ApiModelProperty(value = "秒配额")
     private Long quotaSeconds;
 
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
-    private String delFlag;
-
 
     /**
      * 分页大小
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java
new file mode 100644
index 000000000..fd52ce73b
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java
@@ -0,0 +1,50 @@
+package com.ruoyi.isc.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 服务管控审核
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-09
+ */
+
+@Data
+@ApiModel("服务管控审核业务对象")
+public class IscAuditBo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID集合
+     */
+    @ApiModelProperty(value = "ID集合")
+    @NotEmpty(message = "请选择记录")
+    private List<Long> ids;
+
+    /**
+     * 审核状态（0待审核 1审核通过 2驳回）
+     */
+    @ApiModelProperty(value = "审核状态（0待审核 1审核通过 2驳回）")
+    @NotBlank(message = "请填写审核结果")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
index 994773a18..26cc0f3e6 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
 
 import java.util.Collection;
@@ -53,4 +54,11 @@ public interface IIscAppServiceApplyService extends IServicePlus<IscAppServiceAp
      * @return
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 应用服务审核
+     * @param bo 审核业务数据
+     * @return 是否审核成功
+     */
+    Boolean audit(IscAuditBo bo);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 0dae5dcb7..c6c805832 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -2,16 +2,20 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
 import com.ruoyi.isc.mapper.IscAppServiceApplyMapper;
 import com.ruoyi.isc.service.IIscAppServiceApplyService;
@@ -43,7 +47,9 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
 
     @Override
     public IscAppServiceApplyVo queryById(Long applyId){
-        return getVoById(applyId);
+        IscAppServiceApplyVo vo = getVoById(applyId);
+        genServiceNameAndApplicationName(Arrays.asList(vo));
+        return vo;
     }
 
     @Override
@@ -128,4 +134,31 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
         }
         return removeByIds(ids);
     }
+
+    @Override
+    public Boolean audit(IscAuditBo bo)
+    {
+        switch (bo.getStatus()) {
+            case IscConstants.AUDIT_PASS:
+                break;
+            case IscConstants.AUDIT_REJECT:
+                Assert.notBlank(bo.getRemark(), () -> new ServiceException("审核意见不能为空"));
+                break;
+            default:
+                throw new ServiceException("审核状态异常");
+        }
+        boolean result = true;
+        for (Long id : bo.getIds())
+        {
+            IscAppServiceApply apply = getOne(Wrappers.<IscAppServiceApply>lambdaQuery()
+                    .eq(IscAppServiceApply::getApplyId, id)
+                    .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT), false);
+            if(Objects.isNull(apply)) {
+                continue;
+            }
+            result = updateById(new IscAppServiceApply().setApplyId(id).setStatus(bo.getStatus())
+                    .setAuditMind(bo.getRemark()));
+        }
+        return result;
+    }
 }
diff --git a/ruoyi-ui/src/api/isc/serviceapply.js b/ruoyi-ui/src/api/isc/serviceapply.js
index ea0291535..fdc6012a5 100644
--- a/ruoyi-ui/src/api/isc/serviceapply.js
+++ b/ruoyi-ui/src/api/isc/serviceapply.js
@@ -17,28 +17,11 @@ export function getServiceapply(applyId) {
   })
 }
 
-// 新增应用服务申请信息
-export function addServiceapply(data) {
+// 应用服务申请信息审核
+export function auditServiceapply(data) {
   return request({
-    url: '/isc/serviceapply',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改应用服务申请信息
-export function updateServiceapply(data) {
-  return request({
-    url: '/isc/serviceapply',
+    url: '/isc/serviceapply/audit',
     method: 'put',
     data: data
   })
 }
-
-// 删除应用服务申请信息
-export function delServiceapply(applyId) {
-  return request({
-    url: '/isc/serviceapply/' + applyId,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 779b48da3..0f188cc32 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -186,8 +186,8 @@
             <el-option key="3" label="3(月)" value="3"/>
             <el-option key="6" label="6(月)" value="6"/>
             <el-option key="9" label="9(月)" value="9"/>
-            <el-option key="12" label="1(年)" value="12"/>
-            <el-option key="24" label="2(年)" value="24"/>
+            <el-option key="12" label="12(月)" value="12"/>
+            <el-option key="24" label="24(月)" value="24"/>
           </el-select>
         </el-form-item>
         <el-form-item label="日配额" prop="quotaDays" v-if="this.applyType === 0 || this.applyType === 2">
diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue
index a15183644..305161f47 100644
--- a/ruoyi-ui/src/views/isc/cate/index.vue
+++ b/ruoyi-ui/src/views/isc/cate/index.vue
@@ -48,7 +48,11 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column label="分类名称" align="center" prop="cateName"  width="160"/>
-      <el-table-column label="启用状态" align="center" prop="enabled" :formatter="enabledFormat" />
+      <el-table-column label="启用状态" align="center" prop="enabled" >
+        <template slot-scope="scope">
+          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+        </template>
+      </el-table-column>
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
       <el-table-column label="更新者" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
@@ -205,10 +209,6 @@ export default {
         this.cateOptions.push(data);
       });
     },
-    // 启用状态字典翻译
-    enabledFormat(row, column) {
-      return this.selectDictLabel(this.enabledOptions, row.enabled);
-    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index 4c1db3159..b2f5407fa 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -101,9 +101,21 @@
       <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
-      <el-table-column label="服务状态" align="center" prop="enabled" :formatter="enabledFormat"  width="100"/>
-      <el-table-column label="是否在线" align="center" prop="onlineStatus" :formatter="onlineStatusFormat"  width="100"/>
-      <el-table-column label="审核状态" align="center" prop="status" :formatter="statusFormat"  width="100"/>
+      <el-table-column label="服务状态" align="center" prop="enabled" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="status" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
       <el-table-column label="更新时间" align="center" prop="updateTime"  width="150">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
index 7be4d3cdf..4c0faa76e 100644
--- a/ruoyi-ui/src/views/isc/serviceapply/index.vue
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -32,33 +32,13 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['isc:serviceapply:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['isc:serviceapply:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
+          icon="el-icon-view"
           size="mini"
           :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['isc:serviceapply:remove']"
-        >删除</el-button>
+          @click="handleAudit"
+          v-hasPermi="['isc:serviceapply:audit']"
+        >批量审核</el-button>
+      </el-col>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -75,7 +55,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="serviceapplyList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
       <el-table-column label="申请ID" align="center" prop="applyId" v-if="false"/>
       <el-table-column label="应用名称" align="left" prop="applicationName" />
       <el-table-column label="服务名称" align="left" prop="serviceName" />
@@ -105,17 +85,19 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['isc:serviceapply:edit']"
-          >修改</el-button>
+            icon="el-icon-view"
+            @click="handleAuditSingle(scope.row)"
+            v-if="scope.row.status == 0"
+            v-hasPermi="['isc:serviceapply:audit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['isc:serviceapply:remove']"
-          >删除</el-button>
+            icon="el-icon-info"
+            @click="handleAuditSingle(scope.row)"
+            v-if="scope.row.status > 0"
+            v-hasPermi="['isc:serviceapply:query']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -130,56 +112,68 @@
 
     <!-- 添加或修改应用服务申请信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="应用服务ID" prop="appServiceId">
-          <el-input v-model="form.appServiceId" placeholder="请输入应用服务ID" />
-        </el-form-item>
-        <el-form-item label="续期时长" prop="renewalDuration">
-          <el-input v-model="form.renewalDuration" placeholder="请输入续期时长" />
-        </el-form-item>
-        <el-form-item label="天配额" prop="quotaDays">
-          <el-input v-model="form.quotaDays" placeholder="请输入天配额" />
-        </el-form-item>
-        <el-form-item label="小时配额" prop="quotaHours">
-          <el-input v-model="form.quotaHours" placeholder="请输入小时配额" />
-        </el-form-item>
-        <el-form-item label="分钟配额" prop="quotaMinutes">
-          <el-input v-model="form.quotaMinutes" placeholder="请输入分钟配额" />
-        </el-form-item>
-        <el-form-item label="秒配额" prop="quotaSeconds">
-          <el-input v-model="form.quotaSeconds" placeholder="请输入秒配额" />
-        </el-form-item>
-        <el-form-item label="创建者" prop="createBy">
-          <el-input v-model="form.createBy" placeholder="请输入创建者" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-date-picker clearable size="small"
-            v-model="form.createTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
-          <el-input v-model="form.updateBy" placeholder="请输入更新者" />
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updateTime">
-          <el-date-picker clearable size="small"
-            v-model="form.updateTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择更新时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+      <el-card shadow="never" v-if="!single" style="margin-bottom: 20px">
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">应用名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.applicationName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">申请类型</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="applyTypeOptions" :value="this.form.applyType"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">审核状态</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="statusOptions" :value="this.form.status"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">续期时长(月)</el-col>
+          <el-col :span="18" class="col-content">{{this.form.renewalDuration}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">每日配额</el-col>
+          <el-col :span="18" class="col-content">{{this.form.quotaDays}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">小时配额</el-col>
+          <el-col :span="18" class="col-content">{{this.form.quotaHours}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">分钟配额</el-col>
+          <el-col :span="18" class="col-content">{{this.form.quotaMinutes}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">每秒配额</el-col>
+          <el-col :span="18" class="col-content">{{this.form.quotaSeconds}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">提交人</el-col>
+          <el-col :span="18" class="col-content">{{this.form.updateBy}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">提交时间</el-col>
+          <el-col :span="18" class="col-content">{{this.form.updateTime}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">备注</el-col>
+          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
+        </el-row>
+      </el-card>
+      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
+        <el-form-item label="审核意见" prop="remark">
+          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.form.status > 0' placeholder="请输入审核意见"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="success" @click="submitForm(1)" icon="el-icon-check" v-if="this.form.status == 0">通 过</el-button>
+        <el-button :loading="buttonLoading" type="warning" @click="submitForm(2)" icon="el-icon-close" v-if="this.form.status == 0">驳 回</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -187,7 +181,7 @@
 </template>
 
 <script>
-import { listServiceapply, getServiceapply, delServiceapply, addServiceapply, updateServiceapply } from "@/api/isc/serviceapply";
+import { listServiceapply, getServiceapply, auditServiceapply } from "@/api/isc/serviceapply";
 
 export default {
   name: "Serviceapply",
@@ -228,10 +222,12 @@ export default {
       },
       // 表单参数
       form: {},
+      // 审核表单参数
+      auditForm: {},
       // 表单校验
       rules: {
-        appServiceId: [
-          { required: true, message: "应用服务ID不能为空", trigger: "blur" }
+        remark: [
+          { max: 200, message: '最大长度为200个字符', trigger: 'blur' }
         ],
       }
     };
@@ -260,24 +256,14 @@ export default {
       this.open = false;
       this.reset();
     },
+    selectable(row, index) {
+      return row.status == 0;
+    },
     // 表单重置
     reset() {
       this.form = {
         applyId: undefined,
-        appServiceId: undefined,
-        applyType: undefined,
         status: "0",
-        auditMind: undefined,
-        renewalDuration: undefined,
-        quotaDays: undefined,
-        quotaHours: undefined,
-        quotaMinutes: undefined,
-        quotaSeconds: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined,
-        delFlag: undefined,
         remark: undefined
       };
       this.resetForm("form");
@@ -298,67 +284,52 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加应用服务申请信息";
+    /** 审核按钮操作 */
+    handleAudit(row) {
+      if(this.single) {
+        this.open = true;
+        this.title = "服务申请审核";
+        this.auditForm.ids = this.ids;
+        return;
+      }
+      this.handleAuditSingle(row);
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleAuditSingle(row) {
+      this.single = false;
       this.loading = true;
       this.reset();
       const applyId = row.applyId || this.ids
+      console.log(applyId)
       getServiceapply(applyId).then(response => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
-        this.title = "修改应用服务申请信息";
+        this.title = "服务申请审核";
+        this.auditForm.ids = [applyId]
       });
     },
     /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
+    submitForm(status) {
+      this.auditForm.status = status;
+      this.$refs["auditForm"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          if (this.form.applyId != null) {
-            updateServiceapply(this.form).then(response => {
-              this.msgSuccess("修改成功");
+          console.log(this.auditForm)
+          if (this.auditForm.ids.length > 0) {
+            auditServiceapply(this.auditForm).then(response => {
+              this.msgSuccess("审核成功");
               this.open = false;
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
             });
           } else {
-            addServiceapply(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
+              this.msgError("请选择记录");
               this.buttonLoading = false;
-            });
           }
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const applyIds = row.applyId || this.ids;
-      this.$confirm('是否确认删除应用服务申请信息编号为"' + applyIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.loading = true;
-          return delServiceapply(applyIds);
-        }).then(() => {
-          this.loading = false;
-          this.getList();
-          this.msgSuccess("删除成功");
-      }).finally(() => {
-          this.loading = false;
-      });
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.downLoadExcel('/isc/serviceapply/export', this.queryParams);
@@ -366,3 +337,15 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+     .el-card .el-row {
+       font-size: 14px;
+       line-height: 36px;
+       vertical-align: middle;
+     }
+     .el-card .el-row .col-title {
+       text-align: right;
+       color: #606266;
+       font-weight: bold;
+     }
+</style>
\ No newline at end of file

From e04a4526ceed8f05876be883cd419945c4527c40 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Thu, 9 Sep 2021 23:42:56 +0800
Subject: [PATCH 21/60] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0(?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=9E=E7=8E=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IscServiceServiceImpl.java   |  9 ++--
 ruoyi-ui/src/views/isc/appservice/index.vue   |  7 ++++
 ruoyi-ui/src/views/isc/service/index.vue      | 41 +++++++++++--------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 49ec72bcc..2b0895d11 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -25,10 +25,7 @@ import com.ruoyi.isc.service.IIscServiceService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,7 +43,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     @Override
     public IscServiceVo queryById(Long serviceId)
     {
-        return getVoById(serviceId);
+        final IscServiceVo vo = getVoById(serviceId);
+        genVoInfo(Arrays.asList(vo));
+        return vo;
     }
 
     @Override
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 0f188cc32..daad3d48d 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -123,6 +123,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="handleRenewal(scope.row)"
+            v-hasPermi="['isc:appservice:query']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index b2f5407fa..9e613b17d 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -71,6 +71,17 @@
           v-hasPermi="['isc:service:edit']"
         >修改</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          :disabled="multiple"
+          @click="handleUpdate"
+          v-hasPermi="['isc:service:audit']"
+        >批量审核</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -124,6 +135,20 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:service:query']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['isc:service:audit']"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -317,22 +342,6 @@ export default {
         this.loading = false;
       });
     },
-    // 跨域标志字典翻译
-    corsFlagFormat(row, column) {
-      return this.selectDictLabel(this.corsFlagOptions, row.corsFlag);
-    },
-    // 是否在线字典翻译
-    onlineStatusFormat(row, column) {
-      return this.selectDictLabel(this.onlineStatusOptions, row.onlineStatus);
-    },
-    // 审核状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
-    },
-    // 服务状态字典翻译
-    enabledFormat(row, column) {
-      return this.selectDictLabel(this.enabledOptions, row.enabled);
-    },
     // 取消按钮
     cancel() {
       this.open = false;

From 0d66a9caf9c092cf097e9ecdac2b28729579d046 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 11:35:16 +0800
Subject: [PATCH 22/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isc/controller/IscServiceController.java  |  41 +++--
 .../ruoyi/isc/service/IIscServiceService.java |  15 +-
 .../impl/IscAppServiceApplyServiceImpl.java   |  12 +-
 .../service/impl/IscServiceServiceImpl.java   |  36 +++++
 ruoyi-ui/src/api/isc/service.js               |   9 ++
 ruoyi-ui/src/views/isc/service/index.vue      | 146 +++++++++++++++++-
 ruoyi-ui/src/views/isc/serviceapply/index.vue |  89 ++++++-----
 7 files changed, 279 insertions(+), 69 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
index 1e3ec6979..8faea9e73 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
@@ -1,30 +1,31 @@
 package com.ruoyi.isc.controller;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.isc.domain.vo.IscServiceVo;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.bo.IscServiceBo;
+import com.ruoyi.isc.domain.vo.IscServiceVo;
 import com.ruoyi.isc.service.IIscServiceService;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 服务信息Controller
@@ -109,4 +110,16 @@ public class IscServiceController extends BaseController {
                                        @PathVariable Long[] serviceIds) {
         return toAjax(iIscServiceService.deleteWithValidByIds(Arrays.asList(serviceIds), true) ? 1 : 0);
     }
+
+    /**
+     * 服务信息审核
+     */
+    @ApiOperation("服务信息审核")
+    @PreAuthorize("@ss.hasPermi('isc:service:audit')")
+    @Log(title = "服务信息审核", businessType = BusinessType.AUDIT)
+    @RepeatSubmit()
+    @PutMapping("/audit")
+    public AjaxResult<Void> audit(@Validated @RequestBody IscAuditBo bo) {
+        return toAjax(iIscServiceService.audit(bo) ? 1 : 0);
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
index dc125d83f..2ff145ec1 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
@@ -1,10 +1,10 @@
 package com.ruoyi.isc.service;
 
 import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNode;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.bo.IscServiceBo;
 import com.ruoyi.isc.domain.vo.IscServiceVo;
 
@@ -77,4 +77,17 @@ public interface IIscServiceService extends IServicePlus<IscService, IscServiceV
      * @return 服务树结构
      */
     List<Tree<Long>> genServiceTree(Set<Long> exitsIds);
+
+    /**
+     * 服务信息审核
+     * @param bo 审核信息
+     * @return 操作结果
+     */
+    Boolean audit(IscAuditBo bo);
+
+    /**
+     * 校验 审核参数
+     * @param bo 审核业务对象
+     */
+    void checkAuditBO(IscAuditBo bo);
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index c6c805832..a48376e36 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -2,14 +2,12 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
@@ -138,15 +136,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
     @Override
     public Boolean audit(IscAuditBo bo)
     {
-        switch (bo.getStatus()) {
-            case IscConstants.AUDIT_PASS:
-                break;
-            case IscConstants.AUDIT_REJECT:
-                Assert.notBlank(bo.getRemark(), () -> new ServiceException("审核意见不能为空"));
-                break;
-            default:
-                throw new ServiceException("审核状态异常");
-        }
+        serviceService.checkAuditBO(bo);
         boolean result = true;
         for (Long id : bo.getIds())
         {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 2b0895d11..1ecff6f25 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,11 +13,13 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.FullPathUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscService;
+import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.bo.IscServiceBo;
 import com.ruoyi.isc.domain.vo.IscServiceVo;
 import com.ruoyi.isc.mapper.IscServiceMapper;
@@ -159,4 +162,37 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
                 .orderByDesc(IscService::getUpdateTime));
         return cateService.genCateTree(cateService.selectCateList(), serviceList, exitsIds);
     }
+
+    @Override
+    public Boolean audit(IscAuditBo bo)
+    {
+        checkAuditBO(bo);
+        boolean result = true;
+        for (Long id : bo.getIds())
+        {
+            IscService service = getOne(Wrappers.<IscService>lambdaQuery()
+                .eq(IscService::getServiceId, id)
+                .eq(IscService::getStatus, IscConstants.AUDIT_WAIT), false);
+            if(Objects.isNull(service)) {
+                continue;
+            }
+            result = updateById(new IscService().setServiceId(id).setStatus(bo.getStatus())
+                .setAuditMind(bo.getRemark()));
+        }
+        return result;
+    }
+
+    @Override
+    public void checkAuditBO(IscAuditBo bo)
+    {
+        switch (bo.getStatus()) {
+            case IscConstants.AUDIT_PASS:
+                break;
+            case IscConstants.AUDIT_REJECT:
+                Assert.notBlank(bo.getRemark(), () -> new ServiceException("审核意见不能为空"));
+                break;
+            default:
+                throw new ServiceException("审核状态异常");
+        }
+    }
 }
diff --git a/ruoyi-ui/src/api/isc/service.js b/ruoyi-ui/src/api/isc/service.js
index e181459bc..ba9c58336 100644
--- a/ruoyi-ui/src/api/isc/service.js
+++ b/ruoyi-ui/src/api/isc/service.js
@@ -42,3 +42,12 @@ export function delService(serviceId) {
     method: 'delete'
   })
 }
+
+// 服务信息审核
+export function auditService(data) {
+  return request({
+    url: '/isc/service/audit',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index 9e613b17d..b191f79a3 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -78,7 +78,7 @@
           icon="el-icon-view"
           size="mini"
           :disabled="multiple"
-          @click="handleUpdate"
+          @click="handleAudit"
           v-hasPermi="['isc:service:audit']"
         >批量审核</el-button>
       </el-col>
@@ -139,14 +139,14 @@
             size="mini"
             type="text"
             icon="el-icon-info"
-            @click="handleUpdate(scope.row)"
+            @click="handleAuditSingle(scope.row)"
             v-hasPermi="['isc:service:query']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleUpdate(scope.row)"
+            @click="handleAuditSingle(scope.row)"
             v-hasPermi="['isc:service:audit']"
           >审核</el-button>
           <el-button
@@ -223,11 +223,67 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    
+    <!-- 查看或审核服务信息对话框 -->
+    <el-dialog :title="title" :visible.sync="openView" width="500px" append-to-body>
+      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务分类</el-col>
+          <el-col :span="18" class="col-content">{{this.form.cateName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">探活地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.probeActiveAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">请求方式</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="requestMethodOptions" :value="this.form.requestMethod"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">备注</el-col>
+          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">跨域标志</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="corsFlagOptions" :value="this.form.corsFlag"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">隐藏参数</el-col>
+          <el-col :span="18" class="col-content">{{this.form.hiddenParams}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">JSON文档</el-col>
+          <el-col :span="18" class="col-content">{{this.form.apiDoc}}</el-col>
+        </el-row>
+      </el-card>
+      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
+        <el-form-item label="审核意见" prop="remark">
+          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="success" @click="submitAuditForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
+        <el-button :loading="buttonLoading" type="warning" @click="submitAuditForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listService, getService, delService, addService, updateService } from "@/api/isc/service";
+import { listService, getService, delService, addService, updateService, auditService } from "@/api/isc/service";
 import { treeselect } from "@/api/isc/cate";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -246,6 +302,10 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
+      // 是否查看
+      view: false,
+      // 是否展示详情
+      show: false,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -260,6 +320,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      openView: false,
       // 跨域标志字典
       corsFlagOptions: [],
       // 是否在线字典
@@ -284,6 +346,8 @@ export default {
       },
       // 表单参数
       form: {},
+      // 审核表单参数
+      auditForm: {},
       // 表单校验
       rules: {
         serviceName: [
@@ -344,7 +408,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = this.openView = false;
       this.reset();
     },
     // 表单重置
@@ -372,6 +436,15 @@ export default {
       };
       this.resetForm("form");
     },
+    // 审核表单重置
+    resetAudit() {
+      this.auditForm = {
+        ids: [],
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("auditForm");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -388,6 +461,36 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /** 审核按钮操作 */
+    handleAudit(row) {
+      if(this.single) {
+        this.openView = true;
+        this.show = false;
+        this.title = "服务审核";
+        this.resetAudit();
+        this.auditForm.ids = this.ids;
+        return;
+      }
+      this.handleAuditSingle(row, false);
+    },
+    handleAuditSingle(row, view) {
+      this.loading = true;
+      this.view = view;
+      this.show = true;
+      this.reset();
+      const serviceId = row.serviceId || this.ids
+      getService(serviceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.openView = true;
+        if(view) {
+          this.title = "服务查看";
+        }else{
+          this.title = "服务审核";
+        }
+        this.auditForm.ids = [serviceId]
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -445,6 +548,27 @@ export default {
         }
       });
     },
+    /** 提交按钮 */
+    submitAuditForm(status) {
+      this.auditForm.status = status;
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.auditForm.ids.length > 0) {
+            auditService(this.auditForm).then(response => {
+              this.msgSuccess("审核成功");
+              this.openView = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+              this.msgError("请选择记录");
+              this.buttonLoading = false;
+          }
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const serviceIds = row.serviceId || this.ids;
@@ -470,3 +594,15 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+     .el-card .el-row {
+       font-size: 14px;
+       line-height: 36px;
+       vertical-align: middle;
+     }
+     .el-card .el-row .col-title {
+       text-align: right;
+       color: #606266;
+       font-weight: bold;
+     }
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
index 4c0faa76e..3a11bca06 100644
--- a/ruoyi-ui/src/views/isc/serviceapply/index.vue
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -85,19 +85,18 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
-            @click="handleAuditSingle(scope.row)"
-            v-if="scope.row.status == 0"
-            v-hasPermi="['isc:serviceapply:audit']"
-          >审核</el-button>
+            icon="el-icon-info"
+            @click="handleAuditSingle(scope.row, true)"
+            v-hasPermi="['isc:serviceapply:query']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-info"
-            @click="handleAuditSingle(scope.row)"
-            v-if="scope.row.status > 0"
-            v-hasPermi="['isc:serviceapply:query']"
-          >查看</el-button>
+            icon="el-icon-view"
+            @click="handleAuditSingle(scope.row, false)"
+            v-if="scope.row.status == 0"
+            v-hasPermi="['isc:serviceapply:audit']"
+          >审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -110,70 +109,70 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改应用服务申请信息对话框 -->
+    <!-- 查看或审核服务申请信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-card shadow="never" v-if="!single" style="margin-bottom: 20px">
+      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">应用名称</el-col>
-          <el-col :span="18" class="col-content">{{this.form.applicationName}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.applicationName}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">服务名称</el-col>
-          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.serviceName}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">申请类型</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="applyTypeOptions" :value="this.form.applyType"/>
+            <dict-tag :options="applyTypeOptions" :value="this.viewData.applyType"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">审核状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="statusOptions" :value="this.form.status"/>
+            <dict-tag :options="statusOptions" :value="this.viewData.status"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">续期时长(月)</el-col>
-          <el-col :span="18" class="col-content">{{this.form.renewalDuration}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.renewalDuration}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">每日配额</el-col>
-          <el-col :span="18" class="col-content">{{this.form.quotaDays}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.quotaDays}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">小时配额</el-col>
-          <el-col :span="18" class="col-content">{{this.form.quotaHours}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.quotaHours}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">分钟配额</el-col>
-          <el-col :span="18" class="col-content">{{this.form.quotaMinutes}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.quotaMinutes}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">每秒配额</el-col>
-          <el-col :span="18" class="col-content">{{this.form.quotaSeconds}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.quotaSeconds}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">提交人</el-col>
-          <el-col :span="18" class="col-content">{{this.form.updateBy}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.updateBy}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">提交时间</el-col>
-          <el-col :span="18" class="col-content">{{this.form.updateTime}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.updateTime}}</el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">备注</el-col>
-          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
+          <el-col :span="18" class="col-content">{{this.viewData.remark}}</el-col>
         </el-row>
       </el-card>
       <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
         <el-form-item label="审核意见" prop="remark">
-          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.form.status > 0' placeholder="请输入审核意见"/>
+          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="success" @click="submitForm(1)" icon="el-icon-check" v-if="this.form.status == 0">通 过</el-button>
-        <el-button :loading="buttonLoading" type="warning" @click="submitForm(2)" icon="el-icon-close" v-if="this.form.status == 0">驳 回</el-button>
+        <el-button :loading="buttonLoading" type="success" @click="submitForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
+        <el-button :loading="buttonLoading" type="warning" @click="submitForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -195,6 +194,10 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
+      // 是否查看
+      view: false,
+      // 是否展示详情
+      show: false,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -221,7 +224,7 @@ export default {
         status: undefined,
       },
       // 表单参数
-      form: {},
+      viewData: {},
       // 审核表单参数
       auditForm: {},
       // 表单校验
@@ -255,18 +258,23 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.resetAudit();
     },
     selectable(row, index) {
       return row.status == 0;
     },
     // 表单重置
     reset() {
-      this.form = {
-        applyId: undefined,
+      this.viewData = { };
+    },
+    // 审核表单重置
+    resetAudit() {
+      this.auditForm = {
+        ids: [],
         status: "0",
         remark: undefined
       };
-      this.resetForm("form");
+      this.resetForm("auditForm");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -289,22 +297,28 @@ export default {
       if(this.single) {
         this.open = true;
         this.title = "服务申请审核";
+        this.resetAudit();
+        this.show = false;
         this.auditForm.ids = this.ids;
         return;
       }
-      this.handleAuditSingle(row);
+      this.handleAuditSingle(row, false);
     },
-    handleAuditSingle(row) {
-      this.single = false;
+    handleAuditSingle(row, view) {
       this.loading = true;
+      this.view = view;
+      this.show = true;
       this.reset();
       const applyId = row.applyId || this.ids
-      console.log(applyId)
       getServiceapply(applyId).then(response => {
         this.loading = false;
-        this.form = response.data;
+        this.viewData = response.data;
         this.open = true;
-        this.title = "服务申请审核";
+        if(view) {
+          this.title = "服务申请查看";
+        }else{
+          this.title = "服务申请审核";
+        }
         this.auditForm.ids = [applyId]
       });
     },
@@ -314,7 +328,6 @@ export default {
       this.$refs["auditForm"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          console.log(this.auditForm)
           if (this.auditForm.ids.length > 0) {
             auditServiceapply(this.auditForm).then(response => {
               this.msgSuccess("审核成功");

From 4b43db12ccff19b194018b4773106f0a0bb1fe5f Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 11:50:01 +0800
Subject: [PATCH 23/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=81=E7=AE=A1=E7=90=86=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/service/audit.vue | 429 +++++++++++++++++++++++
 ruoyi-ui/src/views/isc/service/index.vue | 167 +--------
 2 files changed, 432 insertions(+), 164 deletions(-)
 create mode 100644 ruoyi-ui/src/views/isc/service/audit.vue

diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue
new file mode 100644
index 000000000..92a66f0f8
--- /dev/null
+++ b/ruoyi-ui/src/views/isc/service/audit.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="服务名称" prop="serviceName">
+        <el-input
+          v-model="queryParams.serviceName"
+          placeholder="请输入服务名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否在线" prop="onlineStatus">
+        <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
+          <el-option
+            v-for="dict in onlineStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务状态" prop="enabled">
+        <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
+          <el-option
+            v-for="dict in enabledOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="服务分类" prop="cateFullPath">
+        <treeselect v-model="queryParams.cateFullPath" :options="cateOptions" :show-count="true" :normalizer="normalizer" placeholder="请选择服务分类" style="width:215px"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          :disabled="multiple"
+          @click="handleAudit"
+          v-hasPermi="['isc:service:audit']"
+        >批量审核</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['isc:service:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
+      <el-table-column label="服务名称" align="left" prop="serviceName" />
+      <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
+      <el-table-column label="服务状态" align="center" prop="enabled" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="status" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
+      <el-table-column label="更新时间" align="center" prop="updateTime"  width="150">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="handleAuditSingle(scope.row)"
+            v-hasPermi="['isc:service:query']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleAuditSingle(scope.row)"
+            v-hasPermi="['isc:service:audit']"
+          >审核</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+    <!-- 查看或审核服务信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务分类</el-col>
+          <el-col :span="18" class="col-content">{{this.form.cateName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">探活地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.probeActiveAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">请求方式</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="requestMethodOptions" :value="this.form.requestMethod"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">备注</el-col>
+          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">跨域标志</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="corsFlagOptions" :value="this.form.corsFlag"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">隐藏参数</el-col>
+          <el-col :span="18" class="col-content">{{this.form.hiddenParams}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">JSON文档</el-col>
+          <el-col :span="18" class="col-content">{{this.form.apiDoc}}</el-col>
+        </el-row>
+      </el-card>
+      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
+        <el-form-item label="审核意见" prop="remark">
+          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="success" @click="submitForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
+        <el-button :loading="buttonLoading" type="warning" @click="submitForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listService, getService, auditService } from "@/api/isc/service";
+import { treeselect } from "@/api/isc/cate";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { downLoadExcel } from "@/utils/download";
+
+export default {
+  name: "Service",
+  components: { Treeselect },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 是否查看
+      view: false,
+      // 是否展示详情
+      show: false,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务信息表格数据
+      serviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 跨域标志字典
+      corsFlagOptions: [],
+      // 是否在线字典
+      onlineStatusOptions: [],
+      // 审核状态字典
+      statusOptions: [],
+      // 服务状态字典
+      enabledOptions: [],
+      // 服务状态字典
+      requestMethodOptions: [],
+      //服务分类
+      cateOptions:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        serviceName: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        enabled: undefined,
+        cateFullPath: undefined
+      },
+      // 表单参数
+      form: {},
+      // 审核表单参数
+      auditForm: {},
+      // 表单校验
+      rules: {
+        remark: [
+          { max: 200, message: '最大长度为200个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("sys_yes_no").then(response => {
+      this.corsFlagOptions = response.data;
+    });
+    this.getDicts("isc_online_status").then(response => {
+      this.onlineStatusOptions = response.data;
+    });
+    this.getDicts("sys_audit_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.enabledOptions = response.data;
+    });
+    this.getDicts("isc_request_method").then(response => {
+      this.requestMethodOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询服务信息列表 */
+    getList() {
+      this.loading = true;
+      listService(this.queryParams).then(response => {
+        this.serviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        serviceId: undefined,
+        serviceName: undefined,
+        serviceAddr: undefined,
+        probeActiveAddr: undefined,
+        requestMethod: 'GET',
+        remark: undefined,
+        corsFlag: 'Y',
+        hiddenParams: undefined,
+        onlineStatus: undefined,
+        status: undefined,
+        apiDoc: undefined,
+        auditMind: undefined,
+        enabled: "0",
+        cateFullPath: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    // 审核表单重置
+    resetAudit() {
+      this.auditForm = {
+        ids: [],
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("auditForm");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.serviceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 审核按钮操作 */
+    handleAudit(row) {
+      if(this.single) {
+        this.open = true;
+        this.show = false;
+        this.title = "服务审核";
+        this.resetAudit();
+        this.auditForm.ids = this.ids;
+        return;
+      }
+      this.handleAuditSingle(row, false);
+    },
+    handleAuditSingle(row, view) {
+      this.loading = true;
+      this.view = view;
+      this.show = true;
+      this.reset();
+      const serviceId = row.serviceId || this.ids
+      getService(serviceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        if(view) {
+          this.title = "服务查看";
+        }else{
+          this.title = "服务审核";
+        }
+        this.auditForm.ids = [serviceId]
+      });
+    },
+    /** 查询服务分类树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.cateOptions = response.data;
+      });
+    },
+    //树节点转换
+    normalizer(node) {
+      return {
+        id: node.fullPath,
+        label: node.label,
+        children: node.children,
+      }
+    },
+    /** 提交按钮 */
+    submitForm(status) {
+      this.auditForm.status = status;
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.auditForm.ids.length > 0) {
+            auditService(this.auditForm).then(response => {
+              this.msgSuccess("审核成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+              this.msgError("请选择记录");
+              this.buttonLoading = false;
+          }
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      downLoadExcel('/isc/service/export', this.queryParams);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+     .el-card .el-row {
+       font-size: 14px;
+       line-height: 36px;
+       vertical-align: middle;
+     }
+     .el-card .el-row .col-title {
+       text-align: right;
+       color: #606266;
+       font-weight: bold;
+     }
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index b191f79a3..50a794f4d 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -71,17 +71,6 @@
           v-hasPermi="['isc:service:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-view"
-          size="mini"
-          :disabled="multiple"
-          @click="handleAudit"
-          v-hasPermi="['isc:service:audit']"
-        >批量审核</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -135,20 +124,6 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-info"
-            @click="handleAuditSingle(scope.row)"
-            v-hasPermi="['isc:service:query']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleAuditSingle(scope.row)"
-            v-hasPermi="['isc:service:audit']"
-          >审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -223,67 +198,11 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    
-    <!-- 查看或审核服务信息对话框 -->
-    <el-dialog :title="title" :visible.sync="openView" width="500px" append-to-body>
-      <el-card shadow="never" v-if="this.show" style="margin-bottom: 20px">
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务分类</el-col>
-          <el-col :span="18" class="col-content">{{this.form.cateName}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务名称</el-col>
-          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">服务地址</el-col>
-          <el-col :span="18" class="col-content">{{this.form.serviceAddr}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">探活地址</el-col>
-          <el-col :span="18" class="col-content">{{this.form.probeActiveAddr}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">请求方式</el-col>
-          <el-col :span="18" class="col-content">
-            <dict-tag :options="requestMethodOptions" :value="this.form.requestMethod"/>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">备注</el-col>
-          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">跨域标志</el-col>
-          <el-col :span="18" class="col-content">
-            <dict-tag :options="corsFlagOptions" :value="this.form.corsFlag"/>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">隐藏参数</el-col>
-          <el-col :span="18" class="col-content">{{this.form.hiddenParams}}</el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" class="col-title">JSON文档</el-col>
-          <el-col :span="18" class="col-content">{{this.form.apiDoc}}</el-col>
-        </el-row>
-      </el-card>
-      <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="80px">
-        <el-form-item label="审核意见" prop="remark">
-          <el-input v-model="auditForm.remark" type="textarea" :disabled='this.view' placeholder="请输入审核意见"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="success" @click="submitAuditForm(1)" icon="el-icon-check" v-if="!this.view">通 过</el-button>
-        <el-button :loading="buttonLoading" type="warning" @click="submitAuditForm(2)" icon="el-icon-close" v-if="!this.view">驳 回</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listService, getService, delService, addService, updateService, auditService } from "@/api/isc/service";
+import { listService, getService, delService, addService, updateService } from "@/api/isc/service";
 import { treeselect } from "@/api/isc/cate";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -302,10 +221,6 @@ export default {
       exportLoading: false,
       // 选中数组
       ids: [],
-      // 是否查看
-      view: false,
-      // 是否展示详情
-      show: false,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -320,8 +235,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 是否显示弹出层
-      openView: false,
       // 跨域标志字典
       corsFlagOptions: [],
       // 是否在线字典
@@ -346,8 +259,6 @@ export default {
       },
       // 表单参数
       form: {},
-      // 审核表单参数
-      auditForm: {},
       // 表单校验
       rules: {
         serviceName: [
@@ -408,7 +319,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = this.openView = false;
+      this.open = false;
       this.reset();
     },
     // 表单重置
@@ -436,15 +347,6 @@ export default {
       };
       this.resetForm("form");
     },
-    // 审核表单重置
-    resetAudit() {
-      this.auditForm = {
-        ids: [],
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("auditForm");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -461,36 +363,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 审核按钮操作 */
-    handleAudit(row) {
-      if(this.single) {
-        this.openView = true;
-        this.show = false;
-        this.title = "服务审核";
-        this.resetAudit();
-        this.auditForm.ids = this.ids;
-        return;
-      }
-      this.handleAuditSingle(row, false);
-    },
-    handleAuditSingle(row, view) {
-      this.loading = true;
-      this.view = view;
-      this.show = true;
-      this.reset();
-      const serviceId = row.serviceId || this.ids
-      getService(serviceId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.openView = true;
-        if(view) {
-          this.title = "服务查看";
-        }else{
-          this.title = "服务审核";
-        }
-        this.auditForm.ids = [serviceId]
-      });
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -548,27 +420,6 @@ export default {
         }
       });
     },
-    /** 提交按钮 */
-    submitAuditForm(status) {
-      this.auditForm.status = status;
-      this.$refs["auditForm"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.auditForm.ids.length > 0) {
-            auditService(this.auditForm).then(response => {
-              this.msgSuccess("审核成功");
-              this.openView = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-              this.msgError("请选择记录");
-              this.buttonLoading = false;
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const serviceIds = row.serviceId || this.ids;
@@ -593,16 +444,4 @@ export default {
     }
   }
 };
-</script>
-<style lang="scss" scoped>
-     .el-card .el-row {
-       font-size: 14px;
-       line-height: 36px;
-       vertical-align: middle;
-     }
-     .el-card .el-row .col-title {
-       text-align: right;
-       color: #606266;
-       font-weight: bold;
-     }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file

From 98eddbdc0d71c56386b923902fa5084a6a607f73 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 17:07:47 +0800
Subject: [PATCH 24/60] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/DateUtils.java     | 43 +++++++--
 .../main/java/com/ruoyi/isc/RouteUtils.java   | 36 +++++++
 .../ruoyi/isc/domain/IscAppServiceApply.java  |  4 +-
 .../isc/domain/bo/IscAppServiceApplyBo.java   |  8 +-
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  2 +-
 .../isc/domain/vo/IscAppServiceApplyVo.java   |  2 +-
 .../impl/IscAppServiceApplyServiceImpl.java   | 96 +++++++++++++++++++
 .../impl/IscAppServiceServiceImpl.java        | 62 +++++++-----
 ruoyi-ui/src/views/isc/appservice/index.vue   | 18 ++--
 ruoyi-ui/src/views/isc/service/audit.vue      | 12 ++-
 ruoyi-ui/src/views/isc/serviceapply/index.vue |  1 +
 11 files changed, 231 insertions(+), 53 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 536cb3cf0..dbfea97c0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -1,14 +1,17 @@
 package com.ruoyi.common.utils;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
@@ -22,15 +25,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-    
+
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
     public static Date getNowDate()
@@ -40,7 +43,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
     public static String getDate()
@@ -121,7 +124,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             return null;
         }
     }
-    
+
     /**
      * 获取服务器启动时间
      */
@@ -152,4 +155,30 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    /**
+     * 获取一天的开始时间 即00:00:00
+     *
+     * @param date 日期
+     * @return 一天的开始时间
+     */
+    public static Date beginOfDay(Date date)
+    {
+        return Date.from(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.of(date))
+            .atZone(ZoneId.systemDefault()).toInstant());
+    }
+
+
+
+    /**
+     * 获取一天的结束时间 即23:59:59
+     *
+     * @param date 日期
+     * @return 一天的最后一秒
+     */
+    public static Date endOfDay(Date date)
+    {
+        return Date.from(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.of(date))
+            .atZone(ZoneId.systemDefault()).toInstant());
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
new file mode 100644
index 000000000..63352a594
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
@@ -0,0 +1,36 @@
+package com.ruoyi.isc;
+
+import cn.hutool.crypto.SecureUtil;
+import com.ruoyi.common.exception.ServiceException;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021/9/10 14:46
+ */
+public class RouteUtils
+{
+    public static final String PATH_PREFIX = "/proxy";
+
+    /**
+     * 获取虚拟URL Path 部分
+     *
+     * @param applicationId 应用ID
+     * @param serviceId     服务Id
+     * @param serviceAddr   服务地址
+     * @return
+     */
+    public static String genVirtualAddrPath(Long applicationId, Long serviceId, String serviceAddr)
+    {
+        URI uri = null;
+        try {
+            uri = new URI(serviceAddr);
+        } catch (URISyntaxException e) {
+            throw new ServiceException("URL格式异常");
+        }
+        return String.format("%s/%s/%s%s", PATH_PREFIX, SecureUtil.md5(String.valueOf(applicationId)),
+            SecureUtil.md5(String.valueOf(serviceId)), uri.getPath());
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
index 76fcd14c7..1f8cc6195 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
 
 /**
  * 应用服务申请信息对象 isc_app_service_apply
@@ -52,7 +52,7 @@ public class IscAppServiceApply implements Serializable {
     /**
      * 续期时长（单位月）
      */
-    private Long renewalDuration;
+    private Integer renewalDuration;
 
     /**
      * 天配额
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
index 27d151064..0b79e1ec4 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
@@ -1,16 +1,14 @@
 package com.ruoyi.isc.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotNull;
 
 /**
  * 应用服务申请信息业务对象 isc_app_service_apply
@@ -53,7 +51,7 @@ public class IscAppServiceApplyBo extends BaseEntity {
      * 续期时长（单位月）
      */
     @ApiModelProperty(value = "续期时长（单位月）")
-    private Long renewalDuration;
+    private Integer renewalDuration;
 
     /**
      * 天配额
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index 5fb254b01..8a0397684 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -91,7 +91,7 @@ public class IscAppServiceBo extends BaseEntity {
      * 续期时长（单位月）
      */
     @NotNull(message = "续期时长不能为空", groups = { AddGroup.class })
-    private Long renewalDuration;
+    private Integer renewalDuration;
 
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
index f6a42ad47..0d461831a 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
@@ -72,7 +72,7 @@ public class IscAppServiceApplyVo {
     @ExcelProperty(value = "续期时长", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "单=位月")
     @ApiModelProperty("续期时长（单位月）")
-    private Long renewalDuration;
+    private Integer renewalDuration;
 
     /**
      * 天配额
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index a48376e36..127c3d181 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -2,16 +2,21 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.RouteUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAuditBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceApplyVo;
@@ -148,7 +153,98 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             }
             result = updateById(new IscAppServiceApply().setApplyId(id).setStatus(bo.getStatus())
                     .setAuditMind(bo.getRemark()));
+            IscAppService appService = appServiceService.getById(apply.getAppServiceId());
+            Assert.notNull(appService, () -> new ServiceException("申请信息不存在"));
+
+            IscAppService updateData = null;
+            if(IscConstants.AUDIT_PASS.equals(bo.getStatus())) {
+                updateData = genAuditPassData(apply, appService, bo.getStatus());
+            }else{
+                //如果 应用服务 状态为不通过 时需要同步状态
+                updateData = genAuditRejectData(appService, bo);
+            }
+            if(Objects.nonNull(updateData)) {
+                result = appServiceService.updateById(updateData);
+            }
         }
         return result;
     }
+
+    /**
+     * 审核通过处理
+     * @param apply      申请信息
+     * @param appService 应用服务信息
+     * @param status     操作状态
+     * @return 更新数据
+     */
+    private IscAppService genAuditPassData(IscAppServiceApply apply, IscAppService appService, String status)
+    {
+        IscAppService updateData = new IscAppService().setAppServiceId(appService.getAppServiceId());
+        //如果是 服务申请 修改 应用服务 审核状态、生成虚拟地址、服务到期时间
+        //如果是续期申请 修改 服务到期时间
+        switch (apply.getApplyType()) {
+            case IscConstants.APPLY_TYPE_APPLY:
+                genServicePassInit(apply, appService, status, updateData);
+                break;
+            case IscConstants.APPLY_TYPE_MODIFY:
+                //如果 应用服务 状态不为通过 则修改状态（如果是通过：续期不能影响使用）
+                if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
+                    genServicePassInit(apply, appService, status, updateData);
+                }
+                updateData.setQuotaDays(apply.getQuotaDays());
+                updateData.setQuotaHours(apply.getQuotaHours());
+                updateData.setQuotaMinutes(apply.getQuotaMinutes());
+                updateData.setQuotaSeconds(apply.getQuotaSeconds());
+                break;
+            case IscConstants.APPLY_TYPE_RENEWAL:
+                Date startDate = Objects.isNull(appService.getEndTime()) ? DateUtils.getNowDate() : appService.getEndTime();
+                updateData.setEndTime(DateUtils.beginOfDay(DateUtils.addMonths(startDate, apply.getRenewalDuration())));
+                break;
+            default:
+                throw new ServiceException("申请类型异常");
+        }
+        return updateData;
+    }
+
+    /**
+     * 审核通过 初始化生成 虚拟地址、服务结束时间
+     * @param apply      申请信息
+     * @param appService 应用服务信息
+     * @param status     审核状态
+     * @param updateData 需要修改的数据
+     */
+    private void genServicePassInit(IscAppServiceApply apply, IscAppService appService, String status,
+                                    IscAppService updateData)
+    {
+        updateData.setStatus(status);
+        IscService service = serviceService.getById(appService.getServiceId());
+        Assert.notNull(service, () -> new ServiceException("服务信息不存在"));
+        Integer renewalDuration = apply.getRenewalDuration();
+        //如果 申请时长为空，需要查询审核记录 中的审核时长
+        if(Objects.isNull(renewalDuration)) {
+            IscAppServiceApply log = getOne(Wrappers.<IscAppServiceApply>lambdaQuery()
+                .eq(IscAppServiceApply::getAppServiceId, appService.getAppServiceId())
+                .eq(IscAppServiceApply::getApplyType, IscConstants.APPLY_TYPE_APPLY)
+                .last("LIMIT 1"), false);
+            renewalDuration = Objects.nonNull(log) ? log.getRenewalDuration() : 1;
+        }
+        updateData.setEndTime(DateUtils.beginOfDay(DateUtils.addMonths(DateUtils.getNowDate(), renewalDuration)));
+        updateData.setVirtualAddr(RouteUtils.genVirtualAddrPath(appService.getApplicationId(),
+            appService.getServiceId(), service.getServiceAddr()));
+    }
+
+    /**
+     * 审核不通过处理
+     * @param appService 应用服务信息
+     * @param bo         审核数据
+     * @return 需要更新的信息
+     */
+    private IscAppService genAuditRejectData(IscAppService appService, IscAuditBo bo) {
+        if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
+            IscAppService updateData = new IscAppService().setAppServiceId(appService.getAppServiceId());
+            updateData.setStatus(bo.getStatus());
+            return updateData;
+        }
+        return null;
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index c5995713b..a3c643b30 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -38,7 +37,8 @@ import java.util.stream.Collectors;
  * @date 2021-09-08
  */
 @Service
-public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMapper, IscAppService, IscAppServiceVo> implements IIscAppServiceService {
+public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMapper, IscAppService, IscAppServiceVo> implements IIscAppServiceService
+{
 
     @Resource
     private IIscServiceService serviceService;
@@ -46,19 +46,22 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     private IIscAppServiceApplyService applyService;
 
     @Override
-    public IscAppServiceVo queryById(Long appServiceId){
+    public IscAppServiceVo queryById(Long appServiceId)
+    {
         return getVoById(appServiceId);
     }
 
     @Override
-    public TableDataInfo<IscAppServiceVo> queryPageList(IscAppServiceBo bo) {
+    public TableDataInfo<IscAppServiceVo> queryPageList(IscAppServiceBo bo)
+    {
         PagePlus<IscAppService, IscAppServiceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         genServiceName(result.getRecordsVo());
         return PageUtils.buildDataInfo(result);
     }
 
     @Override
-    public List<IscAppServiceVo> queryList(IscAppServiceBo bo) {
+    public List<IscAppServiceVo> queryList(IscAppServiceBo bo)
+    {
         final List<IscAppServiceVo> results = listVo(buildQueryWrapper(bo));
         genServiceName(results);
         return results;
@@ -66,22 +69,23 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
 
     /**
      * 组装服务名称
+     *
      * @param results 应用服务列表
      */
     private void genServiceName(List<IscAppServiceVo> results)
     {
-        if(CollectionUtil.isEmpty(results)) {
+        if (CollectionUtil.isEmpty(results)) {
             return;
         }
         Set<Long> serviceIds = results.stream().map(IscAppServiceVo::getServiceId).collect(Collectors.toSet());
         Map<Long, String> nameMap = serviceService.getNameMap(serviceIds);
-        for (IscAppServiceVo result : results)
-        {
+        for (IscAppServiceVo result : results) {
             result.setServiceName(nameMap.get(result.getServiceId()));
         }
     }
 
-    private LambdaQueryWrapper<IscAppService> buildQueryWrapper(IscAppServiceBo bo) {
+    private LambdaQueryWrapper<IscAppService> buildQueryWrapper(IscAppServiceBo bo)
+    {
         Map<String, Object> params = bo.getParams();
         Long userId = SecurityUtils.getUserId();
         LambdaQueryWrapper<IscAppService> lqw = Wrappers.lambdaQuery();
@@ -94,7 +98,8 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     }
 
     @Override
-    public Boolean insertByBo(IscAppServiceBo bo) {
+    public Boolean insertByBo(IscAppServiceBo bo)
+    {
         IscAppService add = BeanUtil.toBean(bo, IscAppService.class);
         validEntityBeforeSave(add);
         add.setStatus(IscConstants.AUDIT_WAIT);
@@ -106,12 +111,21 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     }
 
     @Override
-    public Boolean updateByBo(IscAppServiceBo bo) {
-        IscAppService update = BeanUtil.toBean(bo, IscAppService.class);
+    public Boolean updateByBo(IscAppServiceBo bo)
+    {
+        IscAppService appService = getById(bo.getAppServiceId());
+        Assert.notNull(appService, () -> new ServiceException("申请信息不存在"));
+        IscAppService update = new IscAppService().setAppServiceId(bo.getAppServiceId());
         validEntityBeforeSave(update);
-        update.setStatus(IscConstants.AUDIT_WAIT);
-        addApplyRecord(bo, IscConstants.APPLY_TYPE_RENEWAL, bo.getAppServiceId());
-        return updateById(update);
+        boolean result = true;
+        if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
+            update.setStatus(IscConstants.AUDIT_WAIT);
+            result = updateById(update);
+        }
+        String applyType = Objects.nonNull(bo.getRenewalDuration()) ? IscConstants.APPLY_TYPE_RENEWAL :
+            IscConstants.APPLY_TYPE_MODIFY;
+        addApplyRecord(bo, applyType, bo.getAppServiceId());
+        return result;
     }
 
     /**
@@ -119,9 +133,10 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(IscAppService entity){
+    private void validEntityBeforeSave(IscAppService entity)
+    {
         //判断是否有申请未审核
-        if(Objects.nonNull(entity.getAppServiceId())){
+        if (Objects.nonNull(entity.getAppServiceId())) {
             long count = applyService.count(Wrappers.<IscAppServiceApply>lambdaQuery()
                 .eq(IscAppServiceApply::getAppServiceId, entity.getAppServiceId())
                 .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT));
@@ -130,8 +145,9 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid)
+    {
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return removeByIds(ids);
@@ -141,8 +157,8 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     public List<Tree<Long>> genAppServiceTree(Long applicationId)
     {
         List<Long> serviceIds = listObjs(Wrappers.<IscAppService>lambdaQuery()
-                .select(IscAppService::getServiceId)
-                .eq(IscAppService::getApplicationId, applicationId), o -> (Long) o);
+            .select(IscAppService::getServiceId)
+            .eq(IscAppService::getApplicationId, applicationId), o -> (Long) o);
         return serviceService.genServiceTree(CollectionUtil.newHashSet(serviceIds));
     }
 
@@ -156,12 +172,14 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
 
     /**
      * 添加 服务申请记录
+     *
      * @param appService   应用服务信息
      * @param applyType    申请类型
      * @param appServiceId 应用服务ID
      * @return 是否添加成功
      */
-    private Boolean addApplyRecord(IscAppServiceBo appService, String applyType, Long appServiceId) {
+    private Boolean addApplyRecord(IscAppServiceBo appService, String applyType, Long appServiceId)
+    {
         IscAppServiceApplyBo entity = new IscAppServiceApplyBo();
         entity.setAppServiceId(appServiceId);
         entity.setApplyType(applyType);
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index daad3d48d..3239730a6 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -47,17 +47,6 @@
           @click="handleAdd"
           v-hasPermi="['isc:appservice:add']"
         >申请</el-button>
-      </el-col>
-        <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-time"
-          size="mini"
-          :disabled="single"
-          @click="handleRenewal"
-          v-hasPermi="['isc:appservice:edit']"
-        >续期</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -96,7 +85,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="appserviceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
       <el-table-column label="应用服务ID" align="center" prop="appServiceId" v-if="false"/>
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="虚拟地址" align="left" prop="virtualAddr" />
@@ -136,6 +125,7 @@
             icon="el-icon-time"
             @click="handleRenewal(scope.row)"
             v-hasPermi="['isc:appservice:edit']"
+            v-if="scope.row.status == 1"
           >续期</el-button>
           <el-button
             size="mini"
@@ -143,6 +133,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['isc:appservice:edit']"
+            v-if="scope.row.status != 0"
           >修改</el-button>
           <el-button
             size="mini"
@@ -310,6 +301,9 @@ export default {
         this.loading = false;
       });
     },
+    selectable(row, index) {
+      return row.status != 0;
+    },
     /** 获取应用信息 */
     getApplicationName(applicationId) {
       getApplication(applicationId).then(response => {
diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue
index 92a66f0f8..13de6885a 100644
--- a/ruoyi-ui/src/views/isc/service/audit.vue
+++ b/ruoyi-ui/src/views/isc/service/audit.vue
@@ -76,7 +76,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="serviceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
       <el-table-column label="服务ID" align="center" prop="serviceId" width="100"/>
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
@@ -107,15 +107,16 @@
             size="mini"
             type="text"
             icon="el-icon-info"
-            @click="handleAuditSingle(scope.row)"
+            @click="handleAuditSingle(scope.row, true)"
             v-hasPermi="['isc:service:query']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="handleAuditSingle(scope.row)"
+            @click="handleAuditSingle(scope.row, false)"
             v-hasPermi="['isc:service:audit']"
+            v-if="scope.row.status == 0"
           >审核</el-button>
         </template>
       </el-table-column>
@@ -292,6 +293,10 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.resetAudit();
+    },
+    selectable(row, index) {
+      return row.status == 0;
     },
     // 表单重置
     reset() {
@@ -360,6 +365,7 @@ export default {
       this.view = view;
       this.show = true;
       this.reset();
+      this.resetAudit();
       const serviceId = row.serviceId || this.ids
       getService(serviceId).then(response => {
         this.loading = false;
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
index 3a11bca06..478d4025a 100644
--- a/ruoyi-ui/src/views/isc/serviceapply/index.vue
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -309,6 +309,7 @@ export default {
       this.view = view;
       this.show = true;
       this.reset();
+      this.resetAudit();
       const applyId = row.applyId || this.ids
       getServiceapply(applyId).then(response => {
         this.loading = false;

From 71817249c8e017389be89ef394c351eb251ab835 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 17:14:25 +0800
Subject: [PATCH 25/60] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/application/index.vue  | 2 ++
 ruoyi-ui/src/views/isc/service/audit.vue      | 4 +++-
 ruoyi-ui/src/views/isc/service/index.vue      | 4 +++-
 ruoyi-ui/src/views/isc/serviceapply/index.vue | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 9c9977c40..74e652153 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -170,6 +170,8 @@ export default {
         pageSize: 10,
         applicationName: undefined,
         accessKey: undefined,
+        orderByColumn: 'update_time',
+        isAsc: 'desc'
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue
index 13de6885a..2c924823a 100644
--- a/ruoyi-ui/src/views/isc/service/audit.vue
+++ b/ruoyi-ui/src/views/isc/service/audit.vue
@@ -246,7 +246,9 @@ export default {
         onlineStatus: undefined,
         status: undefined,
         enabled: undefined,
-        cateFullPath: undefined
+        cateFullPath: undefined,
+        orderByColumn: 'update_time',
+        isAsc: 'desc'
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index 50a794f4d..084ce5570 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -255,7 +255,9 @@ export default {
         onlineStatus: undefined,
         status: undefined,
         enabled: undefined,
-        cateFullPath: undefined
+        cateFullPath: undefined,
+        orderByColumn: 'update_time',
+        isAsc: 'desc'
       },
       // 表单参数
       form: {},
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
index 478d4025a..f6161c8ea 100644
--- a/ruoyi-ui/src/views/isc/serviceapply/index.vue
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -222,6 +222,8 @@ export default {
         pageSize: 10,
         applyType: undefined,
         status: undefined,
+        orderByColumn: 'update_time',
+        isAsc: 'desc'
       },
       // 表单参数
       viewData: {},

From 7a39478e838d491f8ef98349e99403c12ff4cee1 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 18:01:27 +0800
Subject: [PATCH 26/60] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/application/index.vue | 20 +++++++++++++-
 ruoyi-ui/src/views/isc/appservice/index.vue  | 28 ++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 74e652153..e8a3464bd 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -82,7 +82,12 @@
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="应用密钥" align="center" prop="accessKey" />
+      <el-table-column label="应用密钥" align="center" prop="accessKey">
+        <template slot-scope="scope">
+            <span>{{ scope.row.accessKey }} </span> 
+            <i class="el-icon-copy-document" style="color: #4A8DFF" @click="handleCopy(scope.row.accessKey)" title="复制"/>
+        </template>
+      </el-table-column>
       <el-table-column label="更新者" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
@@ -254,6 +259,19 @@ export default {
         this.title = "修改应用信息";
       });
     },
+    // 复制ak
+    handleCopy(data) {
+      let oInput = document.createElement('input')
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('copy')
+      this.$message({
+        message: '复制成功',
+        type: 'success'
+      })
+      oInput.remove()
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 3239730a6..3a19cd800 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -88,7 +88,12 @@
       <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
       <el-table-column label="应用服务ID" align="center" prop="appServiceId" v-if="false"/>
       <el-table-column label="服务名称" align="left" prop="serviceName" />
-      <el-table-column label="虚拟地址" align="left" prop="virtualAddr" />
+      <el-table-column label="虚拟地址" align="left" prop="virtualAddr">
+        <template slot-scope="scope">
+            <span :title="scope.row.virtualAddr" v-text="handleVirtualAddr(scope.row.virtualAddr)"></span> 
+            <i class="el-icon-copy-document" style="color: #4A8DFF" @click="handleCopy(scope.row.virtualAddr)" title="复制"/>
+        </template>
+      </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
@@ -256,7 +261,9 @@ export default {
         pageSize: 10,
         enabled: undefined,
         status: undefined,
-        applicationId: undefined
+        applicationId: undefined,
+        orderByColumn: 'update_time',
+        isAsc: 'desc'
       },
       applicationName: undefined,
       applicationId: undefined,
@@ -399,6 +406,23 @@ export default {
         this.title = "应用服务续期";
       });
     },
+    // 复制地址
+    handleCopy(data) {
+      let oInput = document.createElement('input')
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('copy')
+      this.$message({
+        message: '复制成功',
+        type: 'success'
+      })
+      oInput.remove()
+    },
+    // 处理虚拟地址
+    handleVirtualAddr(data) {
+      return data.length > 40 ? data.substring(0, 37) + '...' : data;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

From 0626bd3e926a5add31988861b34304c3f9811088 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Fri, 10 Sep 2021 18:05:21 +0800
Subject: [PATCH 27/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/isc.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/isc.sql b/sql/isc.sql
index 1bc7057a5..b546ad060 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -247,6 +247,7 @@ INSERT INTO `sys_menu` VALUES (1637, '服务申请', 1606, 1, 'serviceapply', 'i
 INSERT INTO `sys_menu` VALUES (1638, '服务申请信息查询', 1637, 1, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:query', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1639, '服务申请信息审核', 1637, 2, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:audit', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (1640, '服务申请信息导出', 1637, 5, '#', '', 1, 0, 'F', '0', '0', 'isc:serviceapply:export', '#', 'admin', '2021-09-09 14:45:09', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (1641, '服务审核', 1606, 5, 'service/audit', 'isc/service/audit', 1, 0, 'C', '0', '0', 'isc:service:audit', 'eye-open', 'admin', '2021-09-10 13:35:18', 'admin', '2021-09-10 13:37:14', '');
 
 INSERT INTO `sys_dict_type` VALUES (100, '审核状态', 'sys_audit_status', '0', 'admin', '2021-08-21 21:21:58', 'admin', '2021-08-21 21:21:58', '审核状态列表');
 INSERT INTO `sys_dict_type` VALUES (101, '在线状态', 'isc_online_status', '0', 'admin', '2021-08-21 21:24:28', 'admin', '2021-08-21 21:24:28', '在线状态列表');

From aefb605d539974c375230ebd932a96bce3abd756 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 10 Sep 2021 20:39:52 +0800
Subject: [PATCH 28/60] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=BC=A0=E6=A0=87=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/application/index.vue | 3 ++-
 ruoyi-ui/src/views/isc/appservice/index.vue  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index e8a3464bd..213546ebc 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -85,7 +85,8 @@
       <el-table-column label="应用密钥" align="center" prop="accessKey">
         <template slot-scope="scope">
             <span>{{ scope.row.accessKey }} </span> 
-            <i class="el-icon-copy-document" style="color: #4A8DFF" @click="handleCopy(scope.row.accessKey)" title="复制"/>
+            <i class="el-icon-copy-document" style="color: #4A8DFF;cursor:pointer" v-if="scope.row.accessKey"
+            @click="handleCopy(scope.row.accessKey)" title="复制"/>
         </template>
       </el-table-column>
       <el-table-column label="更新者" align="center" prop="updateBy" />
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 3a19cd800..3b521e442 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -90,8 +90,9 @@
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="虚拟地址" align="left" prop="virtualAddr">
         <template slot-scope="scope">
-            <span :title="scope.row.virtualAddr" v-text="handleVirtualAddr(scope.row.virtualAddr)"></span> 
-            <i class="el-icon-copy-document" style="color: #4A8DFF" @click="handleCopy(scope.row.virtualAddr)" title="复制"/>
+            <span :title="scope.row.virtualAddr" v-text="handleVirtualAddr(scope.row.virtualAddr)"/>
+            <i class="el-icon-copy-document" v-if="scope.row.virtualAddr" style="color: #4A8DFF;cursor:pointer" 
+            @click="handleCopy(scope.row.virtualAddr)" title="复制"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
@@ -421,7 +422,7 @@ export default {
     },
     // 处理虚拟地址
     handleVirtualAddr(data) {
-      return data.length > 40 ? data.substring(0, 37) + '...' : data;
+      return data && data.length > 40 ? data.substring(0, 37) + '...' : data;
     },
     /** 提交按钮 */
     submitForm() {

From 40d179fc9a6edfe88aeebe74f92c602c14262401 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 10 Sep 2021 21:11:17 +0800
Subject: [PATCH 29/60] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  |   6 +
 .../impl/IscAppServiceServiceImpl.java        |   4 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   | 109 ++++++++++++++++--
 3 files changed, 108 insertions(+), 11 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
index 782ad2cfe..8fd398cc8 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -120,6 +120,12 @@ public class IscAppServiceVo {
     @ApiModelProperty(value = "秒配额")
     private Long quotaSeconds;
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     /**
      * 更新者
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index a3c643b30..650e8bf68 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -48,7 +48,9 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     @Override
     public IscAppServiceVo queryById(Long appServiceId)
     {
-        return getVoById(appServiceId);
+        IscAppServiceVo vo = getVoById(appServiceId);
+        genServiceName(Arrays.asList(vo));
+        return vo;
     }
 
     @Override
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 3b521e442..fb83b5451 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -100,16 +100,16 @@
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="到期时间" align="center" prop="endTime" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
           <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
+      <el-table-column label="到期时间" align="center" prop="endTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="更新者" align="center" prop="updateBy" width="100"/>
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
@@ -122,7 +122,7 @@
             size="mini"
             type="text"
             icon="el-icon-info"
-            @click="handleRenewal(scope.row)"
+            @click="handleView(scope.row)"
             v-hasPermi="['isc:appservice:query']"
           >查看</el-button>
           <el-button
@@ -194,7 +194,7 @@
             <el-option key="24" label="24(月)" value="24"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="日配额" prop="quotaDays" v-if="this.applyType === 0 || this.applyType === 2">
+        <el-form-item label="每日配额" prop="quotaDays" v-if="this.applyType === 0 || this.applyType === 2">
           <el-input-number v-model="form.quotaDays" :step="1000" placeholder="请输入日配额" />
         </el-form-item>
         <el-form-item label="小时配额" prop="quotaHours" v-if="this.applyType === 0 || this.applyType === 2">
@@ -203,7 +203,7 @@
         <el-form-item label="分钟配额" prop="quotaMinutes" v-if="this.applyType === 0 || this.applyType === 2">
           <el-input-number v-model="form.quotaMinutes" :step="10" placeholder="请输入分钟配额" />
         </el-form-item>
-        <el-form-item label="秒配额" prop="quotaSeconds" v-if="this.applyType === 0 || this.applyType === 2">
+        <el-form-item label="每秒配额" prop="quotaSeconds" v-if="this.applyType === 0 || this.applyType === 2">
           <el-input-number v-model="form.quotaSeconds" placeholder="请输入秒配额" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -215,6 +215,69 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    
+    <!-- 查看应用服务信息对话框 -->
+    <el-dialog title="应用服务查看" :visible.sync="openView" width="500px" append-to-body>
+      <el-card shadow="never" style="margin-bottom: 20px">
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">服务名称</el-col>
+          <el-col :span="18" class="col-content">{{this.form.serviceName}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">虚拟地址</el-col>
+          <el-col :span="18" class="col-content">{{this.form.virtualAddr}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">审核状态</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="statusOptions" :value="this.form.status"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">启用状态</el-col>
+          <el-col :span="18" class="col-content">
+            <dict-tag :options="enabledOptions" :value="this.form.enabled"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">到期时间</el-col>
+          <el-col :span="18" class="col-content">
+            <span>{{ parseTime(this.form.endTime, '{y}-{m}-{d}') }}</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">每日配额</el-col>
+          <el-col :span="18" class="col-content" v-text="this.form.quotaDays"/>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">小时配额</el-col>
+          <el-col :span="18" class="col-content" v-text="this.form.quotaHours"/>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">分钟配额</el-col>
+          <el-col :span="18" class="col-content" v-text="this.form.quotaMinutes"/>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">每秒配额</el-col>
+          <el-col :span="18" class="col-content" v-text="this.form.quotaSeconds"/>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">更新人</el-col>
+          <el-col :span="18" class="col-content">{{this.form.updateBy}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">更新时间</el-col>
+          <el-col :span="18" class="col-content">{{parseTime(this.form.updateTime)}}</el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" class="col-title">备注</el-col>
+          <el-col :span="18" class="col-content">{{this.form.remark}}</el-col>
+        </el-row>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -250,6 +313,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示查看弹出层
+      openView: false,
       // 启用状态字典
       enabledOptions: [],
       // 审核状态字典
@@ -336,7 +401,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = this.openView = false;
       this.reset();
     },
     // 表单重置
@@ -407,7 +472,19 @@ export default {
         this.title = "应用服务续期";
       });
     },
-    // 复制地址
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.loading = true;
+      this.reset();
+      const appServiceId = row.appServiceId;
+      getAppservice(appServiceId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.form.status = this.form.status.split(",");
+        this.openView = true;
+      });
+    },
+    /** 复制地址 */ 
     handleCopy(data) {
       let oInput = document.createElement('input')
       oInput.value = data
@@ -475,3 +552,15 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+     .el-card .el-row {
+       font-size: 14px;
+       line-height: 36px;
+       vertical-align: middle;
+     }
+     .el-card .el-row .col-title {
+       text-align: right;
+       color: #606266;
+       font-weight: bold;
+     }
+</style>
\ No newline at end of file

From 5e7d11092c56ce9cbf9e81ce765bc93faf0342bb Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 10 Sep 2021 22:05:37 +0800
Subject: [PATCH 30/60] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/isc/domain/IscAppService.java   | 10 ++++-----
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  6 ++++++
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  |  6 ++++++
 .../impl/IscAppServiceApplyServiceImpl.java   |  2 ++
 .../impl/IscAppServiceServiceImpl.java        | 21 +++++++++++++------
 .../mapper/isc/IscAppServiceMapper.xml        |  3 ++-
 ruoyi-ui/src/views/isc/appservice/index.vue   |  8 ++++++-
 sql/isc.sql                                   |  1 -
 8 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
index 4c8a8d1b3..fd1d2d1f3 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
@@ -49,16 +49,16 @@ public class IscAppService implements Serializable {
      */
     private String enabled;
 
-    /**
-     * 申请类型(0申请 1续期)
-     */
-    private String applyType;
-
     /**
      * 审核状态（0待审核 1审核通过 2驳回）
      */
     private String status;
 
+    /**
+     * 审核意见
+     */
+    private String auditMind;
+
     /**
      * 虚拟地址
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index 8a0397684..e40d7512c 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -93,6 +93,12 @@ public class IscAppServiceBo extends BaseEntity {
     @NotNull(message = "续期时长不能为空", groups = { AddGroup.class })
     private Integer renewalDuration;
 
+    /**
+     * 申请类型(0申请 1续期)
+     */
+    @NotBlank(message = "申请类型必填")
+    private String applyType;
+
 
     /**
      * 分页大小
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
index 8fd398cc8..a4eba30ef 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
@@ -82,6 +82,12 @@ public class IscAppServiceVo {
     @ApiModelProperty("审核状态（0待审核 1审核通过 2驳回）")
     private String status;
 
+    /**
+     * 审核意见
+     */
+    @ApiModelProperty("审核意见")
+    private String auditMind;
+
     /**
      * 虚拟地址
      */
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 127c3d181..6029c5c52 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -159,6 +159,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             IscAppService updateData = null;
             if(IscConstants.AUDIT_PASS.equals(bo.getStatus())) {
                 updateData = genAuditPassData(apply, appService, bo.getStatus());
+                updateData.setAuditMind(bo.getRemark());
             }else{
                 //如果 应用服务 状态为不通过 时需要同步状态
                 updateData = genAuditRejectData(appService, bo);
@@ -243,6 +244,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
         if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
             IscAppService updateData = new IscAppService().setAppServiceId(appService.getAppServiceId());
             updateData.setStatus(bo.getStatus());
+            updateData.setAuditMind(bo.getRemark());
             return updateData;
         }
         return null;
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index 650e8bf68..d27e217d4 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -105,7 +105,6 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         IscAppService add = BeanUtil.toBean(bo, IscAppService.class);
         validEntityBeforeSave(add);
         add.setStatus(IscConstants.AUDIT_WAIT);
-        add.setApplyType(IscConstants.APPLY_TYPE_APPLY);
         add.setUserId(SecurityUtils.getUserId());
         boolean result = save(add);
         addApplyRecord(bo, IscConstants.APPLY_TYPE_APPLY, add.getAppServiceId());
@@ -120,12 +119,22 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         IscAppService update = new IscAppService().setAppServiceId(bo.getAppServiceId());
         validEntityBeforeSave(update);
         boolean result = true;
-        if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
-            update.setStatus(IscConstants.AUDIT_WAIT);
+        boolean changeStatus = !IscConstants.AUDIT_PASS.equals(appService.getStatus());
+        boolean changeRemark = !IscConstants.APPLY_TYPE_RENEWAL.equals(bo.getApplyType());
+        if (changeStatus || changeRemark)
+        {
+            if (changeStatus)
+            {
+                update.setStatus(IscConstants.AUDIT_WAIT);
+            }
+            if (changeRemark)
+            {
+                update.setRemark(bo.getRemark());
+            }
             result = updateById(update);
         }
-        String applyType = Objects.nonNull(bo.getRenewalDuration()) ? IscConstants.APPLY_TYPE_RENEWAL :
-            IscConstants.APPLY_TYPE_MODIFY;
+        String applyType = IscConstants.APPLY_TYPE_RENEWAL.equals(bo.getApplyType())
+                ? IscConstants.APPLY_TYPE_RENEWAL : IscConstants.APPLY_TYPE_MODIFY;
         addApplyRecord(bo, applyType, bo.getAppServiceId());
         return result;
     }
@@ -189,8 +198,8 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         entity.setRemark(appService.getRemark());
         switch (applyType) {
             case IscConstants.APPLY_TYPE_APPLY:
-                entity.setRenewalDuration(appService.getRenewalDuration());
             case IscConstants.APPLY_TYPE_MODIFY:
+                entity.setRenewalDuration(appService.getRenewalDuration());
                 entity.setQuotaDays(appService.getQuotaDays());
                 entity.setQuotaHours(appService.getQuotaHours());
                 entity.setQuotaMinutes(appService.getQuotaMinutes());
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
index 57b2d3127..599d22355 100644
--- a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
+++ b/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
@@ -10,8 +10,8 @@
         <result property="applicationId" column="application_id"/>
         <result property="userId" column="user_id"/>
         <result property="enabled" column="enabled"/>
-        <result property="applyType" column="apply_type"/>
         <result property="status" column="status"/>
+        <result property="auditMind" column="audit_mind"/>
         <result property="virtualAddr" column="virtual_addr"/>
         <result property="endTime" column="end_time"/>
         <result property="quotaDays" column="quota_days"/>
@@ -23,6 +23,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
 
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index fb83b5451..9f31344f6 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -184,7 +184,7 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="申请时长" prop="renewalDuration" v-if="this.applyType === 0 || this.applyType === 1">
+        <el-form-item label="申请时长" prop="renewalDuration" v-if="!(this.form.status == 1 && this.applyType == 2)">
           <el-select v-model="form.renewalDuration" placeholder="请选择申请时长" clearable size="small">
             <el-option key="1" label="1(月)" value="1"/>
             <el-option key="3" label="3(月)" value="3"/>
@@ -233,6 +233,10 @@
             <dict-tag :options="statusOptions" :value="this.form.status"/>
           </el-col>
         </el-row>
+        <el-row :gutter="20" v-if="this.form.status == 2">
+          <el-col :span="6" class="col-title">审核意见</el-col>
+          <el-col :span="18" class="col-content">{{this.form.auditMind}}</el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">启用状态</el-col>
           <el-col :span="18" class="col-content">
@@ -467,6 +471,7 @@ export default {
       getAppservice(appServiceId).then(response => {
         this.loading = false;
         this.form = response.data;
+        this.form.remark = undefined;
         this.form.status = this.form.status.split(",");
         this.open = true;
         this.title = "应用服务续期";
@@ -506,6 +511,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.applyType = this.applyType;
           this.form.status = this.form.status.join(",");
           if (this.form.appServiceId != null) {
             updateAppservice(this.form).then(response => {
diff --git a/sql/isc.sql b/sql/isc.sql
index b546ad060..5664a8f7c 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -11,7 +11,6 @@ CREATE TABLE `isc_app_service`  (
   `application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
   `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
   `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
-  `apply_type` char(1)  DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
   `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
   `virtual_addr` varchar(255)  DEFAULT NULL COMMENT '虚拟地址',
   `end_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间',

From ff1c7293850c30908fa4ffca725c23d7591138d3 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 10 Sep 2021 23:04:12 +0800
Subject: [PATCH 31/60] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/CopyTag/index.vue    | 48 ++++++++++++++++++++
 ruoyi-ui/src/views/isc/application/index.vue | 19 ++------
 ruoyi-ui/src/views/isc/appservice/index.vue  | 24 ++--------
 3 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 ruoyi-ui/src/components/CopyTag/index.vue

diff --git a/ruoyi-ui/src/components/CopyTag/index.vue b/ruoyi-ui/src/components/CopyTag/index.vue
new file mode 100644
index 000000000..df5956179
--- /dev/null
+++ b/ruoyi-ui/src/components/CopyTag/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <template v-if="data">
+      <span :title="data" v-text="handleData()"/>
+      <i class="el-icon-copy-document" @click="handleCopy()" title="复制"/>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "CopyTag",
+  props: {
+    data: {
+      required: true,
+      type: String
+    },
+    maxLength: {
+      type: Number,
+      default: 40,
+    }
+  },
+  methods: {
+    handleData() {
+      return this.data && this.data.length > this.maxLength ? this.data.substring(0, this.maxLength - 3) + '...' : this.data;
+    },
+    handleCopy() {
+      let oInput = document.createElement('input')
+      oInput.value = this.data;
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('copy')
+      this.$message({
+        message: '复制成功',
+        type: 'success'
+      })
+      oInput.remove()
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+  .el-icon-copy-document {
+    color: #4A8DFF; 
+    cursor:pointer;
+    margin-left: 5px;
+  }
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 213546ebc..83350c51f 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -84,9 +84,7 @@
       </el-table-column>
       <el-table-column label="应用密钥" align="center" prop="accessKey">
         <template slot-scope="scope">
-            <span>{{ scope.row.accessKey }} </span> 
-            <i class="el-icon-copy-document" style="color: #4A8DFF;cursor:pointer" v-if="scope.row.accessKey"
-            @click="handleCopy(scope.row.accessKey)" title="复制"/>
+            <copy-tag :data="scope.row.accessKey"/>
         </template>
       </el-table-column>
       <el-table-column label="更新者" align="center" prop="updateBy" />
@@ -143,9 +141,11 @@
 
 <script>
 import { listApplication, getApplication, delApplication, addApplication, updateApplication } from "@/api/isc/application";
+import CopyTag from '@/components/CopyTag';
 
 export default {
   name: "Application",
+  components: {CopyTag},
   data() {
     return {
       // 按钮loading
@@ -260,19 +260,6 @@ export default {
         this.title = "修改应用信息";
       });
     },
-    // 复制ak
-    handleCopy(data) {
-      let oInput = document.createElement('input')
-      oInput.value = data
-      document.body.appendChild(oInput)
-      oInput.select()
-      document.execCommand('copy')
-      this.$message({
-        message: '复制成功',
-        type: 'success'
-      })
-      oInput.remove()
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 9f31344f6..32e2f6322 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -90,9 +90,7 @@
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="虚拟地址" align="left" prop="virtualAddr">
         <template slot-scope="scope">
-            <span :title="scope.row.virtualAddr" v-text="handleVirtualAddr(scope.row.virtualAddr)"/>
-            <i class="el-icon-copy-document" v-if="scope.row.virtualAddr" style="color: #4A8DFF;cursor:pointer" 
-            @click="handleCopy(scope.row.virtualAddr)" title="复制"/>
+          <copy-tag :data="scope.row.virtualAddr"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
@@ -289,10 +287,11 @@
 import { listAppservice, getAppservice, delAppservice, addAppservice, updateAppservice, treeselect } from "@/api/isc/appservice";
 import { getApplication } from "@/api/isc/application";
 import Treeselect from "@riophae/vue-treeselect";
+import CopyTag from '@/components/CopyTag';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Appservice",
-  components: { Treeselect },
+  components: { Treeselect, CopyTag },
   data() {
     return {
       // 按钮loading
@@ -489,23 +488,6 @@ export default {
         this.openView = true;
       });
     },
-    /** 复制地址 */ 
-    handleCopy(data) {
-      let oInput = document.createElement('input')
-      oInput.value = data
-      document.body.appendChild(oInput)
-      oInput.select()
-      document.execCommand('copy')
-      this.$message({
-        message: '复制成功',
-        type: 'success'
-      })
-      oInput.remove()
-    },
-    // 处理虚拟地址
-    handleVirtualAddr(data) {
-      return data && data.length > 40 ? data.substring(0, 37) + '...' : data;
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

From 7da40951e7231ee95707d8447a879f0e1a3d144a Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Mon, 13 Sep 2021 13:06:45 +0800
Subject: [PATCH 32/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   7 ++
 ruoyi-extend/pom.xml                          |   1 +
 ruoyi-extend/ruoyi-isc-gateway/pom.xml        |  45 +++++++
 .../com/ruoyi/gateway/GatewayApplication.java |  20 +++
 .../ruoyi/gateway/config/GatewayConfig.java   |  68 +++++++++++
 .../ComplexRouteDefinitionRepository.java     |  65 ++++++++++
 .../RedisRouteDefinitionRepository.java       |  50 ++++++++
 .../src/main/resources/application-dev.yml    |  44 +++++++
 .../src/main/resources/application.yml        |   8 ++
 .../src/main/resources/logback.xml            | 114 ++++++++++++++++++
 10 files changed, 422 insertions(+)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/pom.xml
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/GatewayApplication.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 3a5000b82..f199256bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
         <hutool.version>5.7.11</hutool.version>
         <guava.version>29.0-jre</guava.version>
         <feign.version>3.0.3</feign.version>
+        <gateway.version>3.0.3</gateway.version>
         <feign-okhttp.version>11.6</feign-okhttp.version>
         <okhttp.version>4.9.1</okhttp.version>
         <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
@@ -155,6 +156,12 @@
                 <version>${guava.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-gateway</artifactId>
+                <version>${gateway.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-starter-openfeign</artifactId>
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 2a348af4a..f4ea1559a 100644
--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -13,6 +13,7 @@
 
     <modules>
         <module>ruoyi-monitor-admin</module>
+        <module>ruoyi-isc-gateway</module>
     </modules>
 
 </project>
diff --git a/ruoyi-extend/ruoyi-isc-gateway/pom.xml b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
new file mode 100644
index 000000000..d6fc777cf
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.1.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-isc-gateway</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+        <!-- pool 对象池 -->
+        <!--<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/GatewayApplication.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/GatewayApplication.java
new file mode 100644
index 000000000..8fbc70508
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/GatewayApplication.java
@@ -0,0 +1,20 @@
+package com.ruoyi.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 启动程序
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-11
+ */
+@SpringBootApplication
+public class GatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GatewayApplication.class, args);
+        System.out.println("Gateway 启动成功" );
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
new file mode 100644
index 000000000..cc0eec028
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -0,0 +1,68 @@
+package com.ruoyi.gateway.config;
+
+import com.ruoyi.gateway.config.provider.ComplexRouteDefinitionRepository;
+import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
+import org.springframework.cloud.gateway.route.InMemoryRouteDefinitionRepository;
+import org.springframework.cloud.gateway.route.RouteDefinition;
+import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import javax.annotation.Resource;
+
+/**
+ * Gateway 配置文件
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-11
+ */
+@Configuration
+public class GatewayConfig {
+
+    @Resource
+    private RedisTemplate<String, RouteDefinition> redisTemplate;
+
+    @Bean
+    public RedisTemplate<String, RouteDefinition> redisTemplate(RedisConnectionFactory redisConnectionFactory)
+    {
+        final RedisTemplate<String, RouteDefinition> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory);
+        Jackson2JsonRedisSerializer<RouteDefinition> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(RouteDefinition.class);
+        template.setValueSerializer(jackson2JsonRedisSerializer);
+        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+        final StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        template.setKeySerializer(stringRedisSerializer);
+        template.setHashKeySerializer(stringRedisSerializer);
+        return template;
+    }
+
+    @Bean
+    public RouteDefinitionRepository complexRouteDefinitionRepository()
+    {
+        return new ComplexRouteDefinitionRepository(inMemoryRouteDefinitionRepository(), redisRouteDefinitionRepository());
+    }
+
+    /**
+     * 内存 路由仓库
+     *
+     * @return 本地内存路由仓库
+     */
+    RouteDefinitionRepository inMemoryRouteDefinitionRepository()
+    {
+        return new InMemoryRouteDefinitionRepository();
+    }
+
+    /**
+     * Redis 路由仓库
+     *
+     * @return redis路由仓库
+     */
+    RouteDefinitionRepository redisRouteDefinitionRepository()
+    {
+        return new RedisRouteDefinitionRepository(redisTemplate);
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
new file mode 100644
index 000000000..70af9a671
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
@@ -0,0 +1,65 @@
+package com.ruoyi.gateway.config.provider;
+
+import org.springframework.cloud.gateway.route.RouteDefinition;
+import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 复合的路由存储器
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-11
+ */
+public class ComplexRouteDefinitionRepository implements RouteDefinitionRepository {
+
+    private RouteDefinitionRepository localCache;
+    private RouteDefinitionRepository remoteReps;
+
+    public ComplexRouteDefinitionRepository(RouteDefinitionRepository localCache, RouteDefinitionRepository remoteReps)
+    {
+        this.localCache = localCache;
+        this.remoteReps = remoteReps;
+    }
+
+
+    @Override
+    public Flux<RouteDefinition> getRouteDefinitions()
+    {
+        final Flux<RouteDefinition> routeDefinitions = localCache.getRouteDefinitions();
+        return routeDefinitions.collectList().flatMapIterable(list -> {
+            if(list.isEmpty()) {
+                final Flux<RouteDefinition> definitions = remoteReps.getRouteDefinitions();
+                definitions.collectList().flatMapIterable(routes -> {
+                    if(!routes.isEmpty()) {
+                        routes.stream().map(m -> {
+                            routes.add(m);
+                            return Mono.just(m);
+                        }).forEach(m -> {
+                            localCache.save(m);
+                        });
+                    }
+                    return routes;
+                }).filter(l -> Objects.nonNull(l)).map(m -> list.add(m)).collectList();
+            }
+            return list;
+        });
+    }
+
+    @Override
+    public Mono<Void> save(Mono<RouteDefinition> route)
+    {
+        remoteReps.save(route);
+        return localCache.save(route);
+    }
+
+    @Override
+    public Mono<Void> delete(Mono<String> routeId)
+    {
+        remoteReps.delete(routeId);
+        return localCache.delete(routeId);
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
new file mode 100644
index 000000000..fd8fc1beb
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -0,0 +1,50 @@
+package com.ruoyi.gateway.config.provider;
+
+import org.springframework.cloud.gateway.route.RouteDefinition;
+import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
+import org.springframework.data.redis.core.RedisTemplate;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+/**
+ * Redis 路由仓库
+ *
+ * @author Wenchao Gong
+ * @date 2021-09-11
+ */
+public class RedisRouteDefinitionRepository implements RouteDefinitionRepository {
+    public static final String KEY_ROUTES = "ROUTES::";
+    private final RedisTemplate<String, RouteDefinition> redisTemplate;
+
+    public RedisRouteDefinitionRepository(RedisTemplate<String, RouteDefinition> redisTemplate)
+    {
+        this.redisTemplate = redisTemplate;
+    }
+
+    @Override
+    public Flux<RouteDefinition> getRouteDefinitions()
+    {
+        List<RouteDefinition> values = redisTemplate.<String,RouteDefinition>opsForHash().values(KEY_ROUTES);
+        return Flux.fromIterable(values);
+    }
+
+    @Override
+    public Mono<Void> save(Mono<RouteDefinition> route)
+    {
+        return route.flatMap(definition -> {
+            redisTemplate.opsForHash().put(KEY_ROUTES, definition.getId(), definition);
+            return Mono.empty();
+        });
+    }
+
+    @Override
+    public Mono<Void> delete(Mono<String> routeId)
+    {
+        return routeId.flatMap(id -> {
+            redisTemplate.opsForHash().delete(KEY_ROUTES, id);
+            return Mono.empty();
+        });
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
new file mode 100644
index 000000000..c94a3d34f
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
@@ -0,0 +1,44 @@
+--- # 监控配置
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
+        # 增加客户端开关
+        enabled: true
+        # 设置 Spring Boot Admin Server 地址
+        url: http://localhost:9090/admin
+        instance:
+          prefer-ip: true # 注册实例时，优先使用 IP
+        username: ruoyi
+        password: 123456
+
+--- # redis 配置
+spring:
+  redis:
+    # 地址
+    host: 192.168.64.128
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl: false
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      # Actuator 提供的 API 接口的根目录。默认为 /actuator
+      base-path: /actuator
+      exposure:
+        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+        # 生产环境不建议放开所有 根据项目需求放开即可
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
new file mode 100644
index 000000000..9e1aa773c
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
@@ -0,0 +1,8 @@
+server:
+  port: 8090
+# Spring配置
+spring:
+  application:
+    name: RuoYi-Gateway
+  profiles:
+    active: @profiles.active@
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/logback.xml
new file mode 100644
index 000000000..663eef0c5
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/logback.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="log.path" value="./logs"/>
+    <property name="console.log.pattern"
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %green([%thread]) %boldMagenta(%logger{36}) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n"/>
+
+	<!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+		</encoder>
+	</appender>
+
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+	<!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+	<!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+	<!-- 系统模块日志级别控制  -->
+	<logger name="com.ruoyi" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+        <appender-ref ref="file_console" />
+    </root>
+
+	<!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+</configuration>

From 71a58178eb87bdb66a09296c91d9d7ec026609fa Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Mon, 13 Sep 2021 14:33:57 +0800
Subject: [PATCH 33/60] =?UTF-8?q?=E7=BD=91=E5=85=B3=E4=BD=BF=E7=94=A8Redis?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=B7=AF=E7=94=B1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-extend/ruoyi-isc-gateway/pom.xml        |  25 ++--
 .../ruoyi/gateway/config/GatewayConfig.java   |  29 ++--
 .../com/ruoyi/gateway/config/RedisConfig.java | 104 ++++++++++++++
 .../ComplexRouteDefinitionRepository.java     |  65 ---------
 .../RedisRouteDefinitionRepository.java       |  24 ++--
 .../config/provider/RedissonProperties.java   | 134 ++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  34 ++++-
 .../src/main/resources/application-local.yml  |  76 ++++++++++
 .../src/main/resources/application.yml        |  12 ++
 9 files changed, 391 insertions(+), 112 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
 delete mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedissonProperties.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml

diff --git a/ruoyi-extend/ruoyi-isc-gateway/pom.xml b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
index d6fc777cf..4df6d0639 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/pom.xml
+++ b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
@@ -20,26 +20,23 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.lettuce</groupId>
-                    <artifactId>lettuce-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
         </dependency>
-        <!-- pool 对象池 -->
-        <!--<dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index cc0eec028..678d3cb35 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,8 +1,7 @@
 package com.ruoyi.gateway.config;
 
-import com.ruoyi.gateway.config.provider.ComplexRouteDefinitionRepository;
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
-import org.springframework.cloud.gateway.route.InMemoryRouteDefinitionRepository;
+import org.redisson.api.RedissonClient;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import org.springframework.context.annotation.Bean;
@@ -21,10 +20,13 @@ import javax.annotation.Resource;
  * @date 2021-09-11
  */
 @Configuration
-public class GatewayConfig {
+public class GatewayConfig
+{
 
     @Resource
     private RedisTemplate<String, RouteDefinition> redisTemplate;
+    @Resource
+    private RedissonClient redissonClient;
 
     @Bean
     public RedisTemplate<String, RouteDefinition> redisTemplate(RedisConnectionFactory redisConnectionFactory)
@@ -40,29 +42,14 @@ public class GatewayConfig {
         return template;
     }
 
-    @Bean
-    public RouteDefinitionRepository complexRouteDefinitionRepository()
-    {
-        return new ComplexRouteDefinitionRepository(inMemoryRouteDefinitionRepository(), redisRouteDefinitionRepository());
-    }
-
-    /**
-     * 内存 路由仓库
-     *
-     * @return 本地内存路由仓库
-     */
-    RouteDefinitionRepository inMemoryRouteDefinitionRepository()
-    {
-        return new InMemoryRouteDefinitionRepository();
-    }
-
     /**
      * Redis 路由仓库
      *
      * @return redis路由仓库
      */
-    RouteDefinitionRepository redisRouteDefinitionRepository()
+    @Bean
+    public RouteDefinitionRepository redisRouteDefinitionRepository()
     {
-        return new RedisRouteDefinitionRepository(redisTemplate);
+        return new RedisRouteDefinitionRepository(redissonClient);
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
new file mode 100644
index 000000000..adc4f28da
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
@@ -0,0 +1,104 @@
+package com.ruoyi.gateway.config;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.gateway.config.provider.RedissonProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+
+import java.io.IOException;
+
+/**
+ * redis配置
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport {
+
+	private static final String REDIS_PROTOCOL_PREFIX = "redis://";
+	private static final String REDISS_PROTOCOL_PREFIX = "rediss://";
+
+	@Autowired
+	private RedisProperties redisProperties;
+
+	@Autowired
+	private RedissonProperties redissonProperties;
+
+	@Bean(destroyMethod = "shutdown")
+	@ConditionalOnMissingBean(RedissonClient.class)
+	public RedissonClient redisson() throws IOException {
+		String prefix = REDIS_PROTOCOL_PREFIX;
+		if (redisProperties.isSsl()) {
+			prefix = REDISS_PROTOCOL_PREFIX;
+		}
+		Config config = new Config();
+		config.setThreads(redissonProperties.getThreads())
+			.setNettyThreads(redissonProperties.getNettyThreads())
+			.setCodec(JsonJacksonCodec.INSTANCE)
+			.setTransportMode(redissonProperties.getTransportMode());
+
+		RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
+		// 使用单机模式
+		config.useSingleServer()
+			.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
+			.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
+			.setDatabase(redisProperties.getDatabase())
+			.setPassword(StrUtil.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
+			.setTimeout(singleServerConfig.getTimeout())
+			.setRetryAttempts(singleServerConfig.getRetryAttempts())
+			.setRetryInterval(singleServerConfig.getRetryInterval())
+			.setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection())
+			.setClientName(singleServerConfig.getClientName())
+			.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
+			.setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize())
+			.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
+			.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
+			.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
+			.setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
+		RedissonClient redissonClient = Redisson.create(config);
+		log.info("初始化 redis 配置");
+		return redissonClient;
+	}
+
+	@Bean
+	public DefaultRedisScript<Long> limitScript() {
+		DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
+		redisScript.setScriptText(limitScriptText());
+		redisScript.setResultType(Long.class);
+		return redisScript;
+	}
+
+	/**
+	 * 限流脚本
+	 */
+	private String limitScriptText() {
+		return StrUtil.builder()
+			.append("local key = KEYS[1]\n")
+			.append("local count = tonumber(ARGV[1])\n")
+			.append("local time = tonumber(ARGV[2])\n")
+			.append("local current = redis.call('get', key);\n")
+			.append("if current and tonumber(current) > count then\n")
+			.append("    return current;\n")
+			.append("end\n")
+			.append("current = redis.call('incr', key)\n")
+			.append("if tonumber(current) == 1 then\n")
+			.append("    redis.call('expire', key, time)\n")
+			.append("end\n")
+			.append("return current;")
+			.toString();
+	}
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
deleted file mode 100644
index 70af9a671..000000000
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/ComplexRouteDefinitionRepository.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.ruoyi.gateway.config.provider;
-
-import org.springframework.cloud.gateway.route.RouteDefinition;
-import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 复合的路由存储器
- *
- * @author Wenchao Gong
- * @date 2021-09-11
- */
-public class ComplexRouteDefinitionRepository implements RouteDefinitionRepository {
-
-    private RouteDefinitionRepository localCache;
-    private RouteDefinitionRepository remoteReps;
-
-    public ComplexRouteDefinitionRepository(RouteDefinitionRepository localCache, RouteDefinitionRepository remoteReps)
-    {
-        this.localCache = localCache;
-        this.remoteReps = remoteReps;
-    }
-
-
-    @Override
-    public Flux<RouteDefinition> getRouteDefinitions()
-    {
-        final Flux<RouteDefinition> routeDefinitions = localCache.getRouteDefinitions();
-        return routeDefinitions.collectList().flatMapIterable(list -> {
-            if(list.isEmpty()) {
-                final Flux<RouteDefinition> definitions = remoteReps.getRouteDefinitions();
-                definitions.collectList().flatMapIterable(routes -> {
-                    if(!routes.isEmpty()) {
-                        routes.stream().map(m -> {
-                            routes.add(m);
-                            return Mono.just(m);
-                        }).forEach(m -> {
-                            localCache.save(m);
-                        });
-                    }
-                    return routes;
-                }).filter(l -> Objects.nonNull(l)).map(m -> list.add(m)).collectList();
-            }
-            return list;
-        });
-    }
-
-    @Override
-    public Mono<Void> save(Mono<RouteDefinition> route)
-    {
-        remoteReps.save(route);
-        return localCache.save(route);
-    }
-
-    @Override
-    public Mono<Void> delete(Mono<String> routeId)
-    {
-        remoteReps.delete(routeId);
-        return localCache.delete(routeId);
-    }
-}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
index fd8fc1beb..e1f1a0726 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -1,40 +1,41 @@
 package com.ruoyi.gateway.config.provider;
 
+import org.redisson.api.RMap;
+import org.redisson.api.RedissonClient;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
-import org.springframework.data.redis.core.RedisTemplate;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.List;
-
 /**
  * Redis 路由仓库
  *
  * @author Wenchao Gong
  * @date 2021-09-11
  */
-public class RedisRouteDefinitionRepository implements RouteDefinitionRepository {
+public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
+{
     public static final String KEY_ROUTES = "ROUTES::";
-    private final RedisTemplate<String, RouteDefinition> redisTemplate;
+    private final RedissonClient redissonClient;
 
-    public RedisRouteDefinitionRepository(RedisTemplate<String, RouteDefinition> redisTemplate)
+    public RedisRouteDefinitionRepository(RedissonClient redissonClient)
     {
-        this.redisTemplate = redisTemplate;
+        this.redissonClient = redissonClient;
     }
 
     @Override
     public Flux<RouteDefinition> getRouteDefinitions()
     {
-        List<RouteDefinition> values = redisTemplate.<String,RouteDefinition>opsForHash().values(KEY_ROUTES);
-        return Flux.fromIterable(values);
+        RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+        return Flux.fromIterable(map.values());
     }
 
     @Override
     public Mono<Void> save(Mono<RouteDefinition> route)
     {
         return route.flatMap(definition -> {
-            redisTemplate.opsForHash().put(KEY_ROUTES, definition.getId(), definition);
+            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+            map.put(definition.getId(), definition);
             return Mono.empty();
         });
     }
@@ -43,7 +44,8 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
     public Mono<Void> delete(Mono<String> routeId)
     {
         return routeId.flatMap(id -> {
-            redisTemplate.opsForHash().delete(KEY_ROUTES, id);
+            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+            map.remove(id);
             return Mono.empty();
         });
     }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedissonProperties.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedissonProperties.java
new file mode 100644
index 000000000..9a74bc703
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedissonProperties.java
@@ -0,0 +1,134 @@
+package com.ruoyi.gateway.config.provider;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.redisson.config.TransportMode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Redisson 配置属性
+ *
+ * @author Lion Li
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "redisson")
+public class RedissonProperties
+{
+
+	/**
+	 * 线程池数量,默认值 = 当前处理核数量 * 2
+	 */
+	private int threads;
+
+	/**
+	 * Netty线程池数量,默认值 = 当前处理核数量 * 2
+	 */
+	private int nettyThreads;
+
+	/**
+	 * 传输模式
+	 */
+	private TransportMode transportMode;
+
+	/**
+	 * 单机服务配置
+	 */
+	private SingleServerConfig singleServerConfig;
+
+	/**
+	 * 缓存组
+	 */
+	private List<CacheGroup> cacheGroup;
+
+	@Data
+	@NoArgsConstructor
+	public static class SingleServerConfig {
+
+		/**
+		 * 客户端名称
+		 */
+		private String clientName;
+
+		/**
+		 * 最小空闲连接数
+		 */
+		private int connectionMinimumIdleSize;
+
+		/**
+		 * 连接池大小
+		 */
+		private int connectionPoolSize;
+
+		/**
+		 * 连接空闲超时，单位：毫秒
+		 */
+		private int idleConnectionTimeout;
+
+		/**
+		 * 命令等待超时，单位：毫秒
+		 */
+		private int timeout;
+
+		/**
+		 * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+		 */
+		private int retryAttempts;
+
+		/**
+		 * 命令重试发送时间间隔，单位：毫秒
+		 */
+		private int retryInterval;
+
+		/**
+		 * 发布和订阅连接的最小空闲连接数
+		 */
+		private int subscriptionConnectionMinimumIdleSize;
+
+		/**
+		 * 发布和订阅连接池大小
+		 */
+		private int subscriptionConnectionPoolSize;
+
+		/**
+		 * 单个连接最大订阅数量
+		 */
+		private int subscriptionsPerConnection;
+
+		/**
+		 * DNS监测时间间隔，单位：毫秒
+		 */
+		private int dnsMonitoringInterval;
+
+	}
+
+	@Data
+	@NoArgsConstructor
+	public static class CacheGroup {
+
+		/**
+		 * 组id
+		 */
+		private String groupId;
+
+		/**
+		 * 组过期时间
+		 */
+		private long ttl;
+
+		/**
+		 * 组最大空闲时间
+		 */
+		private long maxIdleTime;
+
+		/**
+		 * 组最大长度
+		 */
+		private int maxSize;
+
+	}
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
index c94a3d34f..d1e0c347d 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
@@ -29,6 +29,38 @@ spring:
     # 是否开启ssl
     ssl: false
 
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000
+
 --- # Actuator 监控端点的配置项
 management:
   endpoints:
@@ -41,4 +73,4 @@ management:
         include: @endpoints.include@
   endpoint:
     logfile:
-      external-file: ./logs/sys-console.log
\ No newline at end of file
+      external-file: ./logs/sys-console.log
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
new file mode 100644
index 000000000..a59c5c023
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
@@ -0,0 +1,76 @@
+--- # 监控配置
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
+        # 增加客户端开关
+        enabled: true
+        # 设置 Spring Boot Admin Server 地址
+        url: http://localhost:9090/admin
+        instance:
+          prefer-ip: true # 注册实例时，优先使用 IP
+        username: ruoyi
+        password: 123456
+
+--- # redis 配置
+spring:
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl: false
+
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      # Actuator 提供的 API 接口的根目录。默认为 /actuator
+      base-path: /actuator
+      exposure:
+        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+        # 生产环境不建议放开所有 根据项目需求放开即可
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
index 9e1aa773c..99a081b1e 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application.yml
@@ -1,3 +1,15 @@
+# 项目相关配置
+ruoyi:
+  # 名称
+  name: RuoYi-Vue-Plus
+  # 版本
+  version: ${ruoyi-vue-plus.version}
+  # 版权年份
+  copyrightYear: 2021
+  # 实例演示开关
+  demoEnabled: true
+  # 获取ip地址开关
+  addressEnabled: true
 server:
   port: 8090
 # Spring配置

From d36384ca9501e863d8b8f0477c14f67de7a92525 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Mon, 13 Sep 2021 16:38:37 +0800
Subject: [PATCH 34/60] =?UTF-8?q?=E7=BD=91=E5=85=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/provider/RedisRouteDefinitionRepository.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
index e1f1a0726..b7b713b8c 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -1,5 +1,6 @@
 package com.ruoyi.gateway.config.provider;
 
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.cloud.gateway.route.RouteDefinition;
@@ -13,6 +14,7 @@ import reactor.core.publisher.Mono;
  * @author Wenchao Gong
  * @date 2021-09-11
  */
+@Slf4j
 public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
 {
     public static final String KEY_ROUTES = "ROUTES::";
@@ -27,6 +29,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
     public Flux<RouteDefinition> getRouteDefinitions()
     {
         RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+        log.debug("Routes from redis size:[{}]!", map.size());
         return Flux.fromIterable(map.values());
     }
 
@@ -36,6 +39,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
         return route.flatMap(definition -> {
             RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
             map.put(definition.getId(), definition);
+            log.debug("Saving route to redis id:[{}]!", definition.getId());
             return Mono.empty();
         });
     }
@@ -46,6 +50,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
         return routeId.flatMap(id -> {
             RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
             map.remove(id);
+            log.debug("Remove route from redis id:[{}]!", id);
             return Mono.empty();
         });
     }

From f7f28a88f5e2abf6520e78c55fac251ea66ded0d Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyeduxing2012@163.com>
Date: Sat, 18 Sep 2021 16:44:37 +0800
Subject: [PATCH 35/60] =?UTF-8?q?Spring=20Boot=20Admin=20=E6=95=B4?=
 =?UTF-8?q?=E5=90=88Security=20=E4=BD=BF=E7=94=A8=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    |   4 +-
 .../src/main/resources/application-local.yml  |   4 +-
 .../src/main/resources/application-local.yml  |   4 +-
 ruoyi-extend/ruoyi-monitor-admin/pom.xml      |  16 +
 .../monitor/admin/config/SecurityConfig.java  |  22 ++
 .../src/main/resources/application.yml        |  11 +-
 .../impl/IscAppServiceApplyServiceImpl.java   |   2 +-
 .../com/ruoyi/isc/{ => utils}/RouteUtils.java |   3 +-
 .../ruoyi/isc/utils/beans/GatewayRoute.java   |  16 +
 sql/isc.sql                                   | 352 +++++++++---------
 10 files changed, 238 insertions(+), 196 deletions(-)
 rename ruoyi-isc/src/main/java/com/ruoyi/isc/{ => utils}/RouteUtils.java (96%)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 55c27d720..02a6ed9d1 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -130,5 +130,5 @@ spring:
         url: http://localhost:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
-        username: ruoyi
-        password: 123456
+        username: admin
+        password: admin123
diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
index 72485783d..3f94095ae 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -130,5 +130,5 @@ spring:
         url: http://localhost:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
-        username: ruoyi
-        password: 123456
+        username: admin
+        password: admin123
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
index a59c5c023..8edfcb289 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
@@ -10,8 +10,8 @@ spring:
         url: http://localhost:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
-        username: ruoyi
-        password: 123456
+        username: admin
+        password: admin123
 
 --- # redis 配置
 spring:
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index dc0830373..9db00a9ff 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -28,6 +28,22 @@
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
index 98834a9bc..3b34d3dcb 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java
@@ -1,13 +1,19 @@
 package com.ruoyi.monitor.admin.config;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
+import javax.sql.DataSource;
+
 /**
  * spring security配置
  *
@@ -45,4 +51,20 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 			.headers().frameOptions().disable();
 	}
 
+	@Bean
+    public UserDetailsService userDetailsService(DataSource dataSource) {
+        JdbcDaoImpl service = new JdbcDaoImpl();
+        service.setDataSource(dataSource);
+        return service;
+    }
+
+    /**
+     * 强散列哈希加密实现
+     */
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder()
+    {
+        return new BCryptPasswordEncoder();
+    }
+
 }
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 631f3e772..fced7df80 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -2,10 +2,13 @@ server:
   port: 9090
 
 spring:
-  security:
-    user:
-      name: ruoyi
-      password: 123456
   boot:
     admin:
       context-path: /admin
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: root
+
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 6029c5c52..c1c2f307b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.isc.RouteUtils;
+import com.ruoyi.isc.utils.RouteUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.IscService;
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
similarity index 96%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
rename to ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 63352a594..d47c3ee45 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.isc;
+package com.ruoyi.isc.utils;
 
 import cn.hutool.crypto.SecureUtil;
 import com.ruoyi.common.exception.ServiceException;
@@ -33,4 +33,5 @@ public class RouteUtils
         return String.format("%s/%s/%s%s", PATH_PREFIX, SecureUtil.md5(String.valueOf(applicationId)),
             SecureUtil.md5(String.valueOf(serviceId)), uri.getPath());
     }
+
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
new file mode 100644
index 000000000..bfd071015
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
@@ -0,0 +1,16 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author Wechao Gong
+ * @date 2021/9-14
+ */
+@Getter
+@Setter
+public class GatewayRoute implements Serializable
+{
+}
diff --git a/sql/isc.sql b/sql/isc.sql
index 5664a8f7c..15207cb48 100644
--- a/sql/isc.sql
+++ b/sql/isc.sql
@@ -2,216 +2,182 @@ SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
--- Table structure for isc_app_service
--- ----------------------------
-DROP TABLE IF EXISTS `isc_app_service`;
-CREATE TABLE `isc_app_service`  (
-  `app_service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
-  `service_id` bigint NULL DEFAULT NULL COMMENT '服务ID',
-  `application_id` bigint NULL DEFAULT NULL COMMENT '应用ID',
-  `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
-  `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
-  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
-  `virtual_addr` varchar(255)  DEFAULT NULL COMMENT '虚拟地址',
-  `end_time` datetime(0) NULL DEFAULT NULL COMMENT '到期时间',
-  `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
-  `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
-  `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
-  `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
-  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  PRIMARY KEY (`app_service_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
-
--- ----------------------------
--- Records of isc_app_service
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_app_service_apply
--- ----------------------------
-DROP TABLE IF EXISTS `isc_app_service_apply`;
-CREATE TABLE `isc_app_service_apply`  (
-  `apply_id` bigint NOT NULL AUTO_INCREMENT COMMENT '申请ID',
-  `app_service_id` bigint NOT NULL COMMENT '应用服务ID',
-  `apply_type` char(1)  DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
-  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
-  `audit_mind` varchar(255)  DEFAULT NULL COMMENT '审核意见',
-  `renewal_duration` int NULL DEFAULT NULL COMMENT '续期时长（单位月）',
-  `quota_days` int NULL DEFAULT NULL COMMENT '天配额',
-  `quota_hours` int NULL DEFAULT NULL COMMENT '小时配额',
-  `quota_minutes` int NULL DEFAULT NULL COMMENT '分钟配额',
-  `quota_seconds` int NULL DEFAULT NULL COMMENT '秒配额',
-  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`apply_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用服务申请信息';
-
--- ----------------------------
--- Records of isc_app_service_apply
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_application
--- ----------------------------
-DROP TABLE IF EXISTS `isc_application`;
-CREATE TABLE `isc_application`  (
-  `application_id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用ID',
-  `application_name` varchar(255) NOT NULL COMMENT '应用名称',
-  `access_key` varchar(32) NOT NULL COMMENT '应用密钥',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`application_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '应用信息';
-
--- ----------------------------
--- Records of isc_application
--- ----------------------------
-BEGIN;
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_service
+-- 服务信息
 -- ----------------------------
 DROP TABLE IF EXISTS `isc_service`;
-CREATE TABLE `isc_service`  (
-  `service_id` bigint NOT NULL AUTO_INCREMENT COMMENT '服务ID',
-  `service_name` varchar(255) NOT NULL COMMENT '服务名称',
-  `service_addr` varchar(255) NOT NULL COMMENT '服务地址',
-  `probe_active_addr` varchar(255)  DEFAULT NULL COMMENT '探活地址',
-  `request_method` varchar(10)  DEFAULT NULL COMMENT '请求方式（默认GET）',
-  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
-  `cors_flag` char(1)  DEFAULT NULL COMMENT '跨域标志（Y是 N否）',
-  `hidden_params` varchar(500)  DEFAULT NULL COMMENT '隐藏参数',
-  `api_doc` text  COMMENT 'JSON文档',
-  `online_status` char(1) DEFAULT NULL COMMENT '是否在线（0离线 1在线）',
-  `status` char(1)  DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
-  `audit_mind` varchar(255)  DEFAULT NULL COMMENT '审核意见',
-  `enabled` char(1) NOT NULL COMMENT '服务状态（0启用 1停用）',
-  `cate_full_path` varchar(30)  DEFAULT NULL COMMENT '服务分类全路径',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  PRIMARY KEY (`service_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务信息';
+CREATE TABLE `isc_service`
+(
+    `service_id`        BIGINT       NOT NULL AUTO_INCREMENT COMMENT '服务ID',
+    `service_name`      VARCHAR(255) NOT NULL COMMENT '服务名称',
+    `service_addr`      VARCHAR(255) NOT NULL COMMENT '服务地址',
+    `probe_active_addr` VARCHAR(255)      DEFAULT NULL COMMENT '探活地址',
+    `request_method`    VARCHAR(10)       DEFAULT NULL COMMENT '请求方式（默认GET）',
+    `remark`            VARCHAR(500)      DEFAULT NULL COMMENT '备注',
+    `cors_flag`         CHAR(1)           DEFAULT NULL COMMENT '跨域标志（Y是 N否）',
+    `hidden_params`     VARCHAR(500)      DEFAULT NULL COMMENT '隐藏参数',
+    `api_doc`           TEXT COMMENT 'JSON文档',
+    `online_status`     CHAR(1)           DEFAULT NULL COMMENT '是否在线（0离线 1在线）',
+    `status`            CHAR(1)           DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+    `audit_mind`        VARCHAR(255)      DEFAULT NULL COMMENT '审核意见',
+    `enabled`           CHAR(1)      NOT NULL COMMENT '服务状态（0启用 1停用）',
+    `cate_full_path`    VARCHAR(30)       DEFAULT NULL COMMENT '服务分类全路径',
+    `user_id`           BIGINT       NOT NULL COMMENT '用户ID',
+    `create_by`         VARCHAR(64)       DEFAULT '' COMMENT '创建者',
+    `create_time`       DATETIME(0)  NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`         VARCHAR(64)       DEFAULT '' COMMENT '更新者',
+    `update_time`       DATETIME(0)  NULL DEFAULT NULL COMMENT '更新时间',
+    `del_flag`          CHAR(1)           DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    PRIMARY KEY (`service_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '服务信息';
 
 -- ----------------------------
--- Records of isc_service
--- ----------------------------
-BEGIN;
-INSERT INTO `isc_service` VALUES (1, '测试', 'https://www.baidu.com/', 'https://www.baidu.com/', 'GET', NULL, 'Y', NULL, '{}', '1', '0', NULL, '0', '001000000000000000000000000000', 1, 'admin', '2021-09-05 22:47:41', 'admin', '2021-09-05 22:47:41', '0');
-COMMIT;
-
--- ----------------------------
--- Table structure for isc_service_cate
+-- 服务分类
 -- ----------------------------
 DROP TABLE IF EXISTS `isc_service_cate`;
-CREATE TABLE `isc_service_cate`  (
-  `cate_id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类ID',
-  `parent_id` bigint NULL DEFAULT NULL COMMENT '父分类ID',
-  `cate_name` varchar(64)  DEFAULT NULL COMMENT '分类名称',
-  `full_path` varchar(30)  DEFAULT NULL COMMENT '搜索全路径',
-  `enabled` char(1) NOT NULL COMMENT '启用状态（0启用 1停用）',
-  `order_num` int NULL DEFAULT 0 COMMENT '显示顺序',
-  `create_by` varchar(64)  DEFAULT '' COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(64)  DEFAULT '' COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `del_flag` char(1)  DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
-  `remark` varchar(500)  DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`cate_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 COMMENT = '服务分类';
+CREATE TABLE `isc_service_cate`
+(
+    `cate_id`     BIGINT      NOT NULL AUTO_INCREMENT COMMENT '分类ID',
+    `parent_id`   BIGINT      NULL DEFAULT NULL COMMENT '父分类ID',
+    `cate_name`   VARCHAR(64)      DEFAULT NULL COMMENT '分类名称',
+    `full_path`   VARCHAR(30)      DEFAULT NULL COMMENT '搜索全路径',
+    `enabled`     CHAR(1)     NOT NULL COMMENT '启用状态（0启用 1停用）',
+    `order_num`   INT         NULL DEFAULT 0 COMMENT '显示顺序',
+    `create_by`   VARCHAR(64)      DEFAULT '' COMMENT '创建者',
+    `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`   VARCHAR(64)      DEFAULT '' COMMENT '更新者',
+    `update_time` DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+    `del_flag`    CHAR(1)          DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    `remark`      VARCHAR(500)     DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`cate_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 4 COMMENT = '服务分类';
 
 -- ----------------------------
--- Records of isc_service_cate
+-- 应用信息
 -- ----------------------------
-BEGIN;
-INSERT INTO `isc_service_cate` VALUES (10, 0, 'API服务', '001000000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:35:13', 'admin', '2021-09-04 23:35:13', '0', NULL), (11, 0, '地图服务', '002000000000000000000000000000', '0', 20, 'admin', '2021-09-04 23:35:37', 'admin', '2021-09-04 23:35:37', '0', NULL), (12, 0, '数据服务', '003000000000000000000000000000', '0', 30, 'admin', '2021-09-04 23:36:01', 'admin', '2021-09-04 23:36:01', '0', NULL), (13, 11, 'WFS服务', '002001000000000000000000000000', '0', 10, 'admin', '2021-09-04 23:36:26', 'admin', '2021-09-04 23:36:26', '0', NULL);
-COMMIT;
+DROP TABLE IF EXISTS `isc_application`;
+CREATE TABLE `isc_application`
+(
+    `application_id`   BIGINT       NOT NULL AUTO_INCREMENT COMMENT '应用ID',
+    `application_name` VARCHAR(255) NOT NULL COMMENT '应用名称',
+    `access_key`       VARCHAR(32)  NOT NULL COMMENT '应用密钥',
+    `user_id`          BIGINT       NOT NULL COMMENT '用户ID',
+    `create_by`        VARCHAR(64)       DEFAULT '' COMMENT '创建者',
+    `create_time`      DATETIME(0)  NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`        VARCHAR(64)       DEFAULT '' COMMENT '更新者',
+    `update_time`      DATETIME(0)  NULL DEFAULT NULL COMMENT '更新时间',
+    `del_flag`         CHAR(1)           DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    `remark`           VARCHAR(500)      DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`application_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '应用信息';
 
 -- ----------------------------
--- Table structure for isc_service_log_count
+-- 应用服务信息
 -- ----------------------------
-DROP TABLE IF EXISTS `isc_service_log_count`;
-CREATE TABLE `isc_service_log_count`  (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
-  `service_id` bigint NOT NULL COMMENT '服务ID',
-  `count_date` date NOT NULL COMMENT '统计日期',
-  `total_num` bigint NOT NULL COMMENT '调用次数',
-  `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务每日统计';
+DROP TABLE IF EXISTS `isc_app_service`;
+CREATE TABLE `isc_app_service`
+(
+    `app_service_id` BIGINT      NOT NULL AUTO_INCREMENT COMMENT '应用服务ID',
+    `service_id`     BIGINT      NULL DEFAULT NULL COMMENT '服务ID',
+    `application_id` BIGINT      NULL DEFAULT NULL COMMENT '应用ID',
+    `user_id`        BIGINT      NULL DEFAULT NULL COMMENT '用户ID',
+    `enabled`        CHAR(1)     NOT NULL COMMENT '启用状态（0启用 1停用）',
+    `status`         CHAR(1)          DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+    `virtual_addr`   VARCHAR(255)     DEFAULT NULL COMMENT '虚拟地址',
+    `end_time`       DATETIME(0) NULL DEFAULT NULL COMMENT '到期时间',
+    `quota_days`     INT         NULL DEFAULT NULL COMMENT '天配额',
+    `quota_hours`    INT         NULL DEFAULT NULL COMMENT '小时配额',
+    `quota_minutes`  INT         NULL DEFAULT NULL COMMENT '分钟配额',
+    `quota_seconds`  INT         NULL DEFAULT NULL COMMENT '秒配额',
+    `create_by`      VARCHAR(64)      DEFAULT '' COMMENT '创建者',
+    `create_time`    DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`      VARCHAR(64)      DEFAULT '' COMMENT '更新者',
+    `update_time`    DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+    `del_flag`       CHAR(1)          DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    PRIMARY KEY (`app_service_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '应用服务信息';
 
 -- ----------------------------
--- Records of isc_service_log_count
+-- 应用服务申请信息
 -- ----------------------------
-BEGIN;
-COMMIT;
+DROP TABLE IF EXISTS `isc_app_service_apply`;
+CREATE TABLE `isc_app_service_apply`
+(
+    `apply_id`         BIGINT      NOT NULL AUTO_INCREMENT COMMENT '申请ID',
+    `app_service_id`   BIGINT      NOT NULL COMMENT '应用服务ID',
+    `apply_type`       CHAR(1)          DEFAULT NULL COMMENT '申请类型(0申请 1续期)',
+    `status`           CHAR(1)          DEFAULT NULL COMMENT '审核状态（0待审核 1审核通过 2驳回）',
+    `audit_mind`       VARCHAR(255)     DEFAULT NULL COMMENT '审核意见',
+    `renewal_duration` INT         NULL DEFAULT NULL COMMENT '续期时长（单位月）',
+    `quota_days`       INT         NULL DEFAULT NULL COMMENT '天配额',
+    `quota_hours`      INT         NULL DEFAULT NULL COMMENT '小时配额',
+    `quota_minutes`    INT         NULL DEFAULT NULL COMMENT '分钟配额',
+    `quota_seconds`    INT         NULL DEFAULT NULL COMMENT '秒配额',
+    `create_by`        VARCHAR(64)      DEFAULT '' COMMENT '创建者',
+    `create_time`      DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`        VARCHAR(64)      DEFAULT '' COMMENT '更新者',
+    `update_time`      DATETIME(0) NULL DEFAULT NULL COMMENT '更新时间',
+    `del_flag`         CHAR(1)          DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    `remark`           VARCHAR(500)     DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`apply_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '应用服务申请信息';
 
 -- ----------------------------
--- Table structure for isc_service_log_detail
+-- 服务调用日志
 -- ----------------------------
 DROP TABLE IF EXISTS `isc_service_log_detail`;
-CREATE TABLE `isc_service_log_detail`  (
-  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志ID',
-  `service_id` bigint NOT NULL COMMENT '服务ID',
-  `application_id` bigint NOT NULL COMMENT '应用ID',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `request_ip` varchar(64)  DEFAULT NULL COMMENT '调用IP',
-  `begin_time` timestamp(0) NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '结束时间',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `remark` varchar(500)  DEFAULT NULL COMMENT '备注信息',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务调用日志';
+CREATE TABLE `isc_service_log_detail`
+(
+    `id`             BIGINT       NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+    `service_id`     BIGINT       NOT NULL COMMENT '服务ID',
+    `application_id` BIGINT       NOT NULL COMMENT '应用ID',
+    `user_id`        BIGINT       NOT NULL COMMENT '用户ID',
+    `request_ip`     VARCHAR(64)       DEFAULT NULL COMMENT '调用IP',
+    `begin_time`     TIMESTAMP(0) NULL DEFAULT NULL COMMENT '开始时间',
+    `end_time`       TIMESTAMP(0) NULL DEFAULT NULL COMMENT '结束时间',
+    `create_time`    DATETIME(0)  NULL DEFAULT NULL COMMENT '创建时间',
+    `remark`         VARCHAR(500)      DEFAULT NULL COMMENT '备注信息',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '服务调用日志';
 
 -- ----------------------------
--- Records of isc_service_log_detail
+-- 服务每日统计
 -- ----------------------------
-BEGIN;
-COMMIT;
+DROP TABLE IF EXISTS `isc_service_log_count`;
+CREATE TABLE `isc_service_log_count`
+(
+    `id`          BIGINT      NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+    `service_id`  BIGINT      NOT NULL COMMENT '服务ID',
+    `count_date`  DATE        NOT NULL COMMENT '统计日期',
+    `total_num`   BIGINT      NOT NULL COMMENT '调用次数',
+    `avg_time`    BIGINT      NULL DEFAULT NULL COMMENT '平均响应时间',
+    `create_time` DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '服务每日统计';
 
 -- ----------------------------
--- Table structure for isc_service_log_user_count
+-- 服务日志用户统计
 -- ----------------------------
 DROP TABLE IF EXISTS `isc_service_log_user_count`;
-CREATE TABLE `isc_service_log_user_count`  (
-  `id` int NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
-  `service_id` bigint NOT NULL COMMENT '服务ID',
-  `application_id` bigint NOT NULL COMMENT '应用ID',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `count_date` date NULL DEFAULT NULL COMMENT '统计日期',
-  `total_num` bigint NULL DEFAULT NULL COMMENT '调用次数',
-  `avg_time` bigint NULL DEFAULT NULL COMMENT '平均响应时间',
-  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 COMMENT = '服务日志用户统计';
-
--- ----------------------------
--- Records of isc_service_log_user_count
--- ----------------------------
-BEGIN;
-COMMIT;
+CREATE TABLE `isc_service_log_user_count`
+(
+    `id`             INT         NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+    `service_id`     BIGINT      NOT NULL COMMENT '服务ID',
+    `application_id` BIGINT      NOT NULL COMMENT '应用ID',
+    `user_id`        BIGINT      NOT NULL COMMENT '用户ID',
+    `count_date`     DATE        NULL DEFAULT NULL COMMENT '统计日期',
+    `total_num`      BIGINT      NULL DEFAULT NULL COMMENT '调用次数',
+    `avg_time`       BIGINT      NULL DEFAULT NULL COMMENT '平均响应时间',
+    `create_time`    DATETIME(0) NULL DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1 COMMENT = '服务日志用户统计';
 
 BEGIN;
 INSERT INTO `sys_menu` VALUES (1607, '服务分类', 1606, 1, 'cate', 'isc/cate/index', 1, 0, 'C', '0', '0', 'isc:cate:list', '#', 'admin', '2021-09-08 13:59:21', 'admin', '2021-09-08 14:02:25', '服务分类菜单');
@@ -265,4 +231,22 @@ INSERT INTO `sys_dict_data` VALUES (108, 1, 'GET', 'GET', 'isc_request_method',
 INSERT INTO `sys_dict_data` VALUES (109, 2, 'POST', 'POST', 'isc_request_method', NULL, 'info', 'N', '0', 'admin', '2021-09-07 22:13:40', 'admin', '2021-09-07 22:13:40', NULL);
 COMMIT;
 
+-- ----------------------------
+-- Security 用户视图
+-- ----------------------------
+CREATE OR REPLACE VIEW users AS (
+SELECT user_name                                                   AS username,
+       `password`                                                  AS `password`,
+       (CASE WHEN `status` = 0 AND del_flag = 0 THEN 1 ELSE 0 END) AS enabled
+FROM sys_user
+);
+
+-- ----------------------------
+-- Security 权限视图
+-- ----------------------------
+CREATE OR REPLACE VIEW authorities AS (
+SELECT user_name AS username,
+       NULL      AS authority
+FROM sys_user
+);
 SET FOREIGN_KEY_CHECKS = 1;

From b320663b4f43ff503f735d5147bc84572422a35d Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Tue, 21 Sep 2021 21:27:03 +0800
Subject: [PATCH 36/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-prod.yml   |  2 +-
 .../src/main/resources/application-dev.yml    |  4 +-
 .../src/main/resources/application-prod.yml   | 76 +++++++++++++++++++
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-prod.yml

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index f043ea0b8..5b03ec7b6 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -131,4 +131,4 @@ spring:
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
-        password: 123456
+        password: admin@123456
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
index d1e0c347d..7a45512e0 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-dev.yml
@@ -10,8 +10,8 @@ spring:
         url: http://localhost:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
-        username: ruoyi
-        password: 123456
+        username: admin
+        password: admin123
 
 --- # redis 配置
 spring:
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-prod.yml
new file mode 100644
index 000000000..0cedf863f
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-prod.yml
@@ -0,0 +1,76 @@
+--- # 监控配置
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
+        # 增加客户端开关
+        enabled: true
+        # 设置 Spring Boot Admin Server 地址
+        url: http://172.17.0.1:9090/admin
+        instance:
+          prefer-ip: true # 注册实例时，优先使用 IP
+        username: admin
+        password: admin@123456
+
+--- # redis 配置
+spring:
+  redis:
+    # 地址
+    host: 172.17.0.1
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl: false
+
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      # Actuator 提供的 API 接口的根目录。默认为 /actuator
+      base-path: /actuator
+      exposure:
+        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+        # 生产环境不建议放开所有 根据项目需求放开即可
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log

From 7dd7dddeb83e74898cf63030e6f2672beafa1db5 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Tue, 28 Sep 2021 21:58:19 +0800
Subject: [PATCH 37/60] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java   | 1 +
 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index d27e217d4..747f99994 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -161,6 +161,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        applyService.remove(Wrappers.<IscAppServiceApply>lambdaQuery().in(IscAppServiceApply::getAppServiceId, ids));
         return removeByIds(ids);
     }
 
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index d47c3ee45..fb7124e84 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -27,11 +27,10 @@ public class RouteUtils
         URI uri = null;
         try {
             uri = new URI(serviceAddr);
+            return PATH_PREFIX + uri.getPath();
         } catch (URISyntaxException e) {
             throw new ServiceException("URL格式异常");
         }
-        return String.format("%s/%s/%s%s", PATH_PREFIX, SecureUtil.md5(String.valueOf(applicationId)),
-            SecureUtil.md5(String.valueOf(serviceId)), uri.getPath());
     }
 
 }

From 176b0f4722202ac9a83bac032cc1902c15468883 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Wed, 29 Sep 2021 00:48:58 +0800
Subject: [PATCH 38/60] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/constant/IscConstants.java   |   5 +-
 .../impl/IscAppServiceApplyServiceImpl.java   |  27 ++-
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 159 +++++++++++++++++-
 .../isc/utils/beans/IscFilterDefinition.java  |  22 +++
 .../utils/beans/IscPredicateDefinition.java   |  22 +++
 .../isc/utils/beans/IscRouteDefinition.java   |  38 +++++
 6 files changed, 255 insertions(+), 18 deletions(-)
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index bbfe503ea..6ca156762 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -23,5 +23,8 @@ public class IscConstants {
     /** 申请类型 申请修改 */
     public static final String APPLY_TYPE_MODIFY = "2";
 
-
+    /**
+     * Gateway 路由信息Redis Key
+     */
+    public static final String KEY_ROUTES = "ROUTES::";
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index c1c2f307b..256b18b85 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -13,7 +13,6 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.isc.utils.RouteUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.IscService;
@@ -25,6 +24,8 @@ import com.ruoyi.isc.service.IIscAppServiceApplyService;
 import com.ruoyi.isc.service.IIscAppServiceService;
 import com.ruoyi.isc.service.IIscApplicationService;
 import com.ruoyi.isc.service.IIscServiceService;
+import com.ruoyi.isc.utils.RouteUtils;
+import com.ruoyi.isc.utils.beans.IscRouteDefinition;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -157,8 +158,12 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             Assert.notNull(appService, () -> new ServiceException("申请信息不存在"));
 
             IscAppService updateData = null;
+            IscRouteDefinition route = null;
+            IscService service = null;
             if(IscConstants.AUDIT_PASS.equals(bo.getStatus())) {
-                updateData = genAuditPassData(apply, appService, bo.getStatus());
+                service = serviceService.getById(appService.getServiceId());
+                Assert.notNull(service, () -> new ServiceException("服务信息不存在"));
+                updateData = genAuditPassData(apply, appService, service, bo.getStatus());
                 updateData.setAuditMind(bo.getRemark());
             }else{
                 //如果 应用服务 状态为不通过 时需要同步状态
@@ -166,6 +171,11 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             }
             if(Objects.nonNull(updateData)) {
                 result = appServiceService.updateById(updateData);
+                if(Objects.nonNull(service)) {
+                    IscAppService dbAppService = appServiceService.getById(apply.getAppServiceId());
+                    route = RouteUtils.generateRoute(dbAppService, service.getServiceAddr());
+                    RouteUtils.saveRoute(route);
+                }
             }
         }
         return result;
@@ -175,22 +185,24 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
      * 审核通过处理
      * @param apply      申请信息
      * @param appService 应用服务信息
+     * @param service    服务信息
      * @param status     操作状态
      * @return 更新数据
      */
-    private IscAppService genAuditPassData(IscAppServiceApply apply, IscAppService appService, String status)
+    private IscAppService genAuditPassData(IscAppServiceApply apply, IscAppService appService, IscService service,
+                                           String status)
     {
         IscAppService updateData = new IscAppService().setAppServiceId(appService.getAppServiceId());
         //如果是 服务申请 修改 应用服务 审核状态、生成虚拟地址、服务到期时间
         //如果是续期申请 修改 服务到期时间
         switch (apply.getApplyType()) {
             case IscConstants.APPLY_TYPE_APPLY:
-                genServicePassInit(apply, appService, status, updateData);
+                genServicePassInit(apply, appService, status, updateData, service);
                 break;
             case IscConstants.APPLY_TYPE_MODIFY:
                 //如果 应用服务 状态不为通过 则修改状态（如果是通过：续期不能影响使用）
                 if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
-                    genServicePassInit(apply, appService, status, updateData);
+                    genServicePassInit(apply, appService, status, updateData, service);
                 }
                 updateData.setQuotaDays(apply.getQuotaDays());
                 updateData.setQuotaHours(apply.getQuotaHours());
@@ -213,13 +225,12 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
      * @param appService 应用服务信息
      * @param status     审核状态
      * @param updateData 需要修改的数据
+     * @param service    服务信息
      */
     private void genServicePassInit(IscAppServiceApply apply, IscAppService appService, String status,
-                                    IscAppService updateData)
+                                    IscAppService updateData, IscService service)
     {
         updateData.setStatus(status);
-        IscService service = serviceService.getById(appService.getServiceId());
-        Assert.notNull(service, () -> new ServiceException("服务信息不存在"));
         Integer renewalDuration = apply.getRenewalDuration();
         //如果 申请时长为空，需要查询审核记录 中的审核时长
         if(Objects.isNull(renewalDuration)) {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index fb7124e84..737256c90 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -1,18 +1,34 @@
 package com.ruoyi.isc.utils;
 
-import cn.hutool.crypto.SecureUtil;
+import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.utils.beans.IscFilterDefinition;
+import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
+import com.ruoyi.isc.utils.beans.IscRouteDefinition;
+import org.redisson.api.RMap;
+import org.redisson.api.RedissonClient;
+import org.redisson.codec.JsonJacksonCodec;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author Wenchao Gong
  * @date 2021/9/10 14:46
  */
-public class RouteUtils
-{
+public class RouteUtils {
+    /**
+     * Gateway 虚拟路径前缀
+     */
     public static final String PATH_PREFIX = "/proxy";
+    private static RedissonClient client = SpringUtils.getBean(RedissonClient.class);
 
     /**
      * 获取虚拟URL Path 部分
@@ -20,17 +36,142 @@ public class RouteUtils
      * @param applicationId 应用ID
      * @param serviceId     服务Id
      * @param serviceAddr   服务地址
-     * @return
+     * @return 虚拟地址Path
      */
     public static String genVirtualAddrPath(Long applicationId, Long serviceId, String serviceAddr)
     {
-        URI uri = null;
-        try {
-            uri = new URI(serviceAddr);
-            return PATH_PREFIX + uri.getPath();
-        } catch (URISyntaxException e) {
+        return PATH_PREFIX + getPathUri(serviceAddr);
+    }
+
+    /**
+     * 返回URI 的Path部分
+     *
+     * @param uri URI
+     * @return path
+     */
+    public static String getPathUri(String uri)
+    {
+        return getURI(uri).getPath();
+    }
+
+    /**
+     * 通过 URI字符串 生成URI对象
+     *
+     * @param uri URI字符串
+     * @return URI
+     */
+    public static URI getURI(String uri)
+    {
+        try
+        {
+            return new URI(uri);
+        } catch (URISyntaxException e)
+        {
             throw new ServiceException("URL格式异常");
         }
     }
 
+    /**
+     * 刷新路由信息 先清空再批量新增
+     *
+     * @param routes 路由信息
+     * @return 是否成功
+     */
+    public static boolean refreshRoute(List<IscRouteDefinition> routes)
+    {
+        Map<String, IscRouteDefinition> routeMap = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId,
+                Function.identity(), (o1, o2) -> o2));
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        map.clear();
+        map.putAll(routeMap);
+        return true;
+    }
+
+    /**
+     * 保存路由信息
+     *
+     * @param route 路由信息
+     * @return 是否成功
+     */
+    public static boolean saveRoute(IscRouteDefinition route)
+    {
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        map.put(route.getId(), route);
+        return true;
+    }
+
+    /**
+     * 删除路由信息
+     *
+     * @param routeId 路由ID
+     * @return 是否成功
+     */
+    public static boolean deleteRoute(String routeId)
+    {
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        map.remove(routeId);
+        return true;
+    }
+
+    /**
+     * 更新路由信息
+     *
+     * @param route 路由信息
+     * @return 是否成功
+     */
+    public static boolean updateRoute(IscRouteDefinition route)
+    {
+        return saveRoute(route);
+    }
+
+    /**
+     * 生成 路由信息
+     *
+     * @param appService  应用服务信息
+     * @param serviceAddr 服务地址
+     * @return 路由信息
+     */
+    public static IscRouteDefinition generateRoute(IscAppService appService, String serviceAddr)
+    {
+        IscRouteDefinition route = new IscRouteDefinition();
+        route.setId(String.valueOf(appService.getAppServiceId()));
+        route.setUri(getURI(serviceAddr.substring(0, serviceAddr.length() - getPathUri(serviceAddr).length())));
+
+        //断言
+        IscPredicateDefinition pathPredicate = new IscPredicateDefinition();
+        pathPredicate.setName("Path");
+        pathPredicate.getArgs().put("pattern", appService.getVirtualAddr());
+        route.setPredicates(Arrays.asList(pathPredicate));
+
+        //过滤器
+        IscFilterDefinition stripPrefixFilter = new IscFilterDefinition();
+        stripPrefixFilter.setName("StripPrefix");
+        stripPrefixFilter.getArgs().put("parts", "1");
+
+        IscFilterDefinition retryFilter = new IscFilterDefinition();
+        retryFilter.setName("Retry");
+        retryFilter.getArgs().put("retries", "1");
+        route.setFilters(Arrays.asList(stripPrefixFilter, retryFilter));
+
+        //其他信息
+        Map<String, Object> metadata = route.getMetadata();
+        metadata.put("secondsLimit", toString(appService.getQuotaSeconds()));
+        metadata.put("minutesLimit", toString(appService.getQuotaMinutes()));
+        metadata.put("hoursLimit", toString(appService.getQuotaHours()));
+        metadata.put("daysLimit", toString(appService.getQuotaDays()));
+        metadata.put("expire", toString(appService.getEndTime()));
+        return route;
+    }
+
+    /**
+     * 对象转字符串
+     *
+     * @param obj 具体属性
+     * @return
+     */
+    public static String toString(Object obj)
+    {
+        return Objects.isNull(obj) ? StringUtils.EMPTY : obj instanceof Date ?
+                DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, (Date) obj) : String.valueOf(obj);
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
new file mode 100644
index 000000000..ffee7ab81
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
@@ -0,0 +1,22 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotNull;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-09-28
+ */
+@Data
+@Validated
+public class IscFilterDefinition {
+
+    @NotNull
+    private String name;
+
+    private Map<String, String> args = new LinkedHashMap<>();
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
new file mode 100644
index 000000000..efcee83c1
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
@@ -0,0 +1,22 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotNull;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-09-28
+ */
+@Data
+@Validated
+public class IscPredicateDefinition {
+
+    @NotNull
+    private String name;
+
+    private Map<String, String> args = new LinkedHashMap<>();
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java
new file mode 100644
index 000000000..f5cbb42d2
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java
@@ -0,0 +1,38 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-09-28
+ */
+@Data
+@Validated
+public class IscRouteDefinition {
+
+    private String id;
+
+    @NotEmpty
+    @Valid
+    private List<IscPredicateDefinition> predicates = new ArrayList<>();
+
+    @Valid
+    private List<IscFilterDefinition> filters = new ArrayList<>();
+
+    @NotNull
+    private URI uri;
+
+    private Map<String, Object> metadata = new HashMap<>();
+
+    private int order = 0;
+}

From 55ccb406e769dbedd3a4d035f145f560d10d1f1e Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Wed, 29 Sep 2021 21:23:09 +0800
Subject: [PATCH 39/60] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=81Redisson=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RedisRouteDefinitionRepository.java       |  9 ++--
 .../isc/service/IIscAppServiceService.java    |  5 +++
 .../impl/IscAppServiceServiceImpl.java        | 43 +++++++++++++++++++
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 11 +++--
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
index b7b713b8c..17d4c1dcc 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -3,6 +3,8 @@ package com.ruoyi.gateway.config.provider;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.TypedJsonJacksonCodec;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import reactor.core.publisher.Flux;
@@ -17,6 +19,7 @@ import reactor.core.publisher.Mono;
 @Slf4j
 public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
 {
+    public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, RouteDefinition.class);
     public static final String KEY_ROUTES = "ROUTES::";
     private final RedissonClient redissonClient;
 
@@ -28,7 +31,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
     @Override
     public Flux<RouteDefinition> getRouteDefinitions()
     {
-        RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+        RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES, ROUTE_CODES_INSTANCE);
         log.debug("Routes from redis size:[{}]!", map.size());
         return Flux.fromIterable(map.values());
     }
@@ -37,7 +40,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
     public Mono<Void> save(Mono<RouteDefinition> route)
     {
         return route.flatMap(definition -> {
-            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES, ROUTE_CODES_INSTANCE);
             map.put(definition.getId(), definition);
             log.debug("Saving route to redis id:[{}]!", definition.getId());
             return Mono.empty();
@@ -48,7 +51,7 @@ public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
     public Mono<Void> delete(Mono<String> routeId)
     {
         return routeId.flatMap(id -> {
-            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES);
+            RMap<String, RouteDefinition> map = redissonClient.getMap(KEY_ROUTES, ROUTE_CODES_INSTANCE);
             map.remove(id);
             log.debug("Remove route from redis id:[{}]!", id);
             return Mono.empty();
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
index 9fce813a9..d19089f90 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
@@ -68,4 +68,9 @@ public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAp
      * @return 应用服务列表
      */
     List<IscAppService> getAppServiceListByIds(Collection<Long> ids);
+
+    /**
+     * 刷新路由信息
+     */
+    void refreshRoutes();
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index 747f99994..91e20e376 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -8,15 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.ruoyi.common.constant.IscConstants;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceVo;
@@ -24,10 +27,15 @@ import com.ruoyi.isc.mapper.IscAppServiceMapper;
 import com.ruoyi.isc.service.IIscAppServiceApplyService;
 import com.ruoyi.isc.service.IIscAppServiceService;
 import com.ruoyi.isc.service.IIscServiceService;
+import com.ruoyi.isc.utils.RouteUtils;
+import com.ruoyi.isc.utils.beans.IscRouteDefinition;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +44,7 @@ import java.util.stream.Collectors;
  * @author Wenchao Gong
  * @date 2021-09-08
  */
+@Slf4j
 @Service
 public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMapper, IscAppService, IscAppServiceVo> implements IIscAppServiceService
 {
@@ -45,6 +54,11 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     @Resource
     private IIscAppServiceApplyService applyService;
 
+    @PostConstruct
+    public void init() {
+        refreshRoutes();
+    }
+
     @Override
     public IscAppServiceVo queryById(Long appServiceId)
     {
@@ -182,6 +196,35 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
             .in(IscAppService::getAppServiceId, ids));
     }
 
+    @Override
+    public void refreshRoutes()
+    {
+        List<IscAppService> list = list(Wrappers.<IscAppService>lambdaQuery()
+                .eq(IscAppService::getEnabled, UserConstants.NORMAL)
+                .eq(IscAppService::getStatus, IscConstants.AUDIT_PASS)
+                .gt(IscAppService::getEndTime, DateUtils.getNowDate()));
+        if(CollectionUtil.isEmpty(list)) {
+            return;
+        }
+        Set<Long> serviceIds = list.stream().map(IscAppService::getServiceId).collect(Collectors.toSet());
+        Map<Long, IscService> serviceMap = serviceService.list(Wrappers.<IscService>lambdaQuery()
+                .select(IscService::getServiceId, IscService::getServiceAddr)
+                .in(IscService::getServiceId, serviceIds)).stream()
+                .collect(Collectors.toMap(IscService::getServiceId, Function.identity()));
+        List<IscRouteDefinition> routes = new ArrayList<>();
+
+        for (IscAppService appService : list)
+        {
+            IscService service = serviceMap.get(appService.getServiceId());
+            if(Objects.isNull(service)) {
+                log.error("路由初始化失败: 服务[{}]信息不存在！", appService.getServiceId());
+                continue;
+            }
+            routes.add(RouteUtils.generateRoute(appService, service.getServiceAddr()));
+        }
+        RouteUtils.refreshRoute(routes);
+    }
+
     /**
      * 添加 服务申请记录
      *
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 737256c90..69eb59eec 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -11,7 +11,8 @@ import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
 import com.ruoyi.isc.utils.beans.IscRouteDefinition;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
-import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.TypedJsonJacksonCodec;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -24,6 +25,8 @@ import java.util.stream.Collectors;
  * @date 2021/9/10 14:46
  */
 public class RouteUtils {
+
+    public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRouteDefinition.class);
     /**
      * Gateway 虚拟路径前缀
      */
@@ -81,7 +84,7 @@ public class RouteUtils {
     {
         Map<String, IscRouteDefinition> routeMap = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId,
                 Function.identity(), (o1, o2) -> o2));
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.clear();
         map.putAll(routeMap);
         return true;
@@ -95,7 +98,7 @@ public class RouteUtils {
      */
     public static boolean saveRoute(IscRouteDefinition route)
     {
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.put(route.getId(), route);
         return true;
     }
@@ -108,7 +111,7 @@ public class RouteUtils {
      */
     public static boolean deleteRoute(String routeId)
     {
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES);
+        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.remove(routeId);
         return true;
     }

From 98722a6b222f163830cd6c3b4d240418b21f5397 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Wed, 29 Sep 2021 23:48:48 +0800
Subject: [PATCH 40/60] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IscAppServiceApplyServiceImpl.java   |  4 +-
 .../impl/IscAppServiceServiceImpl.java        | 20 +++++++--
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 45 ++++++++++++++++---
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 256b18b85..483a39469 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.IscApplication;
 import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAuditBo;
@@ -173,7 +174,8 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
                 result = appServiceService.updateById(updateData);
                 if(Objects.nonNull(service)) {
                     IscAppService dbAppService = appServiceService.getById(apply.getAppServiceId());
-                    route = RouteUtils.generateRoute(dbAppService, service.getServiceAddr());
+                    IscApplication application = applicationService.getById(dbAppService.getApplicationId());
+                    route = RouteUtils.generateRoute(dbAppService, service, application.getAccessKey());
                     RouteUtils.saveRoute(route);
                 }
             }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index 91e20e376..bbd80cad8 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -19,6 +19,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
+import com.ruoyi.isc.domain.IscApplication;
 import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
@@ -26,6 +27,7 @@ import com.ruoyi.isc.domain.vo.IscAppServiceVo;
 import com.ruoyi.isc.mapper.IscAppServiceMapper;
 import com.ruoyi.isc.service.IIscAppServiceApplyService;
 import com.ruoyi.isc.service.IIscAppServiceService;
+import com.ruoyi.isc.service.IIscApplicationService;
 import com.ruoyi.isc.service.IIscServiceService;
 import com.ruoyi.isc.utils.RouteUtils;
 import com.ruoyi.isc.utils.beans.IscRouteDefinition;
@@ -53,6 +55,8 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     private IIscServiceService serviceService;
     @Resource
     private IIscAppServiceApplyService applyService;
+    @Resource
+    private IIscApplicationService applicationService;
 
     @PostConstruct
     public void init() {
@@ -208,19 +212,29 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         }
         Set<Long> serviceIds = list.stream().map(IscAppService::getServiceId).collect(Collectors.toSet());
         Map<Long, IscService> serviceMap = serviceService.list(Wrappers.<IscService>lambdaQuery()
-                .select(IscService::getServiceId, IscService::getServiceAddr)
+                .select(IscService::getServiceId, IscService::getServiceAddr, IscService::getHiddenParams, IscService::getRequestMethod)
                 .in(IscService::getServiceId, serviceIds)).stream()
                 .collect(Collectors.toMap(IscService::getServiceId, Function.identity()));
+        Set<Long> applicationIds = list.stream().map(IscAppService::getApplicationId).collect(Collectors.toSet());
+        Map<Long, String> accessKeyMap = applicationService.list(Wrappers.<IscApplication>lambdaQuery()
+                .select(IscApplication::getApplicationId, IscApplication::getAccessKey)
+                .in(IscApplication::getApplicationId, applicationIds)).stream()
+                .collect(Collectors.toMap(IscApplication::getApplicationId, IscApplication::getAccessKey));
         List<IscRouteDefinition> routes = new ArrayList<>();
 
         for (IscAppService appService : list)
         {
             IscService service = serviceMap.get(appService.getServiceId());
             if(Objects.isNull(service)) {
-                log.error("路由初始化失败: 服务[{}]信息不存在！", appService.getServiceId());
+                log.error("路由初始化失败: id:[{}],服务[{}]信息不存在！", appService.getAppServiceId(), appService.getServiceId());
                 continue;
             }
-            routes.add(RouteUtils.generateRoute(appService, service.getServiceAddr()));
+            String ak = accessKeyMap.get(appService.getApplicationId());
+            if(StringUtils.isBlank(ak)) {
+                log.error("路由初始化失败: id:[{}],ak[{}]信息不存在！", appService.getAppServiceId(), appService.getApplicationId());
+                continue;
+            }
+            routes.add(RouteUtils.generateRoute(appService, service, ak));
         }
         RouteUtils.refreshRoute(routes);
     }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 69eb59eec..90f7af214 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -3,9 +3,11 @@ package com.ruoyi.isc.utils;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.isc.domain.IscAppService;
+import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.utils.beans.IscFilterDefinition;
 import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
 import com.ruoyi.isc.utils.beans.IscRouteDefinition;
@@ -130,31 +132,64 @@ public class RouteUtils {
     /**
      * 生成 路由信息
      *
-     * @param appService  应用服务信息
-     * @param serviceAddr 服务地址
+     * @param appService 应用服务信息
+     * @param service    服务信息
+     * @param ak         AK
      * @return 路由信息
      */
-    public static IscRouteDefinition generateRoute(IscAppService appService, String serviceAddr)
+    public static IscRouteDefinition generateRoute(IscAppService appService, IscService service, String ak)
     {
         IscRouteDefinition route = new IscRouteDefinition();
         route.setId(String.valueOf(appService.getAppServiceId()));
+        final String serviceAddr = service.getServiceAddr();
         route.setUri(getURI(serviceAddr.substring(0, serviceAddr.length() - getPathUri(serviceAddr).length())));
 
         //断言
+        IscPredicateDefinition methodPredicate = new IscPredicateDefinition();
+        methodPredicate.setName("Method");
+        methodPredicate.getArgs().put("methods", service.getRequestMethod());
+
+        IscPredicateDefinition queryPredicate = new IscPredicateDefinition();
+        queryPredicate.setName("Query");
+        queryPredicate.getArgs().put("param", "ak");
+
         IscPredicateDefinition pathPredicate = new IscPredicateDefinition();
         pathPredicate.setName("Path");
         pathPredicate.getArgs().put("pattern", appService.getVirtualAddr());
-        route.setPredicates(Arrays.asList(pathPredicate));
+        route.setPredicates(Arrays.asList(methodPredicate, queryPredicate, pathPredicate));
 
         //过滤器
+        List<IscFilterDefinition> filters = new ArrayList<>();
         IscFilterDefinition stripPrefixFilter = new IscFilterDefinition();
         stripPrefixFilter.setName("StripPrefix");
         stripPrefixFilter.getArgs().put("parts", "1");
+        filters.add(stripPrefixFilter);
+
+        IscFilterDefinition removeRequestParameterFilter = new IscFilterDefinition();
+        removeRequestParameterFilter.setName("RemoveRequestParameter");
+        removeRequestParameterFilter.getArgs().put("name", "ak");
+        filters.add(removeRequestParameterFilter);
+
+        String hiddenParams = service.getHiddenParams();
+        if(StringUtils.isNotBlank(hiddenParams)) {
+            Map<String, Object> paramsMap = JsonUtils.parseMap(hiddenParams);
+            Iterator<Map.Entry<String, Object>> it = paramsMap.entrySet().iterator();
+            while (it.hasNext()) {
+                IscFilterDefinition addRequestParameterFilter = new IscFilterDefinition();
+                Map<String, String> args = addRequestParameterFilter.getArgs();
+                addRequestParameterFilter.setName("AddRequestParameter");
+                Map.Entry<String, Object> param = it.next();
+                args.put("name", param.getKey());
+                args.put("value", String.valueOf(param.getValue()));
+                filters.add(addRequestParameterFilter);
+            }
+        }
 
         IscFilterDefinition retryFilter = new IscFilterDefinition();
         retryFilter.setName("Retry");
         retryFilter.getArgs().put("retries", "1");
-        route.setFilters(Arrays.asList(stripPrefixFilter, retryFilter));
+        filters.add(retryFilter);
+        route.setFilters(filters);
 
         //其他信息
         Map<String, Object> metadata = route.getMetadata();

From b5b765238d3a7ff426681517c5323930f3193a6a Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 15 Oct 2021 23:22:08 +0800
Subject: [PATCH 41/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0POST=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0/=E5=88=A0=E9=99=A4=E5=8F=82=E6=95=B0=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E3=80=81=E9=99=90=E6=B5=81=E5=99=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   |  24 ++++
 .../gateway/exception/GatewayException.java   |  11 ++
 .../AddRequestParamGatewayFilterFactory.java  | 114 ++++++++++++++++++
 ...emoveRequestParamGatewayFilterFactory.java | 104 ++++++++++++++++
 .../com/ruoyi/gateway/utils/GatewayUtils.java |  61 ++++++++++
 .../java/com/ruoyi/isc/utils/RouteUtils.java  |  31 +++--
 ruoyi-system/pom.xml                          |   6 +-
 7 files changed, 340 insertions(+), 11 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 678d3cb35..5150d07d0 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,15 +1,21 @@
 package com.ruoyi.gateway.config;
 
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
+import com.ruoyi.gateway.filter.factory.AddRequestParamGatewayFilterFactory;
+import com.ruoyi.gateway.filter.factory.RemoveRequestParamGatewayFilterFactory;
 import org.redisson.api.RedissonClient;
+import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
+import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
+import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
 
@@ -52,4 +58,22 @@ public class GatewayConfig
     {
         return new RedisRouteDefinitionRepository(redissonClient);
     }
+
+    @Bean
+    public AddRequestParamGatewayFilterFactory addRequestParamGatewayFilterFactory()
+    {
+        return new AddRequestParamGatewayFilterFactory();
+    }
+
+    @Bean
+    public RemoveRequestParamGatewayFilterFactory removeRequestParamGatewayFilterFactory()
+    {
+        return new RemoveRequestParamGatewayFilterFactory();
+    }
+
+    @Bean("routeIdKeyResolver")
+    public KeyResolver routeIdKeyResolver()
+    {
+        return exchange -> Mono.just(((Route) exchange.getAttributes().get(ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR)).getId());
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
new file mode 100644
index 000000000..c4d4c969b
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
@@ -0,0 +1,11 @@
+package com.ruoyi.gateway.exception;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+public class GatewayException extends RuntimeException {
+    public GatewayException(String msg) {
+        super(msg);
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
new file mode 100644
index 000000000..9d20f6839
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
@@ -0,0 +1,114 @@
+package com.ruoyi.gateway.filter.factory;
+
+import cn.hutool.json.JSONObject;
+import com.ruoyi.gateway.exception.GatewayException;
+import com.ruoyi.gateway.utils.GatewayUtils;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.factory.AbstractNameValueGatewayFilterFactory;
+import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.function.server.HandlerStrategies;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Mono;
+
+import java.net.URI;
+
+import static org.springframework.cloud.gateway.support.GatewayToStringStyler.filterToStringCreator;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+public class AddRequestParamGatewayFilterFactory extends AbstractNameValueGatewayFilterFactory {
+
+    @Override
+    public GatewayFilter apply(NameValueConfig config)
+    {
+        return new GatewayFilter() {
+            @Override
+            public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
+            {
+                final ServerHttpRequest request = exchange.getRequest();
+                HttpMethod method = request.getMethod();
+                if (HttpMethod.GET.equals(method))
+                {
+                    URI uri = request.getURI();
+                    StringBuilder query = new StringBuilder();
+                    String originalQuery = uri.getRawQuery();
+
+                    if (StringUtils.hasText(originalQuery))
+                    {
+                        query.append(originalQuery);
+                        if (originalQuery.charAt(originalQuery.length() - 1) != '&')
+                        {
+                            query.append('&');
+                        }
+                    }
+
+                    String value = ServerWebExchangeUtils.expand(exchange, config.getValue());
+                    // TODO urlencode?
+                    query.append(config.getName());
+                    query.append('=');
+                    query.append(value);
+
+                    try
+                    {
+                        URI newUri = UriComponentsBuilder.fromUri(uri).replaceQuery(query.toString()).build(false).toUri();
+                        return chain.filter(exchange.mutate().request(request.mutate().uri(newUri).build()).build());
+                    } catch (RuntimeException ex)
+                    {
+                        throw new IllegalStateException("Invalid URI query: \"" + query.toString() + "\"");
+                    }
+                } else if (HttpMethod.POST.equals(method))
+                {
+                    ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
+                    Mono<String> modifiedBody = serverRequest.bodyToMono(String.class)
+                            .flatMap(body -> {
+                                MediaType mediaType = request.getHeaders().getContentType();
+                                if (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType))
+                                {
+                                    JSONObject jsonObject = new JSONObject(body);
+                                    jsonObject.set(config.getName(), config.getValue());
+                                    return Mono.just(jsonObject.toString());
+                                } else if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType))
+                                {
+                                    StringBuilder newBody = new StringBuilder();
+                                    if (org.springframework.util.StringUtils.hasText(body))
+                                    {
+                                        newBody.append(body);
+                                        if (body.charAt(body.length() - 1) != '&')
+                                        {
+                                            newBody.append('&');
+                                        }
+                                    }
+                                    String value = ServerWebExchangeUtils.expand(exchange, config.getValue());
+                                    newBody.append(config.getName());
+                                    newBody.append('=');
+                                    newBody.append(value);
+                                    return Mono.just(newBody.toString());
+                                }
+                                return Mono.empty();
+                            });
+                    return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+                } else
+                {
+                    throw new GatewayException(String.format("Method %s Not Supported!", method.name()));
+                }
+            }
+
+            @Override
+            public String toString()
+            {
+                return filterToStringCreator(AddRequestParamGatewayFilterFactory.this)
+                        .append(config.getName(), config.getValue()).toString();
+            }
+        };
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
new file mode 100644
index 000000000..403214bf9
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
@@ -0,0 +1,104 @@
+package com.ruoyi.gateway.filter.factory;
+
+import cn.hutool.json.JSONObject;
+import com.ruoyi.gateway.exception.GatewayException;
+import com.ruoyi.gateway.utils.GatewayUtils;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.function.server.HandlerStrategies;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Mono;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.springframework.cloud.gateway.support.GatewayToStringStyler.filterToStringCreator;
+import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-15
+ */
+public class RemoveRequestParamGatewayFilterFactory extends AbstractGatewayFilterFactory<AbstractGatewayFilterFactory.NameConfig> {
+
+    public RemoveRequestParamGatewayFilterFactory()
+    {
+        super(NameConfig.class);
+    }
+
+    @Override
+    public List<String> shortcutFieldOrder()
+    {
+        return Arrays.asList(NAME_KEY);
+    }
+
+    @Override
+    public GatewayFilter apply(NameConfig config)
+    {
+        return new GatewayFilter() {
+            @Override
+            public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
+            {
+                ServerHttpRequest request = exchange.getRequest();
+                HttpMethod method = request.getMethod();
+                if (HttpMethod.GET.equals(method))
+                {
+                    MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
+                    queryParams.remove(config.getName());
+
+                    URI newUri = UriComponentsBuilder.fromUri(request.getURI())
+                            .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
+
+                    ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
+
+                    return chain.filter(exchange.mutate().request(updatedRequest).build());
+                } else if (HttpMethod.POST.equals(method))
+                {
+                    ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
+                    Mono<String> modifiedBody = serverRequest.bodyToMono(String.class)
+                            .flatMap(body -> {
+                                MediaType mediaType = request.getHeaders().getContentType();
+                                if (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType))
+                                {
+                                    JSONObject jsonObject = new JSONObject(body);
+                                    jsonObject.remove(config.getName());
+                                    return Mono.just(jsonObject.toString());
+                                } else if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType))
+                                {
+                                    if (StringUtils.hasText(body))
+                                    {
+                                        return Mono.just(Arrays.stream(body.split("&"))
+                                                .filter(str -> config.getName().equals(str.split("=")[0]))
+                                                .collect(Collectors.joining("&")));
+                                    }
+                                    return Mono.just(body);
+                                }
+                                return Mono.empty();
+                            });
+                    return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+                } else
+                {
+                    throw new GatewayException(String.format("Method %s Not Supported!", method.name()));
+                }
+            }
+
+            @Override
+            public String toString()
+            {
+                return filterToStringCreator(RemoveRequestParamGatewayFilterFactory.this)
+                        .append("name", config.getName()).toString();
+            }
+        };
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
new file mode 100644
index 000000000..eefd3033a
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -0,0 +1,61 @@
+package com.ruoyi.gateway.utils;
+
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.factory.rewrite.CachedBodyOutputMessage;
+import org.springframework.cloud.gateway.support.BodyInserterContext;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
+import org.springframework.web.reactive.function.BodyInserter;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-15
+ */
+public class GatewayUtils {
+
+    public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher)
+    {
+        BodyInserter bodyInserter = BodyInserters.fromPublisher(publisher, String.class);
+        HttpHeaders headers = new HttpHeaders();
+        headers.putAll(exchange.getRequest().getHeaders());
+        headers.remove(HttpHeaders.CONTENT_LENGTH);
+        CachedBodyOutputMessage outputMessage = new CachedBodyOutputMessage(exchange, headers);
+        return bodyInserter.insert(outputMessage, new BodyInserterContext())
+                .then(Mono.defer(() -> {
+                    ServerHttpRequest decorator = decorate(exchange, headers, outputMessage);
+                    return chain.filter(exchange.mutate().request(decorator).build());
+                }));
+    }
+
+
+    public static ServerHttpRequestDecorator decorate(ServerWebExchange exchange, HttpHeaders headers, CachedBodyOutputMessage outputMessage)
+    {
+        return new ServerHttpRequestDecorator(exchange.getRequest()) {
+            public HttpHeaders getHeaders()
+            {
+                long contentLength = headers.getContentLength();
+                HttpHeaders httpHeaders = new HttpHeaders();
+                httpHeaders.putAll(super.getHeaders());
+                if (contentLength > 0L)
+                {
+                    httpHeaders.setContentLength(contentLength);
+                } else
+                {
+                    httpHeaders.set("Transfer-Encoding", "chunked");
+                }
+                return httpHeaders;
+            }
+
+            public Flux<DataBuffer> getBody()
+            {
+                return outputMessage.getBody();
+            }
+        };
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 90f7af214..0a1b22fbe 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -33,6 +33,7 @@ public class RouteUtils {
      * Gateway 虚拟路径前缀
      */
     public static final String PATH_PREFIX = "/proxy";
+    public static final String ACCESS_KEY_NAME = "ak";
     private static RedissonClient client = SpringUtils.getBean(RedissonClient.class);
 
     /**
@@ -151,7 +152,7 @@ public class RouteUtils {
 
         IscPredicateDefinition queryPredicate = new IscPredicateDefinition();
         queryPredicate.setName("Query");
-        queryPredicate.getArgs().put("param", "ak");
+        queryPredicate.getArgs().put("param", ACCESS_KEY_NAME);
 
         IscPredicateDefinition pathPredicate = new IscPredicateDefinition();
         pathPredicate.setName("Path");
@@ -165,23 +166,34 @@ public class RouteUtils {
         stripPrefixFilter.getArgs().put("parts", "1");
         filters.add(stripPrefixFilter);
 
-        IscFilterDefinition removeRequestParameterFilter = new IscFilterDefinition();
-        removeRequestParameterFilter.setName("RemoveRequestParameter");
-        removeRequestParameterFilter.getArgs().put("name", "ak");
-        filters.add(removeRequestParameterFilter);
+        final Long quotaSeconds = appService.getQuotaSeconds();
+        if (Objects.nonNull(quotaSeconds))
+        {
+            IscFilterDefinition requestRateLimiterFilter = new IscFilterDefinition();
+            requestRateLimiterFilter.setName("RequestRateLimiter");
+            requestRateLimiterFilter.getArgs().put("redis-rate-limiter.replenishRate", String.valueOf(quotaSeconds));
+            requestRateLimiterFilter.getArgs().put("redis-rate-limiter.burstCapacity", String.valueOf(quotaSeconds << 1));
+            requestRateLimiterFilter.getArgs().put("key-resolver", "#{@routeIdKeyResolver}");
+            filters.add(requestRateLimiterFilter);
+        }
+
+        IscFilterDefinition removeRequestParamFilter = new IscFilterDefinition();
+        removeRequestParamFilter.setName("RemoveRequestParam");
+        removeRequestParamFilter.getArgs().put("name", ACCESS_KEY_NAME);
+        filters.add(removeRequestParamFilter);
 
         String hiddenParams = service.getHiddenParams();
         if(StringUtils.isNotBlank(hiddenParams)) {
             Map<String, Object> paramsMap = JsonUtils.parseMap(hiddenParams);
             Iterator<Map.Entry<String, Object>> it = paramsMap.entrySet().iterator();
             while (it.hasNext()) {
-                IscFilterDefinition addRequestParameterFilter = new IscFilterDefinition();
-                Map<String, String> args = addRequestParameterFilter.getArgs();
-                addRequestParameterFilter.setName("AddRequestParameter");
+                IscFilterDefinition addRequestParamFilter = new IscFilterDefinition();
+                Map<String, String> args = addRequestParamFilter.getArgs();
+                addRequestParamFilter.setName("AddRequestParam");
                 Map.Entry<String, Object> param = it.next();
                 args.put("name", param.getKey());
                 args.put("value", String.valueOf(param.getValue()));
-                filters.add(addRequestParameterFilter);
+                filters.add(addRequestParamFilter);
             }
         }
 
@@ -193,7 +205,6 @@ public class RouteUtils {
 
         //其他信息
         Map<String, Object> metadata = route.getMetadata();
-        metadata.put("secondsLimit", toString(appService.getQuotaSeconds()));
         metadata.put("minutesLimit", toString(appService.getQuotaMinutes()));
         metadata.put("hoursLimit", toString(appService.getQuotaHours()));
         metadata.put("daysLimit", toString(appService.getQuotaDays()));
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 8e536cce2..b425e1d86 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -16,7 +16,11 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.13.1</version>
+        </dependency>
         <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>

From 2a6479c74357d25c5136774ef3474ca471fcac6a Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Fri, 15 Oct 2021 23:23:52 +0800
Subject: [PATCH 42/60] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=99=90=E6=B5=81?=
 =?UTF-8?q?=E5=99=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/gateway/config/GatewayConfig.java | 10 ----------
 .../main/java/com/ruoyi/isc/utils/RouteUtils.java    | 12 +-----------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 5150d07d0..98b6e4f92 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -4,18 +4,14 @@ import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.factory.AddRequestParamGatewayFilterFactory;
 import com.ruoyi.gateway.filter.factory.RemoveRequestParamGatewayFilterFactory;
 import org.redisson.api.RedissonClient;
-import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
-import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
-import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
-import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
 
@@ -70,10 +66,4 @@ public class GatewayConfig
     {
         return new RemoveRequestParamGatewayFilterFactory();
     }
-
-    @Bean("routeIdKeyResolver")
-    public KeyResolver routeIdKeyResolver()
-    {
-        return exchange -> Mono.just(((Route) exchange.getAttributes().get(ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR)).getId());
-    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 0a1b22fbe..220e97468 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -166,17 +166,6 @@ public class RouteUtils {
         stripPrefixFilter.getArgs().put("parts", "1");
         filters.add(stripPrefixFilter);
 
-        final Long quotaSeconds = appService.getQuotaSeconds();
-        if (Objects.nonNull(quotaSeconds))
-        {
-            IscFilterDefinition requestRateLimiterFilter = new IscFilterDefinition();
-            requestRateLimiterFilter.setName("RequestRateLimiter");
-            requestRateLimiterFilter.getArgs().put("redis-rate-limiter.replenishRate", String.valueOf(quotaSeconds));
-            requestRateLimiterFilter.getArgs().put("redis-rate-limiter.burstCapacity", String.valueOf(quotaSeconds << 1));
-            requestRateLimiterFilter.getArgs().put("key-resolver", "#{@routeIdKeyResolver}");
-            filters.add(requestRateLimiterFilter);
-        }
-
         IscFilterDefinition removeRequestParamFilter = new IscFilterDefinition();
         removeRequestParamFilter.setName("RemoveRequestParam");
         removeRequestParamFilter.getArgs().put("name", ACCESS_KEY_NAME);
@@ -205,6 +194,7 @@ public class RouteUtils {
 
         //其他信息
         Map<String, Object> metadata = route.getMetadata();
+        metadata.put("secondsLimit", toString(appService.getQuotaSeconds()));
         metadata.put("minutesLimit", toString(appService.getQuotaMinutes()));
         metadata.put("hoursLimit", toString(appService.getQuotaHours()));
         metadata.put("daysLimit", toString(appService.getQuotaDays()));

From dd46fa932f83a4467c6b38503d801e696faeeb5e Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sat, 16 Oct 2021 22:16:51 +0800
Subject: [PATCH 43/60] =?UTF-8?q?=E9=99=90=E6=B5=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/constant/IscConstants.java   |   7 +-
 .../ruoyi/gateway/config/GatewayConfig.java   |  14 +-
 .../RedisRouteDefinitionRepository.java       |   2 +-
 .../gateway/filter/CustomerGlobalFilter.java  | 170 ++++++++++++++++++
 .../AddRequestParamGatewayFilterFactory.java  | 114 ------------
 ...emoveRequestParamGatewayFilterFactory.java | 104 -----------
 .../com/ruoyi/gateway/utils/GatewayUtils.java | 103 +++++++++++
 .../ruoyi/gateway/utils/beans/IscRule.java    |  26 +++
 .../isc/service/IIscAppServiceService.java    |   4 +-
 .../ruoyi/isc/service/IIscServiceService.java |   5 +
 .../impl/IscAppServiceApplyServiceImpl.java   |   7 +-
 .../impl/IscAppServiceServiceImpl.java        |  24 +--
 .../service/impl/IscServiceServiceImpl.java   |  22 +++
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 126 ++++++++-----
 .../ruoyi/isc/utils/beans/GatewayRoute.java   |  16 --
 .../com/ruoyi/isc/utils/beans/IscRule.java    |  26 +++
 16 files changed, 451 insertions(+), 319 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
 delete mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
 delete mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java
 delete mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index 6ca156762..fe3c523f7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -26,5 +26,10 @@ public class IscConstants {
     /**
      * Gateway 路由信息Redis Key
      */
-    public static final String KEY_ROUTES = "ROUTES::";
+    public static final String KEY_ROUTES = "ROUTES:";
+
+    /**
+     * Gateway 服务对应AK规则
+     */
+    public static final String KEY_RULES = "RULES:";
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 98b6e4f92..0836e7c70 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,9 +1,9 @@
 package com.ruoyi.gateway.config;
 
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
-import com.ruoyi.gateway.filter.factory.AddRequestParamGatewayFilterFactory;
-import com.ruoyi.gateway.filter.factory.RemoveRequestParamGatewayFilterFactory;
+import com.ruoyi.gateway.filter.CustomerGlobalFilter;
 import org.redisson.api.RedissonClient;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import org.springframework.context.annotation.Bean;
@@ -56,14 +56,8 @@ public class GatewayConfig
     }
 
     @Bean
-    public AddRequestParamGatewayFilterFactory addRequestParamGatewayFilterFactory()
+    public GlobalFilter customerGlobalFilter()
     {
-        return new AddRequestParamGatewayFilterFactory();
-    }
-
-    @Bean
-    public RemoveRequestParamGatewayFilterFactory removeRequestParamGatewayFilterFactory()
-    {
-        return new RemoveRequestParamGatewayFilterFactory();
+        return new CustomerGlobalFilter();
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
index 17d4c1dcc..ebdb94caf 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -20,7 +20,7 @@ import reactor.core.publisher.Mono;
 public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
 {
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, RouteDefinition.class);
-    public static final String KEY_ROUTES = "ROUTES::";
+    public static final String KEY_ROUTES = "ROUTES:";
     private final RedissonClient redissonClient;
 
     public RedisRouteDefinitionRepository(RedissonClient redissonClient)
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
new file mode 100644
index 000000000..ec6f5d4ba
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -0,0 +1,170 @@
+package com.ruoyi.gateway.filter;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.gateway.utils.GatewayUtils;
+import com.ruoyi.gateway.utils.beans.IscRule;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.cloud.gateway.route.Route;
+import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.MultiValueMapAdapter;
+import org.springframework.util.StringUtils;
+import org.springframework.web.reactive.function.server.HandlerStrategies;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Mono;
+
+import java.net.URI;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
+
+/**
+ * 自定义全局过滤器，操作如下：
+ * 1.ak 是否存在
+ * 2.是否到期
+ * 3.是否限流
+ * 4.删除参数ak
+ * 5.添加隐藏参数
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-15
+ */
+public class CustomerGlobalFilter implements GlobalFilter, Ordered {
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        final Route route = exchange.getRequiredAttribute(ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR);
+        final Map<String, Object> metadata = route.getMetadata();
+        final ServerHttpRequest request = exchange.getRequest();
+        //ak 是否存在
+        final HttpMethod httpMethod = request.getMethod();
+        final String accessKeyName = String.valueOf(metadata.get(GatewayUtils.CONFIG_ACCESS_KEY_NAME_KEY));
+        String headerAk = GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKeyName));
+        if (HttpMethod.GET.equals(httpMethod)) {
+            final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
+            handleRule(headerAk, () -> queryParams.get(accessKeyName), route, request, accessKeyName);
+            queryParams.remove(accessKeyName);
+            handleHiddenParams(route, queryParams, (json, map) -> {
+                Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
+                while (iterator.hasNext()) {
+                    Map.Entry<String, Object> next = iterator.next();
+                    Object value;
+                    if (Objects.isNull(value = next.getValue()) || StrUtil.isBlank(value.toString())) {
+                        map.add(next.getKey(), StrUtil.EMPTY);
+                    } else {
+                        map.add(next.getKey(), value.toString());
+                    }
+                }
+            });
+            URI newUri = UriComponentsBuilder.fromUri(request.getURI())
+                    .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
+            ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
+            return chain.filter(exchange.mutate().request(updatedRequest).build());
+        } else if (HttpMethod.POST.equals(httpMethod)) {
+            final ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
+            final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class);
+            modifiedBody.flatMap(body -> {
+                MediaType mediaType = request.getHeaders().getContentType();
+                if (MediaType.APPLICATION_JSON.equals(mediaType)) {
+                    JSONObject jsonObj = JSONUtil.parseObj(body);
+                    String ak = handleRule(headerAk, () -> Arrays.asList(jsonObj.get(accessKeyName, String.class,
+                            true)), route, request, accessKeyName);
+                    jsonObj.remove(accessKeyName);
+                    handleHiddenParams(route, jsonObj, (json, map) -> {
+                        Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
+                        while (iterator.hasNext()) {
+                            Map.Entry<String, Object> next = iterator.next();
+                            map.set(next.getKey(), next.getValue());
+                        }
+                    });
+                    return Mono.just(jsonObj.toString());
+                } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
+                    if (StringUtils.hasText(body)) {
+                        final Stream<String[]> stream = Arrays.stream(body.split("&")).map(param -> param.split("="));
+                        handleRule(headerAk, () -> stream.filter(param -> param.length > 0 &&
+                                        accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()),
+                                route, request, accessKeyName);
+                        final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
+                        handleHiddenParams(route, params, (json, list) -> {
+                            Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
+                            while (iterator.hasNext()) {
+                                Map.Entry<String, Object> next = iterator.next();
+                                list.add(new String[]{next.getKey(), next.getValue().toString()});
+                            }
+                        });
+                        return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
+                    }
+                }
+                return Mono.empty();
+            });
+            return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+        }
+        return chain.filter(exchange);
+    }
+
+    @Override
+    public int getOrder() {
+        return -1;
+    }
+
+    /**
+     * 处理规则
+     *
+     * @param headerAk
+     * @param valueSupplier
+     * @param route
+     * @param request
+     * @param accessKeyName
+     * @return
+     */
+    private String handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route,
+                              ServerHttpRequest request, String accessKeyName) {
+        //获取AK
+        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, () -> new RuntimeException("AK 不存在"));
+        //获取规则
+        final IscRule rule = GatewayUtils.getRequiredValue(() -> GatewayUtils.getRule(ak, route.getId()),
+                () -> new RuntimeException("AK异常"));
+        //是否到期
+        GatewayUtils.isBefore(rule, () -> new RuntimeException("AK已过期"));
+        //TODO 限流
+
+        //如果header中有AK,则删除
+        if (Objects.nonNull(headerAk)) {
+            request.getHeaders().remove(accessKeyName);
+        }
+        return ak;
+    }
+
+    /**
+     * 处理隐藏参数
+     *
+     * @param route
+     * @param result
+     * @param mapper
+     * @param <U>
+     */
+    private <U> void handleHiddenParams(Route route, U result, BiConsumer<JSONObject, U> mapper) {
+        final Object obj = route.getMetadata().get(GatewayUtils.CONFIG_ADD_PARAM_KEY);
+        if (Objects.isNull(obj)) {
+            return;
+        }
+        final JSONObject json = JSONUtil.parseObj(obj.toString());
+        if (json.isEmpty()) {
+            return;
+        }
+        mapper.accept(json, result);
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
deleted file mode 100644
index 9d20f6839..000000000
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/AddRequestParamGatewayFilterFactory.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.gateway.filter.factory;
-
-import cn.hutool.json.JSONObject;
-import com.ruoyi.gateway.exception.GatewayException;
-import com.ruoyi.gateway.utils.GatewayUtils;
-import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.factory.AbstractNameValueGatewayFilterFactory;
-import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.util.StringUtils;
-import org.springframework.web.reactive.function.server.HandlerStrategies;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.util.UriComponentsBuilder;
-import reactor.core.publisher.Mono;
-
-import java.net.URI;
-
-import static org.springframework.cloud.gateway.support.GatewayToStringStyler.filterToStringCreator;
-
-/**
- * @author Wenchao Gong
- * @date 2021-10-04
- */
-public class AddRequestParamGatewayFilterFactory extends AbstractNameValueGatewayFilterFactory {
-
-    @Override
-    public GatewayFilter apply(NameValueConfig config)
-    {
-        return new GatewayFilter() {
-            @Override
-            public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
-            {
-                final ServerHttpRequest request = exchange.getRequest();
-                HttpMethod method = request.getMethod();
-                if (HttpMethod.GET.equals(method))
-                {
-                    URI uri = request.getURI();
-                    StringBuilder query = new StringBuilder();
-                    String originalQuery = uri.getRawQuery();
-
-                    if (StringUtils.hasText(originalQuery))
-                    {
-                        query.append(originalQuery);
-                        if (originalQuery.charAt(originalQuery.length() - 1) != '&')
-                        {
-                            query.append('&');
-                        }
-                    }
-
-                    String value = ServerWebExchangeUtils.expand(exchange, config.getValue());
-                    // TODO urlencode?
-                    query.append(config.getName());
-                    query.append('=');
-                    query.append(value);
-
-                    try
-                    {
-                        URI newUri = UriComponentsBuilder.fromUri(uri).replaceQuery(query.toString()).build(false).toUri();
-                        return chain.filter(exchange.mutate().request(request.mutate().uri(newUri).build()).build());
-                    } catch (RuntimeException ex)
-                    {
-                        throw new IllegalStateException("Invalid URI query: \"" + query.toString() + "\"");
-                    }
-                } else if (HttpMethod.POST.equals(method))
-                {
-                    ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
-                    Mono<String> modifiedBody = serverRequest.bodyToMono(String.class)
-                            .flatMap(body -> {
-                                MediaType mediaType = request.getHeaders().getContentType();
-                                if (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType))
-                                {
-                                    JSONObject jsonObject = new JSONObject(body);
-                                    jsonObject.set(config.getName(), config.getValue());
-                                    return Mono.just(jsonObject.toString());
-                                } else if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType))
-                                {
-                                    StringBuilder newBody = new StringBuilder();
-                                    if (org.springframework.util.StringUtils.hasText(body))
-                                    {
-                                        newBody.append(body);
-                                        if (body.charAt(body.length() - 1) != '&')
-                                        {
-                                            newBody.append('&');
-                                        }
-                                    }
-                                    String value = ServerWebExchangeUtils.expand(exchange, config.getValue());
-                                    newBody.append(config.getName());
-                                    newBody.append('=');
-                                    newBody.append(value);
-                                    return Mono.just(newBody.toString());
-                                }
-                                return Mono.empty();
-                            });
-                    return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
-                } else
-                {
-                    throw new GatewayException(String.format("Method %s Not Supported!", method.name()));
-                }
-            }
-
-            @Override
-            public String toString()
-            {
-                return filterToStringCreator(AddRequestParamGatewayFilterFactory.this)
-                        .append(config.getName(), config.getValue()).toString();
-            }
-        };
-    }
-
-}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
deleted file mode 100644
index 403214bf9..000000000
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/factory/RemoveRequestParamGatewayFilterFactory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.gateway.filter.factory;
-
-import cn.hutool.json.JSONObject;
-import com.ruoyi.gateway.exception.GatewayException;
-import com.ruoyi.gateway.utils.GatewayUtils;
-import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
-import org.springframework.web.reactive.function.server.HandlerStrategies;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.util.UriComponentsBuilder;
-import reactor.core.publisher.Mono;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.springframework.cloud.gateway.support.GatewayToStringStyler.filterToStringCreator;
-import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
-
-/**
- * @author Wenchao Gong
- * @date 2021-10-15
- */
-public class RemoveRequestParamGatewayFilterFactory extends AbstractGatewayFilterFactory<AbstractGatewayFilterFactory.NameConfig> {
-
-    public RemoveRequestParamGatewayFilterFactory()
-    {
-        super(NameConfig.class);
-    }
-
-    @Override
-    public List<String> shortcutFieldOrder()
-    {
-        return Arrays.asList(NAME_KEY);
-    }
-
-    @Override
-    public GatewayFilter apply(NameConfig config)
-    {
-        return new GatewayFilter() {
-            @Override
-            public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
-            {
-                ServerHttpRequest request = exchange.getRequest();
-                HttpMethod method = request.getMethod();
-                if (HttpMethod.GET.equals(method))
-                {
-                    MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
-                    queryParams.remove(config.getName());
-
-                    URI newUri = UriComponentsBuilder.fromUri(request.getURI())
-                            .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
-
-                    ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
-
-                    return chain.filter(exchange.mutate().request(updatedRequest).build());
-                } else if (HttpMethod.POST.equals(method))
-                {
-                    ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
-                    Mono<String> modifiedBody = serverRequest.bodyToMono(String.class)
-                            .flatMap(body -> {
-                                MediaType mediaType = request.getHeaders().getContentType();
-                                if (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType))
-                                {
-                                    JSONObject jsonObject = new JSONObject(body);
-                                    jsonObject.remove(config.getName());
-                                    return Mono.just(jsonObject.toString());
-                                } else if (MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(mediaType))
-                                {
-                                    if (StringUtils.hasText(body))
-                                    {
-                                        return Mono.just(Arrays.stream(body.split("&"))
-                                                .filter(str -> config.getName().equals(str.split("=")[0]))
-                                                .collect(Collectors.joining("&")));
-                                    }
-                                    return Mono.just(body);
-                                }
-                                return Mono.empty();
-                            });
-                    return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
-                } else
-                {
-                    throw new GatewayException(String.format("Method %s Not Supported!", method.name()));
-                }
-            }
-
-            @Override
-            public String toString()
-            {
-                return filterToStringCreator(RemoveRequestParamGatewayFilterFactory.this)
-                        .append("name", config.getName()).toString();
-            }
-        };
-    }
-}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
index eefd3033a..9cbfa0d20 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -1,5 +1,13 @@
 package com.ruoyi.gateway.utils;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.extra.spring.SpringUtil;
+import com.ruoyi.gateway.utils.beans.IscRule;
+import org.redisson.api.RMap;
+import org.redisson.api.RedissonClient;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.TypedJsonJacksonCodec;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.factory.rewrite.CachedBodyOutputMessage;
 import org.springframework.cloud.gateway.support.BodyInserterContext;
@@ -7,18 +15,35 @@ import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
+import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.sql.Date;
+import java.time.Instant;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+
 /**
  * @author Wenchao Gong
  * @date 2021-10-15
  */
 public class GatewayUtils {
 
+    public static final String CONFIG_ACCESS_KEY_NAME_KEY = "accessKeyName";
+    public static final String CONFIG_ADD_PARAM_KEY = "addParam";
+    /**
+     * Gateway 服务对应AK规则
+     */
+    public static final String KEY_RULES = "RULES:";
+
+    public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
+    private static RedissonClient client = SpringUtil.getBean(RedissonClient.class);
+
     public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher)
     {
         BodyInserter bodyInserter = BodyInserters.fromPublisher(publisher, String.class);
@@ -58,4 +83,82 @@ public class GatewayUtils {
             }
         };
     }
+
+    /**
+     * 从 values 中获取第一个不为空 的值
+     *
+     * @param before        获取之前的值 如果不为空直接返回
+     * @param valueSupplier 值列表生产者
+     * @return
+     */
+    public static String getValue(String before, Supplier<List<String>> valueSupplier) {
+        return getValue(before, valueSupplier, null);
+    }
+
+    /**
+     * 从 values 中获取第一个不为空 的值
+     *
+     * @param before           获取之前的值 如果不为空直接返回
+     * @param valueSupplier    值列表生产者
+     * @param errorMsgSupplier 异常信息生产者
+     * @param <X>
+     * @return
+     */
+    public static <X extends RuntimeException> String getValue(String before, Supplier<List<String>> valueSupplier, Supplier<X> errorMsgSupplier)
+    {
+        if(StringUtils.hasText(before)) {
+            return before;
+        }
+        final List<String> values = valueSupplier.get();
+        if(CollectionUtil.isNotEmpty(values)) {
+            for (String value : values) {
+                if(StringUtils.hasText(value)) {
+                    before = value;
+                    break;
+                }
+            }
+        }
+        if(errorMsgSupplier != null) {
+            Assert.notBlank(before, errorMsgSupplier);
+        }
+        return before;
+    }
+
+    /**
+     * 获取必要值，可抛出异常
+     * @param valueSupplier
+     * @param errorMsgSupplier
+     * @param <T>
+     * @param <X>
+     * @return
+     */
+    public static <T, X extends RuntimeException> T getRequiredValue(Supplier<T> valueSupplier, Supplier<X> errorMsgSupplier) {
+        final T value = valueSupplier.get();
+        if(Objects.nonNull(errorMsgSupplier)) {
+            Assert.notNull(value, errorMsgSupplier);
+        }
+        return value;
+    }
+
+
+    /**
+     * 获取规则
+     * @param ak AK
+     * @param routeId 路由ID
+     * @return
+     */
+    public static IscRule getRule(String ak, String routeId) {
+        final RMap<String, IscRule> map = client.getMap(KEY_RULES, RULE_CODES_INSTANCE);
+        return map.get(ak + ':' + routeId);
+    }
+
+    /**
+     * 断言是否超过结束时间
+     * @param rule
+     * @param errorMsgSupplier
+     * @param <X>
+     */
+    public static  <X extends RuntimeException> void isBefore(IscRule rule, Supplier<X> errorMsgSupplier) {
+        Assert.isTrue(Objects.nonNull(rule.getExpire()) && Date.from(Instant.now()).before(rule.getExpire()), errorMsgSupplier);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java
new file mode 100644
index 000000000..23e205f20
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java
@@ -0,0 +1,26 @@
+package com.ruoyi.gateway.utils.beans;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 网关 规则信息(服务对应AK处理规则)
+ * @author Wechao Gong
+ * @date 2021-10-16
+ */
+@Getter
+@Setter
+public class IscRule implements Serializable
+{
+    @JsonIgnore
+    private String id;
+    private Date expire;
+    private Long daysLimit;
+    private Long hoursLimit;
+    private Long minutesLimit;
+    private Long secondsLimit;
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
index d19089f90..f3d74ece8 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
@@ -70,7 +70,7 @@ public interface IIscAppServiceService extends IServicePlus<IscAppService, IscAp
     List<IscAppService> getAppServiceListByIds(Collection<Long> ids);
 
     /**
-     * 刷新路由信息
+     * 刷新规则信息（服务对应AK）
      */
-    void refreshRoutes();
+    void refreshRules();
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
index 2ff145ec1..48a675940 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
@@ -90,4 +90,9 @@ public interface IIscServiceService extends IServicePlus<IscService, IscServiceV
      * @param bo 审核业务对象
      */
     void checkAuditBO(IscAuditBo bo);
+
+    /**
+     * 刷新路由信息
+     */
+    void refreshRoutes();
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 483a39469..3500235eb 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -159,7 +159,6 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             Assert.notNull(appService, () -> new ServiceException("申请信息不存在"));
 
             IscAppService updateData = null;
-            IscRouteDefinition route = null;
             IscService service = null;
             if(IscConstants.AUDIT_PASS.equals(bo.getStatus())) {
                 service = serviceService.getById(appService.getServiceId());
@@ -175,8 +174,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
                 if(Objects.nonNull(service)) {
                     IscAppService dbAppService = appServiceService.getById(apply.getAppServiceId());
                     IscApplication application = applicationService.getById(dbAppService.getApplicationId());
-                    route = RouteUtils.generateRoute(dbAppService, service, application.getAccessKey());
-                    RouteUtils.saveRoute(route);
+                    RouteUtils.saveRule(RouteUtils.generateRule(dbAppService, application.getAccessKey()));
                 }
             }
         }
@@ -243,8 +241,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
             renewalDuration = Objects.nonNull(log) ? log.getRenewalDuration() : 1;
         }
         updateData.setEndTime(DateUtils.beginOfDay(DateUtils.addMonths(DateUtils.getNowDate(), renewalDuration)));
-        updateData.setVirtualAddr(RouteUtils.genVirtualAddrPath(appService.getApplicationId(),
-            appService.getServiceId(), service.getServiceAddr()));
+        updateData.setVirtualAddr(RouteUtils.genVirtualAddrPath(service.getServiceAddr()));
     }
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index bbd80cad8..5d3065f9e 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -20,7 +20,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.IscApplication;
-import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.domain.bo.IscAppServiceApplyBo;
 import com.ruoyi.isc.domain.bo.IscAppServiceBo;
 import com.ruoyi.isc.domain.vo.IscAppServiceVo;
@@ -30,14 +29,13 @@ import com.ruoyi.isc.service.IIscAppServiceService;
 import com.ruoyi.isc.service.IIscApplicationService;
 import com.ruoyi.isc.service.IIscServiceService;
 import com.ruoyi.isc.utils.RouteUtils;
-import com.ruoyi.isc.utils.beans.IscRouteDefinition;
+import com.ruoyi.isc.utils.beans.IscRule;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -60,7 +58,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
 
     @PostConstruct
     public void init() {
-        refreshRoutes();
+        refreshRules();
     }
 
     @Override
@@ -201,7 +199,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     }
 
     @Override
-    public void refreshRoutes()
+    public void refreshRules()
     {
         List<IscAppService> list = list(Wrappers.<IscAppService>lambdaQuery()
                 .eq(IscAppService::getEnabled, UserConstants.NORMAL)
@@ -210,33 +208,23 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         if(CollectionUtil.isEmpty(list)) {
             return;
         }
-        Set<Long> serviceIds = list.stream().map(IscAppService::getServiceId).collect(Collectors.toSet());
-        Map<Long, IscService> serviceMap = serviceService.list(Wrappers.<IscService>lambdaQuery()
-                .select(IscService::getServiceId, IscService::getServiceAddr, IscService::getHiddenParams, IscService::getRequestMethod)
-                .in(IscService::getServiceId, serviceIds)).stream()
-                .collect(Collectors.toMap(IscService::getServiceId, Function.identity()));
         Set<Long> applicationIds = list.stream().map(IscAppService::getApplicationId).collect(Collectors.toSet());
         Map<Long, String> accessKeyMap = applicationService.list(Wrappers.<IscApplication>lambdaQuery()
                 .select(IscApplication::getApplicationId, IscApplication::getAccessKey)
                 .in(IscApplication::getApplicationId, applicationIds)).stream()
                 .collect(Collectors.toMap(IscApplication::getApplicationId, IscApplication::getAccessKey));
-        List<IscRouteDefinition> routes = new ArrayList<>();
+        List<IscRule> routes = new ArrayList<>();
 
         for (IscAppService appService : list)
         {
-            IscService service = serviceMap.get(appService.getServiceId());
-            if(Objects.isNull(service)) {
-                log.error("路由初始化失败: id:[{}],服务[{}]信息不存在！", appService.getAppServiceId(), appService.getServiceId());
-                continue;
-            }
             String ak = accessKeyMap.get(appService.getApplicationId());
             if(StringUtils.isBlank(ak)) {
                 log.error("路由初始化失败: id:[{}],ak[{}]信息不存在！", appService.getAppServiceId(), appService.getApplicationId());
                 continue;
             }
-            routes.add(RouteUtils.generateRoute(appService, service, ak));
+            routes.add(RouteUtils.generateRule(appService, ak));
         }
-        RouteUtils.refreshRoute(routes);
+        RouteUtils.refreshRules(routes);
     }
 
     /**
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 1ecff6f25..afda1230b 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -25,8 +25,11 @@ import com.ruoyi.isc.domain.vo.IscServiceVo;
 import com.ruoyi.isc.mapper.IscServiceMapper;
 import com.ruoyi.isc.service.IIscServiceCateService;
 import com.ruoyi.isc.service.IIscServiceService;
+import com.ruoyi.isc.utils.RouteUtils;
+import com.ruoyi.isc.utils.beans.IscRouteDefinition;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -43,6 +46,11 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     @Resource
     private IIscServiceCateService cateService;
 
+    @PostConstruct
+    public void init() {
+        refreshRoutes();
+    }
+
     @Override
     public IscServiceVo queryById(Long serviceId)
     {
@@ -195,4 +203,18 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
                 throw new ServiceException("审核状态异常");
         }
     }
+
+    @Override
+    public void refreshRoutes()
+    {
+        final List<IscService> serviceList = list(Wrappers.<IscService>lambdaQuery()
+                .select(IscService::getServiceId, IscService::getServiceAddr, IscService::getHiddenParams, IscService::getRequestMethod)
+                .eq(IscService::getStatus, IscConstants.AUDIT_PASS));
+        List<IscRouteDefinition> routes = new ArrayList<>();
+        for (IscService service : serviceList)
+        {
+            routes.add(RouteUtils.generateRoute(service));
+        }
+        RouteUtils.refreshRoute(routes);
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 220e97468..77d259ac5 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -2,15 +2,13 @@ package com.ruoyi.isc.utils;
 
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.utils.beans.IscFilterDefinition;
 import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
 import com.ruoyi.isc.utils.beans.IscRouteDefinition;
+import com.ruoyi.isc.utils.beans.IscRule;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
@@ -18,7 +16,10 @@ import org.redisson.codec.TypedJsonJacksonCodec;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
 public class RouteUtils {
 
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRouteDefinition.class);
+    public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
     /**
      * Gateway 虚拟路径前缀
      */
@@ -39,12 +41,10 @@ public class RouteUtils {
     /**
      * 获取虚拟URL Path 部分
      *
-     * @param applicationId 应用ID
-     * @param serviceId     服务Id
-     * @param serviceAddr   服务地址
+     * @param serviceAddr 服务地址
      * @return 虚拟地址Path
      */
-    public static String genVirtualAddrPath(Long applicationId, Long serviceId, String serviceAddr)
+    public static String genVirtualAddrPath(String serviceAddr)
     {
         return PATH_PREFIX + getPathUri(serviceAddr);
     }
@@ -133,15 +133,13 @@ public class RouteUtils {
     /**
      * 生成 路由信息
      *
-     * @param appService 应用服务信息
      * @param service    服务信息
-     * @param ak         AK
      * @return 路由信息
      */
-    public static IscRouteDefinition generateRoute(IscAppService appService, IscService service, String ak)
+    public static IscRouteDefinition generateRoute(IscService service)
     {
         IscRouteDefinition route = new IscRouteDefinition();
-        route.setId(String.valueOf(appService.getAppServiceId()));
+        route.setId(String.valueOf(service.getServiceId()));
         final String serviceAddr = service.getServiceAddr();
         route.setUri(getURI(serviceAddr.substring(0, serviceAddr.length() - getPathUri(serviceAddr).length())));
 
@@ -150,14 +148,10 @@ public class RouteUtils {
         methodPredicate.setName("Method");
         methodPredicate.getArgs().put("methods", service.getRequestMethod());
 
-        IscPredicateDefinition queryPredicate = new IscPredicateDefinition();
-        queryPredicate.setName("Query");
-        queryPredicate.getArgs().put("param", ACCESS_KEY_NAME);
-
         IscPredicateDefinition pathPredicate = new IscPredicateDefinition();
         pathPredicate.setName("Path");
-        pathPredicate.getArgs().put("pattern", appService.getVirtualAddr());
-        route.setPredicates(Arrays.asList(methodPredicate, queryPredicate, pathPredicate));
+        pathPredicate.getArgs().put("pattern", genVirtualAddrPath(service.getServiceAddr()));
+        route.setPredicates(Arrays.asList(methodPredicate, pathPredicate));
 
         //过滤器
         List<IscFilterDefinition> filters = new ArrayList<>();
@@ -166,26 +160,6 @@ public class RouteUtils {
         stripPrefixFilter.getArgs().put("parts", "1");
         filters.add(stripPrefixFilter);
 
-        IscFilterDefinition removeRequestParamFilter = new IscFilterDefinition();
-        removeRequestParamFilter.setName("RemoveRequestParam");
-        removeRequestParamFilter.getArgs().put("name", ACCESS_KEY_NAME);
-        filters.add(removeRequestParamFilter);
-
-        String hiddenParams = service.getHiddenParams();
-        if(StringUtils.isNotBlank(hiddenParams)) {
-            Map<String, Object> paramsMap = JsonUtils.parseMap(hiddenParams);
-            Iterator<Map.Entry<String, Object>> it = paramsMap.entrySet().iterator();
-            while (it.hasNext()) {
-                IscFilterDefinition addRequestParamFilter = new IscFilterDefinition();
-                Map<String, String> args = addRequestParamFilter.getArgs();
-                addRequestParamFilter.setName("AddRequestParam");
-                Map.Entry<String, Object> param = it.next();
-                args.put("name", param.getKey());
-                args.put("value", String.valueOf(param.getValue()));
-                filters.add(addRequestParamFilter);
-            }
-        }
-
         IscFilterDefinition retryFilter = new IscFilterDefinition();
         retryFilter.setName("Retry");
         retryFilter.getArgs().put("retries", "1");
@@ -194,23 +168,79 @@ public class RouteUtils {
 
         //其他信息
         Map<String, Object> metadata = route.getMetadata();
-        metadata.put("secondsLimit", toString(appService.getQuotaSeconds()));
-        metadata.put("minutesLimit", toString(appService.getQuotaMinutes()));
-        metadata.put("hoursLimit", toString(appService.getQuotaHours()));
-        metadata.put("daysLimit", toString(appService.getQuotaDays()));
-        metadata.put("expire", toString(appService.getEndTime()));
+        metadata.put("accessKeyName", ACCESS_KEY_NAME);
+        metadata.put("addParam", service.getHiddenParams());
         return route;
     }
 
     /**
-     * 对象转字符串
+     * 生成 服务对应AK调用规则
      *
-     * @param obj 具体属性
+     * @param appService
+     * @param accessKey
      * @return
      */
-    public static String toString(Object obj)
+    public static IscRule generateRule(IscAppService appService, String accessKey)
     {
-        return Objects.isNull(obj) ? StringUtils.EMPTY : obj instanceof Date ?
-                DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, (Date) obj) : String.valueOf(obj);
+        IscRule rule = new IscRule();
+        rule.setId(accessKey + ':' + appService.getServiceId());
+        rule.setExpire(appService.getEndTime());
+        rule.setDaysLimit(appService.getQuotaDays());
+        rule.setHoursLimit(appService.getQuotaHours());
+        rule.setMinutesLimit(appService.getQuotaMinutes());
+        rule.setSecondsLimit(appService.getQuotaSeconds());
+        return rule;
+    }
+
+    /**
+     * 刷新规则信息 先清空再批量新增
+     *
+     * @param rules 规则信息
+     * @return 是否成功
+     */
+    public static boolean refreshRules(List<IscRule> rules)
+    {
+        Map<String, IscRule> ruleMap = rules.stream().collect(Collectors.toMap(IscRule::getId, Function.identity(), (o1, o2) -> o2));
+        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        map.clear();
+        map.putAll(ruleMap);
+        return true;
+    }
+
+    /**
+     * 保存规则信息
+     *
+     * @param rule 规则信息
+     * @return 是否成功
+     */
+    public static boolean saveRule(IscRule rule)
+    {
+        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        map.put(rule.getId(), rule);
+        return true;
+    }
+
+    /**
+     * 删除规则信息
+     *
+     * @param ruleId 规则ID
+     * @return 是否成功
+     */
+    public static boolean deleteRule(String ruleId)
+    {
+        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        map.remove(ruleId);
+        return true;
+    }
+
+    /**
+     * 更新规则信息
+     *
+     * @param rule 规则信息
+     * @return 是否成功
+     */
+    public static boolean updateRule(IscRule rule)
+    {
+        return saveRule(rule);
     }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
deleted file mode 100644
index bfd071015..000000000
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/GatewayRoute.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.isc.utils.beans;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author Wechao Gong
- * @date 2021/9-14
- */
-@Getter
-@Setter
-public class GatewayRoute implements Serializable
-{
-}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java
new file mode 100644
index 000000000..3d55f6ed6
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java
@@ -0,0 +1,26 @@
+package com.ruoyi.isc.utils.beans;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 网关 规则信息(服务对应AK处理规则)
+ * @author Wechao Gong
+ * @date 2021-10-16
+ */
+@Getter
+@Setter
+public class IscRule implements Serializable
+{
+    @JsonIgnore
+    private String id;
+    private Date expire;
+    private Long daysLimit;
+    private Long hoursLimit;
+    private Long minutesLimit;
+    private Long secondsLimit;
+}

From 71ee37556df0931bbee78eb95ec922876c28b277 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sat, 16 Oct 2021 23:09:21 +0800
Subject: [PATCH 44/60] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gateway/filter/CustomerGlobalFilter.java  | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index ec6f5d4ba..b71b86929 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -1,6 +1,7 @@
 package com.ruoyi.gateway.filter;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.gateway.utils.GatewayUtils;
@@ -57,16 +58,14 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
             final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
             handleRule(headerAk, () -> queryParams.get(accessKeyName), route, request, accessKeyName);
             queryParams.remove(accessKeyName);
-            handleHiddenParams(route, queryParams, (json, map) -> {
-                Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
-                while (iterator.hasNext()) {
-                    Map.Entry<String, Object> next = iterator.next();
-                    Object value;
-                    if (Objects.isNull(value = next.getValue()) || StrUtil.isBlank(value.toString())) {
-                        map.add(next.getKey(), StrUtil.EMPTY);
-                    } else {
-                        map.add(next.getKey(), value.toString());
-                    }
+            handleHiddenParams(route, queryParams, (next, map) -> {
+                Object value;
+                if (Objects.isNull(value = next.getValue())) {
+                    map.add(next.getKey(), StrUtil.EMPTY);
+                } else if(value instanceof JSONArray) {
+                    map.put(next.getKey(), ((JSONArray)value).toList(String.class));
+                } else {
+                    map.add(next.getKey(), value.toString());
                 }
             });
             URI newUri = UriComponentsBuilder.fromUri(request.getURI())
@@ -80,15 +79,11 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 MediaType mediaType = request.getHeaders().getContentType();
                 if (MediaType.APPLICATION_JSON.equals(mediaType)) {
                     JSONObject jsonObj = JSONUtil.parseObj(body);
-                    String ak = handleRule(headerAk, () -> Arrays.asList(jsonObj.get(accessKeyName, String.class,
-                            true)), route, request, accessKeyName);
+                    handleRule(headerAk, () -> Arrays.asList(jsonObj.get(accessKeyName, String.class, true)),
+                            route, request, accessKeyName);
                     jsonObj.remove(accessKeyName);
-                    handleHiddenParams(route, jsonObj, (json, map) -> {
-                        Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
-                        while (iterator.hasNext()) {
-                            Map.Entry<String, Object> next = iterator.next();
-                            map.set(next.getKey(), next.getValue());
-                        }
+                    handleHiddenParams(route, jsonObj, (next, map) -> {
+                        map.set(next.getKey(), next.getValue());
                     });
                     return Mono.just(jsonObj.toString());
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
@@ -98,12 +93,18 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                                         accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()),
                                 route, request, accessKeyName);
                         final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
-                        handleHiddenParams(route, params, (json, list) -> {
-                            Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
-                            while (iterator.hasNext()) {
-                                Map.Entry<String, Object> next = iterator.next();
+                        handleHiddenParams(route, params, (next, list) -> {
+                            Object value;
+                            if (Objects.isNull(value = next.getValue())) {
+                                list.add(new String[]{next.getKey(), StrUtil.EMPTY});
+                            } else if(value instanceof JSONArray) {
+                                ((JSONArray)value).stream().map(o -> String.valueOf(o)).forEach(v -> {
+                                    list.add(new String[]{next.getKey(), v});
+                                });
+                            } else {
                                 list.add(new String[]{next.getKey(), next.getValue().toString()});
                             }
+
                         });
                         return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
                     }
@@ -156,7 +157,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param mapper
      * @param <U>
      */
-    private <U> void handleHiddenParams(Route route, U result, BiConsumer<JSONObject, U> mapper) {
+    private <U> void handleHiddenParams(Route route, U result, BiConsumer<Map.Entry<String, Object>, U> mapper) {
         final Object obj = route.getMetadata().get(GatewayUtils.CONFIG_ADD_PARAM_KEY);
         if (Objects.isNull(obj)) {
             return;
@@ -165,6 +166,10 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         if (json.isEmpty()) {
             return;
         }
-        mapper.accept(json, result);
+        Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Object> next = iterator.next();
+            mapper.accept(next, result);
+        }
     }
 }

From 0271887c6bc4ddc0af07ed1ffa3a35ebdfedfb24 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 17 Oct 2021 01:24:30 +0800
Subject: [PATCH 45/60] =?UTF-8?q?QPS=20=E9=99=90=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   |  18 ++-
 .../gateway/filter/CustomerGlobalFilter.java  | 148 ++++++++++++------
 .../ratelimit/CustomerRedisRateLimiter.java   | 106 +++++++++++++
 3 files changed, 223 insertions(+), 49 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 0836e7c70..d6ee44530 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -2,18 +2,25 @@ package com.ruoyi.gateway.config;
 
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.CustomerGlobalFilter;
+import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
+import org.springframework.cloud.gateway.support.ConfigurationService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * Gateway 配置文件
@@ -56,8 +63,15 @@ public class GatewayConfig
     }
 
     @Bean
-    public GlobalFilter customerGlobalFilter()
+    public CustomerRedisRateLimiter customerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate,
+             @Qualifier(RedisRateLimiter.REDIS_SCRIPT_NAME) RedisScript<List<Long>> redisScript,
+             ConfigurationService configurationService) {
+        return new CustomerRedisRateLimiter(redisTemplate, redisScript, configurationService);
+    }
+
+    @Bean
+    public GlobalFilter customerGlobalFilter(CustomerRedisRateLimiter customerRedisRateLimiter)
     {
-        return new CustomerGlobalFilter();
+        return new CustomerGlobalFilter(customerRedisRateLimiter);
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index b71b86929..5bb256884 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -4,19 +4,21 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
 import com.ruoyi.gateway.utils.GatewayUtils;
 import com.ruoyi.gateway.utils.beans.IscRule;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.MultiValueMapAdapter;
 import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.server.HandlerStrategies;
 import org.springframework.web.reactive.function.server.ServerRequest;
@@ -31,6 +33,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.setResponseStatus;
 import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
 
 /**
@@ -45,6 +48,11 @@ import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap
  * @date 2021-10-15
  */
 public class CustomerGlobalFilter implements GlobalFilter, Ordered {
+    private CustomerRedisRateLimiter rateLimiter;
+    public CustomerGlobalFilter(CustomerRedisRateLimiter rateLimiter) {
+        this.rateLimiter = rateLimiter;
+    }
+
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         final Route route = exchange.getRequiredAttribute(ServerWebExchangeUtils.GATEWAY_ROUTE_ATTR);
@@ -56,22 +64,26 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         String headerAk = GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKeyName));
         if (HttpMethod.GET.equals(httpMethod)) {
             final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
-            handleRule(headerAk, () -> queryParams.get(accessKeyName), route, request, accessKeyName);
-            queryParams.remove(accessKeyName);
-            handleHiddenParams(route, queryParams, (next, map) -> {
-                Object value;
-                if (Objects.isNull(value = next.getValue())) {
-                    map.add(next.getKey(), StrUtil.EMPTY);
-                } else if(value instanceof JSONArray) {
-                    map.put(next.getKey(), ((JSONArray)value).toList(String.class));
-                } else {
-                    map.add(next.getKey(), value.toString());
-                }
-            });
-            URI newUri = UriComponentsBuilder.fromUri(request.getURI())
-                    .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
-            ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
-            return chain.filter(exchange.mutate().request(updatedRequest).build());
+            final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route);
+            Supplier<Mono<Void>> rateLimiterAftersupplier = () -> {
+                removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
+                handleHiddenParams(route, queryParams, (next, map) -> {
+                    Object value;
+                    if (Objects.isNull(value = next.getValue())) {
+                        map.add(next.getKey(), StrUtil.EMPTY);
+                    } else if (value instanceof JSONArray) {
+                        map.put(next.getKey(), ((JSONArray) value).toList(String.class));
+                    } else {
+                        map.add(next.getKey(), value.toString());
+                    }
+                });
+                URI newUri = UriComponentsBuilder.fromUri(request.getURI())
+                        .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
+                ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
+                return chain.filter(exchange.mutate().request(updatedRequest).build());
+            };
+
+            return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
         } else if (HttpMethod.POST.equals(httpMethod)) {
             final ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
             final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class);
@@ -79,34 +91,41 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 MediaType mediaType = request.getHeaders().getContentType();
                 if (MediaType.APPLICATION_JSON.equals(mediaType)) {
                     JSONObject jsonObj = JSONUtil.parseObj(body);
-                    handleRule(headerAk, () -> Arrays.asList(jsonObj.get(accessKeyName, String.class, true)),
-                            route, request, accessKeyName);
-                    jsonObj.remove(accessKeyName);
-                    handleHiddenParams(route, jsonObj, (next, map) -> {
-                        map.set(next.getKey(), next.getValue());
-                    });
-                    return Mono.just(jsonObj.toString());
+                    final IscRule rule = handleRule(headerAk, () ->
+                            Arrays.asList(jsonObj.get(accessKeyName, String.class, true)), route);
+                    Supplier<Mono<String>> rateLimiterAftersupplier = () -> {
+                        removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
+                        handleHiddenParams(route, jsonObj, (next, map) -> {
+                            map.set(next.getKey(), next.getValue());
+                        });
+                        return Mono.just(jsonObj.toString());
+                    };
+
+                    return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
                     if (StringUtils.hasText(body)) {
                         final Stream<String[]> stream = Arrays.stream(body.split("&")).map(param -> param.split("="));
-                        handleRule(headerAk, () -> stream.filter(param -> param.length > 0 &&
-                                        accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()),
-                                route, request, accessKeyName);
-                        final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
-                        handleHiddenParams(route, params, (next, list) -> {
-                            Object value;
-                            if (Objects.isNull(value = next.getValue())) {
-                                list.add(new String[]{next.getKey(), StrUtil.EMPTY});
-                            } else if(value instanceof JSONArray) {
-                                ((JSONArray)value).stream().map(o -> String.valueOf(o)).forEach(v -> {
-                                    list.add(new String[]{next.getKey(), v});
-                                });
-                            } else {
-                                list.add(new String[]{next.getKey(), next.getValue().toString()});
-                            }
+                        final IscRule rule = handleRule(headerAk, () -> stream.filter(param -> param.length > 0 &&
+                                        accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()), route);
+                        Supplier<Mono<String>> rateLimiterAftersupplier = () -> {
+                            removeParam(headerAk, request, accessKeyName, null);
+                            final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
+                            handleHiddenParams(route, params, (next, list) -> {
+                                Object value;
+                                if (Objects.isNull(value = next.getValue())) {
+                                    list.add(new String[]{next.getKey(), StrUtil.EMPTY});
+                                } else if (value instanceof JSONArray) {
+                                    ((JSONArray) value).stream().map(o -> String.valueOf(o)).forEach(v -> {
+                                        list.add(new String[]{next.getKey(), v});
+                                    });
+                                } else {
+                                    list.add(new String[]{next.getKey(), next.getValue().toString()});
+                                }
+                            });
+                            return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
+                        };
 
-                        });
-                        return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
+                        return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
                     }
                 }
                 return Mono.empty();
@@ -127,12 +146,9 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param headerAk
      * @param valueSupplier
      * @param route
-     * @param request
-     * @param accessKeyName
      * @return
      */
-    private String handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route,
-                              ServerHttpRequest request, String accessKeyName) {
+    private IscRule handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route) {
         //获取AK
         final String ak = GatewayUtils.getValue(headerAk, valueSupplier, () -> new RuntimeException("AK 不存在"));
         //获取规则
@@ -140,13 +156,27 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 () -> new RuntimeException("AK异常"));
         //是否到期
         GatewayUtils.isBefore(rule, () -> new RuntimeException("AK已过期"));
-        //TODO 限流
+        //设置AK 到ID 为了传参方便
+        rule.setId(ak);
+        return rule;
+    }
 
+    /**
+     * 删除参数
+     * @param headerAk
+     * @param request
+     * @param accessKeyName
+     * @param removeSupplier
+     * @param <T>
+     */
+    private <T> void removeParam(String headerAk, ServerHttpRequest request, String accessKeyName, Supplier<T> removeSupplier) {
         //如果header中有AK,则删除
         if (Objects.nonNull(headerAk)) {
             request.getHeaders().remove(accessKeyName);
         }
-        return ak;
+        if(Objects.nonNull(removeSupplier)) {
+            removeSupplier.get();
+        }
     }
 
     /**
@@ -172,4 +202,28 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
             mapper.accept(next, result);
         }
     }
+
+    /**
+     * 限流
+     * @param exchange
+     * @param rule
+     * @Param route
+     * @param rateLimiterAftersupplier 限流后操作(删除参数、添加隐藏参数，跳转)
+     * @param <T>
+     * @return
+     */
+    private <T extends Object> Mono rateLimiter(ServerWebExchange exchange, IscRule rule, Route route,
+                                                Supplier<Mono<T>> rateLimiterAftersupplier) {
+        final RedisRateLimiter.Config config = new RedisRateLimiter.Config().setReplenishRate(1);
+        return rateLimiter.isAllowed(config, rule.getId() + ':' + route.getId()).flatMap(response -> {
+            for (Map.Entry<String, String> header : response.getHeaders().entrySet()) {
+                exchange.getResponse().getHeaders().add(header.getKey(), header.getValue());
+            }
+            if (response.isAllowed()) {
+                return rateLimiterAftersupplier.get();
+            }
+            setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
+            return exchange.getResponse().setComplete();
+        });
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
new file mode 100644
index 000000000..cd388ffca
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
@@ -0,0 +1,106 @@
+package com.ruoyi.gateway.ratelimit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
+import org.springframework.cloud.gateway.support.ConfigurationService;
+import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
+import org.springframework.data.redis.core.script.RedisScript;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-16
+ */
+@Slf4j
+public class CustomerRedisRateLimiter extends RedisRateLimiter {
+
+    private ReactiveStringRedisTemplate redisTemplate;
+
+    private RedisScript<List<Long>> script;
+
+    private AtomicBoolean initialized = new AtomicBoolean(false);
+
+    public CustomerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate, RedisScript<List<Long>> script,
+                                    ConfigurationService configurationService) {
+        super(redisTemplate, script, configurationService);
+        this.redisTemplate = redisTemplate;
+        this.redisTemplate = redisTemplate;
+        this.script = script;
+        this.initialized.compareAndSet(false, true);
+    }
+
+    public Mono<Response> isAllowed(Config routeConfig, String id)
+    {
+        if (!this.initialized.get()) {
+            throw new IllegalStateException("RedisRateLimiter is not initialized");
+        }
+
+        // How many requests per second do you want a user to be allowed to do?
+        int replenishRate = routeConfig.getReplenishRate();
+
+        // How much bursting do you want to allow?
+        int burstCapacity = routeConfig.getBurstCapacity();
+
+        // How many tokens are requested per request?
+        int requestedTokens = routeConfig.getRequestedTokens();
+
+        try {
+            List<String> keys = getKeys(id);
+
+            // The arguments to the LUA script. time() returns unixtime in seconds.
+            List<String> scriptArgs = Arrays.asList(replenishRate + "", burstCapacity + "",
+                    Instant.now().getEpochSecond() + "", requestedTokens + "");
+            // allowed, tokens_left = redis.eval(SCRIPT, keys, args)
+            Flux<List<Long>> flux = this.redisTemplate.execute(this.script, keys, scriptArgs);
+            // .log("redisratelimiter", Level.FINER);
+            return flux.onErrorResume(throwable -> {
+                if (log.isDebugEnabled()) {
+                    log.debug("Error calling rate limiter lua", throwable);
+                }
+                return Flux.just(Arrays.asList(1L, -1L));
+            }).reduce(new ArrayList<Long>(), (longs, l) -> {
+                longs.addAll(l);
+                return longs;
+            }).map(results -> {
+                boolean allowed = results.get(0) == 1L;
+                Long tokensLeft = results.get(1);
+
+                Response response = new Response(allowed, getHeaders(routeConfig, tokensLeft));
+
+                if (log.isDebugEnabled()) {
+                    log.debug("response: " + response);
+                }
+                return response;
+            });
+        }
+        catch (Exception e) {
+            /*
+             * We don't want a hard dependency on Redis to allow traffic. Make sure to set
+             * an alert so you know if this is happening too much. Stripe's observed
+             * failure rate is 0.01%.
+             */
+            log.error("Error determining if user allowed from redis", e);
+        }
+        return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
+    }
+
+    static List<String> getKeys(String id) {
+        // use `{}` around keys to use Redis Key hash tags
+        // this allows for using redis cluster
+
+        // Make a unique key per user.
+        String prefix = "request_rate_limiter.{" + id;
+
+        // You need two Redis keys for Token Bucket.
+        String tokenKey = prefix + "}.tokens";
+        String timestampKey = prefix + "}.timestamp";
+        return Arrays.asList(tokenKey, timestampKey);
+    }
+}

From 3930b70a2bccd9c0ce51114293e4729ec473b7f7 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 17 Oct 2021 16:18:57 +0800
Subject: [PATCH 46/60] =?UTF-8?q?=E5=88=86=E9=92=9F=E3=80=81=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E3=80=81=E5=A4=A9=E9=99=90=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   | 27 +-----
 .../gateway/filter/CustomerGlobalFilter.java  | 43 ++++++---
 .../ratelimit/CustomerRedisRateLimiter.java   | 93 ++++++++++++++++++-
 3 files changed, 119 insertions(+), 44 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index d6ee44530..29143581c 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -7,17 +7,13 @@ import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
-import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import org.springframework.cloud.gateway.support.ConfigurationService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -31,26 +27,9 @@ import java.util.List;
 @Configuration
 public class GatewayConfig
 {
-
-    @Resource
-    private RedisTemplate<String, RouteDefinition> redisTemplate;
     @Resource
     private RedissonClient redissonClient;
 
-    @Bean
-    public RedisTemplate<String, RouteDefinition> redisTemplate(RedisConnectionFactory redisConnectionFactory)
-    {
-        final RedisTemplate<String, RouteDefinition> template = new RedisTemplate<>();
-        template.setConnectionFactory(redisConnectionFactory);
-        Jackson2JsonRedisSerializer<RouteDefinition> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(RouteDefinition.class);
-        template.setValueSerializer(jackson2JsonRedisSerializer);
-        template.setHashValueSerializer(jackson2JsonRedisSerializer);
-        final StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-        template.setKeySerializer(stringRedisSerializer);
-        template.setHashKeySerializer(stringRedisSerializer);
-        return template;
-    }
-
     /**
      * Redis 路由仓库
      *
@@ -65,8 +44,8 @@ public class GatewayConfig
     @Bean
     public CustomerRedisRateLimiter customerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate,
              @Qualifier(RedisRateLimiter.REDIS_SCRIPT_NAME) RedisScript<List<Long>> redisScript,
-             ConfigurationService configurationService) {
-        return new CustomerRedisRateLimiter(redisTemplate, redisScript, configurationService);
+             ConfigurationService configurationService, DefaultRedisScript<Long> timeRedisScript) {
+        return new CustomerRedisRateLimiter(redisTemplate, redisScript, configurationService, timeRedisScript);
     }
 
     @Bean
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 5bb256884..7de9df5b6 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -9,7 +9,6 @@ import com.ruoyi.gateway.utils.GatewayUtils;
 import com.ruoyi.gateway.utils.beans.IscRule;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.Ordered;
@@ -28,6 +27,7 @@ import reactor.core.publisher.Mono;
 
 import java.net.URI;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -48,10 +48,11 @@ import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap
  * @date 2021-10-15
  */
 public class CustomerGlobalFilter implements GlobalFilter, Ordered {
-    private CustomerRedisRateLimiter rateLimiter;
+    private final CustomerRedisRateLimiter rateLimiter;
     public CustomerGlobalFilter(CustomerRedisRateLimiter rateLimiter) {
         this.rateLimiter = rateLimiter;
     }
+    public static final TimeUnit[] TIME_UNITS = {TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
@@ -65,7 +66,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         if (HttpMethod.GET.equals(httpMethod)) {
             final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
             final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route);
-            Supplier<Mono<Void>> rateLimiterAftersupplier = () -> {
+            Supplier<Mono<Void>> rateLimiterAfterSupplier = () -> {
                 removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
                 handleHiddenParams(route, queryParams, (next, map) -> {
                     Object value;
@@ -83,7 +84,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 return chain.filter(exchange.mutate().request(updatedRequest).build());
             };
 
-            return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
+            return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
         } else if (HttpMethod.POST.equals(httpMethod)) {
             final ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
             final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class);
@@ -93,7 +94,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                     JSONObject jsonObj = JSONUtil.parseObj(body);
                     final IscRule rule = handleRule(headerAk, () ->
                             Arrays.asList(jsonObj.get(accessKeyName, String.class, true)), route);
-                    Supplier<Mono<String>> rateLimiterAftersupplier = () -> {
+                    Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
                         removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
                         handleHiddenParams(route, jsonObj, (next, map) -> {
                             map.set(next.getKey(), next.getValue());
@@ -101,13 +102,13 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                         return Mono.just(jsonObj.toString());
                     };
 
-                    return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
+                    return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
                     if (StringUtils.hasText(body)) {
                         final Stream<String[]> stream = Arrays.stream(body.split("&")).map(param -> param.split("="));
                         final IscRule rule = handleRule(headerAk, () -> stream.filter(param -> param.length > 0 &&
                                         accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()), route);
-                        Supplier<Mono<String>> rateLimiterAftersupplier = () -> {
+                        Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
                             removeParam(headerAk, request, accessKeyName, null);
                             final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
                             handleHiddenParams(route, params, (next, list) -> {
@@ -125,7 +126,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                             return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
                         };
 
-                        return rateLimiter(exchange, rule, route, rateLimiterAftersupplier);
+                        return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
                     }
                 }
                 return Mono.empty();
@@ -207,20 +208,32 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * 限流
      * @param exchange
      * @param rule
-     * @Param route
-     * @param rateLimiterAftersupplier 限流后操作(删除参数、添加隐藏参数，跳转)
+     * @param route
+     * @param rateLimiterAfterSupplier 限流后操作(删除参数、添加隐藏参数，跳转)
      * @param <T>
      * @return
      */
-    private <T extends Object> Mono rateLimiter(ServerWebExchange exchange, IscRule rule, Route route,
-                                                Supplier<Mono<T>> rateLimiterAftersupplier) {
-        final RedisRateLimiter.Config config = new RedisRateLimiter.Config().setReplenishRate(1);
-        return rateLimiter.isAllowed(config, rule.getId() + ':' + route.getId()).flatMap(response -> {
+    private <T extends Object> Mono rateLimiter(ServerWebExchange exchange, IscRule rule, Route route, final int index,
+                                                Supplier<Mono<T>> rateLimiterAfterSupplier) {
+        final TimeUnit timeUnit = TIME_UNITS[index];
+        final Long limit = TimeUnit.SECONDS.equals(timeUnit) ? rule.getSecondsLimit() : TimeUnit.MINUTES.equals(timeUnit)
+                ? rule.getMinutesLimit() : TimeUnit.HOURS.equals(timeUnit) ? rule.getHoursLimit() : rule.getDaysLimit();
+        if(Objects.isNull(limit) || limit <= 0L) {
+            if(TimeUnit.DAYS.equals(timeUnit)) {
+                return rateLimiterAfterSupplier.get();
+            }
+            return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
+        }
+        return rateLimiter.isAllowed(route.getId(), rule.getId(), limit, timeUnit).flatMap(response -> {
             for (Map.Entry<String, String> header : response.getHeaders().entrySet()) {
                 exchange.getResponse().getHeaders().add(header.getKey(), header.getValue());
             }
             if (response.isAllowed()) {
-                return rateLimiterAftersupplier.get();
+                if(TimeUnit.DAYS.equals(timeUnit)) {
+                    return rateLimiterAfterSupplier.get();
+                }
+                return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
+
             }
             setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
             return exchange.getResponse().setComplete();
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
index cd388ffca..6d3b298cb 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
@@ -1,17 +1,23 @@
 package com.ruoyi.gateway.ratelimit;
 
+import cn.hutool.core.date.LocalDateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.support.ConfigurationService;
 import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -24,20 +30,47 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
     private ReactiveStringRedisTemplate redisTemplate;
 
     private RedisScript<List<Long>> script;
+    private RedisScript<Long> timeRedisScript;
 
     private AtomicBoolean initialized = new AtomicBoolean(false);
 
     public CustomerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate, RedisScript<List<Long>> script,
-                                    ConfigurationService configurationService) {
+                                    ConfigurationService configurationService, DefaultRedisScript<Long> timeRedisScript) {
         super(redisTemplate, script, configurationService);
         this.redisTemplate = redisTemplate;
-        this.redisTemplate = redisTemplate;
         this.script = script;
+        this.timeRedisScript = timeRedisScript;
         this.initialized.compareAndSet(false, true);
     }
 
-    public Mono<Response> isAllowed(Config routeConfig, String id)
-    {
+    public Mono<Response> isAllowed(String routeId, String ak, Long replenishRate, TimeUnit timeUnit) {
+        Config routeConfig = new Config().setReplenishRate(replenishRate.intValue());
+        String id = ak + ':' + routeId;
+        int time = 60;
+        LocalDateTime now = LocalDateTime.now();
+        List<String> keys;
+        switch (timeUnit) {
+            case DAYS:
+                time += LocalDateTimeUtil.between(now, LocalDateTime.now().with(LocalTime.MAX), ChronoUnit.SECONDS);
+                keys = getKeys(id, now.getDayOfMonth(), timeUnit);
+                break;
+            case HOURS:
+                time += (60 - now.getMinute()) * 60 - now.getSecond();
+                keys = getKeys(id, now.getHour(), timeUnit);
+                break;
+            case MINUTES:
+                time += 60 - now.getSecond();
+                keys = getKeys(id, now.getMinute(), timeUnit);
+                break;
+            case SECONDS:
+                return isAllowed(routeConfig, id);
+            default:
+                return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
+        }
+        return isAllowed(routeConfig, keys, time);
+    }
+
+    public Mono<Response> isAllowed(Config routeConfig, String id) {
         if (!this.initialized.get()) {
             throw new IllegalStateException("RedisRateLimiter is not initialized");
         }
@@ -91,16 +124,66 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
         return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
     }
 
+    public Mono<Response> isAllowed(Config routeConfig, List<String> keys, int time) {
+        if (!this.initialized.get()) {
+            throw new IllegalStateException("RedisRateLimiter is not initialized");
+        }
+
+        // How many requests per second do you want a user to be allowed to do?
+        int replenishRate = routeConfig.getReplenishRate();
+
+        // How much bursting do you want to allow?
+        int burstCapacity = routeConfig.getBurstCapacity();
+
+        // How many tokens are requested per request?
+        int requestedTokens = routeConfig.getRequestedTokens();
+
+        try {
+            // The arguments to the LUA script. time() returns unixtime in seconds.
+            List<String> scriptArgs = Arrays.asList(replenishRate + "", time + "");
+            // allowed, tokens_left = redis.eval(SCRIPT, keys, args)
+            Flux<Long> flux = this.redisTemplate.execute(this.timeRedisScript, keys, scriptArgs);
+            // .log("redisratelimiter", Level.FINER);
+            return flux.next().onErrorResume(throwable -> {
+                if (log.isDebugEnabled()) {
+                    log.debug("Error calling rate limiter lua", throwable);
+                }
+                return Mono.just(-1L);
+            }).map(tokensLeft -> {
+                boolean allowed = tokensLeft < replenishRate;
+                Response response = new Response(allowed, getHeaders(routeConfig, tokensLeft));
+                if (log.isDebugEnabled()) {
+                    log.debug("response: " + response);
+                }
+                return response;
+            });
+        }
+        catch (Exception e) {
+            /*
+             * We don't want a hard dependency on Redis to allow traffic. Make sure to set
+             * an alert so you know if this is happening too much. Stripe's observed
+             * failure rate is 0.01%.
+             */
+            log.error("Error determining if user allowed from redis", e);
+        }
+        return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
+    }
+
     static List<String> getKeys(String id) {
         // use `{}` around keys to use Redis Key hash tags
         // this allows for using redis cluster
 
         // Make a unique key per user.
-        String prefix = "request_rate_limiter.{" + id;
+        String prefix = "rate_limiter.{" + id;
 
         // You need two Redis keys for Token Bucket.
         String tokenKey = prefix + "}.tokens";
         String timestampKey = prefix + "}.timestamp";
         return Arrays.asList(tokenKey, timestampKey);
     }
+
+    static List<String> getKeys(String id, int now, TimeUnit timeUnit) {
+        String tokenKey = "rate_limiter.{" + id + ':' + now + "}." + timeUnit.name();
+        return Arrays.asList(tokenKey);
+    }
 }

From 4464e3d1419261a81d92490c283f7ef9a70542e6 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 17 Oct 2021 16:53:37 +0800
Subject: [PATCH 47/60] =?UTF-8?q?=E5=88=86=E9=92=9F=E3=80=81=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E3=80=81=E5=A4=A9=E9=99=90=E6=B5=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=B4=E4=BF=A1=E6=81=AF=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gateway/filter/CustomerGlobalFilter.java  |  1 -
 .../ratelimit/CustomerRedisRateLimiter.java   | 23 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 7de9df5b6..b5b8b4fe2 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -233,7 +233,6 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                     return rateLimiterAfterSupplier.get();
                 }
                 return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
-
             }
             setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
             return exchange.getResponse().setComplete();
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
index 6d3b298cb..5c2acaea7 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
@@ -1,6 +1,7 @@
 package com.ruoyi.gateway.ratelimit;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.support.ConfigurationService;
@@ -14,9 +15,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -67,7 +66,7 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
             default:
                 return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
         }
-        return isAllowed(routeConfig, keys, time);
+        return isAllowed(routeConfig, keys, time, timeUnit);
     }
 
     public Mono<Response> isAllowed(Config routeConfig, String id) {
@@ -124,7 +123,7 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
         return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
     }
 
-    public Mono<Response> isAllowed(Config routeConfig, List<String> keys, int time) {
+    public Mono<Response> isAllowed(Config routeConfig, List<String> keys, int time, TimeUnit timeUnit) {
         if (!this.initialized.get()) {
             throw new IllegalStateException("RedisRateLimiter is not initialized");
         }
@@ -151,7 +150,7 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
                 return Mono.just(-1L);
             }).map(tokensLeft -> {
                 boolean allowed = tokensLeft < replenishRate;
-                Response response = new Response(allowed, getHeaders(routeConfig, tokensLeft));
+                Response response = new Response(allowed, getHeaders(routeConfig, tokensLeft, timeUnit));
                 if (log.isDebugEnabled()) {
                     log.debug("response: " + response);
                 }
@@ -166,7 +165,17 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
              */
             log.error("Error determining if user allowed from redis", e);
         }
-        return Mono.just(new Response(true, getHeaders(routeConfig, -1L)));
+        return Mono.just(new Response(true, getHeaders(routeConfig, -1L, timeUnit)));
+    }
+
+    public Map<String, String> getHeaders(Config config, Long tokensLeft, TimeUnit timeUnit) {
+        Map<String, String> headers = new HashMap<>();
+        if (isIncludeHeaders()) {
+            String suffix = StrUtil.upperFirst(timeUnit.name().toLowerCase());
+            headers.put(this.getRemainingHeader() + '-' + suffix, tokensLeft.toString());
+            headers.put(this.getReplenishRateHeader() + '-' + suffix, String.valueOf(config.getReplenishRate()));
+        }
+        return headers;
     }
 
     static List<String> getKeys(String id) {

From bfdfb8739e4095be562b80acc501e55a307e378c Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 17 Oct 2021 23:20:23 +0800
Subject: [PATCH 48/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/application/index.vue | 13 ++++++++++++-
 ruoyi-ui/src/views/isc/service/index.vue     |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index 83350c51f..c0720ca88 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -77,7 +77,7 @@
       <el-table-column label="应用ID" align="center" prop="applicationId" v-if="true" width="80"/>
       <el-table-column label="应用名称" align="left" prop="applicationName" >
         <template slot-scope="scope">
-          <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" class="link-type">
+          <router-link :to="'/isc/app-service/index/' + scope.row.applicationId" v-hasPermi="['isc:appservice:list']" class="link-type">
             <span>{{ scope.row.applicationName }}</span>
           </router-link>
         </template>
@@ -95,6 +95,13 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleAppServiceList(scope.row)"
+            v-hasPermi="['isc:appservice:list']"
+          >服务清单</el-button>
           <el-button
             size="mini"
             type="text"
@@ -260,6 +267,10 @@ export default {
         this.title = "修改应用信息";
       });
     },
+    handleAppServiceList(row) {
+      const applicationId = row.applicationId;
+      this.$router.push("/isc/app-service/index/" + applicationId);
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index 084ce5570..27a9cfcdc 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -129,6 +129,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.status != 1"
             v-hasPermi="['isc:service:edit']"
           >修改</el-button>
           <el-button

From d543236366d51ef9d2e5478b0024162d34fafe6b Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Mon, 18 Oct 2021 12:41:09 +0800
Subject: [PATCH 49/60] fix

---
 .../java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index b5b8b4fe2..7287fee55 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -87,8 +87,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
             return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
         } else if (HttpMethod.POST.equals(httpMethod)) {
             final ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
-            final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class);
-            modifiedBody.flatMap(body -> {
+            final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class).flatMap(body -> {
                 MediaType mediaType = request.getHeaders().getContentType();
                 if (MediaType.APPLICATION_JSON.equals(mediaType)) {
                     JSONObject jsonObj = JSONUtil.parseObj(body);

From 373c9af86739b16dee70ae65743b4678397fc714 Mon Sep 17 00:00:00 2001
From: 80003818 <80003818@sfmail.sf-express.com>
Date: Mon, 18 Oct 2021 17:59:08 +0800
Subject: [PATCH 50/60] =?UTF-8?q?POST=E8=AF=B7=E6=B1=82=E4=B8=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=9A=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0contentType=20=E4=B8=8D=E5=AF=B9,=20body=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=20Header=20=E5=A4=B4=E9=83=A8AK=E7=A7=BB=E9=99=A4:=20?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=A7=BB=E9=99=A4=E5=BD=93=E5=89=8Drequest?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B0=B1=E8=A1=8C=EF=BC=8C=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yml  |   2 +-
 .../gateway/exception/AkRequireException.java |  14 +
 .../ContentTypeNotSupportedException.java     |  14 +
 .../gateway/exception/GatewayException.java   |   9 +-
 .../MethodNotSupportedException.java          |  14 +
 .../gateway/exception/RateLimitException.java |  28 ++
 .../exception/RuleExpiredException.java       |  14 +
 .../exception/RuleNotExistException.java      |  14 +
 .../gateway/filter/CustomerGlobalFilter.java  | 278 +++++++++++-------
 .../com/ruoyi/gateway/utils/GatewayUtils.java |  64 ++--
 .../src/main/resources/application-local.yml  |   2 +-
 11 files changed, 321 insertions(+), 132 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java

diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
index 3f94095ae..64181ee2d 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -78,7 +78,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 11
     # 密码
     password:
     # 连接超时时间
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
new file mode 100644
index 000000000..39747e4c4
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
@@ -0,0 +1,14 @@
+package com.ruoyi.gateway.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * 网关异常-AK必要
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class AkRequireException extends GatewayException {
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
new file mode 100644
index 000000000..b5a5c9e2d
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
@@ -0,0 +1,14 @@
+package com.ruoyi.gateway.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * 网关异常-请求方法不支持
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class ContentTypeNotSupportedException extends GatewayException {
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
index c4d4c969b..5b1311de5 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
@@ -1,11 +1,14 @@
 package com.ruoyi.gateway.exception;
 
+import lombok.NoArgsConstructor;
+
 /**
+ * 网关异常
+ *
  * @author Wenchao Gong
  * @date 2021-10-04
  */
+@NoArgsConstructor
 public class GatewayException extends RuntimeException {
-    public GatewayException(String msg) {
-        super(msg);
-    }
+
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
new file mode 100644
index 000000000..42783bc10
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
@@ -0,0 +1,14 @@
+package com.ruoyi.gateway.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * 网关异常-请求方法不支持
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class MethodNotSupportedException extends GatewayException {
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
new file mode 100644
index 000000000..cf3dbb349
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
@@ -0,0 +1,28 @@
+package com.ruoyi.gateway.exception;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.NoArgsConstructor;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 网关异常-限流异常
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class RateLimitException extends GatewayException {
+
+    private TimeUnit timeUnit;
+    private int replenishRate;
+    private int tokensLeft;
+    private String message;
+    public RateLimitException(int replenishRate, int tokensLeft, TimeUnit timeUnit) {
+        this.replenishRate = replenishRate;
+        this.tokensLeft = tokensLeft;
+        this.timeUnit = timeUnit;
+        String unit = StrUtil.upperFirst(timeUnit.name().toLowerCase());
+        message = String.format("服务限流: 上限[%d/%s], 实际[%d/%s]", replenishRate, unit, tokensLeft, unit);
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
new file mode 100644
index 000000000..e3d48deea
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
@@ -0,0 +1,14 @@
+package com.ruoyi.gateway.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * 网关异常-规则已过期
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class RuleExpiredException extends GatewayException {
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
new file mode 100644
index 000000000..634d9d4e1
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
@@ -0,0 +1,14 @@
+package com.ruoyi.gateway.exception;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * 网关异常-规则不存在
+ *
+ * @author Wenchao Gong
+ * @date 2021-10-04
+ */
+@NoArgsConstructor
+public class RuleNotExistException extends GatewayException {
+
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 7287fee55..8e7bfbe61 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -1,9 +1,11 @@
 package com.ruoyi.gateway.filter;
 
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.gateway.exception.*;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
 import com.ruoyi.gateway.utils.GatewayUtils;
 import com.ruoyi.gateway.utils.beans.IscRule;
@@ -12,13 +14,13 @@ import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.server.HandlerStrategies;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.server.ServerWebExchange;
@@ -31,7 +33,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.setResponseStatus;
 import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
@@ -49,10 +50,12 @@ import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap
  */
 public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     private final CustomerRedisRateLimiter rateLimiter;
+
     public CustomerGlobalFilter(CustomerRedisRateLimiter rateLimiter) {
         this.rateLimiter = rateLimiter;
     }
-    public static final TimeUnit[] TIME_UNITS = {TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
+
+    private static final TimeUnit[] TIME_UNITS = {TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
@@ -64,75 +67,144 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         final String accessKeyName = String.valueOf(metadata.get(GatewayUtils.CONFIG_ACCESS_KEY_NAME_KEY));
         String headerAk = GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKeyName));
         if (HttpMethod.GET.equals(httpMethod)) {
-            final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
-            final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route);
-            Supplier<Mono<Void>> rateLimiterAfterSupplier = () -> {
-                removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
-                handleHiddenParams(route, queryParams, (next, map) -> {
-                    Object value;
-                    if (Objects.isNull(value = next.getValue())) {
-                        map.add(next.getKey(), StrUtil.EMPTY);
-                    } else if (value instanceof JSONArray) {
-                        map.put(next.getKey(), ((JSONArray) value).toList(String.class));
-                    } else {
-                        map.add(next.getKey(), value.toString());
-                    }
-                });
-                URI newUri = UriComponentsBuilder.fromUri(request.getURI())
-                        .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
-                ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
-                return chain.filter(exchange.mutate().request(updatedRequest).build());
-            };
-
-            return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
+            return handleGetRequest(exchange, chain, route, request, accessKeyName, headerAk);
         } else if (HttpMethod.POST.equals(httpMethod)) {
-            final ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
-            final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class).flatMap(body -> {
+            return handlePostRequest(exchange, chain, route, request, accessKeyName, headerAk);
+        }
+        throw new MethodNotSupportedException();
+    }
+
+    /**
+     * 处理POST 请求
+     *
+     * @param exchange      当前服务交换器
+     * @param chain         当前过滤链
+     * @param route         路由信息
+     * @param request       请求信息
+     * @param accessKeyName AK键名
+     * @param headerAk      头部AK信息
+     * @return 指示请求处理何时完成
+     */
+    private Mono<Void> handlePostRequest(ServerWebExchange exchange, GatewayFilterChain chain, Route route,
+                                         ServerHttpRequest request, String accessKeyName, String headerAk) {
+        final ServerRequest serverRequest = ServerRequest.create(exchange,
+            HandlerStrategies.withDefaults().messageReaders());
+        final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class).defaultIfEmpty(StrUtil.EMPTY)
+            .flatMap(body -> {
                 MediaType mediaType = request.getHeaders().getContentType();
                 if (MediaType.APPLICATION_JSON.equals(mediaType)) {
-                    JSONObject jsonObj = JSONUtil.parseObj(body);
-                    final IscRule rule = handleRule(headerAk, () ->
-                            Arrays.asList(jsonObj.get(accessKeyName, String.class, true)), route);
-                    Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
-                        removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
-                        handleHiddenParams(route, jsonObj, (next, map) -> {
-                            map.set(next.getKey(), next.getValue());
-                        });
-                        return Mono.just(jsonObj.toString());
-                    };
-
-                    return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
+                    return handlePostRequestJson(exchange, route, request, accessKeyName, headerAk, body);
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
-                    if (StringUtils.hasText(body)) {
-                        final Stream<String[]> stream = Arrays.stream(body.split("&")).map(param -> param.split("="));
-                        final IscRule rule = handleRule(headerAk, () -> stream.filter(param -> param.length > 0 &&
-                                        accessKeyName.equals(param[0])).map(param -> param[1]).collect(Collectors.toList()), route);
-                        Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
-                            removeParam(headerAk, request, accessKeyName, null);
-                            final List<String[]> params = stream.filter(param -> !accessKeyName.equals(param[0])).collect(Collectors.toList());
-                            handleHiddenParams(route, params, (next, list) -> {
-                                Object value;
-                                if (Objects.isNull(value = next.getValue())) {
-                                    list.add(new String[]{next.getKey(), StrUtil.EMPTY});
-                                } else if (value instanceof JSONArray) {
-                                    ((JSONArray) value).stream().map(o -> String.valueOf(o)).forEach(v -> {
-                                        list.add(new String[]{next.getKey(), v});
-                                    });
-                                } else {
-                                    list.add(new String[]{next.getKey(), next.getValue().toString()});
-                                }
-                            });
-                            return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
-                        };
-
-                        return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
-                    }
+                    return handlePostRequestFormUrlencoded(exchange, route, request, accessKeyName, headerAk, body);
                 }
-                return Mono.empty();
+                throw new ContentTypeNotSupportedException();
             });
-            return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+        return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+    }
+
+    /**
+     * 处理POST APPLICATION_FORM_URLENCODED 请求
+     *
+     * @param exchange      当前服务交换器
+     * @param route         路由信息
+     * @param request       请求信息
+     * @param accessKeyName AK键名
+     * @param headerAk      头部AK信息
+     * @param body          请求Body信息
+     * @return 处理后的Body信息
+     */
+    private Mono<? extends String> handlePostRequestFormUrlencoded(ServerWebExchange exchange, Route route,
+                                                                   ServerHttpRequest request, String accessKeyName,
+                                                                   String headerAk, String body) {
+
+        if (StrUtil.isBlank(body)) {
+            Assert.notBlank(headerAk, AkRequireException::new);
         }
-        return chain.filter(exchange);
+        final List<String[]> srcParams = Arrays.stream(body.split("&")).map(param -> param.split("="))
+            .collect(Collectors.toList());
+        final IscRule rule = handleRule(headerAk, () -> srcParams.stream()
+            .filter(param -> param.length > 0 && accessKeyName.equals(param[0]))
+            .map(param -> param[1]).collect(Collectors.toList()), route);
+        Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
+            removeParam(headerAk, request, accessKeyName, null);
+            final List<String[]> params = srcParams.stream().filter(param -> !accessKeyName.equals(param[0]))
+                .collect(Collectors.toList());
+            handleHiddenParams(route, params, (next, list) -> {
+                Object value;
+                if (Objects.isNull(value = next.getValue())) {
+                    list.add(new String[]{next.getKey(), StrUtil.EMPTY});
+                } else if (value instanceof JSONArray) {
+                    ((JSONArray) value).stream().map(String::valueOf)
+                        .forEach(v -> list.add(new String[]{next.getKey(), v}));
+                } else {
+                    list.add(new String[]{next.getKey(), next.getValue().toString()});
+                }
+            });
+            return Mono.just(params.stream().map(param -> param[0] + '=' + param[1]).collect(Collectors.joining("&")));
+        };
+
+        return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
+    }
+
+    /**
+     * 处理POST APPLICATION_JSON 请求
+     *
+     * @param exchange      当前服务交换器
+     * @param route         路由信息
+     * @param request       请求信息
+     * @param accessKeyName AK键名
+     * @param headerAk      头部AK信息
+     * @param body          请求Body信息
+     * @return 处理后的Body信息
+     */
+    private Mono<? extends String> handlePostRequestJson(ServerWebExchange exchange, Route route,
+                                                         ServerHttpRequest request, String accessKeyName,
+                                                         String headerAk, String body) {
+        JSONObject jsonObj = StrUtil.isBlank(body) ? new JSONObject() : JSONUtil.parseObj(body);
+        final IscRule rule = handleRule(headerAk, () -> Collections.singletonList(jsonObj.get(accessKeyName,
+            String.class, true)), route);
+        Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
+            removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
+            handleHiddenParams(route, jsonObj, (next, map) -> map.set(next.getKey(), next.getValue()));
+            return Mono.just(jsonObj.toString());
+        };
+
+        return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
+    }
+
+    /**
+     * 处理GET 请求
+     *
+     * @param exchange      当前服务交换器
+     * @param chain         当前过滤链
+     * @param route         路由信息
+     * @param request       请求信息
+     * @param accessKeyName AK键名
+     * @param headerAk      头部AK信息
+     * @return 指示请求处理何时完成
+     */
+    private Mono<Void> handleGetRequest(ServerWebExchange exchange, GatewayFilterChain chain, Route route,
+                                        ServerHttpRequest request, String accessKeyName, String headerAk) {
+        final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
+        final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route);
+        Supplier<Mono<Void>> rateLimiterAfterSupplier = () -> {
+            removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
+            handleHiddenParams(route, queryParams, (next, map) -> {
+                Object value;
+                if (Objects.isNull(value = next.getValue())) {
+                    map.add(next.getKey(), StrUtil.EMPTY);
+                } else if (value instanceof JSONArray) {
+                    map.put(next.getKey(), ((JSONArray) value).toList(String.class));
+                } else {
+                    map.add(next.getKey(), value.toString());
+                }
+            });
+            URI newUri = UriComponentsBuilder.fromUri(request.getURI())
+                .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
+            ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
+            return chain.filter(exchange.mutate().request(updatedRequest).build());
+        };
+        return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
     }
 
     @Override
@@ -143,19 +215,19 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     /**
      * 处理规则
      *
-     * @param headerAk
-     * @param valueSupplier
-     * @param route
-     * @return
+     * @param headerAk      头部AK
+     * @param valueSupplier valueList 生产者
+     * @param route         路由信息
+     * @return AK对应服务规则信息
      */
     private IscRule handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route) {
         //获取AK
-        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, () -> new RuntimeException("AK 不存在"));
+        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, AkRequireException::new);
         //获取规则
         final IscRule rule = GatewayUtils.getRequiredValue(() -> GatewayUtils.getRule(ak, route.getId()),
-                () -> new RuntimeException("AK异常"));
+            RuleNotExistException::new);
         //是否到期
-        GatewayUtils.isBefore(rule, () -> new RuntimeException("AK已过期"));
+        GatewayUtils.isBefore(rule, RuleExpiredException::new);
         //设置AK 到ID 为了传参方便
         rule.setId(ak);
         return rule;
@@ -163,18 +235,23 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
 
     /**
      * 删除参数
-     * @param headerAk
-     * @param request
-     * @param accessKeyName
-     * @param removeSupplier
-     * @param <T>
+     *
+     * @param headerAk       头部AK
+     * @param request        请求
+     * @param accessKeyName  AK名称
+     * @param removeSupplier 删除参数提供者
+     * @param <T>            类型
      */
-    private <T> void removeParam(String headerAk, ServerHttpRequest request, String accessKeyName, Supplier<T> removeSupplier) {
+    private <T> void removeParam(String headerAk, ServerHttpRequest request, String accessKeyName,
+                                 Supplier<T> removeSupplier) {
         //如果header中有AK,则删除
         if (Objects.nonNull(headerAk)) {
-            request.getHeaders().remove(accessKeyName);
+            final HttpHeaders headers = request.getHeaders();
+            if(headers.containsKey(accessKeyName)) {
+                request.mutate().headers(headMap -> headMap.remove(accessKeyName)).build();
+            }
         }
-        if(Objects.nonNull(removeSupplier)) {
+        if (Objects.nonNull(removeSupplier)) {
             removeSupplier.get();
         }
     }
@@ -182,10 +259,10 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     /**
      * 处理隐藏参数
      *
-     * @param route
-     * @param result
-     * @param mapper
-     * @param <U>
+     * @param route  路由信息
+     * @param result 参数
+     * @param mapper 处理参数方法
+     * @param <U>    参数类型
      */
     private <U> void handleHiddenParams(Route route, U result, BiConsumer<Map.Entry<String, Object>, U> mapper) {
         final Object obj = route.getMetadata().get(GatewayUtils.CONFIG_ADD_PARAM_KEY);
@@ -196,29 +273,29 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         if (json.isEmpty()) {
             return;
         }
-        Iterator<Map.Entry<String, Object>> iterator = json.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<String, Object> next = iterator.next();
+        for (Map.Entry<String, Object> next : json.entrySet()) {
             mapper.accept(next, result);
         }
     }
 
     /**
      * 限流
-     * @param exchange
-     * @param rule
-     * @param route
+     *
+     * @param exchange                 当前服务交换器
+     * @param rule                     限流规则
+     * @param route                    路由
      * @param rateLimiterAfterSupplier 限流后操作(删除参数、添加隐藏参数，跳转)
-     * @param <T>
-     * @return
+     * @param <T>                      最终返回类型
+     * @return rateLimiterAfterSupplier 返回类型
      */
-    private <T extends Object> Mono rateLimiter(ServerWebExchange exchange, IscRule rule, Route route, final int index,
-                                                Supplier<Mono<T>> rateLimiterAfterSupplier) {
+    private <T> Mono<T> rateLimiter(ServerWebExchange exchange, IscRule rule, Route route, final int index,
+                                    Supplier<Mono<T>> rateLimiterAfterSupplier) {
         final TimeUnit timeUnit = TIME_UNITS[index];
-        final Long limit = TimeUnit.SECONDS.equals(timeUnit) ? rule.getSecondsLimit() : TimeUnit.MINUTES.equals(timeUnit)
-                ? rule.getMinutesLimit() : TimeUnit.HOURS.equals(timeUnit) ? rule.getHoursLimit() : rule.getDaysLimit();
-        if(Objects.isNull(limit) || limit <= 0L) {
-            if(TimeUnit.DAYS.equals(timeUnit)) {
+        final Long limit = TimeUnit.SECONDS.equals(timeUnit) ? rule.getSecondsLimit() :
+            TimeUnit.MINUTES.equals(timeUnit)
+            ? rule.getMinutesLimit() : TimeUnit.HOURS.equals(timeUnit) ? rule.getHoursLimit() : rule.getDaysLimit();
+        if (Objects.isNull(limit) || limit <= 0L) {
+            if (TimeUnit.DAYS.equals(timeUnit)) {
                 return rateLimiterAfterSupplier.get();
             }
             return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
@@ -228,13 +305,14 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 exchange.getResponse().getHeaders().add(header.getKey(), header.getValue());
             }
             if (response.isAllowed()) {
-                if(TimeUnit.DAYS.equals(timeUnit)) {
+                if (TimeUnit.DAYS.equals(timeUnit)) {
                     return rateLimiterAfterSupplier.get();
                 }
                 return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
             }
             setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
-            return exchange.getResponse().setComplete();
+            exchange.getResponse().setComplete();
+            throw new RateLimitException(limit.intValue(), 1, timeUnit);
         });
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
index 9cbfa0d20..107066969 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -44,41 +44,46 @@ public class GatewayUtils {
     public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
     private static RedissonClient client = SpringUtil.getBean(RedissonClient.class);
 
-    public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher)
-    {
+    /**
+     * 修改请求Body
+     *
+     * @param exchange  当前服务交换器
+     * @param chain     当前过滤链
+     * @param publisher body体提供者
+     * @return 指示请求处理何时完成
+     */
+    public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher) {
         BodyInserter bodyInserter = BodyInserters.fromPublisher(publisher, String.class);
         HttpHeaders headers = new HttpHeaders();
         headers.putAll(exchange.getRequest().getHeaders());
         headers.remove(HttpHeaders.CONTENT_LENGTH);
         CachedBodyOutputMessage outputMessage = new CachedBodyOutputMessage(exchange, headers);
         return bodyInserter.insert(outputMessage, new BodyInserterContext())
-                .then(Mono.defer(() -> {
-                    ServerHttpRequest decorator = decorate(exchange, headers, outputMessage);
-                    return chain.filter(exchange.mutate().request(decorator).build());
-                }));
+            .then(Mono.defer(() -> {
+                ServerHttpRequest request = decorate(exchange, headers, outputMessage);
+                return chain.filter(exchange.mutate().request(request).build());
+            }));
     }
 
 
-    public static ServerHttpRequestDecorator decorate(ServerWebExchange exchange, HttpHeaders headers, CachedBodyOutputMessage outputMessage)
-    {
+    public static ServerHttpRequestDecorator decorate(ServerWebExchange exchange, HttpHeaders headers,
+                                                      CachedBodyOutputMessage outputMessage) {
         return new ServerHttpRequestDecorator(exchange.getRequest()) {
-            public HttpHeaders getHeaders()
-            {
+            @Override
+            public HttpHeaders getHeaders() {
                 long contentLength = headers.getContentLength();
                 HttpHeaders httpHeaders = new HttpHeaders();
                 httpHeaders.putAll(super.getHeaders());
-                if (contentLength > 0L)
-                {
+                if (contentLength > 0L) {
                     httpHeaders.setContentLength(contentLength);
-                } else
-                {
+                } else {
                     httpHeaders.set("Transfer-Encoding", "chunked");
                 }
                 return httpHeaders;
             }
 
-            public Flux<DataBuffer> getBody()
-            {
+            @Override
+            public Flux<DataBuffer> getBody() {
                 return outputMessage.getBody();
             }
         };
@@ -104,21 +109,21 @@ public class GatewayUtils {
      * @param <X>
      * @return
      */
-    public static <X extends RuntimeException> String getValue(String before, Supplier<List<String>> valueSupplier, Supplier<X> errorMsgSupplier)
-    {
-        if(StringUtils.hasText(before)) {
+    public static <X extends RuntimeException> String getValue(String before, Supplier<List<String>> valueSupplier,
+                                                               Supplier<X> errorMsgSupplier) {
+        if (StringUtils.hasText(before)) {
             return before;
         }
         final List<String> values = valueSupplier.get();
-        if(CollectionUtil.isNotEmpty(values)) {
+        if (CollectionUtil.isNotEmpty(values)) {
             for (String value : values) {
-                if(StringUtils.hasText(value)) {
+                if (StringUtils.hasText(value)) {
                     before = value;
                     break;
                 }
             }
         }
-        if(errorMsgSupplier != null) {
+        if (errorMsgSupplier != null) {
             Assert.notBlank(before, errorMsgSupplier);
         }
         return before;
@@ -126,15 +131,17 @@ public class GatewayUtils {
 
     /**
      * 获取必要值，可抛出异常
+     *
      * @param valueSupplier
      * @param errorMsgSupplier
      * @param <T>
      * @param <X>
      * @return
      */
-    public static <T, X extends RuntimeException> T getRequiredValue(Supplier<T> valueSupplier, Supplier<X> errorMsgSupplier) {
+    public static <T, X extends RuntimeException> T getRequiredValue(Supplier<T> valueSupplier,
+                                                                     Supplier<X> errorMsgSupplier) {
         final T value = valueSupplier.get();
-        if(Objects.nonNull(errorMsgSupplier)) {
+        if (Objects.nonNull(errorMsgSupplier)) {
             Assert.notNull(value, errorMsgSupplier);
         }
         return value;
@@ -143,7 +150,8 @@ public class GatewayUtils {
 
     /**
      * 获取规则
-     * @param ak AK
+     *
+     * @param ak      AK
      * @param routeId 路由ID
      * @return
      */
@@ -154,11 +162,13 @@ public class GatewayUtils {
 
     /**
      * 断言是否超过结束时间
+     *
      * @param rule
      * @param errorMsgSupplier
      * @param <X>
      */
-    public static  <X extends RuntimeException> void isBefore(IscRule rule, Supplier<X> errorMsgSupplier) {
-        Assert.isTrue(Objects.nonNull(rule.getExpire()) && Date.from(Instant.now()).before(rule.getExpire()), errorMsgSupplier);
+    public static <X extends RuntimeException> void isBefore(IscRule rule, Supplier<X> errorMsgSupplier) {
+        Assert.isTrue(Objects.nonNull(rule.getExpire()) && Date.from(Instant.now()).before(rule.getExpire()),
+            errorMsgSupplier);
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
index 8edfcb289..4f07d97b8 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/resources/application-local.yml
@@ -21,7 +21,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 11
     # 密码
     password:
     # 连接超时时间

From 08c88e9e277bf97787bf584acbc3a60223954d2c Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Mon, 18 Oct 2021 21:06:20 +0800
Subject: [PATCH 51/60] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 8e7bfbe61..f1ab64976 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -97,7 +97,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
                     return handlePostRequestFormUrlencoded(exchange, route, request, accessKeyName, headerAk, body);
                 }
-                throw new ContentTypeNotSupportedException();
+                return Mono.error(ContentTypeNotSupportedException::new);
             });
         return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
     }
@@ -312,7 +312,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
             }
             setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
             exchange.getResponse().setComplete();
-            throw new RateLimitException(limit.intValue(), 1, timeUnit);
+            return Mono.error(new RateLimitException(limit.intValue(), 1, timeUnit));
         });
     }
 }

From 783a3f9946deb1b2079963254bcf180918e35fef Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Mon, 18 Oct 2021 23:59:57 +0800
Subject: [PATCH 52/60] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   |  7 ++
 .../GlobalErrorWebExceptionHandler.java       | 76 +++++++++++++++++++
 .../constant/ErrorMessageConstant.java        | 15 ++++
 .../gateway/exception/AkRequireException.java |  7 +-
 .../ContentTypeNotSupportedException.java     |  7 +-
 .../gateway/exception/GatewayException.java   | 30 +++++++-
 .../MethodNotSupportedException.java          |  7 +-
 .../gateway/exception/RateLimitException.java | 20 ++---
 .../exception/RuleExpiredException.java       |  7 +-
 .../exception/RuleNotExistException.java      |  7 +-
 .../gateway/filter/CustomerGlobalFilter.java  |  6 +-
 11 files changed, 156 insertions(+), 33 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index 29143581c..ca4a9f4ba 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,10 +1,12 @@
 package com.ruoyi.gateway.config;
 
+import com.ruoyi.gateway.config.handler.GlobalErrorWebExceptionHandler;
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.CustomerGlobalFilter;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
@@ -53,4 +55,9 @@ public class GatewayConfig
     {
         return new CustomerGlobalFilter(customerRedisRateLimiter);
     }
+
+    @Bean
+    public ErrorWebExceptionHandler errorWebExceptionHandler() {
+        return new GlobalErrorWebExceptionHandler();
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
new file mode 100644
index 000000000..708af930d
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
@@ -0,0 +1,76 @@
+package com.ruoyi.gateway.config.handler;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.handler.ResponseStatusExceptionHandler;
+import reactor.core.publisher.Mono;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 网关异常通用处理器，只作用在webflux 环境下 , 优先级低于 {@link ResponseStatusExceptionHandler} 执行
+ * @author Wenchao Gong
+ * @date 2021-10-18
+ */
+@Slf4j
+@Order(-1)
+public class GlobalErrorWebExceptionHandler implements ErrorWebExceptionHandler {
+
+    @Override
+    public Mono<Void> handle(ServerWebExchange exchange, Throwable ex)
+    {
+        ServerHttpResponse response = exchange.getResponse();
+
+        if (response.isCommitted()) {
+            return Mono.error(ex);
+        }
+
+        // header set
+        response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
+        if (ex instanceof ResponseStatusException) {
+            final ResponseStatusException statusException = (ResponseStatusException) ex;
+            response.setStatusCode(statusException.getStatus());
+        }
+        Optional<Integer> code = Optional.ofNullable(response.getRawStatusCode());
+        final String message = getMessage(ex);
+
+        return response.writeWith(Mono.fromSupplier(() -> {
+            DataBufferFactory bufferFactory = response.bufferFactory();
+            return bufferFactory.wrap(JSONUtil.toJsonStr(result(code, message))
+                    .getBytes(StandardCharsets.UTF_8));
+        }));
+    }
+
+    private String getMessage(Throwable ex)
+    {
+        if(ex instanceof ResponseStatusException) {
+            String reason = ((ResponseStatusException) ex).getReason();
+            log.info(reason);
+            return reason;
+        }
+        String message = ex.getMessage();
+        log.error(message, ex);
+        return message;
+    }
+
+    private Map<String, Object> result(Optional<Integer> code, String message) {
+        final HashMap<String, Object> result = MapUtil.newHashMap(3);
+        result.put("code", code.orElse(HttpStatus.INTERNAL_SERVER_ERROR.value()));
+        result.put("message", message);
+        result.put("data", null);
+        return result;
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java
new file mode 100644
index 000000000..b7811d093
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java
@@ -0,0 +1,15 @@
+package com.ruoyi.gateway.constant;
+
+/**
+ * 错误消息常量
+ * @author Wenchao Gong
+ * @date 2021-10-18
+ */
+public interface ErrorMessageConstant {
+    String AK_REQUIRE = "没有找到授权码";
+    String CONTENT_TYPE_NOT_SUPPORTED = "请求ContentType不支持";
+    String METHOD_NOT_SUPPORTED = "请求Method不支持";
+    String RATE_LIMIT = "调用次数过多";
+    String RULE_EXPIRED = "规则已过期";
+    String RULE_NOT_EXIST = "规则不存在";
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
index 39747e4c4..1e4f47a7c 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
 /**
  * 网关异常-AK必要
@@ -8,7 +8,10 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class AkRequireException extends GatewayException {
 
+    public AkRequireException()
+    {
+        super(ErrorMessageConstant.AK_REQUIRE);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
index b5a5c9e2d..892343534 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
 /**
  * 网关异常-请求方法不支持
@@ -8,7 +8,10 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class ContentTypeNotSupportedException extends GatewayException {
 
+    public ContentTypeNotSupportedException()
+    {
+        super(ErrorMessageConstant.CONTENT_TYPE_NOT_SUPPORTED);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
index 5b1311de5..cd7f79a42 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/GatewayException.java
@@ -1,6 +1,7 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
 
 /**
  * 网关异常
@@ -8,7 +9,30 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
-public class GatewayException extends RuntimeException {
+public class GatewayException extends ResponseStatusException {
 
+    public GatewayException(String reason)
+    {
+        super(HttpStatus.INTERNAL_SERVER_ERROR, reason);
+    }
+
+    public GatewayException(HttpStatus status)
+    {
+        super(status);
+    }
+
+    public GatewayException(HttpStatus status, String reason)
+    {
+        super(status, reason);
+    }
+
+    public GatewayException(HttpStatus status, String reason, Throwable cause)
+    {
+        super(status, reason, cause);
+    }
+
+    public GatewayException(int rawStatusCode, String reason, Throwable cause)
+    {
+        super(rawStatusCode, reason, cause);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
index 42783bc10..8f465a784 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
 /**
  * 网关异常-请求方法不支持
@@ -8,7 +8,10 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class MethodNotSupportedException extends GatewayException {
 
+    public MethodNotSupportedException()
+    {
+        super(ErrorMessageConstant.METHOD_NOT_SUPPORTED);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
index cf3dbb349..7b6b3b107 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
@@ -1,9 +1,7 @@
 package com.ruoyi.gateway.exception;
 
-import cn.hutool.core.util.StrUtil;
-import lombok.NoArgsConstructor;
-
-import java.util.concurrent.TimeUnit;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
+import org.springframework.http.HttpStatus;
 
 /**
  * 网关异常-限流异常
@@ -11,18 +9,10 @@ import java.util.concurrent.TimeUnit;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class RateLimitException extends GatewayException {
 
-    private TimeUnit timeUnit;
-    private int replenishRate;
-    private int tokensLeft;
-    private String message;
-    public RateLimitException(int replenishRate, int tokensLeft, TimeUnit timeUnit) {
-        this.replenishRate = replenishRate;
-        this.tokensLeft = tokensLeft;
-        this.timeUnit = timeUnit;
-        String unit = StrUtil.upperFirst(timeUnit.name().toLowerCase());
-        message = String.format("服务限流: 上限[%d/%s], 实际[%d/%s]", replenishRate, unit, tokensLeft, unit);
+    public RateLimitException()
+    {
+        super(HttpStatus.TOO_MANY_REQUESTS, ErrorMessageConstant.RATE_LIMIT);
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
index e3d48deea..7b678f85b 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
 /**
  * 网关异常-规则已过期
@@ -8,7 +8,10 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class RuleExpiredException extends GatewayException {
 
+    public RuleExpiredException()
+    {
+        super(ErrorMessageConstant.RULE_EXPIRED);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
index 634d9d4e1..62519a323 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.exception;
 
-import lombok.NoArgsConstructor;
+import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
 /**
  * 网关异常-规则不存在
@@ -8,7 +8,10 @@ import lombok.NoArgsConstructor;
  * @author Wenchao Gong
  * @date 2021-10-04
  */
-@NoArgsConstructor
 public class RuleNotExistException extends GatewayException {
 
+    public RuleNotExistException()
+    {
+        super(ErrorMessageConstant.RULE_NOT_EXIST);
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index f1ab64976..a381bd219 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -16,7 +16,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
@@ -34,7 +33,6 @@ import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.setResponseStatus;
 import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
 
 /**
@@ -310,9 +308,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 }
                 return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
             }
-            setResponseStatus(exchange, HttpStatus.TOO_MANY_REQUESTS);
-            exchange.getResponse().setComplete();
-            return Mono.error(new RateLimitException(limit.intValue(), 1, timeUnit));
+            return Mono.error(RateLimitException::new);
         });
     }
 }

From e4ed70ee7e17ac3e9a3436cfa7f902b5d6d98213 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Tue, 19 Oct 2021 23:13:40 +0800
Subject: [PATCH 53/60] =?UTF-8?q?redis=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/gateway/config/RedisConfig.java  | 13 +++++++++----
 .../ruoyi/gateway/filter/CustomerGlobalFilter.java  |  3 +--
 .../gateway/ratelimit/CustomerRedisRateLimiter.java |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
index adc4f28da..c238e3b2e 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/RedisConfig.java
@@ -89,12 +89,17 @@ public class RedisConfig extends CachingConfigurerSupport {
 			.append("local key = KEYS[1]\n")
 			.append("local count = tonumber(ARGV[1])\n")
 			.append("local time = tonumber(ARGV[2])\n")
-			.append("local current = redis.call('get', key);\n")
-			.append("if current and tonumber(current) > count then\n")
+			.append("local current = tonumber(redis.call('get', key));\n")
+			.append("if current == nil then\n")
+			.append("    current = 1 \n")
+			.append("end\n")
+			//.append("redis.log(redis.LOG_WARNING, \"current \" .. current)\n")
+			.append("if current > count then\n")
 			.append("    return current;\n")
 			.append("end\n")
-			.append("current = redis.call('incr', key)\n")
-			.append("if tonumber(current) == 1 then\n")
+			.append("current = tonumber(redis.call('incr', key))\n")
+			//.append("redis.log(redis.LOG_WARNING, \"current \" .. current)\n")
+			.append("if current == 1 then\n")
 			.append("    redis.call('expire', key, time)\n")
 			.append("end\n")
 			.append("return current;")
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index a381bd219..f4b9a6f0b 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -289,8 +289,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     private <T> Mono<T> rateLimiter(ServerWebExchange exchange, IscRule rule, Route route, final int index,
                                     Supplier<Mono<T>> rateLimiterAfterSupplier) {
         final TimeUnit timeUnit = TIME_UNITS[index];
-        final Long limit = TimeUnit.SECONDS.equals(timeUnit) ? rule.getSecondsLimit() :
-            TimeUnit.MINUTES.equals(timeUnit)
+        final Long limit = TimeUnit.SECONDS.equals(timeUnit) ? rule.getSecondsLimit() : TimeUnit.MINUTES.equals(timeUnit)
             ? rule.getMinutesLimit() : TimeUnit.HOURS.equals(timeUnit) ? rule.getHoursLimit() : rule.getDaysLimit();
         if (Objects.isNull(limit) || limit <= 0L) {
             if (TimeUnit.DAYS.equals(timeUnit)) {
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
index 5c2acaea7..2e2289b80 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
@@ -149,7 +149,7 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
                 }
                 return Mono.just(-1L);
             }).map(tokensLeft -> {
-                boolean allowed = tokensLeft < replenishRate;
+                boolean allowed = tokensLeft > 0 && tokensLeft < replenishRate;
                 Response response = new Response(allowed, getHeaders(routeConfig, tokensLeft, timeUnit));
                 if (log.isDebugEnabled()) {
                     log.debug("response: " + response);

From 1317da09ca1f3e617e61d2644e1909292b9ff63a Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Tue, 19 Oct 2021 23:53:39 +0800
Subject: [PATCH 54/60] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GlobalErrorWebExceptionHandler.java       |  8 +++++--
 .../constant/ErrorMessageConstant.java        | 12 +++++-----
 .../gateway/exception/AkRequireException.java |  4 ++--
 .../ContentTypeNotSupportedException.java     |  5 ++--
 .../MethodNotSupportedException.java          |  5 ++--
 .../gateway/exception/RateLimitException.java |  6 +++--
 .../exception/RuleExpiredException.java       |  7 ++++--
 .../exception/RuleNotExistException.java      |  4 ++--
 .../gateway/filter/CustomerGlobalFilter.java  | 23 ++++++++++---------
 9 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
index 708af930d..fb8afeb61 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
@@ -58,8 +58,12 @@ public class GlobalErrorWebExceptionHandler implements ErrorWebExceptionHandler
     {
         if(ex instanceof ResponseStatusException) {
             String reason = ((ResponseStatusException) ex).getReason();
-            log.info(reason);
-            return reason;
+            if(log.isDebugEnabled()){
+                log.debug(ex.getMessage());
+            }
+            if(StrUtil.isNotBlank(reason)) {
+                return reason;
+            }
         }
         String message = ex.getMessage();
         log.error(message, ex);
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java
index b7811d093..917c53a5e 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/constant/ErrorMessageConstant.java
@@ -6,10 +6,10 @@ package com.ruoyi.gateway.constant;
  * @date 2021-10-18
  */
 public interface ErrorMessageConstant {
-    String AK_REQUIRE = "没有找到授权码";
-    String CONTENT_TYPE_NOT_SUPPORTED = "请求ContentType不支持";
-    String METHOD_NOT_SUPPORTED = "请求Method不支持";
-    String RATE_LIMIT = "调用次数过多";
-    String RULE_EXPIRED = "规则已过期";
-    String RULE_NOT_EXIST = "规则不存在";
+    String AK_REQUIRE = "没有找到授权码[%s]";
+    String CONTENT_TYPE_NOT_SUPPORTED = "请求ContentType[%s]不支持";
+    String METHOD_NOT_SUPPORTED = "请求Method[%s]不支持";
+    String RATE_LIMIT = "调用次数[>%d/%s]过多";
+    String RULE_EXPIRED = "规则已过期[%s]";
+    String RULE_NOT_EXIST = "授权码[%s]对应服务[%s]规则不存在";
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
index 1e4f47a7c..a51c555db 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/AkRequireException.java
@@ -10,8 +10,8 @@ import com.ruoyi.gateway.constant.ErrorMessageConstant;
  */
 public class AkRequireException extends GatewayException {
 
-    public AkRequireException()
+    public AkRequireException(String ak)
     {
-        super(ErrorMessageConstant.AK_REQUIRE);
+        super(String.format(ErrorMessageConstant.AK_REQUIRE, ak));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
index 892343534..4d133af0d 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/ContentTypeNotSupportedException.java
@@ -1,6 +1,7 @@
 package com.ruoyi.gateway.exception;
 
 import com.ruoyi.gateway.constant.ErrorMessageConstant;
+import org.springframework.http.MediaType;
 
 /**
  * 网关异常-请求方法不支持
@@ -10,8 +11,8 @@ import com.ruoyi.gateway.constant.ErrorMessageConstant;
  */
 public class ContentTypeNotSupportedException extends GatewayException {
 
-    public ContentTypeNotSupportedException()
+    public ContentTypeNotSupportedException(MediaType contentType)
     {
-        super(ErrorMessageConstant.CONTENT_TYPE_NOT_SUPPORTED);
+        super(String.format(ErrorMessageConstant.CONTENT_TYPE_NOT_SUPPORTED, contentType));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
index 8f465a784..15fe606ff 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/MethodNotSupportedException.java
@@ -1,6 +1,7 @@
 package com.ruoyi.gateway.exception;
 
 import com.ruoyi.gateway.constant.ErrorMessageConstant;
+import org.springframework.http.HttpMethod;
 
 /**
  * 网关异常-请求方法不支持
@@ -10,8 +11,8 @@ import com.ruoyi.gateway.constant.ErrorMessageConstant;
  */
 public class MethodNotSupportedException extends GatewayException {
 
-    public MethodNotSupportedException()
+    public MethodNotSupportedException(HttpMethod httpMethod)
     {
-        super(ErrorMessageConstant.METHOD_NOT_SUPPORTED);
+        super(String.format(ErrorMessageConstant.METHOD_NOT_SUPPORTED, httpMethod));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
index 7b6b3b107..e29728513 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RateLimitException.java
@@ -3,6 +3,8 @@ package com.ruoyi.gateway.exception;
 import com.ruoyi.gateway.constant.ErrorMessageConstant;
 import org.springframework.http.HttpStatus;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * 网关异常-限流异常
  *
@@ -11,8 +13,8 @@ import org.springframework.http.HttpStatus;
  */
 public class RateLimitException extends GatewayException {
 
-    public RateLimitException()
+    public RateLimitException(long limit, TimeUnit timeUnit)
     {
-        super(HttpStatus.TOO_MANY_REQUESTS, ErrorMessageConstant.RATE_LIMIT);
+        super(HttpStatus.TOO_MANY_REQUESTS, String.format(ErrorMessageConstant.RATE_LIMIT, limit, timeUnit.name()));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
index 7b678f85b..d2e1e918e 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleExpiredException.java
@@ -1,7 +1,10 @@
 package com.ruoyi.gateway.exception;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.gateway.constant.ErrorMessageConstant;
 
+import java.util.Date;
+
 /**
  * 网关异常-规则已过期
  *
@@ -10,8 +13,8 @@ import com.ruoyi.gateway.constant.ErrorMessageConstant;
  */
 public class RuleExpiredException extends GatewayException {
 
-    public RuleExpiredException()
+    public RuleExpiredException(Date endTime)
     {
-        super(ErrorMessageConstant.RULE_EXPIRED);
+        super(String.format(ErrorMessageConstant.RULE_EXPIRED, DateUtil.formatDateTime(endTime)));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
index 62519a323..15cca6e2f 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/exception/RuleNotExistException.java
@@ -10,8 +10,8 @@ import com.ruoyi.gateway.constant.ErrorMessageConstant;
  */
 public class RuleNotExistException extends GatewayException {
 
-    public RuleNotExistException()
+    public RuleNotExistException(String ak, String path)
     {
-        super(ErrorMessageConstant.RULE_NOT_EXIST);
+        super(String.format(ErrorMessageConstant.RULE_NOT_EXIST, ak, path));
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index f4b9a6f0b..1430d6585 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -69,7 +69,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         } else if (HttpMethod.POST.equals(httpMethod)) {
             return handlePostRequest(exchange, chain, route, request, accessKeyName, headerAk);
         }
-        throw new MethodNotSupportedException();
+        throw new MethodNotSupportedException(httpMethod);
     }
 
     /**
@@ -95,7 +95,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
                     return handlePostRequestFormUrlencoded(exchange, route, request, accessKeyName, headerAk, body);
                 }
-                return Mono.error(ContentTypeNotSupportedException::new);
+                return Mono.error(() -> new ContentTypeNotSupportedException(mediaType));
             });
         return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
     }
@@ -116,13 +116,13 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                                                                    String headerAk, String body) {
 
         if (StrUtil.isBlank(body)) {
-            Assert.notBlank(headerAk, AkRequireException::new);
+            Assert.notBlank(headerAk, () -> new AkRequireException(accessKeyName));
         }
         final List<String[]> srcParams = Arrays.stream(body.split("&")).map(param -> param.split("="))
             .collect(Collectors.toList());
         final IscRule rule = handleRule(headerAk, () -> srcParams.stream()
             .filter(param -> param.length > 0 && accessKeyName.equals(param[0]))
-            .map(param -> param[1]).collect(Collectors.toList()), route);
+            .map(param -> param[1]).collect(Collectors.toList()), route, accessKeyName);
         Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
             removeParam(headerAk, request, accessKeyName, null);
             final List<String[]> params = srcParams.stream().filter(param -> !accessKeyName.equals(param[0]))
@@ -160,7 +160,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                                                          String headerAk, String body) {
         JSONObject jsonObj = StrUtil.isBlank(body) ? new JSONObject() : JSONUtil.parseObj(body);
         final IscRule rule = handleRule(headerAk, () -> Collections.singletonList(jsonObj.get(accessKeyName,
-            String.class, true)), route);
+            String.class, true)), route, accessKeyName);
         Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
             removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
             handleHiddenParams(route, jsonObj, (next, map) -> map.set(next.getKey(), next.getValue()));
@@ -184,7 +184,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     private Mono<Void> handleGetRequest(ServerWebExchange exchange, GatewayFilterChain chain, Route route,
                                         ServerHttpRequest request, String accessKeyName, String headerAk) {
         final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
-        final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route);
+        final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route, accessKeyName);
         Supplier<Mono<Void>> rateLimiterAfterSupplier = () -> {
             removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
             handleHiddenParams(route, queryParams, (next, map) -> {
@@ -216,16 +216,17 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param headerAk      头部AK
      * @param valueSupplier valueList 生产者
      * @param route         路由信息
+     * @param accessKeyName AK键名
      * @return AK对应服务规则信息
      */
-    private IscRule handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route) {
+    private IscRule handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route, String accessKeyName) {
         //获取AK
-        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, AkRequireException::new);
+        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, () -> new AkRequireException(accessKeyName));
         //获取规则
         final IscRule rule = GatewayUtils.getRequiredValue(() -> GatewayUtils.getRule(ak, route.getId()),
-            RuleNotExistException::new);
+                () -> new RuleNotExistException(ak, route.getId()));
         //是否到期
-        GatewayUtils.isBefore(rule, RuleExpiredException::new);
+        GatewayUtils.isBefore(rule, () -> new RuleExpiredException(rule.getExpire()));
         //设置AK 到ID 为了传参方便
         rule.setId(ak);
         return rule;
@@ -307,7 +308,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                 }
                 return rateLimiter(exchange, rule, route, index + 1, rateLimiterAfterSupplier);
             }
-            return Mono.error(RateLimitException::new);
+            return Mono.error(() -> new RateLimitException(limit, timeUnit));
         });
     }
 }

From 685fab4eedb5cbaf5c60cbc6cc778e22b0971807 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Wed, 20 Oct 2021 23:52:17 +0800
Subject: [PATCH 55/60] =?UTF-8?q?POST=20=E8=AF=B7=E6=B1=82=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20AccessKey=20=E6=94=BE=E5=9C=A8=20URI=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GlobalErrorWebExceptionHandler.java       |  28 ++-
 .../gateway/filter/CustomerGlobalFilter.java  | 186 ++++++++++++------
 .../com/ruoyi/gateway/utils/GatewayUtils.java |  16 +-
 3 files changed, 161 insertions(+), 69 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
index fb8afeb61..e6684d255 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/handler/GlobalErrorWebExceptionHandler.java
@@ -9,6 +9,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.server.RequestPath;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
@@ -29,6 +30,10 @@ import java.util.Optional;
 @Order(-1)
 public class GlobalErrorWebExceptionHandler implements ErrorWebExceptionHandler {
 
+    public static final String NOT_FOUND_MESSAGE = "服务不存在";
+    public static final String SERVICE_UNAVAILABLE_MESSAGE = "服务暂时不可用";
+    public static final String GATEWAY_TIMEOUT_MESSAGE = "服务响应超时";
+
     @Override
     public Mono<Void> handle(ServerWebExchange exchange, Throwable ex)
     {
@@ -49,17 +54,31 @@ public class GlobalErrorWebExceptionHandler implements ErrorWebExceptionHandler
 
         return response.writeWith(Mono.fromSupplier(() -> {
             DataBufferFactory bufferFactory = response.bufferFactory();
-            return bufferFactory.wrap(JSONUtil.toJsonStr(result(code, message))
+            return bufferFactory.wrap(JSONUtil.toJsonStr(result(code, message, exchange.getRequest().getPath()))
                     .getBytes(StandardCharsets.UTF_8));
         }));
     }
 
     private String getMessage(Throwable ex)
     {
+        String reason;
         if(ex instanceof ResponseStatusException) {
-            String reason = ((ResponseStatusException) ex).getReason();
+            ResponseStatusException statusException = (ResponseStatusException) ex;
+            switch (statusException.getStatus()) {
+                case NOT_FOUND:
+                    reason = NOT_FOUND_MESSAGE;
+                    break;
+                case SERVICE_UNAVAILABLE:
+                    reason = SERVICE_UNAVAILABLE_MESSAGE;
+                    break;
+                case GATEWAY_TIMEOUT:
+                    reason = GATEWAY_TIMEOUT_MESSAGE;
+                    break;
+                default:
+                    reason = statusException.getReason();
+            }
             if(log.isDebugEnabled()){
-                log.debug(ex.getMessage());
+                log.debug(reason, ex);
             }
             if(StrUtil.isNotBlank(reason)) {
                 return reason;
@@ -70,10 +89,11 @@ public class GlobalErrorWebExceptionHandler implements ErrorWebExceptionHandler
         return message;
     }
 
-    private Map<String, Object> result(Optional<Integer> code, String message) {
+    private Map<String, Object> result(Optional<Integer> code, String message, RequestPath path) {
         final HashMap<String, Object> result = MapUtil.newHashMap(3);
         result.put("code", code.orElse(HttpStatus.INTERNAL_SERVER_ERROR.value()));
         result.put("message", message);
+        result.put("path", path.value());
         result.put("data", null);
         return result;
     }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 1430d6585..247100ea2 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -3,6 +3,7 @@ package com.ruoyi.gateway.filter;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONException;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.gateway.exception.*;
@@ -30,9 +31,12 @@ import java.net.URI;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.gateway.filter.CustomerGlobalFilter.AccessKey.AccessKeyType;
+import static com.ruoyi.gateway.filter.CustomerGlobalFilter.AccessKey.AccessKeyType.*;
 import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
 
 /**
@@ -53,6 +57,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         this.rateLimiter = rateLimiter;
     }
 
+    private static final String ACCESS_KEY_NAME_DEFAULT = "ak";
     private static final TimeUnit[] TIME_UNITS = {TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
 
     @Override
@@ -62,12 +67,15 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         final ServerHttpRequest request = exchange.getRequest();
         //ak 是否存在
         final HttpMethod httpMethod = request.getMethod();
-        final String accessKeyName = String.valueOf(metadata.get(GatewayUtils.CONFIG_ACCESS_KEY_NAME_KEY));
-        String headerAk = GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKeyName));
+        AccessKey accessKey = new AccessKey(String.valueOf(metadata.getOrDefault(GatewayUtils.CONFIG_ACCESS_KEY_NAME_KEY,
+                ACCESS_KEY_NAME_DEFAULT)));
+        accessKey.set(GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKey.name)), HEADER);
+        MultiValueMap<String, String> queryParams = request.getQueryParams().containsKey(accessKey.name) ?
+                new LinkedMultiValueMap<>(request.getQueryParams()) : request.getQueryParams();
         if (HttpMethod.GET.equals(httpMethod)) {
-            return handleGetRequest(exchange, chain, route, request, accessKeyName, headerAk);
+            return handleGetRequest(exchange, chain, route, request, accessKey, queryParams);
         } else if (HttpMethod.POST.equals(httpMethod)) {
-            return handlePostRequest(exchange, chain, route, request, accessKeyName, headerAk);
+            return handlePostRequest(exchange, chain, route, request, accessKey, queryParams);
         }
         throw new MethodNotSupportedException(httpMethod);
     }
@@ -75,29 +83,40 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     /**
      * 处理POST 请求
      *
-     * @param exchange      当前服务交换器
-     * @param chain         当前过滤链
-     * @param route         路由信息
-     * @param request       请求信息
-     * @param accessKeyName AK键名
-     * @param headerAk      头部AK信息
+     * @param exchange    当前服务交换器
+     * @param chain       当前过滤链
+     * @param route       路由信息
+     * @param request     请求信息
+     * @param accessKey   AK信息
+     * @param queryParams URL查询参数
      * @return 指示请求处理何时完成
      */
     private Mono<Void> handlePostRequest(ServerWebExchange exchange, GatewayFilterChain chain, Route route,
-                                         ServerHttpRequest request, String accessKeyName, String headerAk) {
-        final ServerRequest serverRequest = ServerRequest.create(exchange,
-            HandlerStrategies.withDefaults().messageReaders());
+                                         ServerHttpRequest request, AccessKey accessKey,
+                                         MultiValueMap<String, String> queryParams) {
+        //处理 URL AccessKey
+        handleAccessKey(accessKey, () -> queryParams.get(accessKey.name), URI, false);
+        ServerRequest serverRequest = ServerRequest.create(exchange, HandlerStrategies.withDefaults().messageReaders());
         final Mono<String> modifiedBody = serverRequest.bodyToMono(String.class).defaultIfEmpty(StrUtil.EMPTY)
             .flatMap(body -> {
                 MediaType mediaType = request.getHeaders().getContentType();
-                if (MediaType.APPLICATION_JSON.equals(mediaType)) {
-                    return handlePostRequestJson(exchange, route, request, accessKeyName, headerAk, body);
+                if (Objects.isNull(mediaType) || MediaType.APPLICATION_JSON.equals(mediaType)) {
+                    try {
+                        JSONObject jsonObj = StrUtil.isBlank(body) ? new JSONObject() : JSONUtil.parseObj(body);
+                        return handlePostRequestJson(exchange, route, request, accessKey, jsonObj, queryParams);
+                    }catch (JSONException e) {
+                        if(Objects.nonNull(mediaType)) {
+                            return Mono.error(e);
+                        }
+                    }
                 } else if (MediaType.APPLICATION_FORM_URLENCODED.equals(mediaType)) {
-                    return handlePostRequestFormUrlencoded(exchange, route, request, accessKeyName, headerAk, body);
+                    return handlePostRequestFormUrlencoded(exchange, route, request, accessKey, body, queryParams);
                 }
                 return Mono.error(() -> new ContentTypeNotSupportedException(mediaType));
             });
-        return GatewayUtils.modifyBody(exchange, chain, modifiedBody);
+        //如果 AccessKey 在URI部分 URI需要重新生成
+        URI uri = URI.equals(accessKey.type) ? getNewUri().apply(request, queryParams) : null;
+        return GatewayUtils.modifyBody(exchange, chain, modifiedBody, uri);
     }
 
     /**
@@ -106,26 +125,25 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param exchange      当前服务交换器
      * @param route         路由信息
      * @param request       请求信息
-     * @param accessKeyName AK键名
-     * @param headerAk      头部AK信息
+     * @param accessKey     AK信息
      * @param body          请求Body信息
      * @return 处理后的Body信息
      */
     private Mono<? extends String> handlePostRequestFormUrlencoded(ServerWebExchange exchange, Route route,
-                                                                   ServerHttpRequest request, String accessKeyName,
-                                                                   String headerAk, String body) {
+                                                                   ServerHttpRequest request, AccessKey accessKey,
+                                                                   String body, MultiValueMap<String, String> queryParams) {
 
         if (StrUtil.isBlank(body)) {
-            Assert.notBlank(headerAk, () -> new AkRequireException(accessKeyName));
+            Assert.notBlank(accessKey.value, () -> new AkRequireException(accessKey.name));
         }
         final List<String[]> srcParams = Arrays.stream(body.split("&")).map(param -> param.split("="))
             .collect(Collectors.toList());
-        final IscRule rule = handleRule(headerAk, () -> srcParams.stream()
-            .filter(param -> param.length > 0 && accessKeyName.equals(param[0]))
-            .map(param -> param[1]).collect(Collectors.toList()), route, accessKeyName);
+        final IscRule rule = handleRule(accessKey, () -> srcParams.stream()
+            .filter(param -> param.length > 0 && accessKey.name.equals(param[0]))
+            .map(param -> param[1]).collect(Collectors.toList()), route, BODY);
         Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
-            removeParam(headerAk, request, accessKeyName, null);
-            final List<String[]> params = srcParams.stream().filter(param -> !accessKeyName.equals(param[0]))
+            removeParam(accessKey, request, null, queryParams);
+            final List<String[]> params = srcParams.stream().filter(param -> !accessKey.name.equals(param[0]))
                 .collect(Collectors.toList());
             handleHiddenParams(route, params, (next, list) -> {
                 Object value;
@@ -150,19 +168,17 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param exchange      当前服务交换器
      * @param route         路由信息
      * @param request       请求信息
-     * @param accessKeyName AK键名
-     * @param headerAk      头部AK信息
-     * @param body          请求Body信息
+     * @param accessKey     AK信息
+     * @param jsonObj       请求Body JSON信息
      * @return 处理后的Body信息
      */
     private Mono<? extends String> handlePostRequestJson(ServerWebExchange exchange, Route route,
-                                                         ServerHttpRequest request, String accessKeyName,
-                                                         String headerAk, String body) {
-        JSONObject jsonObj = StrUtil.isBlank(body) ? new JSONObject() : JSONUtil.parseObj(body);
-        final IscRule rule = handleRule(headerAk, () -> Collections.singletonList(jsonObj.get(accessKeyName,
-            String.class, true)), route, accessKeyName);
+                                                         ServerHttpRequest request, AccessKey accessKey,
+                                                         JSONObject jsonObj, MultiValueMap<String, String> queryParams) {
+        final IscRule rule = handleRule(accessKey, () -> Collections.singletonList(jsonObj.get(accessKey.name,
+            String.class, true)), route, BODY);
         Supplier<Mono<String>> rateLimiterAfterSupplier = () -> {
-            removeParam(headerAk, request, accessKeyName, () -> jsonObj.remove(accessKeyName));
+            removeParam(accessKey, request, () -> jsonObj.remove(accessKey.name), queryParams);
             handleHiddenParams(route, jsonObj, (next, map) -> map.set(next.getKey(), next.getValue()));
             return Mono.just(jsonObj.toString());
         };
@@ -177,16 +193,16 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param chain         当前过滤链
      * @param route         路由信息
      * @param request       请求信息
-     * @param accessKeyName AK键名
-     * @param headerAk      头部AK信息
+     * @param accessKey     AK信息
+     * @param queryParams   URL查询参数
      * @return 指示请求处理何时完成
      */
     private Mono<Void> handleGetRequest(ServerWebExchange exchange, GatewayFilterChain chain, Route route,
-                                        ServerHttpRequest request, String accessKeyName, String headerAk) {
-        final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(request.getQueryParams());
-        final IscRule rule = handleRule(headerAk, () -> queryParams.get(accessKeyName), route, accessKeyName);
+                                        ServerHttpRequest request, AccessKey accessKey,
+                                        MultiValueMap<String, String> queryParams) {
+        final IscRule rule = handleRule(accessKey, () -> queryParams.get(accessKey.name), route, URI);
         Supplier<Mono<Void>> rateLimiterAfterSupplier = () -> {
-            removeParam(headerAk, request, accessKeyName, () -> queryParams.remove(accessKeyName));
+            removeParam(accessKey, request, null, queryParams);
             handleHiddenParams(route, queryParams, (next, map) -> {
                 Object value;
                 if (Objects.isNull(value = next.getValue())) {
@@ -197,14 +213,17 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
                     map.add(next.getKey(), value.toString());
                 }
             });
-            URI newUri = UriComponentsBuilder.fromUri(request.getURI())
-                .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
-            ServerHttpRequest updatedRequest = exchange.getRequest().mutate().uri(newUri).build();
-            return chain.filter(exchange.mutate().request(updatedRequest).build());
+            ServerHttpRequest req = exchange.getRequest().mutate().uri(getNewUri().apply(request, queryParams)).build();
+            return chain.filter(exchange.mutate().request(req).build());
         };
         return rateLimiter(exchange, rule, route, 0, rateLimiterAfterSupplier);
     }
 
+    private BiFunction<ServerHttpRequest, MultiValueMap<String, String>, URI> getNewUri() {
+        return (request, queryParams) -> UriComponentsBuilder.fromUri(request.getURI())
+                .replaceQueryParams(unmodifiableMultiValueMap(queryParams)).build().toUri();
+    }
+
     @Override
     public int getOrder() {
         return -1;
@@ -213,42 +232,64 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
     /**
      * 处理规则
      *
-     * @param headerAk      头部AK
+     * @param accessKey     AK信息
      * @param valueSupplier valueList 生产者
      * @param route         路由信息
-     * @param accessKeyName AK键名
+     * @param type          AK类型
      * @return AK对应服务规则信息
      */
-    private IscRule handleRule(String headerAk, Supplier<List<String>> valueSupplier, Route route, String accessKeyName) {
-        //获取AK
-        final String ak = GatewayUtils.getValue(headerAk, valueSupplier, () -> new AkRequireException(accessKeyName));
+    private IscRule handleRule(AccessKey accessKey, Supplier<List<String>> valueSupplier, Route route, AccessKeyType type) {
+        if(Objects.nonNull(valueSupplier) && Objects.nonNull(type)) {
+            handleAccessKey(accessKey, valueSupplier, type, true);
+        }
         //获取规则
-        final IscRule rule = GatewayUtils.getRequiredValue(() -> GatewayUtils.getRule(ak, route.getId()),
-                () -> new RuleNotExistException(ak, route.getId()));
+        final IscRule rule = GatewayUtils.getRequiredValue(() -> GatewayUtils.getRule(accessKey.value, route.getId()),
+                () -> new RuleNotExistException(accessKey.value, route.getId()));
         //是否到期
         GatewayUtils.isBefore(rule, () -> new RuleExpiredException(rule.getExpire()));
         //设置AK 到ID 为了传参方便
-        rule.setId(ak);
+        rule.setId(accessKey.value);
         return rule;
     }
 
+    /**
+     * 处理 accessKey
+     *
+     * @param accessKey      AccessKey
+     * @param valueSupplier  valueList 生产者
+     * @param type           AccessKeyType
+     * @param throwException 是否抛出异常
+     */
+    private void handleAccessKey(AccessKey accessKey, Supplier<List<String>> valueSupplier, AccessKeyType type, boolean throwException) {
+        //获取AK
+        String value;
+        if(throwException) {
+            value = GatewayUtils.getValue(accessKey.value, valueSupplier, () -> new AkRequireException(accessKey.name));
+        }else {
+            value = GatewayUtils.getValue(accessKey.value, valueSupplier, null);
+        }
+        accessKey.set(value, type);
+    }
+
     /**
      * 删除参数
      *
-     * @param headerAk       头部AK
+     * @param accessKey       AK信息
      * @param request        请求
-     * @param accessKeyName  AK名称
      * @param removeSupplier 删除参数提供者
+     * @param queryParams   URI请求参数
      * @param <T>            类型
      */
-    private <T> void removeParam(String headerAk, ServerHttpRequest request, String accessKeyName,
-                                 Supplier<T> removeSupplier) {
+    private <T> void removeParam(AccessKey accessKey, ServerHttpRequest request, Supplier<T> removeSupplier,
+                                 MultiValueMap<String, String> queryParams) {
         //如果header中有AK,则删除
-        if (Objects.nonNull(headerAk)) {
+        if (HEADER.equals(accessKey.type)) {
             final HttpHeaders headers = request.getHeaders();
-            if(headers.containsKey(accessKeyName)) {
-                request.mutate().headers(headMap -> headMap.remove(accessKeyName)).build();
+            if(headers.containsKey(accessKey.name)) {
+                request.mutate().headers(headMap -> headMap.remove(accessKey.name)).build();
             }
+        }else if(URI.equals(accessKey.type)) {
+            queryParams.remove(accessKey.name);
         }
         if (Objects.nonNull(removeSupplier)) {
             removeSupplier.get();
@@ -311,4 +352,27 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
             return Mono.error(() -> new RateLimitException(limit, timeUnit));
         });
     }
+
+    /**
+     * AK 信息
+     */
+    public static class AccessKey {
+        public AccessKey(String name) {
+            this.name = name;
+        }
+        public void set(String value, AccessKeyType type) {
+            if(StrUtil.isNotBlank(value)) {
+                this.value = value;
+                this.type = type;
+            }
+        }
+        public enum AccessKeyType {
+            HEADER,
+            URI,
+            BODY
+        }
+        private final String name;
+        private String value;
+        private AccessKeyType type;
+    }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
index 107066969..58ebc3806 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -22,6 +22,7 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.net.URI;
 import java.sql.Date;
 import java.time.Instant;
 import java.util.List;
@@ -50,9 +51,10 @@ public class GatewayUtils {
      * @param exchange  当前服务交换器
      * @param chain     当前过滤链
      * @param publisher body体提供者
+     * @param newUri    新的URI（去掉AccessKey）
      * @return 指示请求处理何时完成
      */
-    public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher) {
+    public static Mono<Void> modifyBody(ServerWebExchange exchange, GatewayFilterChain chain, Mono<String> publisher, URI newUri) {
         BodyInserter bodyInserter = BodyInserters.fromPublisher(publisher, String.class);
         HttpHeaders headers = new HttpHeaders();
         headers.putAll(exchange.getRequest().getHeaders());
@@ -60,14 +62,14 @@ public class GatewayUtils {
         CachedBodyOutputMessage outputMessage = new CachedBodyOutputMessage(exchange, headers);
         return bodyInserter.insert(outputMessage, new BodyInserterContext())
             .then(Mono.defer(() -> {
-                ServerHttpRequest request = decorate(exchange, headers, outputMessage);
+                ServerHttpRequest request = decorate(exchange, headers, outputMessage, newUri);
                 return chain.filter(exchange.mutate().request(request).build());
             }));
     }
 
 
     public static ServerHttpRequestDecorator decorate(ServerWebExchange exchange, HttpHeaders headers,
-                                                      CachedBodyOutputMessage outputMessage) {
+                                                      CachedBodyOutputMessage outputMessage, URI newUri) {
         return new ServerHttpRequestDecorator(exchange.getRequest()) {
             @Override
             public HttpHeaders getHeaders() {
@@ -86,6 +88,12 @@ public class GatewayUtils {
             public Flux<DataBuffer> getBody() {
                 return outputMessage.getBody();
             }
+
+            @Override
+            public URI getURI()
+            {
+                return Objects.isNull(newUri) ? super.getURI() : newUri;
+            }
         };
     }
 
@@ -123,7 +131,7 @@ public class GatewayUtils {
                 }
             }
         }
-        if (errorMsgSupplier != null) {
+        if (Objects.nonNull(errorMsgSupplier)) {
             Assert.notBlank(before, errorMsgSupplier);
         }
         return before;

From 08a9a8534b87fe04046ef0247aff4cb3ccdb6e75 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Thu, 21 Oct 2021 23:12:58 +0800
Subject: [PATCH 56/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=20Redis=20=E9=80=9A=E7=9F=A5=20Gateway=20=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E8=B7=AF=E7=94=B1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   | 42 +++++++++++--
 .../service/impl/IscServiceServiceImpl.java   | 19 +++++-
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 62 +++++++++++++++----
 3 files changed, 103 insertions(+), 20 deletions(-)

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index ca4a9f4ba..f56ea21e5 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -1,16 +1,22 @@
 package com.ruoyi.gateway.config;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.ruoyi.gateway.config.handler.GlobalErrorWebExceptionHandler;
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.CustomerGlobalFilter;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
+import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import org.springframework.cloud.gateway.support.ConfigurationService;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
@@ -19,6 +25,7 @@ import org.springframework.data.redis.core.script.RedisScript;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Gateway 配置文件
@@ -26,12 +33,19 @@ import java.util.List;
  * @author Wenchao Gong
  * @date 2021-09-11
  */
+@Slf4j
 @Configuration
-public class GatewayConfig
+public class GatewayConfig implements ApplicationEventPublisherAware
 {
-    @Resource
-    private RedissonClient redissonClient;
-
+    private RedissonClient client = SpringUtil.getBean(RedissonClient.class);
+    public ApplicationEventPublisher publisher;
+    public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
+    {
+        subscribe(TOPIC_GATEWAY_REFRESH_ROUTE, String.class, msg -> {
+            publisher.publishEvent(new RefreshRoutesEvent(this));
+            log.info("网关接收通知[{}]刷新本地路由!", msg);
+        });
+    }
     /**
      * Redis 路由仓库
      *
@@ -40,7 +54,7 @@ public class GatewayConfig
     @Bean
     public RouteDefinitionRepository redisRouteDefinitionRepository()
     {
-        return new RedisRouteDefinitionRepository(redissonClient);
+        return new RedisRouteDefinitionRepository(client);
     }
 
     @Bean
@@ -60,4 +74,22 @@ public class GatewayConfig
     public ErrorWebExceptionHandler errorWebExceptionHandler() {
         return new GlobalErrorWebExceptionHandler();
     }
+
+    /**
+     * 订阅通道接收消息
+     *
+     * @param channelKey 通道key
+     * @param clazz      消息类型
+     * @param consumer   自定义处理
+     */
+    public <T> void subscribe(String channelKey, Class<T> clazz, Consumer<T> consumer) {
+        RTopic topic = client.getTopic(channelKey);
+        topic.addListener(clazz, (channel, msg) -> consumer.accept(msg));
+    }
+
+    @Override
+    public void setApplicationEventPublisher(ApplicationEventPublisher publisher)
+    {
+        this.publisher = publisher;
+    }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index afda1230b..5f83c32fc 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.isc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.map.MapUtil;
@@ -119,7 +120,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     {
         IscService update = BeanUtil.toBean(bo, IscService.class);
         validEntityBeforeSave(update);
-        return updateById(update);
+        boolean result = updateById(update);
+        RouteUtils.updateRoute(RouteUtils.generateRoute(update));
+        return result;
     }
 
     /**
@@ -139,7 +142,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
         {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return removeByIds(ids);
+        boolean result = removeByIds(ids);
+        RouteUtils.deleteRoute(ids.stream().map(String::valueOf).collect(Collectors.toSet()));
+        return result;
     }
 
     @Override
@@ -176,6 +181,8 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     {
         checkAuditBO(bo);
         boolean result = true;
+        boolean pass = IscConstants.AUDIT_PASS.equals(bo.getStatus());
+        Collection<IscRouteDefinition> routes = pass ? ListUtil.list(false) : null;
         for (Long id : bo.getIds())
         {
             IscService service = getOne(Wrappers.<IscService>lambdaQuery()
@@ -186,6 +193,14 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
             }
             result = updateById(new IscService().setServiceId(id).setStatus(bo.getStatus())
                 .setAuditMind(bo.getRemark()));
+            if(pass) {
+                //生成路由
+                routes.add(RouteUtils.generateRoute(service));
+            }
+        }
+        if(pass) {
+            //保存路由信息
+            RouteUtils.saveRoute(routes);
         }
         return result;
     }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 77d259ac5..83d45e519 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -1,7 +1,10 @@
 package com.ruoyi.isc.utils;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscService;
@@ -9,6 +12,7 @@ import com.ruoyi.isc.utils.beans.IscFilterDefinition;
 import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
 import com.ruoyi.isc.utils.beans.IscRouteDefinition;
 import com.ruoyi.isc.utils.beans.IscRule;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
@@ -16,10 +20,9 @@ import org.redisson.codec.TypedJsonJacksonCodec;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -27,10 +30,12 @@ import java.util.stream.Collectors;
  * @author Wenchao Gong
  * @date 2021/9/10 14:46
  */
+@Slf4j
 public class RouteUtils {
 
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRouteDefinition.class);
     public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
+    public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
     /**
      * Gateway 虚拟路径前缀
      */
@@ -68,8 +73,7 @@ public class RouteUtils {
      */
     public static URI getURI(String uri)
     {
-        try
-        {
+        try {
             return new URI(uri);
         } catch (URISyntaxException e)
         {
@@ -77,6 +81,15 @@ public class RouteUtils {
         }
     }
 
+    /**
+     * 发布路由刷新通知
+     * @param consumer
+     * @return
+     */
+    public static void sendRefreshRouteToGateway(Consumer<String> consumer) {
+        RedisUtils.publish(TOPIC_GATEWAY_REFRESH_ROUTE, DateUtil.now(), consumer);
+    }
+
     /**
      * 刷新路由信息 先清空再批量新增
      *
@@ -90,32 +103,53 @@ public class RouteUtils {
         final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.clear();
         map.putAll(routeMap);
+        sendRefreshRouteToGateway((time) -> log.info("路由刷新完成，通知网关刷新路由![{}]", time));
         return true;
     }
 
     /**
      * 保存路由信息
      *
-     * @param route 路由信息
+     * @param routes 路由信息
      * @return 是否成功
      */
-    public static boolean saveRoute(IscRouteDefinition route)
+    public static boolean saveRoute(Collection<IscRouteDefinition> routes) {
+        return saveRoute(routes, null);
+    }
+
+    /**
+     * 保存路由信息
+     *
+     * @param routes    路由信息
+     * @param consumer 回调操作
+     * @return 是否成功
+     */
+    public static boolean saveRoute(Collection<IscRouteDefinition> routes, Consumer<String> consumer)
     {
+        if(CollectionUtil.isEmpty(routes)) {
+            return true;
+        }
         final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
-        map.put(route.getId(), route);
+        Map<String, IscRouteDefinition> collect = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId, Function.identity()));
+        map.putAll(collect);
+        if(Objects.isNull(consumer)) {
+            consumer = (time) -> log.info("保存路由[{}]完成，通知网关刷新路由![{}]", map.keySet(), time);
+        }
+        sendRefreshRouteToGateway(consumer);
         return true;
     }
 
     /**
      * 删除路由信息
      *
-     * @param routeId 路由ID
+     * @param routeIds 路由ID
      * @return 是否成功
      */
-    public static boolean deleteRoute(String routeId)
+    public static boolean deleteRoute(Collection<String> routeIds)
     {
         final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
-        map.remove(routeId);
+        map.fastRemove(routeIds.toArray(new String[0]));
+        sendRefreshRouteToGateway((time) -> log.info("删除路由[{}]完成，通知网关刷新路由![{}]", routeIds, time));
         return true;
     }
 
@@ -127,7 +161,9 @@ public class RouteUtils {
      */
     public static boolean updateRoute(IscRouteDefinition route)
     {
-        return saveRoute(route);
+        boolean result = saveRoute(Collections.singletonList(route), (time) ->
+                log.info("更新路由[{}]完成，通知网关刷新路由![{}]", route.getId(), time));
+        return result;
     }
 
     /**

From fa54edaf6eec1365084d41190fac77ad25a4ed16 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sat, 30 Oct 2021 21:48:41 +0800
Subject: [PATCH 57/60] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=8E=A5=E6=94=B6=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/gateway/config/GatewayConfig.java   |  51 +++++---
 .../com/ruoyi/gateway/utils/GatewayUtils.java |  14 ++-
 .../ruoyi/gateway/utils/beans/TopicMsg.java   |  37 ++++++
 .../gateway/utils/caching/CachingRule.java    |  53 ++++++++
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 114 +++++++++++++-----
 .../com/ruoyi/isc/utils/beans/TopicMsg.java   |  37 ++++++
 6 files changed, 257 insertions(+), 49 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java
 create mode 100644 ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
 create mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java

diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index f56ea21e5..e8ba55e62 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -5,9 +5,14 @@ import com.ruoyi.gateway.config.handler.GlobalErrorWebExceptionHandler;
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.CustomerGlobalFilter;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
+import com.ruoyi.gateway.utils.beans.TopicMsg;
+import com.ruoyi.gateway.utils.caching.CachingRule;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.SerializationCodec;
+import org.redisson.codec.TypedJsonJacksonCodec;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
@@ -22,8 +27,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
+import org.springframework.lang.NonNull;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -35,38 +40,55 @@ import java.util.function.Consumer;
  */
 @Slf4j
 @Configuration
-public class GatewayConfig implements ApplicationEventPublisherAware
-{
-    private RedissonClient client = SpringUtil.getBean(RedissonClient.class);
-    public ApplicationEventPublisher publisher;
+public class GatewayConfig implements ApplicationEventPublisherAware {
+    public static final Codec TOPIC_MSG_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, TopicMsg.class);
     public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
+    public static final String TOPIC_GATEWAY_RULE = "TOPIC_GATEWAY_RULE";
+    public ApplicationEventPublisher publisher;
+    private final RedissonClient client = SpringUtil.getBean(RedissonClient.class);
+
     {
-        subscribe(TOPIC_GATEWAY_REFRESH_ROUTE, String.class, msg -> {
+        subscribe(TOPIC_GATEWAY_REFRESH_ROUTE, TopicMsg.class, msg -> {
             publisher.publishEvent(new RefreshRoutesEvent(this));
             log.info("网关接收通知[{}]刷新本地路由!", msg);
         });
+        subscribe(TOPIC_GATEWAY_RULE, TopicMsg.class, msg -> {
+            switch (msg.getType()) {
+                case ADD:
+                case UPDATE:
+                case DELETE:
+                    CachingRule.evict(msg.getId());
+                    log.info("网关接收通知id:[{}], type:[{}], msg:[{}]清除本地规则!", msg.getId(), msg.getType(), msg.getMsg());
+                    break;
+                case REFRESH:
+                    CachingRule.refresh();
+                    log.info("网关接收通知id:[{}], type:[{}], msg:[{}]本地所有规则!", msg.getId(), msg.getType(), msg.getMsg());
+                    break;
+                default:
+                    break;
+            }
+        });
     }
+
     /**
      * Redis 路由仓库
      *
      * @return redis路由仓库
      */
     @Bean
-    public RouteDefinitionRepository redisRouteDefinitionRepository()
-    {
+    public RouteDefinitionRepository redisRouteDefinitionRepository() {
         return new RedisRouteDefinitionRepository(client);
     }
 
     @Bean
     public CustomerRedisRateLimiter customerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate,
-             @Qualifier(RedisRateLimiter.REDIS_SCRIPT_NAME) RedisScript<List<Long>> redisScript,
-             ConfigurationService configurationService, DefaultRedisScript<Long> timeRedisScript) {
+                                                             @Qualifier(RedisRateLimiter.REDIS_SCRIPT_NAME) RedisScript<List<Long>> redisScript,
+                                                             ConfigurationService configurationService, DefaultRedisScript<Long> timeRedisScript) {
         return new CustomerRedisRateLimiter(redisTemplate, redisScript, configurationService, timeRedisScript);
     }
 
     @Bean
-    public GlobalFilter customerGlobalFilter(CustomerRedisRateLimiter customerRedisRateLimiter)
-    {
+    public GlobalFilter customerGlobalFilter(CustomerRedisRateLimiter customerRedisRateLimiter) {
         return new CustomerGlobalFilter(customerRedisRateLimiter);
     }
 
@@ -83,13 +105,12 @@ public class GatewayConfig implements ApplicationEventPublisherAware
      * @param consumer   自定义处理
      */
     public <T> void subscribe(String channelKey, Class<T> clazz, Consumer<T> consumer) {
-        RTopic topic = client.getTopic(channelKey);
+        RTopic topic = client.getTopic(channelKey, new SerializationCodec());
         topic.addListener(clazz, (channel, msg) -> consumer.accept(msg));
     }
 
     @Override
-    public void setApplicationEventPublisher(ApplicationEventPublisher publisher)
-    {
+    public void setApplicationEventPublisher(@NonNull ApplicationEventPublisher publisher) {
         this.publisher = publisher;
     }
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
index 58ebc3806..da5847b6f 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.extra.spring.SpringUtil;
 import com.ruoyi.gateway.utils.beans.IscRule;
+import com.ruoyi.gateway.utils.caching.CachingRule;
+import org.redisson.api.DeletedObjectListener;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
@@ -164,8 +166,18 @@ public class GatewayUtils {
      * @return
      */
     public static IscRule getRule(String ak, String routeId) {
+        String key = ak + ':' + routeId;
+        return CachingRule.getRule(key, GatewayUtils::getRedisRule);
+    }
+
+    /**
+     * 获取Redis Rule
+     * @param key
+     * @return
+     */
+    private static IscRule getRedisRule(String key) {
         final RMap<String, IscRule> map = client.getMap(KEY_RULES, RULE_CODES_INSTANCE);
-        return map.get(ak + ':' + routeId);
+        return map.get(key);
     }
 
     /**
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java
new file mode 100644
index 000000000..7a82c2ee2
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java
@@ -0,0 +1,37 @@
+package com.ruoyi.gateway.utils.beans;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TopicMsg implements Serializable {
+    /** 消息ID */
+    private String id;
+
+    /** 消息内容 */
+    private String msg;
+
+    /** 消息类型 */
+    private Type type;
+
+    /** 消息类型枚举 */
+    public static enum Type {
+        /** 新增单条记录 */
+        ADD,
+        /** 更新单条记录 */
+        UPDATE,
+        /** 删除单条记录 */
+        DELETE,
+        /** 刷新所有 */
+        REFRESH
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
new file mode 100644
index 000000000..594787655
--- /dev/null
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
@@ -0,0 +1,53 @@
+package com.ruoyi.gateway.utils.caching;
+
+import com.ruoyi.gateway.utils.beans.IscRule;
+import org.springframework.cache.Cache;
+import org.springframework.cache.concurrent.ConcurrentMapCache;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-22
+ */
+public class CachingRule {
+    public static final String RULE_CACHE_NAME = "RULE_CACHE";
+    public static final Cache RULE_CACHE = new ConcurrentMapCache(RULE_CACHE_NAME);
+
+    /**
+     * 通过 Key 获取缓存中的 Rule
+     *
+     * @param key    缓存key
+     * @param mapper 如果缓存中没有 key 从mapper 中获取
+     * @return
+     */
+    public static IscRule getRule(String key, Function<String, IscRule> mapper) {
+        Cache.ValueWrapper value = RULE_CACHE.get(key);
+        if (Objects.nonNull(value)) {
+            return (IscRule) value.get();
+        }
+        IscRule rule = mapper.apply(key);
+        RULE_CACHE.put(key, rule);
+        return rule;
+    }
+
+    /**
+     * 清除 缓存 如果key存在
+     *
+     * @param key 缓存key
+     * @return 是否清除
+     */
+    public static boolean evict(String key) {
+        return RULE_CACHE.evictIfPresent(key);
+    }
+
+    /**
+     * 清除所有缓存 一刷新整个缓存
+     * @return
+     */
+    public static boolean refresh() {
+        RULE_CACHE.clear();
+        return true;
+    }
+}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index 83d45e519..a1bfa766c 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -4,16 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscService;
-import com.ruoyi.isc.utils.beans.IscFilterDefinition;
-import com.ruoyi.isc.utils.beans.IscPredicateDefinition;
-import com.ruoyi.isc.utils.beans.IscRouteDefinition;
-import com.ruoyi.isc.utils.beans.IscRule;
+import com.ruoyi.isc.utils.beans.*;
+import com.ruoyi.isc.utils.beans.TopicMsg.Type;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
+import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.codec.TypedJsonJacksonCodec;
@@ -21,7 +19,6 @@ import org.redisson.codec.TypedJsonJacksonCodec;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -35,13 +32,15 @@ public class RouteUtils {
 
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRouteDefinition.class);
     public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
+    public static final Codec TOPIC_MSG_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, TopicMsg.class);
     public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
+    public static final String TOPIC_GATEWAY_RULE = "TOPIC_GATEWAY_RULE";
     /**
      * Gateway 虚拟路径前缀
      */
     public static final String PATH_PREFIX = "/proxy";
     public static final String ACCESS_KEY_NAME = "ak";
-    private static RedissonClient client = SpringUtils.getBean(RedissonClient.class);
+    private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
 
     /**
      * 获取虚拟URL Path 部分
@@ -82,12 +81,32 @@ public class RouteUtils {
     }
 
     /**
-     * 发布路由刷新通知
-     * @param consumer
-     * @return
+     * 发布通道消息
+     *
+     * @param channelKey 通道key
+     * @param msg        发送数据
+     * @param consumer   自定义处理
      */
-    public static void sendRefreshRouteToGateway(Consumer<String> consumer) {
-        RedisUtils.publish(TOPIC_GATEWAY_REFRESH_ROUTE, DateUtil.now(), consumer);
+    public static <T> void publish(String channelKey, T msg, Consumer<T> consumer) {
+        RTopic topic = CLIENT.getTopic(channelKey, TOPIC_MSG_CODES_INSTANCE);
+        topic.publish(msg);
+        consumer.accept(msg);
+    }
+
+    /**
+     * 发布路由刷新通知
+     * @param consumer 发送消息后执行
+     */
+    public static void sendRefreshRouteToGateway(String id, Type type, Consumer<TopicMsg> consumer) {
+        publish(TOPIC_GATEWAY_REFRESH_ROUTE, new TopicMsg(id, DateUtil.now(), type), consumer);
+    }
+
+    /**
+     * 发布规则通知
+     * @param consumer 发送消息后执行
+     */
+    public static void sendRuleNoticeToGateway(String id, Type type, Consumer<TopicMsg> consumer) {
+        publish(TOPIC_GATEWAY_RULE, new TopicMsg(id, DateUtil.now(), type), consumer);
     }
 
     /**
@@ -100,10 +119,11 @@ public class RouteUtils {
     {
         Map<String, IscRouteDefinition> routeMap = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId,
                 Function.identity(), (o1, o2) -> o2));
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.clear();
         map.putAll(routeMap);
-        sendRefreshRouteToGateway((time) -> log.info("路由刷新完成，通知网关刷新路由![{}]", time));
+        sendRefreshRouteToGateway(null, Type.REFRESH,
+                (msg) -> log.info("路由刷新完成，通知网关刷新路由![{}]", msg.getMsg()));
         return true;
     }
 
@@ -124,18 +144,21 @@ public class RouteUtils {
      * @param consumer 回调操作
      * @return 是否成功
      */
-    public static boolean saveRoute(Collection<IscRouteDefinition> routes, Consumer<String> consumer)
+    public static boolean saveRoute(Collection<IscRouteDefinition> routes, Consumer<TopicMsg> consumer)
     {
         if(CollectionUtil.isEmpty(routes)) {
             return true;
         }
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         Map<String, IscRouteDefinition> collect = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId, Function.identity()));
         map.putAll(collect);
+        final String id = String.join(",", collect.keySet());
+        Type type = Type.UPDATE;
         if(Objects.isNull(consumer)) {
-            consumer = (time) -> log.info("保存路由[{}]完成，通知网关刷新路由![{}]", map.keySet(), time);
+            type = Type.ADD;
+            consumer = (msg) -> log.info("保存[{}]路由[{}]完成，通知网关刷新路由![{}]", msg.getType(), msg.getId(), msg.getMsg());
         }
-        sendRefreshRouteToGateway(consumer);
+        sendRefreshRouteToGateway(id, type, consumer);
         return true;
     }
 
@@ -147,9 +170,12 @@ public class RouteUtils {
      */
     public static boolean deleteRoute(Collection<String> routeIds)
     {
-        final RMap<String, IscRouteDefinition> map = client.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
-        map.fastRemove(routeIds.toArray(new String[0]));
-        sendRefreshRouteToGateway((time) -> log.info("删除路由[{}]完成，通知网关刷新路由![{}]", routeIds, time));
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final String[] ids = routeIds.toArray(new String[0]);
+        map.fastRemove(ids);
+        final String id = String.join(",", routeIds);
+        sendRefreshRouteToGateway(id, Type.DELETE,
+                (msg) -> log.info("删除[{}]路由[{}]完成，通知网关刷新路由![{}]", msg.getType(), msg.getId(), msg.getMsg()));
         return true;
     }
 
@@ -161,9 +187,8 @@ public class RouteUtils {
      */
     public static boolean updateRoute(IscRouteDefinition route)
     {
-        boolean result = saveRoute(Collections.singletonList(route), (time) ->
-                log.info("更新路由[{}]完成，通知网关刷新路由![{}]", route.getId(), time));
-        return result;
+        return saveRoute(Collections.singletonList(route),
+                (msg) -> log.info("保存[{}]路由[{}]完成，通知网关刷新路由![{}]", msg.getType(), msg.getId(), msg.getMsg()));
     }
 
     /**
@@ -212,9 +237,9 @@ public class RouteUtils {
     /**
      * 生成 服务对应AK调用规则
      *
-     * @param appService
-     * @param accessKey
-     * @return
+     * @param appService 服务申请信息
+     * @param accessKey AccessKey
+     * @return 规则信息
      */
     public static IscRule generateRule(IscAppService appService, String accessKey)
     {
@@ -237,22 +262,42 @@ public class RouteUtils {
     public static boolean refreshRules(List<IscRule> rules)
     {
         Map<String, IscRule> ruleMap = rules.stream().collect(Collectors.toMap(IscRule::getId, Function.identity(), (o1, o2) -> o2));
-        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
         map.clear();
         map.putAll(ruleMap);
+        final String id = String.join(",", ruleMap.keySet());
+        sendRuleNoticeToGateway(id, Type.REFRESH,
+                (msg) ->  log.info("刷新[{}]所有规则[{}]完成，通知网关刷新规则![{}]", msg.getType(), msg.getId(), msg.getMsg()));
         return true;
     }
 
     /**
      * 保存规则信息
      *
-     * @param rule 规则信息
+     * @param rule     规则信息
      * @return 是否成功
      */
-    public static boolean saveRule(IscRule rule)
+    public static boolean saveRule(IscRule rule) {
+        return saveRule(rule, null);
+    }
+
+    /**
+     * 保存规则信息
+     *
+     * @param rule     规则信息
+     * @param consumer 回调
+     * @return 是否成功
+     */
+    public static boolean saveRule(IscRule rule, Consumer<TopicMsg> consumer)
     {
-        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
         map.put(rule.getId(), rule);
+        Type type = Type.UPDATE;
+        if(Objects.isNull(consumer)) {
+            type = Type.ADD;
+            consumer = (msg) ->  log.info("新增[{}]规则[{}]完成，通知网关刷新规则![{}]", msg.getType(), msg.getId(), msg.getMsg());
+        }
+        sendRuleNoticeToGateway(rule.getId(), type, consumer);
         return true;
     }
 
@@ -264,8 +309,10 @@ public class RouteUtils {
      */
     public static boolean deleteRule(String ruleId)
     {
-        final RMap<String, IscRule> map = client.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
         map.remove(ruleId);
+        sendRuleNoticeToGateway(ruleId, Type.DELETE,
+                (msg) ->  log.info("删除[{}]规则[{}]完成，通知网关刷新规则![{}]", msg.getType(), msg.getId(), msg.getMsg()));
         return true;
     }
 
@@ -277,6 +324,7 @@ public class RouteUtils {
      */
     public static boolean updateRule(IscRule rule)
     {
-        return saveRule(rule);
+        return saveRule(rule,
+                (msg) ->  log.info("更新[{}]规则[{}]完成，通知网关刷新规则![{}]", msg.getType(), msg.getId(), msg.getMsg()));
     }
 }
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java
new file mode 100644
index 000000000..c5dfb78ce
--- /dev/null
+++ b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java
@@ -0,0 +1,37 @@
+package com.ruoyi.isc.utils.beans;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TopicMsg implements Serializable {
+    /** 消息ID */
+    private String id;
+
+    /** 消息内容 */
+    private String msg;
+
+    /** 消息类型 */
+    private Type type;
+
+    /** 消息类型枚举 */
+    public static enum Type {
+        /** 新增单条记录 */
+        ADD,
+        /** 更新单条记录 */
+        UPDATE,
+        /** 删除单条记录 */
+        DELETE,
+        /** 刷新所有 */
+        REFRESH
+    }
+}

From e07fe57317970759ff0e263c490efa2f46310918 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sat, 30 Oct 2021 23:48:44 +0800
Subject: [PATCH 58/60] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=B8=8D=E5=88=B0=E9=80=9A=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 17 ++++++++-
 .../com/ruoyi/common/constant/Constants.java  | 10 +++++
 .../ruoyi/common/constant/IscConstants.java   | 21 +----------
 ruoyi-extend/ruoyi-isc-gateway/pom.xml        |  4 ++
 .../ruoyi/gateway/config/GatewayConfig.java   | 12 ++----
 .../RedisRouteDefinitionRepository.java       |  3 +-
 .../gateway/filter/CustomerGlobalFilter.java  |  8 ++--
 .../ratelimit/CustomerRedisRateLimiter.java   | 11 +++---
 .../com/ruoyi/gateway/utils/GatewayUtils.java | 19 +++-------
 .../gateway/utils/caching/CachingRule.java    |  2 +-
 ruoyi-isc-parent/pom.xml                      | 33 +++++++++++++++++
 ruoyi-isc-parent/ruoyi-isc-common/pom.xml     | 30 +++++++++++++++
 .../common/constant/IscGatewayContants.java   | 31 ++++++++++++++++
 .../isc/common/constant/IscRedisKeys.java     | 19 ++++++++++
 .../ruoyi/isc/common/utils/GatewayUtils.java  | 30 +++++++++++++++
 .../isc/common}/utils/beans/IscRule.java      |  2 +-
 .../isc/common}/utils/beans/TopicMsg.java     |  2 +-
 .../ruoyi-isc}/pom.xml                        |  6 ++-
 .../IscAppServiceApplyController.java         |  0
 .../controller/IscAppServiceController.java   |  0
 .../controller/IscApplicationController.java  |  0
 .../controller/IscServiceCateController.java  |  0
 .../isc/controller/IscServiceController.java  |  0
 .../com/ruoyi/isc/domain/IscAppService.java   |  0
 .../ruoyi/isc/domain/IscAppServiceApply.java  |  0
 .../com/ruoyi/isc/domain/IscApplication.java  |  0
 .../java/com/ruoyi/isc/domain/IscService.java |  0
 .../com/ruoyi/isc/domain/IscServiceCate.java  |  0
 .../isc/domain/bo/IscAppServiceApplyBo.java   |  0
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  0
 .../ruoyi/isc/domain/bo/IscApplicationBo.java |  0
 .../com/ruoyi/isc/domain/bo/IscAuditBo.java   |  0
 .../com/ruoyi/isc/domain/bo/IscServiceBo.java |  0
 .../ruoyi/isc/domain/bo/IscServiceCateBo.java |  0
 .../isc/domain/vo/IscAppServiceApplyVo.java   |  0
 .../ruoyi/isc/domain/vo/IscAppServiceVo.java  |  0
 .../ruoyi/isc/domain/vo/IscApplicationVo.java |  0
 .../ruoyi/isc/domain/vo/IscServiceCateVo.java |  0
 .../com/ruoyi/isc/domain/vo/IscServiceVo.java |  0
 .../isc/mapper/IscAppServiceApplyMapper.java  |  0
 .../ruoyi/isc/mapper/IscAppServiceMapper.java |  0
 .../isc/mapper/IscApplicationMapper.java      |  0
 .../isc/mapper/IscServiceCateMapper.java      |  0
 .../ruoyi/isc/mapper/IscServiceMapper.java    |  0
 .../service/IIscAppServiceApplyService.java   |  0
 .../isc/service/IIscAppServiceService.java    |  0
 .../isc/service/IIscApplicationService.java   |  0
 .../isc/service/IIscServiceCateService.java   |  0
 .../ruoyi/isc/service/IIscServiceService.java |  0
 .../impl/IscAppServiceApplyServiceImpl.java   |  9 +++--
 .../impl/IscAppServiceServiceImpl.java        | 15 ++++----
 .../impl/IscApplicationServiceImpl.java       |  0
 .../impl/IscServiceCateServiceImpl.java       |  0
 .../service/impl/IscServiceServiceImpl.java   | 15 ++++----
 .../java/com/ruoyi/isc/utils/RouteUtils.java  | 36 +++++++++---------
 .../isc/utils/beans/IscFilterDefinition.java  |  0
 .../utils/beans/IscPredicateDefinition.java   |  0
 .../isc/utils/beans/IscRouteDefinition.java   |  0
 .../mapper/isc/IscAppServiceApplyMapper.xml   |  0
 .../mapper/isc/IscAppServiceMapper.xml        |  0
 .../mapper/isc/IscApplicationMapper.xml       |  0
 .../mapper/isc/IscServiceCateMapper.xml       |  0
 .../resources/mapper/isc/IscServiceMapper.xml |  0
 .../com/ruoyi/isc/utils/beans/IscRule.java    | 26 -------------
 .../com/ruoyi/isc/utils/beans/TopicMsg.java   | 37 -------------------
 65 files changed, 243 insertions(+), 155 deletions(-)
 create mode 100644 ruoyi-isc-parent/pom.xml
 create mode 100644 ruoyi-isc-parent/ruoyi-isc-common/pom.xml
 create mode 100644 ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscGatewayContants.java
 create mode 100644 ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscRedisKeys.java
 create mode 100644 ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/GatewayUtils.java
 rename {ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway => ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common}/utils/beans/IscRule.java (92%)
 rename {ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway => ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common}/utils/beans/TopicMsg.java (94%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/pom.xml (76%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/controller/IscServiceController.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/IscAppService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/IscApplication.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/IscService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/IIscServiceService.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java (97%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java (95%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java (94%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/utils/RouteUtils.java (88%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/resources/mapper/isc/IscAppServiceMapper.xml (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/resources/mapper/isc/IscApplicationMapper.xml (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/resources/mapper/isc/IscServiceCateMapper.xml (100%)
 rename {ruoyi-isc => ruoyi-isc-parent/ruoyi-isc}/src/main/resources/mapper/isc/IscServiceMapper.xml (100%)
 delete mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java
 delete mode 100644 ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java

diff --git a/pom.xml b/pom.xml
index f199256bc..5f029dafe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,11 @@
                 <version>${spring-boot.version}</version>
             </dependency>
             <!--redisson-->
+            <dependency>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson</artifactId>
+                <version>${redisson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson-spring-boot-starter</artifactId>
@@ -276,6 +281,16 @@
             </dependency>
 
             <!-- isc模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-isc-parent</artifactId>
+                <version>${ruoyi-vue-plus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-isc-common</artifactId>
+                <version>${ruoyi-vue-plus.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-isc</artifactId>
@@ -302,7 +317,7 @@
         <module>ruoyi-demo</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-oss</module>
-        <module>ruoyi-isc</module>
+        <module>ruoyi-isc-parent</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index c2cb29dcb..ad636ce04 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -143,4 +143,14 @@ public class Constants
 	 * LDAP 远程方法调用
 	 */
 	public static final String LOOKUP_LDAP = "ldap://";
+
+    /** 待审核 */
+    public static final String AUDIT_WAIT = "0";
+
+    /** 审核通过 */
+    public static final String AUDIT_PASS = "1";
+
+    /** 审核驳回 */
+    public static final String AUDIT_REJECT = "2";
+
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
index fe3c523f7..793140ed5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/IscConstants.java
@@ -2,16 +2,7 @@ package com.ruoyi.common.constant;
 
 public class IscConstants {
 
-    /** 待审核 */
-    public static final String AUDIT_WAIT = "0";
-
-    /** 审核通过 */
-    public static final String AUDIT_PASS = "1";
-
-    /** 审核驳回 */
-    public static final String AUDIT_REJECT = "2";
-
-    /** 待审核 */
+    /** 在线状态 在线 */
     public static final String ONLINE_STATUS_ON = "1";
 
     /** 申请类型 申请服务 */
@@ -22,14 +13,4 @@ public class IscConstants {
 
     /** 申请类型 申请修改 */
     public static final String APPLY_TYPE_MODIFY = "2";
-
-    /**
-     * Gateway 路由信息Redis Key
-     */
-    public static final String KEY_ROUTES = "ROUTES:";
-
-    /**
-     * Gateway 服务对应AK规则
-     */
-    public static final String KEY_RULES = "RULES:";
 }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/pom.xml b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
index 4df6d0639..851b4665d 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/pom.xml
+++ b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
@@ -13,6 +13,10 @@
     <artifactId>ruoyi-isc-gateway</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-isc-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
index e8ba55e62..85cfe323f 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java
@@ -5,14 +5,11 @@ import com.ruoyi.gateway.config.handler.GlobalErrorWebExceptionHandler;
 import com.ruoyi.gateway.config.provider.RedisRouteDefinitionRepository;
 import com.ruoyi.gateway.filter.CustomerGlobalFilter;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
-import com.ruoyi.gateway.utils.beans.TopicMsg;
 import com.ruoyi.gateway.utils.caching.CachingRule;
+import com.ruoyi.isc.common.utils.beans.TopicMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RTopic;
 import org.redisson.api.RedissonClient;
-import org.redisson.client.codec.Codec;
-import org.redisson.codec.SerializationCodec;
-import org.redisson.codec.TypedJsonJacksonCodec;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
@@ -32,6 +29,8 @@ import org.springframework.lang.NonNull;
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.ruoyi.isc.common.constant.IscGatewayContants.*;
+
 /**
  * Gateway 配置文件
  *
@@ -41,9 +40,6 @@ import java.util.function.Consumer;
 @Slf4j
 @Configuration
 public class GatewayConfig implements ApplicationEventPublisherAware {
-    public static final Codec TOPIC_MSG_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, TopicMsg.class);
-    public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
-    public static final String TOPIC_GATEWAY_RULE = "TOPIC_GATEWAY_RULE";
     public ApplicationEventPublisher publisher;
     private final RedissonClient client = SpringUtil.getBean(RedissonClient.class);
 
@@ -105,7 +101,7 @@ public class GatewayConfig implements ApplicationEventPublisherAware {
      * @param consumer   自定义处理
      */
     public <T> void subscribe(String channelKey, Class<T> clazz, Consumer<T> consumer) {
-        RTopic topic = client.getTopic(channelKey, new SerializationCodec());
+        RTopic topic = client.getTopic(channelKey);
         topic.addListener(clazz, (channel, msg) -> consumer.accept(msg));
     }
 
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
index ebdb94caf..492de65d2 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/config/provider/RedisRouteDefinitionRepository.java
@@ -10,6 +10,8 @@ import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import static com.ruoyi.isc.common.constant.IscRedisKeys.KEY_ROUTES;
+
 /**
  * Redis 路由仓库
  *
@@ -20,7 +22,6 @@ import reactor.core.publisher.Mono;
 public class RedisRouteDefinitionRepository implements RouteDefinitionRepository
 {
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, RouteDefinition.class);
-    public static final String KEY_ROUTES = "ROUTES:";
     private final RedissonClient redissonClient;
 
     public RedisRouteDefinitionRepository(RedissonClient redissonClient)
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
index 247100ea2..4b49b0796 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/filter/CustomerGlobalFilter.java
@@ -9,7 +9,7 @@ import cn.hutool.json.JSONUtil;
 import com.ruoyi.gateway.exception.*;
 import com.ruoyi.gateway.ratelimit.CustomerRedisRateLimiter;
 import com.ruoyi.gateway.utils.GatewayUtils;
-import com.ruoyi.gateway.utils.beans.IscRule;
+import com.ruoyi.isc.common.utils.beans.IscRule;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.route.Route;
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 
 import static com.ruoyi.gateway.filter.CustomerGlobalFilter.AccessKey.AccessKeyType;
 import static com.ruoyi.gateway.filter.CustomerGlobalFilter.AccessKey.AccessKeyType.*;
+import static com.ruoyi.isc.common.constant.IscGatewayContants.*;
 import static org.springframework.util.CollectionUtils.unmodifiableMultiValueMap;
 
 /**
@@ -57,7 +58,6 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         this.rateLimiter = rateLimiter;
     }
 
-    private static final String ACCESS_KEY_NAME_DEFAULT = "ak";
     private static final TimeUnit[] TIME_UNITS = {TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
 
     @Override
@@ -67,7 +67,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
         final ServerHttpRequest request = exchange.getRequest();
         //ak 是否存在
         final HttpMethod httpMethod = request.getMethod();
-        AccessKey accessKey = new AccessKey(String.valueOf(metadata.getOrDefault(GatewayUtils.CONFIG_ACCESS_KEY_NAME_KEY,
+        AccessKey accessKey = new AccessKey(String.valueOf(metadata.getOrDefault(CONFIG_ACCESS_KEY_NAME_KEY,
                 ACCESS_KEY_NAME_DEFAULT)));
         accessKey.set(GatewayUtils.getValue(null, () -> request.getHeaders().get(accessKey.name)), HEADER);
         MultiValueMap<String, String> queryParams = request.getQueryParams().containsKey(accessKey.name) ?
@@ -305,7 +305,7 @@ public class CustomerGlobalFilter implements GlobalFilter, Ordered {
      * @param <U>    参数类型
      */
     private <U> void handleHiddenParams(Route route, U result, BiConsumer<Map.Entry<String, Object>, U> mapper) {
-        final Object obj = route.getMetadata().get(GatewayUtils.CONFIG_ADD_PARAM_KEY);
+        final Object obj = route.getMetadata().get(CONFIG_ADD_PARAM_KEY);
         if (Objects.isNull(obj)) {
             return;
         }
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
index 2e2289b80..0eea20016 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/ratelimit/CustomerRedisRateLimiter.java
@@ -2,6 +2,7 @@ package com.ruoyi.gateway.ratelimit;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ruoyi.gateway.utils.GatewayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter;
 import org.springframework.cloud.gateway.support.ConfigurationService;
@@ -26,12 +27,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 @Slf4j
 public class CustomerRedisRateLimiter extends RedisRateLimiter {
 
-    private ReactiveStringRedisTemplate redisTemplate;
+    private final ReactiveStringRedisTemplate redisTemplate;
 
-    private RedisScript<List<Long>> script;
-    private RedisScript<Long> timeRedisScript;
+    private final RedisScript<List<Long>> script;
+    private final RedisScript<Long> timeRedisScript;
 
-    private AtomicBoolean initialized = new AtomicBoolean(false);
+    private final AtomicBoolean initialized = new AtomicBoolean(false);
 
     public CustomerRedisRateLimiter(ReactiveStringRedisTemplate redisTemplate, RedisScript<List<Long>> script,
                                     ConfigurationService configurationService, DefaultRedisScript<Long> timeRedisScript) {
@@ -44,7 +45,7 @@ public class CustomerRedisRateLimiter extends RedisRateLimiter {
 
     public Mono<Response> isAllowed(String routeId, String ak, Long replenishRate, TimeUnit timeUnit) {
         Config routeConfig = new Config().setReplenishRate(replenishRate.intValue());
-        String id = ak + ':' + routeId;
+        String id = GatewayUtils.getRouteKey(ak, routeId);
         int time = 60;
         LocalDateTime now = LocalDateTime.now();
         List<String> keys;
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
index da5847b6f..05035d4ba 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/GatewayUtils.java
@@ -3,9 +3,8 @@ package com.ruoyi.gateway.utils;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.extra.spring.SpringUtil;
-import com.ruoyi.gateway.utils.beans.IscRule;
 import com.ruoyi.gateway.utils.caching.CachingRule;
-import org.redisson.api.DeletedObjectListener;
+import com.ruoyi.isc.common.utils.beans.IscRule;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
@@ -31,20 +30,14 @@ import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
 
+import static com.ruoyi.isc.common.constant.IscGatewayContants.RULE_CODES_INSTANCE;
+import static com.ruoyi.isc.common.constant.IscRedisKeys.KEY_RULES;
+
 /**
  * @author Wenchao Gong
  * @date 2021-10-15
  */
-public class GatewayUtils {
-
-    public static final String CONFIG_ACCESS_KEY_NAME_KEY = "accessKeyName";
-    public static final String CONFIG_ADD_PARAM_KEY = "addParam";
-    /**
-     * Gateway 服务对应AK规则
-     */
-    public static final String KEY_RULES = "RULES:";
-
-    public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
+public class GatewayUtils extends com.ruoyi.isc.common.utils.GatewayUtils {
     private static RedissonClient client = SpringUtil.getBean(RedissonClient.class);
 
     /**
@@ -166,7 +159,7 @@ public class GatewayUtils {
      * @return
      */
     public static IscRule getRule(String ak, String routeId) {
-        String key = ak + ':' + routeId;
+        String key = getRouteKey(ak, routeId);
         return CachingRule.getRule(key, GatewayUtils::getRedisRule);
     }
 
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
index 594787655..5ff5db1fc 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
+++ b/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/caching/CachingRule.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gateway.utils.caching;
 
-import com.ruoyi.gateway.utils.beans.IscRule;
+import com.ruoyi.isc.common.utils.beans.IscRule;
 import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 
diff --git a/ruoyi-isc-parent/pom.xml b/ruoyi-isc-parent/pom.xml
new file mode 100644
index 000000000..d633933a2
--- /dev/null
+++ b/ruoyi-isc-parent/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-isc-parent</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ruoyi-isc-common</module>
+        <module>ruoyi-isc</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-isc-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-isc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/ruoyi-isc-parent/ruoyi-isc-common/pom.xml b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml
new file mode 100644
index 000000000..4bc845234
--- /dev/null
+++ b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-isc-parent</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-isc-common</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscGatewayContants.java b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscGatewayContants.java
new file mode 100644
index 000000000..c11959f5b
--- /dev/null
+++ b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscGatewayContants.java
@@ -0,0 +1,31 @@
+package com.ruoyi.isc.common.constant;
+
+import com.ruoyi.isc.common.utils.beans.IscRule;
+import org.redisson.client.codec.Codec;
+import org.redisson.codec.TypedJsonJacksonCodec;
+
+/**
+ * Isc Gateway 公共常量
+ * @author Wenchao Gong
+ * @date 2021-10-30
+ */
+public interface IscGatewayContants {
+
+    /** AccessKey 默认名称 */
+    String ACCESS_KEY_NAME_DEFAULT = "ak";
+
+    /** 路由刷新通知主题 */
+    String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
+
+    /** 规则刷新通知主题 */
+    String TOPIC_GATEWAY_RULE = "TOPIC_GATEWAY_RULE";
+
+    /** AccessKeyName 路由配置名称 */
+    String CONFIG_ACCESS_KEY_NAME_KEY = "accessKeyName";
+
+    /** 添加参数 路由配置名称 */
+    String CONFIG_ADD_PARAM_KEY = "addParam";
+
+    /** 规则编解码器 */
+    Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
+}
diff --git a/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscRedisKeys.java b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscRedisKeys.java
new file mode 100644
index 000000000..af8e847c5
--- /dev/null
+++ b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/constant/IscRedisKeys.java
@@ -0,0 +1,19 @@
+package com.ruoyi.isc.common.constant;
+
+/**
+ * Redis Keys
+ * @author Wenchao Gong
+ * @date 2021-10-30
+ */
+public interface IscRedisKeys {
+
+    /**
+     * Gateway 路由信息Redis Key
+     */
+    String KEY_ROUTES = "ROUTES:";
+
+    /**
+     * Gateway 服务对应AK规则
+     */
+    String KEY_RULES = "RULES:";
+}
diff --git a/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/GatewayUtils.java b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/GatewayUtils.java
new file mode 100644
index 000000000..620e4a8da
--- /dev/null
+++ b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/GatewayUtils.java
@@ -0,0 +1,30 @@
+package com.ruoyi.isc.common.utils;
+
+/**
+ * @author Wenchao Gong
+ * @date 2021-10-30
+ */
+public class GatewayUtils {
+
+    /**
+     * 获取 路由Key
+     *
+     * @param ak        AccessKey
+     * @param serviceId 服务ID
+     * @return 路由Key
+     */
+    public static String getRouteKey(String ak, String serviceId) {
+        return ak + ':' + serviceId;
+    }
+
+    /**
+     * 获取 路由Key
+     *
+     * @param ak        AccessKey
+     * @param serviceId 服务ID
+     * @return 路由Key
+     */
+    public static String getRouteKey(String ak, Long serviceId) {
+        return getRouteKey(ak, String.valueOf(serviceId));
+    }
+}
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/IscRule.java
similarity index 92%
rename from ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java
rename to ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/IscRule.java
index 23e205f20..a637fa164 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/IscRule.java
+++ b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/IscRule.java
@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.utils.beans;
+package com.ruoyi.isc.common.utils.beans;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
diff --git a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/TopicMsg.java
similarity index 94%
rename from ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java
rename to ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/TopicMsg.java
index 7a82c2ee2..91d64e5ee 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/src/main/java/com/ruoyi/gateway/utils/beans/TopicMsg.java
+++ b/ruoyi-isc-parent/ruoyi-isc-common/src/main/java/com/ruoyi/isc/common/utils/beans/TopicMsg.java
@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.utils.beans;
+package com.ruoyi.isc.common.utils.beans;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/ruoyi-isc/pom.xml b/ruoyi-isc-parent/ruoyi-isc/pom.xml
similarity index 76%
rename from ruoyi-isc/pom.xml
rename to ruoyi-isc-parent/ruoyi-isc/pom.xml
index e994e24fa..80d4fd477 100644
--- a/ruoyi-isc/pom.xml
+++ b/ruoyi-isc-parent/ruoyi-isc/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ruoyi-vue-plus</artifactId>
+        <artifactId>ruoyi-isc-parent</artifactId>
         <groupId>com.ruoyi</groupId>
         <version>3.1.0</version>
     </parent>
@@ -12,6 +12,10 @@
     <artifactId>ruoyi-isc</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-isc-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceApplyController.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscAppServiceController.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscApplicationController.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceCateController.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/controller/IscServiceController.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscAppServiceApply.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscApplication.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/IscServiceCate.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscApplicationBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAuditBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscServiceCateBo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceApplyVo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscAppServiceVo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscApplicationVo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceCateVo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/vo/IscServiceVo.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceApplyMapper.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscAppServiceMapper.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscApplicationMapper.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceCateMapper.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/mapper/IscServiceMapper.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceApplyService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscAppServiceService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscApplicationService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceCateService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/IIscServiceService.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
similarity index 97%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
index 3500235eb..8d6b7588f 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceApplyServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
@@ -149,7 +150,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
         {
             IscAppServiceApply apply = getOne(Wrappers.<IscAppServiceApply>lambdaQuery()
                     .eq(IscAppServiceApply::getApplyId, id)
-                    .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT), false);
+                    .eq(IscAppServiceApply::getStatus, Constants.AUDIT_WAIT), false);
             if(Objects.isNull(apply)) {
                 continue;
             }
@@ -160,7 +161,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
 
             IscAppService updateData = null;
             IscService service = null;
-            if(IscConstants.AUDIT_PASS.equals(bo.getStatus())) {
+            if(Constants.AUDIT_PASS.equals(bo.getStatus())) {
                 service = serviceService.getById(appService.getServiceId());
                 Assert.notNull(service, () -> new ServiceException("服务信息不存在"));
                 updateData = genAuditPassData(apply, appService, service, bo.getStatus());
@@ -201,7 +202,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
                 break;
             case IscConstants.APPLY_TYPE_MODIFY:
                 //如果 应用服务 状态不为通过 则修改状态（如果是通过：续期不能影响使用）
-                if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
+                if(!Constants.AUDIT_PASS.equals(appService.getStatus())) {
                     genServicePassInit(apply, appService, status, updateData, service);
                 }
                 updateData.setQuotaDays(apply.getQuotaDays());
@@ -251,7 +252,7 @@ public class IscAppServiceApplyServiceImpl extends ServicePlusImpl<IscAppService
      * @return 需要更新的信息
      */
     private IscAppService genAuditRejectData(IscAppService appService, IscAuditBo bo) {
-        if(!IscConstants.AUDIT_PASS.equals(appService.getStatus())) {
+        if(!Constants.AUDIT_PASS.equals(appService.getStatus())) {
             IscAppService updateData = new IscAppService().setAppServiceId(appService.getAppServiceId());
             updateData.setStatus(bo.getStatus());
             updateData.setAuditMind(bo.getRemark());
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
similarity index 95%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
index 5d3065f9e..c3be743d5 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscAppServiceServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -17,6 +18,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.isc.common.utils.beans.IscRule;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscAppServiceApply;
 import com.ruoyi.isc.domain.IscApplication;
@@ -29,7 +31,6 @@ import com.ruoyi.isc.service.IIscAppServiceService;
 import com.ruoyi.isc.service.IIscApplicationService;
 import com.ruoyi.isc.service.IIscServiceService;
 import com.ruoyi.isc.utils.RouteUtils;
-import com.ruoyi.isc.utils.beans.IscRule;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -120,7 +121,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     {
         IscAppService add = BeanUtil.toBean(bo, IscAppService.class);
         validEntityBeforeSave(add);
-        add.setStatus(IscConstants.AUDIT_WAIT);
+        add.setStatus(Constants.AUDIT_WAIT);
         add.setUserId(SecurityUtils.getUserId());
         boolean result = save(add);
         addApplyRecord(bo, IscConstants.APPLY_TYPE_APPLY, add.getAppServiceId());
@@ -135,13 +136,13 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         IscAppService update = new IscAppService().setAppServiceId(bo.getAppServiceId());
         validEntityBeforeSave(update);
         boolean result = true;
-        boolean changeStatus = !IscConstants.AUDIT_PASS.equals(appService.getStatus());
+        boolean changeStatus = !Constants.AUDIT_PASS.equals(appService.getStatus());
         boolean changeRemark = !IscConstants.APPLY_TYPE_RENEWAL.equals(bo.getApplyType());
         if (changeStatus || changeRemark)
         {
             if (changeStatus)
             {
-                update.setStatus(IscConstants.AUDIT_WAIT);
+                update.setStatus(Constants.AUDIT_WAIT);
             }
             if (changeRemark)
             {
@@ -166,7 +167,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         if (Objects.nonNull(entity.getAppServiceId())) {
             long count = applyService.count(Wrappers.<IscAppServiceApply>lambdaQuery()
                 .eq(IscAppServiceApply::getAppServiceId, entity.getAppServiceId())
-                .eq(IscAppServiceApply::getStatus, IscConstants.AUDIT_WAIT));
+                .eq(IscAppServiceApply::getStatus, Constants.AUDIT_WAIT));
             Assert.isFalse(SqlHelper.retBool(count), () -> new ServiceException("有申请未审核, 不能再申请"));
         }
     }
@@ -203,7 +204,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
     {
         List<IscAppService> list = list(Wrappers.<IscAppService>lambdaQuery()
                 .eq(IscAppService::getEnabled, UserConstants.NORMAL)
-                .eq(IscAppService::getStatus, IscConstants.AUDIT_PASS)
+                .eq(IscAppService::getStatus, Constants.AUDIT_PASS)
                 .gt(IscAppService::getEndTime, DateUtils.getNowDate()));
         if(CollectionUtil.isEmpty(list)) {
             return;
@@ -240,7 +241,7 @@ public class IscAppServiceServiceImpl extends ServicePlusImpl<IscAppServiceMappe
         IscAppServiceApplyBo entity = new IscAppServiceApplyBo();
         entity.setAppServiceId(appServiceId);
         entity.setApplyType(applyType);
-        entity.setStatus(IscConstants.AUDIT_WAIT);
+        entity.setStatus(Constants.AUDIT_WAIT);
         entity.setRemark(appService.getRemark());
         switch (applyType) {
             case IscConstants.APPLY_TYPE_APPLY:
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscApplicationServiceImpl.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceCateServiceImpl.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
similarity index 94%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
index 5f83c32fc..4bbff4b59 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/service/impl/IscServiceServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -111,7 +112,7 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
         validEntityBeforeSave(add);
         add.setUserId(SecurityUtils.getUserId());
         add.setOnlineStatus(IscConstants.ONLINE_STATUS_ON);
-        add.setStatus(IscConstants.AUDIT_WAIT);
+        add.setStatus(Constants.AUDIT_WAIT);
         return save(add);
     }
 
@@ -170,7 +171,7 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     {
         List<IscService> serviceList = list(Wrappers.<IscService>lambdaQuery()
                 .select(IscService::getServiceId, IscService::getServiceName, IscService::getCateFullPath)
-                .eq(IscService::getStatus, IscConstants.AUDIT_PASS)
+                .eq(IscService::getStatus, Constants.AUDIT_PASS)
                 .eq(IscService::getEnabled, UserConstants.DICT_NORMAL)
                 .orderByDesc(IscService::getUpdateTime));
         return cateService.genCateTree(cateService.selectCateList(), serviceList, exitsIds);
@@ -181,13 +182,13 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     {
         checkAuditBO(bo);
         boolean result = true;
-        boolean pass = IscConstants.AUDIT_PASS.equals(bo.getStatus());
+        boolean pass = Constants.AUDIT_PASS.equals(bo.getStatus());
         Collection<IscRouteDefinition> routes = pass ? ListUtil.list(false) : null;
         for (Long id : bo.getIds())
         {
             IscService service = getOne(Wrappers.<IscService>lambdaQuery()
                 .eq(IscService::getServiceId, id)
-                .eq(IscService::getStatus, IscConstants.AUDIT_WAIT), false);
+                .eq(IscService::getStatus, Constants.AUDIT_WAIT), false);
             if(Objects.isNull(service)) {
                 continue;
             }
@@ -209,9 +210,9 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     public void checkAuditBO(IscAuditBo bo)
     {
         switch (bo.getStatus()) {
-            case IscConstants.AUDIT_PASS:
+            case Constants.AUDIT_PASS:
                 break;
-            case IscConstants.AUDIT_REJECT:
+            case Constants.AUDIT_REJECT:
                 Assert.notBlank(bo.getRemark(), () -> new ServiceException("审核意见不能为空"));
                 break;
             default:
@@ -224,7 +225,7 @@ public class IscServiceServiceImpl extends ServicePlusImpl<IscServiceMapper, Isc
     {
         final List<IscService> serviceList = list(Wrappers.<IscService>lambdaQuery()
                 .select(IscService::getServiceId, IscService::getServiceAddr, IscService::getHiddenParams, IscService::getRequestMethod)
-                .eq(IscService::getStatus, IscConstants.AUDIT_PASS));
+                .eq(IscService::getStatus, Constants.AUDIT_PASS));
         List<IscRouteDefinition> routes = new ArrayList<>();
         for (IscService service : serviceList)
         {
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
similarity index 88%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
index a1bfa766c..d13a5ab27 100644
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/RouteUtils.java
@@ -2,13 +2,16 @@ package com.ruoyi.isc.utils;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import com.ruoyi.common.constant.IscConstants;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.isc.common.constant.IscRedisKeys;
+import com.ruoyi.isc.common.utils.GatewayUtils;
+import com.ruoyi.isc.common.utils.beans.IscRule;
+import com.ruoyi.isc.common.utils.beans.TopicMsg;
+import com.ruoyi.isc.common.utils.beans.TopicMsg.Type;
 import com.ruoyi.isc.domain.IscAppService;
 import com.ruoyi.isc.domain.IscService;
 import com.ruoyi.isc.utils.beans.*;
-import com.ruoyi.isc.utils.beans.TopicMsg.Type;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RMap;
 import org.redisson.api.RTopic;
@@ -23,6 +26,8 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.isc.common.constant.IscGatewayContants.*;
+
 /**
  * @author Wenchao Gong
  * @date 2021/9/10 14:46
@@ -31,15 +36,10 @@ import java.util.stream.Collectors;
 public class RouteUtils {
 
     public static final Codec ROUTE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRouteDefinition.class);
-    public static final Codec RULE_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, IscRule.class);
-    public static final Codec TOPIC_MSG_CODES_INSTANCE = new TypedJsonJacksonCodec(String.class, TopicMsg.class);
-    public static final String TOPIC_GATEWAY_REFRESH_ROUTE = "TOPIC_GATEWAY_REFRESH_ROUTE";
-    public static final String TOPIC_GATEWAY_RULE = "TOPIC_GATEWAY_RULE";
     /**
      * Gateway 虚拟路径前缀
      */
     public static final String PATH_PREFIX = "/proxy";
-    public static final String ACCESS_KEY_NAME = "ak";
     private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
 
     /**
@@ -88,7 +88,7 @@ public class RouteUtils {
      * @param consumer   自定义处理
      */
     public static <T> void publish(String channelKey, T msg, Consumer<T> consumer) {
-        RTopic topic = CLIENT.getTopic(channelKey, TOPIC_MSG_CODES_INSTANCE);
+        RTopic topic = CLIENT.getTopic(channelKey);
         topic.publish(msg);
         consumer.accept(msg);
     }
@@ -119,10 +119,10 @@ public class RouteUtils {
     {
         Map<String, IscRouteDefinition> routeMap = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId,
                 Function.identity(), (o1, o2) -> o2));
-        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscRedisKeys.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         map.clear();
         map.putAll(routeMap);
-        sendRefreshRouteToGateway(null, Type.REFRESH,
+        sendRefreshRouteToGateway(null, TopicMsg.Type.REFRESH,
                 (msg) -> log.info("路由刷新完成，通知网关刷新路由![{}]", msg.getMsg()));
         return true;
     }
@@ -149,7 +149,7 @@ public class RouteUtils {
         if(CollectionUtil.isEmpty(routes)) {
             return true;
         }
-        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscRedisKeys.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         Map<String, IscRouteDefinition> collect = routes.stream().collect(Collectors.toMap(IscRouteDefinition::getId, Function.identity()));
         map.putAll(collect);
         final String id = String.join(",", collect.keySet());
@@ -170,7 +170,7 @@ public class RouteUtils {
      */
     public static boolean deleteRoute(Collection<String> routeIds)
     {
-        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscConstants.KEY_ROUTES, ROUTE_CODES_INSTANCE);
+        final RMap<String, IscRouteDefinition> map = CLIENT.getMap(IscRedisKeys.KEY_ROUTES, ROUTE_CODES_INSTANCE);
         final String[] ids = routeIds.toArray(new String[0]);
         map.fastRemove(ids);
         final String id = String.join(",", routeIds);
@@ -229,8 +229,8 @@ public class RouteUtils {
 
         //其他信息
         Map<String, Object> metadata = route.getMetadata();
-        metadata.put("accessKeyName", ACCESS_KEY_NAME);
-        metadata.put("addParam", service.getHiddenParams());
+        metadata.put(CONFIG_ACCESS_KEY_NAME_KEY, ACCESS_KEY_NAME_DEFAULT);
+        metadata.put(CONFIG_ADD_PARAM_KEY, service.getHiddenParams());
         return route;
     }
 
@@ -244,7 +244,7 @@ public class RouteUtils {
     public static IscRule generateRule(IscAppService appService, String accessKey)
     {
         IscRule rule = new IscRule();
-        rule.setId(accessKey + ':' + appService.getServiceId());
+        rule.setId(GatewayUtils.getRouteKey(accessKey, appService.getServiceId()));
         rule.setExpire(appService.getEndTime());
         rule.setDaysLimit(appService.getQuotaDays());
         rule.setHoursLimit(appService.getQuotaHours());
@@ -262,7 +262,7 @@ public class RouteUtils {
     public static boolean refreshRules(List<IscRule> rules)
     {
         Map<String, IscRule> ruleMap = rules.stream().collect(Collectors.toMap(IscRule::getId, Function.identity(), (o1, o2) -> o2));
-        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscRedisKeys.KEY_RULES, RULE_CODES_INSTANCE);
         map.clear();
         map.putAll(ruleMap);
         final String id = String.join(",", ruleMap.keySet());
@@ -290,7 +290,7 @@ public class RouteUtils {
      */
     public static boolean saveRule(IscRule rule, Consumer<TopicMsg> consumer)
     {
-        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscRedisKeys.KEY_RULES, RULE_CODES_INSTANCE);
         map.put(rule.getId(), rule);
         Type type = Type.UPDATE;
         if(Objects.isNull(consumer)) {
@@ -309,7 +309,7 @@ public class RouteUtils {
      */
     public static boolean deleteRule(String ruleId)
     {
-        final RMap<String, IscRule> map = CLIENT.getMap(IscConstants.KEY_RULES, RULE_CODES_INSTANCE);
+        final RMap<String, IscRule> map = CLIENT.getMap(IscRedisKeys.KEY_RULES, RULE_CODES_INSTANCE);
         map.remove(ruleId);
         sendRuleNoticeToGateway(ruleId, Type.DELETE,
                 (msg) ->  log.info("删除[{}]规则[{}]完成，通知网关刷新规则![{}]", msg.getType(), msg.getId(), msg.getMsg()));
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscFilterDefinition.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscPredicateDefinition.java
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java
similarity index 100%
rename from ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java
rename to ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRouteDefinition.java
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml b/ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
similarity index 100%
rename from ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
rename to ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceApplyMapper.xml
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml b/ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
similarity index 100%
rename from ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
rename to ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscAppServiceMapper.xml
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml b/ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml
similarity index 100%
rename from ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml
rename to ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscApplicationMapper.xml
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml b/ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
similarity index 100%
rename from ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
rename to ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscServiceCateMapper.xml
diff --git a/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml b/ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
similarity index 100%
rename from ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
rename to ruoyi-isc-parent/ruoyi-isc/src/main/resources/mapper/isc/IscServiceMapper.xml
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java
deleted file mode 100644
index 3d55f6ed6..000000000
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/IscRule.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.isc.utils.beans;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 网关 规则信息(服务对应AK处理规则)
- * @author Wechao Gong
- * @date 2021-10-16
- */
-@Getter
-@Setter
-public class IscRule implements Serializable
-{
-    @JsonIgnore
-    private String id;
-    private Date expire;
-    private Long daysLimit;
-    private Long hoursLimit;
-    private Long minutesLimit;
-    private Long secondsLimit;
-}
diff --git a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java b/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java
deleted file mode 100644
index c5dfb78ce..000000000
--- a/ruoyi-isc/src/main/java/com/ruoyi/isc/utils/beans/TopicMsg.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.isc.utils.beans;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author Wenchao Gong
- * @date 2021-10-26
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TopicMsg implements Serializable {
-    /** 消息ID */
-    private String id;
-
-    /** 消息内容 */
-    private String msg;
-
-    /** 消息类型 */
-    private Type type;
-
-    /** 消息类型枚举 */
-    public static enum Type {
-        /** 新增单条记录 */
-        ADD,
-        /** 更新单条记录 */
-        UPDATE,
-        /** 删除单条记录 */
-        DELETE,
-        /** 刷新所有 */
-        REFRESH
-    }
-}

From 1e1f03bbd9f262fa63af35234116869610226581 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 31 Oct 2021 14:52:47 +0800
Subject: [PATCH 59/60] =?UTF-8?q?=E5=8D=87=E7=BA=A73.3.0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 22 ++++----
 .../controller/system/SysDeptController.java  |  4 +-
 .../controller/system/SysMenuController.java  |  4 +-
 .../src/main/resources/application-local.yml  | 56 +++++++++++++------
 ruoyi-extend/ruoyi-isc-gateway/pom.xml        |  2 +-
 .../src/main/resources/application-dev.yml    |  7 +++
 .../src/main/resources/application-local.yml  |  7 +++
 .../src/main/resources/application-prod.yml   |  7 +++
 .../src/main/resources/application.yml        | 10 +---
 .../src/main/resources/application-dev.yml    |  4 +-
 .../src/main/resources/application-local.yml  | 36 ++++++++++++
 .../src/main/resources/application-prod.yml   |  4 +-
 ruoyi-isc-parent/pom.xml                      |  2 +-
 ruoyi-isc-parent/ruoyi-isc-common/pom.xml     |  2 +-
 ruoyi-isc-parent/ruoyi-isc/pom.xml            |  2 +-
 .../isc/domain/bo/IscAppServiceApplyBo.java   |  6 ++
 .../ruoyi/isc/domain/bo/IscAppServiceBo.java  |  5 ++
 17 files changed, 132 insertions(+), 48 deletions(-)
 create mode 100644 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
 create mode 100644 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml
 create mode 100644 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
 create mode 100644 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml

diff --git a/pom.xml b/pom.xml
index f554d6526..06c1a61d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,12 +91,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations.version}</version>
-            </dependency>
-
             <!-- 指定 swagger-annotations 版本冲突-->
             <dependency>
                 <groupId>io.swagger</groupId>
@@ -200,6 +194,10 @@
                         <artifactId>feign-core</artifactId>
                         <groupId>io.github.openfeign</groupId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
@@ -207,12 +205,6 @@
                 <groupId>io.github.openfeign</groupId>
                 <artifactId>feign-okhttp</artifactId>
                 <version>${feign-okhttp.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.github.openfeign</groupId>
-                        <artifactId>feign-core</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.squareup.okio</groupId>
@@ -278,6 +270,12 @@
                 <groupId>com.xuxueli</groupId>
                 <artifactId>xxl-job-core</artifactId>
                 <version>${xxl-job.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.javassist</groupId>
+                        <artifactId>javassist</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index 98f5838fc..8a467060d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -1,11 +1,11 @@
 package com.ruoyi.web.controller.system;
 
+import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -76,7 +76,7 @@ public class SysDeptController extends BaseController {
      */
     @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult<List<TreeSelect>> treeselect(SysDept dept) {
+    public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 1fd181637..11371f843 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,10 +1,10 @@
 package com.ruoyi.web.controller.system;
 
+import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -61,7 +61,7 @@ public class SysMenuController extends BaseController {
      */
     @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult<List<TreeSelect>> treeselect(SysMenu menu) {
+    public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
     }
diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml
index 64181ee2d..123b1c508 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml
+++ b/ruoyi-admin/src/main/resources/application-local.yml
@@ -1,3 +1,42 @@
+--- # 监控配置
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 客户端的相关配置
+      client:
+        # 增加客户端开关
+        enabled: true
+        # 设置 Spring Boot Admin Server 地址
+        url: http://localhost:9090/admin
+        instance:
+          prefer-ip: true # 注册实例时，优先使用 IP
+        username: admin
+        password: admin123
+
+--- # xxl-job 配置
+xxl:
+  job:
+    # 执行器开关
+    enabled: true
+    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
+    admin-addresses: http://localhost:9100/xxl-job-admin
+    # 执行器通讯TOKEN：非空时启用
+    access-token: xxl-job
+    # 执行器配置
+    executor:
+      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
+      appname: xxl-job-executor
+      # 执行器端口号 执行器从9101开始往后写
+      port: 9101
+      # 执行器注册：默认IP:PORT
+      address:
+      # 执行器IP：默认自动获取IP
+      ip:
+      # 执行器运行日志文件存储磁盘路径
+      logpath: ./logs/xxl-job
+      # 执行器日志文件保存天数：大于3生效
+      logretentiondays: 30
+
 # 数据源配置
 spring:
   datasource:
@@ -38,7 +77,7 @@ spring:
         # 配置一个连接在池中最大生存的时间，单位是毫秒
         maxEvictableIdleTimeMillis: 900000
         # 配置检测连接是否有效
-        validationQuery: SELECT 1
+        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -117,18 +156,3 @@ redisson:
     subscriptionsPerConnection: 5
     # DNS监测时间间隔，单位：毫秒
     dnsMonitoringInterval: 5000
-
---- # 监控配置
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        # 增加客户端开关
-        enabled: true
-        # 设置 Spring Boot Admin Server 地址
-        url: http://localhost:9090/admin
-        instance:
-          prefer-ip: true # 注册实例时，优先使用 IP
-        username: admin
-        password: admin123
diff --git a/ruoyi-extend/ruoyi-isc-gateway/pom.xml b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
index 851b4665d..ec6d5d414 100644
--- a/ruoyi-extend/ruoyi-isc-gateway/pom.xml
+++ b/ruoyi-extend/ruoyi-isc-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
new file mode 100644
index 000000000..89832e3ff
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: root
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml
new file mode 100644
index 000000000..0a9ae9bf1
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml
@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: root
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
new file mode 100644
index 000000000..68fb54360
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true
+    username: root
+    password: root
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index fced7df80..012bdab41 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -1,14 +1,8 @@
 server:
   port: 9090
-
 spring:
   boot:
     admin:
       context-path: /admin
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-    username: root
-    password: root
-
+  profiles:
+    active: @profiles.active@
\ No newline at end of file
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
index 065b34262..0aa77cb64 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
@@ -3,12 +3,12 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
     username: root
     password: root
     hikari:
       auto-commit: true
-      connection-test-query: SELECT 1
+      connection-test-query: SELECT 1 FROM DUAL
       connection-timeout: 10000
       idle-timeout: 30000
       max-lifetime: 900000
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml
new file mode 100644
index 000000000..192d9226a
--- /dev/null
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml
@@ -0,0 +1,36 @@
+--- # 数据库配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+    username: root
+    password: root
+    hikari:
+      auto-commit: true
+      connection-test-query: SELECT 1 FROM DUAL
+      connection-timeout: 10000
+      idle-timeout: 30000
+      max-lifetime: 900000
+      maximum-pool-size: 30
+      minimum-idle: 10
+      pool-name: HikariCP
+      validation-timeout: 1000
+
+--- # 邮件配置
+spring:
+  mail:
+    from: xxx@qq.com
+    host: smtp.qq.com
+    username: xxx@qq.com
+    password: xxx
+    port: 25
+    properties:
+      mail:
+        smtp:
+          auth: true
+          socketFactory:
+            class: javax.net.ssl.SSLSocketFactory
+          starttls:
+            enable: true
+            required: true
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index 774d7f81c..2c221267f 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -3,12 +3,12 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.30.0.92:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true
     username: root
     password: root
     hikari:
       auto-commit: true
-      connection-test-query: SELECT 1
+      connection-test-query: SELECT 1 FROM DUAL
       connection-timeout: 10000
       idle-timeout: 30000
       max-lifetime: 900000
diff --git a/ruoyi-isc-parent/pom.xml b/ruoyi-isc-parent/pom.xml
index d633933a2..1b0fcf665 100644
--- a/ruoyi-isc-parent/pom.xml
+++ b/ruoyi-isc-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-isc-parent/ruoyi-isc-common/pom.xml b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml
index 4bc845234..6e911eae8 100644
--- a/ruoyi-isc-parent/ruoyi-isc-common/pom.xml
+++ b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-isc-parent</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-isc-parent/ruoyi-isc/pom.xml b/ruoyi-isc-parent/ruoyi-isc/pom.xml
index 80d4fd477..25ee9f7be 100644
--- a/ruoyi-isc-parent/ruoyi-isc/pom.xml
+++ b/ruoyi-isc-parent/ruoyi-isc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-isc-parent</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
index 0b79e1ec4..f324bdfc2 100644
--- a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
@@ -102,4 +102,10 @@ public class IscAppServiceApplyBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }
diff --git a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
index e40d7512c..1442d6709 100644
--- a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
+++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
@@ -124,4 +124,9 @@ public class IscAppServiceBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

From 4b1eaa9625c4b1d34fe44b58daff05e7f12f7160 Mon Sep 17 00:00:00 2001
From: Wenchao Gong <hanyedxing2012@163.com>
Date: Sun, 31 Oct 2021 16:20:54 +0800
Subject: [PATCH 60/60] =?UTF-8?q?=E5=8D=87=E7=BA=A73.3.0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=20=E5=89=8D=E7=AB=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/isc/application/index.vue  |  2 +-
 ruoyi-ui/src/views/isc/appservice/index.vue   | 45 +++++------
 ruoyi-ui/src/views/isc/cate/index.vue         | 24 +++---
 ruoyi-ui/src/views/isc/service/audit.vue      | 63 +++++-----------
 ruoyi-ui/src/views/isc/service/index.vue      | 75 +++++++------------
 ruoyi-ui/src/views/isc/serviceapply/index.vue | 37 ++++-----
 6 files changed, 87 insertions(+), 159 deletions(-)

diff --git a/ruoyi-ui/src/views/isc/application/index.vue b/ruoyi-ui/src/views/isc/application/index.vue
index c0720ca88..2395d841e 100644
--- a/ruoyi-ui/src/views/isc/application/index.vue
+++ b/ruoyi-ui/src/views/isc/application/index.vue
@@ -316,7 +316,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.downLoadExcel('/isc/application/export', this.queryParams);
+      this.$download.excel('/isc/application/export', this.queryParams);
     }
   }
 };
diff --git a/ruoyi-ui/src/views/isc/appservice/index.vue b/ruoyi-ui/src/views/isc/appservice/index.vue
index 32e2f6322..6505942c5 100644
--- a/ruoyi-ui/src/views/isc/appservice/index.vue
+++ b/ruoyi-ui/src/views/isc/appservice/index.vue
@@ -14,20 +14,20 @@
       <el-form-item label="启用状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -95,12 +95,12 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="启用状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="到期时间" align="center" prop="endTime" width="100">
@@ -176,10 +176,10 @@
         <el-form-item label="启用状态" v-if="this.applyType === 0">
           <el-radio-group v-model="form.enabled">
             <el-radio
-              v-for="dict in enabledOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="申请时长" prop="renewalDuration" v-if="!(this.form.status == 1 && this.applyType == 2)">
@@ -228,7 +228,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">审核状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="statusOptions" :value="this.form.status"/>
+            <dict-tag :options="dict.type.sys_audit_status" :value="this.form.status"/>
           </el-col>
         </el-row>
         <el-row :gutter="20" v-if="this.form.status == 2">
@@ -238,7 +238,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">启用状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="enabledOptions" :value="this.form.enabled"/>
+            <dict-tag :options="dict.type.sys_normal_disable" :value="this.form.enabled"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -291,6 +291,7 @@ import CopyTag from '@/components/CopyTag';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Appservice",
+  dicts: ['sys_normal_disable', 'sys_audit_status'],
   components: { Treeselect, CopyTag },
   data() {
     return {
@@ -318,10 +319,6 @@ export default {
       open: false,
       // 是否显示查看弹出层
       openView: false,
-      // 启用状态字典
-      enabledOptions: [],
-      // 审核状态字典
-      statusOptions: [],
       // 应用服务树
       appServiceOptions: [],
       // 查询参数
@@ -358,12 +355,6 @@ export default {
     this.applicationId = applicationId;
     this.queryParams.applicationId = applicationId;
     this.getList(applicationId);
-    this.getDicts("sys_normal_disable").then(response => {
-      this.enabledOptions = response.data;
-    });
-    this.getDicts("sys_audit_status").then(response => {
-      this.statusOptions = response.data;
-    });
     this.getApplicationName(applicationId);
     this.getTreeselect(applicationId);
   },
@@ -535,7 +526,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.downLoadExcel('/isc/appservice/export', this.queryParams);
+      this.$download.excel('/isc/appservice/export', this.queryParams);
     }
   }
 };
diff --git a/ruoyi-ui/src/views/isc/cate/index.vue b/ruoyi-ui/src/views/isc/cate/index.vue
index 305161f47..a1a500791 100644
--- a/ruoyi-ui/src/views/isc/cate/index.vue
+++ b/ruoyi-ui/src/views/isc/cate/index.vue
@@ -13,10 +13,10 @@
       <el-form-item label="启用状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择启用状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -50,7 +50,7 @@
       <el-table-column label="分类名称" align="center" prop="cateName"  width="160"/>
       <el-table-column label="启用状态" align="center" prop="enabled" >
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
@@ -100,10 +100,10 @@
         <el-form-item label="启用状态" prop="enabled">
           <el-radio-group v-model="form.enabled">
             <el-radio
-              v-for="dict in enabledOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="显示顺序" prop="orderNum">
@@ -128,6 +128,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Cate",
+  dicts:['sys_normal_disable'],
   components: {
     Treeselect
   },
@@ -147,8 +148,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 启用状态字典
-      enabledOptions: [],
       // 查询参数
       queryParams: {
         cateName: null,
@@ -176,9 +175,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("sys_normal_disable").then(response => {
-      this.enabledOptions = response.data;
-    });
   },
   methods: {
     /** 查询服务分类列表 */
diff --git a/ruoyi-ui/src/views/isc/service/audit.vue b/ruoyi-ui/src/views/isc/service/audit.vue
index 2c924823a..0df771acd 100644
--- a/ruoyi-ui/src/views/isc/service/audit.vue
+++ b/ruoyi-ui/src/views/isc/service/audit.vue
@@ -13,30 +13,30 @@
       <el-form-item label="是否在线" prop="onlineStatus">
         <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
           <el-option
-            v-for="dict in onlineStatusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.isc_online_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="服务状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -82,17 +82,17 @@
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
       <el-table-column label="服务状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+          <dict-tag :options="dict.type.isc_online_status" :value="scope.row.onlineStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
@@ -152,7 +152,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">请求方式</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="requestMethodOptions" :value="this.form.requestMethod"/>
+            <dict-tag :options="dict.type.isc_request_method" :value="this.form.requestMethod"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -162,7 +162,7 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">跨域标志</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="corsFlagOptions" :value="this.form.corsFlag"/>
+            <dict-tag :options="dict.type.sys_yes_no" :value="this.form.corsFlag"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -193,10 +193,10 @@ import { listService, getService, auditService } from "@/api/isc/service";
 import { treeselect } from "@/api/isc/cate";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { downLoadExcel } from "@/utils/download";
 
 export default {
   name: "Service",
+  dicts: ['sys_yes_no', 'isc_online_status', 'sys_audit_status', 'sys_normal_disable', 'isc_request_method'],
   components: { Treeselect },
   data() {
     return {
@@ -226,16 +226,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 跨域标志字典
-      corsFlagOptions: [],
-      // 是否在线字典
-      onlineStatusOptions: [],
-      // 审核状态字典
-      statusOptions: [],
-      // 服务状态字典
-      enabledOptions: [],
-      // 服务状态字典
-      requestMethodOptions: [],
       //服务分类
       cateOptions:[],
       // 查询参数
@@ -265,21 +255,6 @@ export default {
   created() {
     this.getList();
     this.getTreeselect();
-    this.getDicts("sys_yes_no").then(response => {
-      this.corsFlagOptions = response.data;
-    });
-    this.getDicts("isc_online_status").then(response => {
-      this.onlineStatusOptions = response.data;
-    });
-    this.getDicts("sys_audit_status").then(response => {
-      this.statusOptions = response.data;
-    });
-    this.getDicts("sys_normal_disable").then(response => {
-      this.enabledOptions = response.data;
-    });
-    this.getDicts("isc_request_method").then(response => {
-      this.requestMethodOptions = response.data;
-    });
   },
   methods: {
     /** 查询服务信息列表 */
@@ -418,7 +393,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      downLoadExcel('/isc/service/export', this.queryParams);
+      this.$download.excel('/isc/service/export', this.queryParams);
     }
   }
 };
diff --git a/ruoyi-ui/src/views/isc/service/index.vue b/ruoyi-ui/src/views/isc/service/index.vue
index 27a9cfcdc..95b785dd8 100644
--- a/ruoyi-ui/src/views/isc/service/index.vue
+++ b/ruoyi-ui/src/views/isc/service/index.vue
@@ -13,30 +13,30 @@
       <el-form-item label="是否在线" prop="onlineStatus">
         <el-select v-model="queryParams.onlineStatus" placeholder="请选择是否在线" clearable size="small">
           <el-option
-            v-for="dict in onlineStatusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.isc_online_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="服务状态" prop="enabled">
         <el-select v-model="queryParams.enabled" placeholder="请选择服务状态" clearable size="small">
           <el-option
-            v-for="dict in enabledOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -103,17 +103,17 @@
       <el-table-column label="服务分类" align="left" prop="cateName" width="150"/>
       <el-table-column label="服务状态" align="center" prop="enabled" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="enabledOptions" :value="scope.row.enabled"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
       <el-table-column label="是否在线" align="center" prop="onlineStatus" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="onlineStatusOptions" :value="scope.row.onlineStatus"/>
+          <dict-tag :options="dict.type.isc_online_status" :value="scope.row.onlineStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy"  width="150"/>
@@ -169,10 +169,10 @@
         <el-form-item label="请求方式" prop="requestMethod">
           <el-radio-group v-model="form.requestMethod">
             <el-radio
-              v-for="dict in requestMethodOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
+              v-for="dict in dict.type.isc_request_method"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -181,10 +181,10 @@
         <el-form-item label="跨域标志">
           <el-radio-group v-model="form.corsFlag">
             <el-radio
-              v-for="dict in corsFlagOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="隐藏参数" prop="hiddenParams">
@@ -207,10 +207,10 @@ import { listService, getService, delService, addService, updateService } from "
 import { treeselect } from "@/api/isc/cate";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { downLoadExcel } from "@/utils/download";
 
 export default {
   name: "Service",
+  dicts: ['sys_yes_no', 'isc_online_status', 'sys_audit_status', 'sys_normal_disable', 'isc_request_method'],
   components: { Treeselect },
   data() {
     return {
@@ -236,16 +236,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 跨域标志字典
-      corsFlagOptions: [],
-      // 是否在线字典
-      onlineStatusOptions: [],
-      // 审核状态字典
-      statusOptions: [],
-      // 服务状态字典
-      enabledOptions: [],
-      // 服务状态字典
-      requestMethodOptions: [],
       //服务分类
       cateOptions:[],
       // 查询参数
@@ -294,21 +284,6 @@ export default {
   created() {
     this.getList();
     this.getTreeselect();
-    this.getDicts("sys_yes_no").then(response => {
-      this.corsFlagOptions = response.data;
-    });
-    this.getDicts("isc_online_status").then(response => {
-      this.onlineStatusOptions = response.data;
-    });
-    this.getDicts("sys_audit_status").then(response => {
-      this.statusOptions = response.data;
-    });
-    this.getDicts("sys_normal_disable").then(response => {
-      this.enabledOptions = response.data;
-    });
-    this.getDicts("isc_request_method").then(response => {
-      this.requestMethodOptions = response.data;
-    });
   },
   methods: {
     /** 查询服务信息列表 */
@@ -443,7 +418,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      downLoadExcel('/isc/service/export', this.queryParams);
+      this.$download.excel('/isc/service/export', this.queryParams);
     }
   }
 };
diff --git a/ruoyi-ui/src/views/isc/serviceapply/index.vue b/ruoyi-ui/src/views/isc/serviceapply/index.vue
index f6161c8ea..554b76cdc 100644
--- a/ruoyi-ui/src/views/isc/serviceapply/index.vue
+++ b/ruoyi-ui/src/views/isc/serviceapply/index.vue
@@ -4,20 +4,20 @@
       <el-form-item label="申请类型" prop="applyType">
         <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable size="small">
           <el-option
-            v-for="dict in applyTypeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.isc_apply_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择审核状态" clearable size="small">
           <el-option
-            v-for="dict in statusOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.sys_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -61,12 +61,12 @@
       <el-table-column label="服务名称" align="left" prop="serviceName" />
       <el-table-column label="申请类型" align="center" prop="applyType" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="applyTypeOptions" :value="scope.row.applyType"/>
+          <dict-tag :options="dict.type.isc_apply_type" :value="scope.row.applyType"/>
         </template>
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="status" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_audit_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="续期时长(月)" align="center" prop="renewalDuration" width="100"/>
@@ -123,13 +123,13 @@
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">申请类型</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="applyTypeOptions" :value="this.viewData.applyType"/>
+            <dict-tag :options="dict.type.isc_apply_type" :value="this.viewData.applyType"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6" class="col-title">审核状态</el-col>
           <el-col :span="18" class="col-content">
-            <dict-tag :options="statusOptions" :value="this.viewData.status"/>
+            <dict-tag :options="dict.type.sys_audit_status" :value="this.viewData.status"/>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -184,6 +184,7 @@ import { listServiceapply, getServiceapply, auditServiceapply } from "@/api/isc/
 
 export default {
   name: "Serviceapply",
+  dicts: ['isc_apply_type', 'sys_audit_status'],
   data() {
     return {
       // 按钮loading
@@ -212,10 +213,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 申请类型(0申请 1续期)字典
-      applyTypeOptions: [],
-      // 审核状态字典
-      statusOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -239,12 +236,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("isc_apply_type").then(response => {
-      this.applyTypeOptions = response.data;
-    });
-    this.getDicts("sys_audit_status").then(response => {
-      this.statusOptions = response.data;
-    });
   },
   methods: {
     /** 查询应用服务申请信息列表 */
@@ -348,7 +339,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.downLoadExcel('/isc/serviceapply/export', this.queryParams);
+      this.$download.excel('/isc/serviceapply/export', this.queryParams);
     }
   }
 };