加入东北师范大学单点登陆

cas/src/main/java/com/qmth/teachcloud/cas/api/OpenApiController.java

@@ -5,6 +5,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.cas.util.bjwlxy.BjwlxyCasUtil;
 import com.qmth.teachcloud.cas.util.cdut.CdutCasUtil;
 import com.qmth.teachcloud.cas.util.gdpu.GdpuCasUtil;
+import com.qmth.teachcloud.cas.util.nenu.NenuCasUtil;
 import com.qmth.teachcloud.cas.util.supwisdom.CasUtils;
 import com.qmth.teachcloud.cas.util.sxmu.SxmuCasUtil;
 import com.qmth.teachcloud.cas.util.sxufe.Constants;
@@ -69,6 +70,9 @@ public class OpenApiController {
     @Resource
     ZufeCasUtil zufeCasUtil;
 
+    @Resource
+    NenuCasUtil nenuCasUtil;
+
     @ApiOperation(value = "cas鉴权接口")
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
     @RequestMapping(value = "/{schoolCode}/authentication", method = RequestMethod.GET)
@@ -103,6 +107,9 @@ public class OpenApiController {
             case ZUFE:
                 redirectParams = zufeCasUtil.authentication(schoolCode);
                 break;
+            case NENU:
+                redirectParams = nenuCasUtil.authentication(schoolCode);
+                break;
             default:
                 break;
         }
@@ -139,6 +146,9 @@ public class OpenApiController {
             case ZUFE:
                 zufeCasUtil.logout(schoolCode);
                 break;
+            case NENU:
+                nenuCasUtil.logout(schoolCode);
+                break;
             default:
                 break;
         }

cas/src/main/java/com/qmth/teachcloud/cas/filter/MyWebApplicationInitializer.java

@@ -1,8 +1,6 @@
 package com.qmth.teachcloud.cas.filter;
 
-import com.qmth.teachcloud.cas.util.sxufe.Constants;
 import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
-import edu.yale.its.tp.cas.client.filter.CASFilter;
 import org.jasig.cas.client.authentication.AuthenticationFilter;
 import org.jasig.cas.client.session.SingleSignOutFilter;
 import org.jasig.cas.client.session.SingleSignOutHttpSessionListener;
@@ -15,8 +13,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
 
 import javax.servlet.FilterRegistration;
 import javax.servlet.ServletContext;
-import java.util.HashMap;
-import java.util.Map;
 
 @Configuration
 public class MyWebApplicationInitializer implements ServletContextInitializer {
@@ -24,6 +20,7 @@ public class MyWebApplicationInitializer implements ServletContextInitializer {
     private static final String GDPU_URL = "/api/open/gdpu/authentication";
     private static final String SXMU_URL = "/api/open/sxmu/authentication";
     private static final String ZUFE_URL = "/api/open/zufe/authentication";
+    private static final String NENU_URL = "/api/open/nenu/authentication";
 //    private static final String SXMU_URL = "/*";
 
     @Override
@@ -76,13 +73,13 @@ public class MyWebApplicationInitializer implements ServletContextInitializer {
 //        transNameFilter.addMappingForUrlPatterns(null, false, GDPU_URL);
 //
 //        /**
-//         * 山西医科大学ilter
+//         * 山西医科大学filter
 //         */
 //        servletContext.addListener(new SingleSignOutHttpSessionListener());
 //        String sxmuServerName = cxt.getEnvironment().getProperty("cas.filter.sxmuServerName");
 //
-//        FilterRegistration.Dynamic sxmuCaslogoutGdpuFilter = servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class);
-//        sxmuCaslogoutGdpuFilter.addMappingForUrlPatterns(null, false, SXMU_URL);
+//        FilterRegistration.Dynamic sxmuCaslogoutFilter = servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class);
+//        sxmuCaslogoutFilter.addMappingForUrlPatterns(null, false, SXMU_URL);
 //
 //        FilterRegistration.Dynamic sxmuAuthenticationFilter = servletContext.addFilter("CASFilter", AuthenticationFilter.class);
 //        sxmuAuthenticationFilter.setInitParameter("casServerLoginUrl", "https://authserver.sxmu.edu.cn/authserver/login");
@@ -98,21 +95,45 @@ public class MyWebApplicationInitializer implements ServletContextInitializer {
 //        FilterRegistration.Dynamic sxmuWrapperFilter = servletContext.addFilter("CAS HttpServletRequest Wrapper Filter", HttpServletRequestWrapperFilter.class);
 //        sxmuWrapperFilter.addMappingForUrlPatterns(null, false, SXMU_URL);
 
+//        /**
+//         * 浙江财经大学filter
+//         */
+//        servletContext.addListener(new SingleSignOutHttpSessionListener());
+//        FilterRegistration.Dynamic zufeCaslogoutGdpuFilter = servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class);
+//        zufeCaslogoutGdpuFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+//
+//        FilterRegistration.Dynamic zufeAuthenticationFilter = servletContext.addFilter("CASAuthenticationFilter", com.neusoft.cas.AuthenticationFilter.class);
+//        zufeAuthenticationFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+//
+//        FilterRegistration.Dynamic zufeValidationFilter = servletContext.addFilter("CASValidationFilter", com.neusoft.cas.Cas20ProxyReceivingTicketValidationFilter.class);
+//        zufeValidationFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+//
+//        FilterRegistration.Dynamic zufeWrapperFilter = servletContext.addFilter("CASHttpServletRequestWrapperFilter", HttpServletRequestWrapperFilter.class);
+//        zufeWrapperFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+//        //接入的应用系统IP:Port，需要根据实际路径修改
+
         /**
-         * 浙江财经大学ilter
+         * 东北师范大学filter
          */
         servletContext.addListener(new SingleSignOutHttpSessionListener());
-        FilterRegistration.Dynamic zufeCaslogoutGdpuFilter = servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class);
-        zufeCaslogoutGdpuFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+        String nenuServerName = cxt.getEnvironment().getProperty("cas.filter.nenuServerName");
+
+        FilterRegistration.Dynamic nenuCaslogoutFilter = servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class);
+        nenuCaslogoutFilter.addMappingForUrlPatterns(null, false, NENU_URL);
 
-        FilterRegistration.Dynamic zufeAuthenticationFilter = servletContext.addFilter("CASAuthenticationFilter", com.neusoft.cas.AuthenticationFilter.class);
-        zufeAuthenticationFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+        FilterRegistration.Dynamic nenuAuthenticationFilter = servletContext.addFilter("CASFilter", AuthenticationFilter.class);
+        nenuAuthenticationFilter.setInitParameter("casServerLoginUrl", "https://authserver.nenu.edu.cn/authserver/login");
+//        nenuAuthenticationFilter.setInitParameter("casWhiteUrl", "/nenu/.*");
+        nenuAuthenticationFilter.setInitParameter("serverName", nenuServerName);
+        nenuAuthenticationFilter.addMappingForUrlPatterns(null, false, NENU_URL);
 
-        FilterRegistration.Dynamic zufeValidationFilter = servletContext.addFilter("CASValidationFilter", com.neusoft.cas.Cas20ProxyReceivingTicketValidationFilter.class);
-        zufeValidationFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
+        FilterRegistration.Dynamic nenuValidationFilter = servletContext.addFilter("CAS Validation Filter", Cas20ProxyReceivingTicketValidationFilter.class);
+        nenuValidationFilter.setInitParameter("casServerUrlPrefix", "https://authserver.nenu.edu.cn/authserver");
+        nenuValidationFilter.setInitParameter("serverName", nenuServerName);
+        nenuValidationFilter.setInitParameter("encoding", SystemConstant.CHARSET_NAME);
+        nenuValidationFilter.addMappingForUrlPatterns(null, false, NENU_URL);
 
-        FilterRegistration.Dynamic zufeWrapperFilter = servletContext.addFilter("CASHttpServletRequestWrapperFilter", HttpServletRequestWrapperFilter.class);
-        zufeWrapperFilter.addMappingForUrlPatterns(null, false, ZUFE_URL);
-        //接入的应用系统IP:Port，需要根据实际路径修改
+        FilterRegistration.Dynamic nenuWrapperFilter = servletContext.addFilter("CAS HttpServletRequest Wrapper Filter", HttpServletRequestWrapperFilter.class);
+        nenuWrapperFilter.addMappingForUrlPatterns(null, false, NENU_URL);
     }
 }

cas/src/main/java/com/qmth/teachcloud/cas/util/nenu/CasUtils.java

@@ -0,0 +1,20 @@
+package com.qmth.teachcloud.cas.util.nenu;
+
+import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+public class CasUtils {
+
+    /**
+     * 获取登出地址
+     */
+    public static String getLogoutUrl(String schoolServiceAddress) throws UnsupportedEncodingException {
+        // 获取本次请求的根Path
+        String loginUrlRoot = SystemConstant.getBasePath() + Constants.SSO_LOGIN_URI;
+        String encodeLoginUrlRoot = URLEncoder.encode(loginUrlRoot, StandardCharsets.UTF_8.toString());
+        return schoolServiceAddress + Constants.CAS_LOGOUT_URL + SystemConstant.GET_UNKNOWN + SystemConstant.SERVICE_KEY + SystemConstant.GET_EQUAL + encodeLoginUrlRoot;
+    }
+}

cas/src/main/java/com/qmth/teachcloud/cas/util/nenu/Constants.java

@@ -0,0 +1,18 @@
+package com.qmth.teachcloud.cas.util.nenu;
+
+public interface Constants {
+
+    // CAS根地址
+    String CAS_BASE_PATH = "https://authserver.nenu.edu.cn";
+
+    // CAS登录地址
+    String CAS_LOGIN_URL = CAS_BASE_PATH + "/authserver/login";
+
+    // CAS注销地址
+    String CAS_LOGOUT_URL = "/authserver/logout";
+
+    // 业务系统认证集成改造之后的登录URI
+    String SSO_LOGIN_URI = "/api/open/nenu/authentication";
+
+    String SSO_LOGOUT_URI = "/api/open/nenu/authentication/logout";
+}

cas/src/main/java/com/qmth/teachcloud/cas/util/nenu/NenuCasUtil.java

@@ -0,0 +1,143 @@
+package com.qmth.teachcloud.cas.util.nenu;
+
+import com.qmth.teachcloud.exchange.common.bean.dto.syssetting.SimpleObject;
+import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
+import com.qmth.teachcloud.exchange.common.bean.params.RedirectParams;
+import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
+import com.qmth.teachcloud.exchange.common.entity.BasicSchool;
+import com.qmth.teachcloud.exchange.common.service.AuthInfoService;
+import com.qmth.teachcloud.exchange.common.service.CommonCacheService;
+import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
+import com.qmth.teachcloud.exchange.common.util.ServletUtil;
+import org.jasig.cas.client.authentication.AttributePrincipal;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description: 东北师范大学cas工具类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/12/2
+ */
+@Component
+public class NenuCasUtil {
+    private static final Logger log = LoggerFactory.getLogger(NenuCasUtil.class);
+
+    @Resource
+    AuthInfoService authInfoService;
+
+    @Resource
+    CommonCacheService commonCacheService;
+
+    /**
+     * 山西医科大学登录逻辑
+     *
+     * @param schoolCode
+     * @return
+     * @throws IOException
+     */
+    public RedirectParams authentication(String schoolCode) throws IOException {
+        HttpServletRequest request = ServletUtil.getRequest();
+        authInfoService.appHasExpired(schoolCode);
+
+        BasicSchool basicSchool = commonCacheService.schoolCache(schoolCode);
+        Objects.requireNonNull(basicSchool, "学校信息不存在");
+
+        OpenParams openParams = null;
+        String employeeNo = null, returnUrl = null;
+        Map<String, SimpleObject> mapSetting = commonCacheService.getSysSetting(basicSchool.getId());
+        if (!CollectionUtils.isEmpty(mapSetting)) {
+            SimpleObject simpleObject = mapSetting.get(SystemConstant.CAS_ADDRESS);
+            Objects.requireNonNull(simpleObject, "未配置单点登录地址");
+            String casAddress = simpleObject.getValue();
+            if (Objects.nonNull(casAddress) && !Objects.equals(casAddress.trim(), "")) {
+                if (casAddress.lastIndexOf("/") == casAddress.length() - 1) {
+                    casAddress = casAddress.substring(0, casAddress.lastIndexOf("/"));
+                }
+                String logoutUri = Constants.SSO_LOGOUT_URI;
+                logoutUri = logoutUri.replace(SystemConstant.SCHOOL_CODE, schoolCode);
+                returnUrl = casAddress + logoutUri;
+            }
+        }
+        String uid = request.getRemoteUser();
+        log.info("uid:{}", uid);
+        String cn = "";
+        Principal principal = request.getUserPrincipal();
+        if (principal != null && principal instanceof AttributePrincipal) {
+            AttributePrincipal aPrincipal = (AttributePrincipal) principal;
+            //获取用户信息中公开的Attributes部分
+            Map<String, Object> map = aPrincipal.getAttributes();
+            log.info("principal map:{}", JacksonUtil.parseJson(map));
+            // 获取姓名,可以根据属性名称获取其他属性
+            cn = (String) map.get("cn");
+            employeeNo = uid;
+            openParams = new OpenParams(cn);
+        }
+        return new RedirectParams(employeeNo, schoolCode, returnUrl, openParams);
+    }
+
+    /**
+     * 山西医科大学注销逻辑
+     *
+     * @param schoolCode
+     * @throws IOException
+     */
+    public void logout(String schoolCode) throws IOException {
+        HttpServletResponse response = ServletUtil.getResponse();
+        HttpSession session = ServletUtil.getSession();
+        authInfoService.appHasExpired(schoolCode);
+        //注销本系统session
+        session.invalidate();
+
+        BasicSchool basicSchool = commonCacheService.schoolCache(schoolCode);
+        Objects.requireNonNull(basicSchool, "学校信息不存在");
+
+        Map<String, SimpleObject> mapSetting = commonCacheService.getSysSetting(basicSchool.getId());
+        if (!CollectionUtils.isEmpty(mapSetting)) {
+            SimpleObject simpleObject = mapSetting.get(SystemConstant.SCHOOL_SERVICE_ADDRESS);
+            Objects.requireNonNull(simpleObject, "未配置学校cas地址");
+            String schoolServiceAddress = simpleObject.getValue();
+            if (Objects.nonNull(schoolServiceAddress) && !Objects.equals(schoolServiceAddress.trim(), "")) {
+                if (schoolServiceAddress.lastIndexOf("/") == schoolServiceAddress.length() - 1) {
+                    schoolServiceAddress = schoolServiceAddress.substring(0, schoolServiceAddress.lastIndexOf("/"));
+                }
+            }
+            log.info("cas:logout:logoutUrl:{}", CasUtils.getLogoutUrl(schoolServiceAddress));
+            //跳转至注销后地址
+            response.setHeader(SystemConstant.ACCESS_CONTROL_ALLOW_ORIGIN, SystemConstant.PATH_MATCH);
+            response.sendRedirect(CasUtils.getLogoutUrl(schoolServiceAddress));
+        }
+    }
+
+//    /**
+//     * 知学登录
+//     *
+//     * @param schoolCode
+//     * @return
+//     * @throws IOException
+//     */
+//    public RedirectParams zxzkLogin(String schoolCode) throws IOException {
+//        String logoutUrl = null;
+//        HttpSession session = ServletUtil.getSession();
+//        String userName = "";
+//        Object object = session.getAttribute(LoginFilter.CONST_CAS_USERNAME);
+//        RedirectParams redirectParams = null;
+//        if (object != null) {
+//            userName = object.toString();
+//            redirectParams = new RedirectParams(userName, schoolCode, logoutUrl, null);
+//        }
+//        return redirectParams;
+//    }
+}

cas/src/main/resources/application.properties

@@ -52,9 +52,10 @@ com.qmth.logging.file-path=/Users/king/Downloads/cas-exchange.log
 #com.qmth.solar.access-key=df8baa73072c4725a07fe4d119cceb24
 #com.qmth.solar.access-secret=r18hy2X8zkj8OPkRoemq1owt4qS87Gal
 #com.qmth.solar.license=/Users/king/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/\u5C71\u897F\u533B\u79D1\u5927\u5B66/\u5C71\u897F\u533B\u79D1\u5927\u5B66\u77E5\u5B66\u77E5\u8003\u6388\u6743.lic
-com.qmth.solar.license=/Users/king/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/cas/\u6D59\u6C5F\u8D22\u7ECF\u5927\u5B66/zufe-\u77E5\u5B66\u77E5\u8003-241031.lic
+com.qmth.solar.license=/Users/king/extend/\u542F\u660E/\u77E5\u5B66\u77E5\u8003/cas/\u4E1C\u5317\u5E08\u8303\u5927\u5B66cas/\u77E5\u5B66\u77E5\u8003-nenu-20250831.lic
 
 cas.filter.gdpuServerName=exam.gdpu.edu.cn:7400
 cas.filter.sxufeServerName=210.31.120.103:7400
 cas.filter.sxmuServerName=10.5.14.60:7111
-cas.filter.zufeServerName=172.16.7.107:7111
+cas.filter.zufeServerName=172.16.7.107:7111
+cas.filter.nenuServerName=172.16.7.107:7111

cas/src/main/resources/static/index/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+123456
+</body>
+</html>

cas/src/main/resources/static/nenu/idswhite.jsp

@@ -0,0 +1,44 @@
+<%@page import="java.util.Map"%>
+<%@ page
+        import="java.security.Principal" %>
+<%@ page
+        import="org.jasig.cas.client.authentication.AttributePrincipal" %>
+<%@ page
+        import="java.util.Iterator" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"	pageEncoding="UTF-8"%>
+<%
+//    cas-client-3.2.1版本集成
+	String uid = request.getRemoteUser();
+    String cn = "";
+	String user_name = "";
+    Principal principal = request.getUserPrincipal();
+    		if(principal!=null && principal instanceof AttributePrincipal){
+    			AttributePrincipal aPrincipal = (AttributePrincipal)principal;
+    //获取用户信息中公开的Attributes部分
+    			Map<String, Object> map = aPrincipal.getAttributes();
+    			/*Iterator<String> it = map.keySet().iterator();
+    			while (it.hasNext()) {
+    				String k = it.next();
+    				response.getWriter().printf("%s:%s\r\n", k, map.get(k));
+    			}*/
+				cn = (String)map.get("cn"); 
+                user_name = (String)map.get("user_name");
+    		}
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+	<head>
+		<title></title>
+	</head>
+	
+	<body>
+		Hello,<%=uid%>! Welcome <%=cn %> &nbsp;
+		用户的uid: <%=uid%> <br/>
+		界面上操作的姓名cn: <%=cn %> <br/>
+		默认传递的user_name: <%=user_name %><br/>
+
+		可以在更新前和更新后进行对比。<br/>
+
+	</body>
+</html>

pom.xml

@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <qmth.boot.version>1.0.4</qmth.boot.version>
+        <qmth.boot.version>1.0.5</qmth.boot.version>
         <java.version>1.8</java.version>
         <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.68</fastjson.version>

teachcloud-exchange-common/pom.xml

@@ -126,6 +126,9 @@
             <groupId>com.aventrix.jnanoid</groupId>
             <artifactId>jnanoid</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
-
 </project>

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/contant/SystemConstant.java

@@ -37,6 +37,7 @@ public class SystemConstant {
     public static final String PREFIX_URL_OPEN = "/open";
     public static final String PREFIX_URL_GDPU_GET_BACK_LOG = "/getbacklog";
     public static final String PREFIX_URL_GDPU_MQ = "/open/mq";
+    public static final String PREFIX_URL_ADMIN = "/admin";
 
     /**
      * 系统常量

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/enums/SchoolCodeEnum.java

@@ -21,7 +21,9 @@ public enum SchoolCodeEnum {
 
     BJWLXY("陕西宝鸡文理学院", "bjwlxy"),
 
-    ZUFE("浙江财经大学", "zufe");
+    ZUFE("浙江财经大学", "zufe"),
+
+    NENU("东北师范大学", "nenu");
 
     private final String title;
     private final String code;

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/util/FileStoreUtil.java

@@ -1,6 +1,6 @@
 package com.qmth.teachcloud.exchange.common.util;
 
-import com.qmth.boot.core.fss.service.FileService;
+import com.qmth.boot.core.fss.service.FileStoreService;
 import com.qmth.teachcloud.exchange.common.config.DictionaryConfig;
 import com.qmth.teachcloud.exchange.common.enums.UploadFileEnum;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -23,7 +23,7 @@ public class FileStoreUtil {
     private final static Logger log = LoggerFactory.getLogger(FileStoreUtil.class);
 
     @Resource
-    private FileService fileService;
+    private FileStoreService fileStoreService;
 
     @Resource
     private DictionaryConfig dictionaryConfig;
@@ -37,7 +37,7 @@ public class FileStoreUtil {
      */
     public void ossUpload(String dirName, InputStream inputStream, String md5, String type) throws Exception {
         log.info("ossUpload is come in");
-        fileService.getFileStore(type).write(dirName, inputStream, md5);
+        fileStoreService.getFileStore(type).write(dirName, inputStream, md5);
         log.info("dirName:{}", dirName);
     }
 
@@ -88,7 +88,7 @@ public class FileStoreUtil {
      */
     public void ossUpload(String dirName, File file, String md5, String type) throws Exception {
         log.info("ossUpload is come in");
-        fileService.getFileStore(type).write(dirName, new FileInputStream(file), md5);
+        fileStoreService.getFileStore(type).write(dirName, new FileInputStream(file), md5);
         log.info("dirName:{}", dirName);
     }
 
@@ -101,7 +101,7 @@ public class FileStoreUtil {
      */
     public void ossUpload(String dirName, String content, String type) throws Exception {
         log.info("ossUpload is come in");
-        fileService.getFileStore(type).write(dirName, new ByteArrayInputStream(content.getBytes()), DigestUtils.md5Hex(new ByteArrayInputStream(content.getBytes())));
+        fileStoreService.getFileStore(type).write(dirName, new ByteArrayInputStream(content.getBytes()), DigestUtils.md5Hex(new ByteArrayInputStream(content.getBytes())));
         log.info("dirName:{}", dirName);
     }
 
@@ -115,7 +115,7 @@ public class FileStoreUtil {
      */
     public File ossDownload(String dirName, String localPath, String type) throws Exception {
         log.info("ossDownload is come in");
-        return this.saveLocal(fileService.getFileStore(type).read(dirName), localPath);
+        return this.saveLocal(fileStoreService.getFileStore(type).read(dirName), localPath);
     }
 
 
@@ -128,7 +128,7 @@ public class FileStoreUtil {
      */
     public byte[] ossDownload(String objectName, String type) throws Exception {
         log.info("oss Download is come in");
-        return IOUtils.toByteArray(fileService.getFileStore(type).read(objectName));
+        return IOUtils.toByteArray(fileStoreService.getFileStore(type).read(objectName));
     }
 
     /**
@@ -140,7 +140,7 @@ public class FileStoreUtil {
      */
     public InputStream ossDownloadIs(String objectName, String type) throws Exception {
         log.info("oss Download is come in");
-        return fileService.getFileStore(type).read(objectName);
+        return fileStoreService.getFileStore(type).read(objectName);
     }
 
 

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/util/HttpUtil.java

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.exchange.common.util;
 import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import com.qmth.teachcloud.exchange.common.enums.ExceptionResultEnum;
 import org.apache.commons.io.FileUtils;
-import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;