修改bug

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SFTPUtil.java

@@ -64,10 +64,10 @@ public class SFTPUtil {
                 channel.connect();
                 sftp = (ChannelSftp) channel;
                 logger.info("登录成功");
-//            }else{
+            }else{
-//                Channel channel = sshSession.openChannel("sftp");
+                Channel channel = sshSession.openChannel("sftp");
-//                channel.connect();
+                channel.connect();
-//                sftp = (ChannelSftp) channel;
+                sftp = (ChannelSftp) channel;
             }
         } catch (Exception e){
             try{
@@ -645,6 +645,13 @@ public class SFTPUtil {
             }finally {
             }
         }
+        if(sftp != null){
+            try {
+                disChannel();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     public static String[] getDirectoryAndFileName(String fileName) {

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -129,7 +129,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
 
         //积木报表排除
-        filterChainDefinitionMap.put("/jmreport/**", "anon");
         filterChainDefinitionMap.put("/**/*.js.map", "anon");
         filterChainDefinitionMap.put("/**/*.css.map", "anon");
         

jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java

@@ -670,7 +670,11 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
 		 QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		 ZyInfo zyInfo = zyInfoService.getById(object.getMainId());
+		 String ywid = object.getYwid();
+		 if(StringUtils.isEmpty(ywid)){
+			 ywid = object.getMainId();
+		 }
+		 ZyInfo zyInfo = zyInfoService.getById(ywid);
 
 		 SysUser teacher = sysUserService.getUserByName(zyInfo.getCreateBy());
 		 // 过滤选中数据

jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/DesUtil.java

@@ -166,7 +166,7 @@ public class DesUtil {
         
         String plainClientCredentials="b49d35b7704e41f_uuid:0683126daa811b7da48c67ccd3c498aa";
         
-        String base64ClientCredentials = new String(Base64.encodeBase64(plainClientCredentials.getBytes()));
+        String base64ClientCredentials = new String(Base64.encodeBase64String(plainClientCredentials.getBytes()));
         System.out.println(base64ClientCredentials);
     }
  

jeecg-module-main/src/main/java/org/jeecg/modules/tools/dbsdkfzpt/InterfaceDemo.java

@@ -3,13 +3,11 @@ package org.jeecg.modules.tools.dbsdkfzpt;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.NameValuePair;
 import org.apache.tomcat.util.codec.binary.Base64;
-import org.jeecg.modules.wps.controller.KsoSign;
 import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.Socket;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -68,7 +66,7 @@ public class InterfaceDemo {
 
             //通过client_id:client_secret构建认证信息
             String plainClientCredentials=appNum+":"+oauthCode;
-            String base64ClientCredentials = new String(Base64.encodeBase64(plainClientCredentials.getBytes()));
+            String base64ClientCredentials = new String(Base64.encodeBase64String(plainClientCredentials.getBytes()));
 
             //构建请求头信息
             HttpHeaders headers = new HttpHeaders();

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -3,9 +3,9 @@ server:
   tomcat:
     max-swallow-size: -1
   error:
-    include-exception: true
+    include-exception: false
-    include-stacktrace: ALWAYS
+    include-stacktrace: NEVER
-    include-message: ALWAYS
+    include-message: NEVER
   servlet:
     context-path: /jeecg-boot
   compression:
@@ -133,24 +133,21 @@ spring:
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master:
-#          url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           url: jdbc:mysql://127.0.0.1:3306/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'
-#          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: root
-#          password: ABCabc@123
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
-#        multi-oracle:
+        multi-oracle:
-#          url: jdbc:oracle:thin:@//192.168.2.14:1521/orcl
+          url: jdbc:mysql://127.0.0.1:3306/dbsd_zjpt?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'
-#          username: kczx
+          username: root
-#          password: kczx
+          password: root
-#          driver-class-name: oracle.jdbc.OracleDriver
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
 #        multi-oracle:
-#          url: jdbc:oracle:thin:@192.168.2.14:1521:orcl?useUnicode=true&characterEncoding=utf8
+#          url: jdbc:oracle:thin:@//202.198.129.24:1521/orcl
-#          username: kczx
+#          username: C##XSKC
-#          password: kczx
+#          password: mAPP2t2ABAfx7
 #          driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:

pom.xml

@@ -31,6 +31,8 @@
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+		<tomcat.version>9.0.90</tomcat.version>
+
 		<!-- 微服务 -->
 		<spring-cloud.version>2021.0.3</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>