Merge bfb828f8f5 into 983aac6c4d

smart-admin-api-java17-springboot3/pom.xml

@@ -241,6 +241,10 @@
                         <artifactId>logback-classic</artifactId>
                         <groupId>ch.qos.logback</groupId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java

@@ -22,7 +22,6 @@ import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

smart-admin-api-java17-springboot3/sa-base/pom.xml

@@ -210,12 +210,6 @@
         <dependency>
             <groupId>cn.idev.excel</groupId>
             <artifactId>fastexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

smart-admin-api-java8-springboot2/pom.xml

@@ -267,6 +267,10 @@
                         <artifactId>logback-classic</artifactId>
                         <groupId>ch.qos.logback</groupId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 

smart-admin-api-java8-springboot2/sa-base/pom.xml

@@ -231,12 +231,6 @@
         <dependency>
             <groupId>cn.idev.excel</groupId>
             <artifactId>fastexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>logback-classic</artifactId>
-                    <groupId>ch.qos.logback</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue

@@ -37,8 +37,3 @@
 
   let activeKey = ref();
 </script>
-<style scoped lang="less">
-  .role-container {
-    height: 100%;
-  }
-</style>

smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue

@@ -37,8 +37,3 @@
 
   let activeKey = ref();
 </script>
-<style scoped lang="less">
-  .role-container {
-    height: 100%;
-  }
-</style>