新增教研分析授权配置

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/TSAuthDto.java

@@ -1,99 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.AuthEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 授权配置 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/4/26
- */
-public class TSAuthDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "accessKey")
-    private String accessKey;
-
-    @ApiModelProperty(value = "accessSecret")
-    private String accessSecret;
-
-    @ApiModelProperty(value = "离线授权证书")
-    private String description;
-
-    @ApiModelProperty(value = "授权类型")
-    private AuthEnum type;
-
-    @ApiModelProperty(value = "过期时间")
-    private Long expireTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getAccessKey() {
-        return accessKey;
-    }
-
-    public void setAccessKey(String accessKey) {
-        this.accessKey = accessKey;
-    }
-
-    public String getAccessSecret() {
-        return accessSecret;
-    }
-
-    public void setAccessSecret(String accessSecret) {
-        this.accessSecret = accessSecret;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public AuthEnum getType() {
-        return type;
-    }
-
-    public void setType(AuthEnum type) {
-        this.type = type;
-    }
-
-    public Long getExpireTime() {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime) {
-        this.expireTime = expireTime;
-    }
-}

distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintAuthenticationService.java

@@ -4,7 +4,6 @@ import com.qmth.boot.core.enums.Platform;
 import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.distributed.print.business.service.AuthInfoService;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -13,6 +12,7 @@ import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PrivilegePropertyEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.RedisUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;

distributed-print/src/main/java/com/qmth/distributed/print/start/StartRunning.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.start;
 
-import com.qmth.distributed.print.business.service.AuthInfoService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;

distributed-print/src/main/java/com/qmth/distributed/print/api/TSAuthController.java → teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/TSAuthController.java

@@ -1,11 +1,9 @@
-package com.qmth.distributed.print.api;
+package com.qmth.teachcloud.common.api.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.solar.crypto.AppLicenseUtil;
-import com.qmth.distributed.print.business.service.AuthInfoService;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.service.CommonCacheService;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -43,12 +41,6 @@ public class TSAuthController {
     @Resource
     AuthInfoService authInfoService;
 
-    @Resource
-    CommonCacheService commonCacheService;
-
-    @Resource
-    DictionaryConfig dictionaryConfig;
-
     @ApiOperation(value = "导出硬件信息")
     @ApiResponses({@ApiResponse(code = 200, message = "导出硬件信息", response = Object.class)})
     @RequestMapping(value = "/export/device/info", method = RequestMethod.POST)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TSAuth.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TSAuth.java

@@ -1,10 +1,10 @@
-package com.qmth.distributed.print.business.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.AuthEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.AuthEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/AuthEnum.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/AuthEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.enums;
+package com.qmth.teachcloud.common.enums;
 
 import java.util.Objects;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TSAuthMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/TSAuthMapper.java

@@ -1,8 +1,7 @@
-package com.qmth.distributed.print.business.mapper;
+package com.qmth.teachcloud.common.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.TSAuth;
 import com.qmth.teachcloud.common.base.CustomBaseMapper;
+import com.qmth.teachcloud.common.entity.TSAuth;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/AuthInfoService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/AuthInfoService.java

@@ -1,7 +1,7 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.service;
 
 import com.qmth.boot.core.solar.model.AppInfo;
-import com.qmth.distributed.print.business.enums.AuthEnum;
+import com.qmth.teachcloud.common.enums.AuthEnum;
 
 /**
  * @Description: 授权信息service

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TSAuthService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/TSAuthService.java

@@ -1,7 +1,7 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TSAuth;
+import com.qmth.teachcloud.common.entity.TSAuth;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/AuthInfoServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AuthInfoServiceImpl.java

@@ -1,24 +1,24 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.core.solar.config.SolarProperties;
 import com.qmth.boot.core.solar.model.AppInfo;
 import com.qmth.boot.core.solar.model.OrgInfo;
 import com.qmth.boot.core.solar.service.SolarService;
-import com.qmth.distributed.print.business.entity.TSAuth;
-import com.qmth.distributed.print.business.enums.AuthEnum;
-import com.qmth.distributed.print.business.mapper.TSAuthMapper;
-import com.qmth.distributed.print.business.service.AuthInfoService;
-import com.qmth.distributed.print.business.service.TSAuthService;
 import com.qmth.teachcloud.common.bean.dto.AuthOrgInfoDto;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
+import com.qmth.teachcloud.common.entity.TSAuth;
+import com.qmth.teachcloud.common.enums.AuthEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.mapper.BasicSchoolMapper;
+import com.qmth.teachcloud.common.mapper.TSAuthMapper;
+import com.qmth.teachcloud.common.service.AuthInfoService;
 import com.qmth.teachcloud.common.service.BasicSchoolService;
 import com.qmth.teachcloud.common.service.CommonCacheService;
+import com.qmth.teachcloud.common.service.TSAuthService;
 import com.qmth.teachcloud.common.util.FileStoreUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TSAuthServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TSAuthServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.TSAuth;
-import com.qmth.distributed.print.business.mapper.TSAuthMapper;
-import com.qmth.distributed.print.business.service.TSAuthService;
+import com.qmth.teachcloud.common.entity.TSAuth;
+import com.qmth.teachcloud.common.mapper.TSAuthMapper;
+import com.qmth.teachcloud.common.service.TSAuthService;
 import org.springframework.stereotype.Service;
 
 /**

distributed-print-business/src/main/resources/mapper/TSAuthMapper.xml → teachcloud-common/src/main/resources/mapper/TSAuthMapper.xml

@@ -1,5 +1,5 @@
 <?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.qmth.distributed.print.business.mapper.TSAuthMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.TSAuthMapper">
 
 </mapper>

teachcloud-report/src/main/resources/application-dev.properties

@@ -94,6 +94,7 @@ prefix.url.datasource=report/datasource
 prefix.url.analyze=report/analyze
 prefix.url.open=report/open
 prefix.url.sso=report/sso
+prefix.url.auth=admin/auth
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info