Merge remote-tracking branch 'origin/master'

胡仁荣

2023-09-11 937daff0ebc1aa16a852d5a86434ab1994d8a02d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/qxueyou/scc/sys/action/LoginController.java

 src/main/java/com/qxueyou/scc/controller/HweiYunOBSController.java

@@ -41,6 +41,7 @@
 * @Version: 1.0
 */
@RestController
@CrossOrigin
@RequestMapping("/file")// @RequestMapping("/file")
public class HweiYunOBSController {
    private final Logger log = LogManager.getLogger("FileController");

 src/main/java/com/qxueyou/scc/sys/action/LoginController.java

@@ -439,8 +439,6 @@
        // 查询用户信息
        User user = commonDAO.findUnique(hql,params, User.class);

        System.out.println(user);

        if(uuNumber!=null&&!"".equals(uuNumber)&&!"null".equals(uuNumber)){
            //录成功存入user里，删除session里的uuNumber，下个人无法使用
            user.setEmail(uuNumber);
@@ -462,7 +460,7 @@
        //比较用户输入的密码加密后的字符串是否跟注册时填写的加密密码相同
        if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
            if (!newPassword.equals(user.getPassword())) {
                return new Result(false, "密码错误");
                return new Result(false, "用户账户、密码错误或缺少凭证");
            }
        }

@@ -568,12 +566,12 @@
     * @param account 账户
     * @return
     */
//    @ApiOperation(value = "退出后台系统操作", notes = "")
//    @RequestMapping(value = "out", method = RequestMethod.GET)
//    public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
//        doRelease(httpRequest, response);
//        return "退出成功";
//    }
    @ApiOperation(value = "退出后台系统操作", notes = "")
    @RequestMapping(value = "release", method = RequestMethod.GET)
    public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
        doRelease(httpRequest, response);
        return "redirect:/web/admin/index.html#login";
    }

    /**
     * 后台：退出录,后台系统

 src/main/java/com/qxueyou/scc/teach/res/service/impl/HweiYunOBSServiceImpl.java

@@ -5,6 +5,7 @@
import com.obs.services.ObsClient;
import com.obs.services.exception.ObsException;
import com.obs.services.model.*;
import com.qxueyou.scc.base.model.CacheConstants;
import com.qxueyou.scc.base.model.FileMeta;
import com.qxueyou.scc.base.model.Result;
import com.qxueyou.scc.base.service.ICacheService;
@@ -128,7 +129,8 @@
        List<FileMeta> files = new ArrayList<FileMeta>(2);
        FileMeta fileMeta = null;
        try {
            String destPath = getDestPath(objectKey);
            System.out.println(objectKey);
//            String destPath = getDestPath(objectKey);
            String bucketName = hweiOBSConfig.getBucketName();
            obsClient = hweiOBSConfig.getInstance();

@@ -142,7 +144,7 @@
            }
            InputStream inputStream = uploadFile.getInputStream();
            long available = inputStream.available();
            PutObjectRequest request = new PutObjectRequest(bucketName,destPath,inputStream);
            PutObjectRequest request = new PutObjectRequest(bucketName,objectKey,inputStream);
            ObjectMetadata objectMetadata = new ObjectMetadata();
            objectMetadata.setContentLength(available);
            request.setMetadata(objectMetadata);
@@ -416,8 +418,7 @@

    @Override
    public Result initUploadChunk(String uniqueId, String fileName, String md5) {
        String path = getDestPath(fileName);
        String key = chopPath(path);
        String key = chopPath(fileName);

        //清缓存
        cache.template().delete(uniqueId + ClientUtils.getUserId());
@@ -434,12 +435,12 @@

        //为配合分片上传，后台先新建文件记录

        ResFile file = newFileToDB(fileName, path, getFileType(fileName), 0l, md5);
        ResFile file = newFileToDB(fileName, fileName, getFileType(fileName), 0l, md5);

        //添加到缓存
        cache.template().opsForHash().put(uniqueId + ClientUtils.getUserId(), "uploadId", uploadId);
        cache.template().opsForHash().put(uniqueId + ClientUtils.getUserId(), "key", key);
        cache.template().opsForHash().put(uniqueId + ClientUtils.getUserId(), "path", path);
        cache.template().opsForHash().put(uniqueId + ClientUtils.getUserId(), "path", fileName);
        cache.template().opsForHash().put(uniqueId + ClientUtils.getUserId(), "fileId", file.getFileId());

        //防止产生过多缓存垃圾