+ * 服务类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface PermissionService extends IService+ * 服务类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface RolePermissionService extends IService@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService; *
* * @author liucong - * @since 2021-12-06 + * @since 2021-12-04 */ -public interface SysDictService extends IService+ * 服务类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface UserRoleService extends IService+ * 服务实现类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +@Service +public class PermissionServiceImpl extends ServiceImpl+ * 服务实现类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +@Service +public class RolePermissionServiceImpl extends ServiceImpl+ * 服务实现类 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +@Service +public class UserRoleServiceImpl extends ServiceImpl+ * + *
+ * + * @author liucong + * @since 2021-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="Permission对象", description="") +public class Permission implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "权限编码") + private String permissionCode; + + @ApiModelProperty(value = "权限名称") + private String permissionName; + + @ApiModelProperty(value = "描述") + private String description; + + @ApiModelProperty(value = "状态: 01 启用 02停用") + private String status; + + @ApiModelProperty(value = "创建人") + private Long createUserId; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "修改人") + private Long updateUserId; + + @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @ApiModelProperty(value = "版本") + @Version + @TableField(fill = FieldFill.UPDATE, condition = SqlCondition.EQUAL) + private Long version; + + +} diff --git a/src/main/java/org/micai/platform/auth/entity/SysDictItem.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/Role.java similarity index 70% rename from src/main/java/org/micai/platform/auth/entity/SysDictItem.java rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/Role.java index f16e58462832f0a3e804605ed5afe27f205a3786..aa8e8f398f9764f355eeed7c153e16235dcf7b39 100644 --- a/src/main/java/org/micai/platform/auth/entity/SysDictItem.java +++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/Role.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.entity; +package org.micai.platform.resourcesserver.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -16,34 +16,31 @@ import java.util.Date; * * * @author liucong - * @since 2021-12-10 + * @since 2021-12-04 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="SysDictItem对象", description="") -public class SysDictItem implements Serializable { +@ApiModel(value="Role对象", description="") +public class Role implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "主键id") + @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "字典表id") - private Long dictId; + @ApiModelProperty(value = "角色编码") + private String roleCode; - @ApiModelProperty(value = "字典项文本") - private String itemText; - - @ApiModelProperty(value = "字典项值") - private String itemValue; + @ApiModelProperty(value = "角色名称") + private String roleName; @ApiModelProperty(value = "描述") private String description; - @ApiModelProperty(value = "排序") - private Integer sn; + @ApiModelProperty(value = "状态: 01 启用 02停用") + private String status; @ApiModelProperty(value = "创建人") private Long createUserId; @@ -59,11 +56,9 @@ public class SysDictItem implements Serializable { @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - @ApiModelProperty(value = "状态: 01 启用 02停用") - private String status; - @ApiModelProperty(value = "版本号") @Version + @TableField(fill = FieldFill.UPDATE, condition = SqlCondition.EQUAL) private Long version; diff --git a/src/main/java/org/micai/platform/auth/entity/PermissionMenu.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/RolePermission.java similarity index 82% rename from src/main/java/org/micai/platform/auth/entity/PermissionMenu.java rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/RolePermission.java index 3518962d513ab44bbdf39b8260bd580e48094cf5..4dafa619507a8f7d692974bfd296e92c1c291e29 100644 --- a/src/main/java/org/micai/platform/auth/entity/PermissionMenu.java +++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/RolePermission.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.entity; +package org.micai.platform.resourcesserver.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -16,25 +16,25 @@ import java.util.Date; * * * @author liucong - * @since 2021-12-06 + * @since 2021-12-04 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="PermissionMenu对象", description="") -public class PermissionMenu implements Serializable { +@ApiModel(value="RolePermission对象", description="") +public class RolePermission implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Long id; + @ApiModelProperty(value = "角色id") + private Long roleId; + @ApiModelProperty(value = "权限id") private Long permissionId; - @ApiModelProperty(value = "菜单id") - private Long menuId; - @ApiModelProperty(value = "创建人id") private Long createUserId; diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/User.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/User.java new file mode 100644 index 0000000000000000000000000000000000000000..7f39f884820c7f362318ba10b2dc9e5d9a121dfc --- /dev/null +++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/User.java @@ -0,0 +1,68 @@ +package org.micai.platform.resourcesserver.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + *+ * + *
+ * + * @author liucong + * @since 2021-12-04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="User对象", description="") +public class User implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty(value = "用户名") + private String username; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "手机号") + private String phone; + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "创建人") + private Long createUserId; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "修改人") + private Long updateUserId; + + @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + @ApiModelProperty(value = "状态: 01 启用 02停用") + private String status; + + @ApiModelProperty(value = "版本") + @Version + @TableField(fill = FieldFill.UPDATE, condition = SqlCondition.EQUAL) + private Long version; + + +} diff --git a/src/main/java/org/micai/platform/auth/entity/OrganUser.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/UserRole.java similarity index 74% rename from src/main/java/org/micai/platform/auth/entity/OrganUser.java rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/UserRole.java index bd5b74d64e4402bde4f468099fec0bf8a1c7773a..2d5f44b64ea5684f568eb59c1032e9b6d2b68e3c 100644 --- a/src/main/java/org/micai/platform/auth/entity/OrganUser.java +++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/entity/UserRole.java @@ -1,4 +1,4 @@ -package org.micai.platform.auth.entity; +package org.micai.platform.resourcesserver.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -16,27 +16,28 @@ import java.util.Date; * * * @author liucong - * @since 2021-12-06 + * @since 2021-12-04 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="OrganUser对象", description="") -public class OrganUser implements Serializable { +@ApiModel(value="UserRole对象", description="") +public class UserRole implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键id") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "组织机构id") - private Long organId; - @ApiModelProperty(value = "用户id") private Long userId; - @ApiModelProperty(value = "创建人") - private Long createUserId; + @ApiModelProperty(value = "角色id") + private Long roleId; + + @ApiModelProperty(value = "创建用户id") + private Long creatUserId; @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/filter/AuthHeaderFilter.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/filter/AuthHeaderFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..75c0b8a2028d90486b9244e94c81503472b5b75e --- /dev/null +++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/filter/AuthHeaderFilter.java @@ -0,0 +1,103 @@ +package org.micai.platform.resourcesserver.filter; + +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import org.micai.platform.common.base.constant.ConstantCode; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.util.Assert; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Vector; + +/** + * @Author liuCong + * @Date 2022/12/12 上午 9:58 + * @ClassName AuthHeaderFilter + * @Description + */ +@Slf4j +public class AuthHeaderFilter implements Filter { + + //拦截接口让OAuth2AuthenticationProcessingFilter去验证 + private final List+ * Mapper 接口 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface PermissionMapper extends BaseMapper+ * Mapper 接口 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface RoleMapper extends BaseMapper+ * Mapper 接口 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface RolePermissionMapper extends BaseMapper+ * Mapper 接口 + *
+ * + * @author liucong + * @since 2021-12-04 + */ +public interface UserRoleMapper extends BaseMapper null （如果 AuthenticationProvider 无法支持）
+ * 对传递的 Authentication 对象的身份验证。 在这种情况下，
+ * 支持所提供的下一个 AuthenticationProvider
+ * 将尝试 Authentication 类。
+ *
+ * @throws AuthenticationException 如果身份验证失败。
+ */
+ @Override
+ public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+ // 获取认证的用户名 & 密码
+ String name = authentication.getName();
+ String password = authentication.getCredentials().toString();
+ // 认证逻辑
+ User userDetails = userService.getOne(new LambdaQueryWrapper().eq(User::getUsername,name));
+ if (ObjectUtil.isEmpty(userDetails)) {
+ throw new MyAuthException(ConstantEnum.USER_CODE_ERROR);
+ }
+
+ if (!bCryptPasswordEncoder.matches(password, userDetails.getPassword())) {
+ throw new MyAuthException(ConstantEnum.USER_CODE_ERROR);
+ }
+ //获取用户权限
+ List userRoleList = userRoleService.list(new QueryWrapper().lambda().eq(UserRole::getUserId,userDetails.getId()));
+ if (ObjectUtil.isEmpty(userRoleList)){
+ throw new MyAuthException(ConstantEnum.NO_ROLE);
+ }
+ List roleIdList = userRoleList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
+ List roleList = roleService.list(new QueryWrapper().lambda()
+ .in(Role::getId,roleIdList).eq(Role::getStatus, ConstantCode.STR_Z_ONE));
+ if (ObjectUtil.isEmpty(roleList)){
+ throw new MyAuthException(ConstantEnum.NO_ROLE);
+ }
+ List rolePermissionList = rolePermissionService.list(new QueryWrapper().lambda()
+ .in(RolePermission::getRoleId,roleIdList));
+ if (ObjectUtil.isEmpty(rolePermissionList)){
+ throw new MyAuthException(ConstantEnum.NO_PERMISSION);
+ }
+ List permissionIdList = rolePermissionList.stream().map(RolePermission::getPermissionId).collect(Collectors.toList());
+ List permissionList = permissionService.list(new QueryWrapper().lambda()
+ .in(Permission::getId,permissionIdList).eq(Permission::getStatus,ConstantCode.STR_Z_ONE));
+ if (ObjectUtil.isEmpty(permissionList)){
+ throw new MyAuthException(ConstantEnum.NO_PERMISSION);
+ }
+
+ String roleStr = roleList.stream().distinct().map(Role::getRoleCode).collect(Collectors.joining(","));
+ String permissionStr = permissionList.stream().distinct().map(Permission::getPermissionCode).collect(Collectors.joining(","));
+ String authStr = roleStr + ConstantCode.SEPARATOR + permissionStr;
+ // 这里设置权限和角色
+ List grantedAuthorities = AuthorityUtils.commaSeparatedStringToAuthorityList(authStr);
+ // 生成令牌 这里令牌里面存入了:name,password,authorities, 当然你也可以放其他内容
+ name = userDetails.getId() + "-" + name;
+ log.info("authStr:{} , 用户:{}", authStr, name);
+ return new UsernamePasswordAuthenticationToken(name, password, grantedAuthorities);
+ }
+
+ /**
+ * 是否可以提供输入类型的认证服务
+ * @param authentication
+ * @return
+ */
+ @Override
+ public boolean supports(Class authentication) {
+ return authentication.equals(UsernamePasswordAuthenticationToken.class);
+ }
+
+}
diff --git a/src/main/java/org/micai/platform/auth/service/PermissionService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
similarity index 56%
rename from src/main/java/org/micai/platform/auth/service/PermissionService.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
index 7d213f47cf8da1ac36ec73e197de47ce0d369954..ca8a3cbd3748829f4e5b0c522b69500d6b422f94 100644
--- a/src/main/java/org/micai/platform/auth/service/PermissionService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
@@ -1,13 +1,13 @@
-package org.micai.platform.auth.service;
+package org.micai.platform.resourcesserver.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.bo.PermissionDelBo;
-import org.micai.platform.auth.bo.PermissionFindBo;
-import org.micai.platform.auth.bo.PermissionSaveBo;
-import org.micai.platform.auth.bo.PermissionUpdateBo;
-import org.micai.platform.auth.entity.Permission;
-import org.micai.platform.auth.vo.RoleListVo;
+import org.micai.platform.resourcesserver.bo.PermissionDelBo;
+import org.micai.platform.resourcesserver.bo.PermissionFindBo;
+import org.micai.platform.resourcesserver.bo.PermissionSaveBo;
+import org.micai.platform.resourcesserver.bo.PermissionUpdateBo;
+import org.micai.platform.resourcesserver.entity.Permission;
+import org.micai.platform.resourcesserver.vo.RoleListVo;
/**
*
diff --git a/src/main/java/org/micai/platform/auth/service/RolePermissionService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RolePermissionService.java
similarity index 55%
rename from src/main/java/org/micai/platform/auth/service/RolePermissionService.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RolePermissionService.java
index e1697c83ed266cb28c859389e89f56d70b071086..4a17ca55f1280220d94c12e1084bd20323525ac5 100644
--- a/src/main/java/org/micai/platform/auth/service/RolePermissionService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RolePermissionService.java
@@ -1,9 +1,9 @@
-package org.micai.platform.auth.service;
+package org.micai.platform.resourcesserver.service;
-import org.micai.platform.auth.bo.RolePermissionDelBo;
-import org.micai.platform.auth.bo.RolePermissionSaveBo;
-import org.micai.platform.auth.bo.RolePermissionUpdateBo;
-import org.micai.platform.auth.entity.RolePermission;
+import org.micai.platform.resourcesserver.bo.RolePermissionDelBo;
+import org.micai.platform.resourcesserver.bo.RolePermissionSaveBo;
+import org.micai.platform.resourcesserver.bo.RolePermissionUpdateBo;
+import org.micai.platform.resourcesserver.entity.RolePermission;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/src/main/java/org/micai/platform/auth/service/RoleService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
similarity index 55%
rename from src/main/java/org/micai/platform/auth/service/RoleService.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
index 9a925dc3a9e962f35d0a34b329a8d0d101aeb66c..ffe069699e31152eeaa1ac370c3aa752785dfb01 100644
--- a/src/main/java/org/micai/platform/auth/service/RoleService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
@@ -1,13 +1,13 @@
-package org.micai.platform.auth.service;
+package org.micai.platform.resourcesserver.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.micai.platform.auth.bo.RoleDelBo;
-import org.micai.platform.auth.bo.RoleFindBo;
-import org.micai.platform.auth.bo.RoleSaveBo;
-import org.micai.platform.auth.bo.RoleUpdateBo;
-import org.micai.platform.auth.entity.Role;
+import org.micai.platform.resourcesserver.bo.RoleDelBo;
+import org.micai.platform.resourcesserver.bo.RoleFindBo;
+import org.micai.platform.resourcesserver.bo.RoleSaveBo;
+import org.micai.platform.resourcesserver.bo.RoleUpdateBo;
+import org.micai.platform.resourcesserver.entity.Role;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.vo.UserListVo;
+import org.micai.platform.resourcesserver.vo.UserListVo;
/**
*
diff --git a/src/main/java/org/micai/platform/auth/service/UserRoleService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserRoleService.java
similarity index 55%
rename from src/main/java/org/micai/platform/auth/service/UserRoleService.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserRoleService.java
index 45ce2f08ed177b87894796689db90aa21236dc10..8d3c12bb37df96719e2e32251a75c5ebfee1c7ce 100644
--- a/src/main/java/org/micai/platform/auth/service/UserRoleService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserRoleService.java
@@ -1,9 +1,9 @@
-package org.micai.platform.auth.service;
+package org.micai.platform.resourcesserver.service;
-import org.micai.platform.auth.bo.UserRoleDelBo;
-import org.micai.platform.auth.bo.UserRoleSaveBo;
-import org.micai.platform.auth.bo.UserRoleUpdateBo;
-import org.micai.platform.auth.entity.UserRole;
+import org.micai.platform.resourcesserver.bo.UserRoleDelBo;
+import org.micai.platform.resourcesserver.bo.UserRoleSaveBo;
+import org.micai.platform.resourcesserver.bo.UserRoleUpdateBo;
+import org.micai.platform.resourcesserver.entity.UserRole;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/src/main/java/org/micai/platform/auth/service/UserService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserService.java
similarity index 56%
rename from src/main/java/org/micai/platform/auth/service/UserService.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserService.java
index 68ff57d87d80466f88a85bddd0404acd7b8ea433..3027e0648bb8ff4972fb72cd5365dc7f25c92c6f 100644
--- a/src/main/java/org/micai/platform/auth/service/UserService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/UserService.java
@@ -1,13 +1,13 @@
-package org.micai.platform.auth.service;
+package org.micai.platform.resourcesserver.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.bo.UserDelBo;
-import org.micai.platform.auth.bo.UserFindBo;
-import org.micai.platform.auth.bo.UserSaveBo;
-import org.micai.platform.auth.bo.UserUpdateBo;
-import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.vo.UserListVo;
+import org.micai.platform.resourcesserver.bo.UserDelBo;
+import org.micai.platform.resourcesserver.bo.UserFindBo;
+import org.micai.platform.resourcesserver.bo.UserSaveBo;
+import org.micai.platform.resourcesserver.bo.UserUpdateBo;
+import org.micai.platform.resourcesserver.entity.User;
+import org.micai.platform.resourcesserver.vo.UserListVo;
import java.util.List;
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/GrantedAuthorityImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/GrantedAuthorityImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..551c06f36c808a48c6d256d4e6dd0392548200b2
--- /dev/null
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/GrantedAuthorityImpl.java
@@ -0,0 +1,26 @@
+package org.micai.platform.resourcesserver.service.impl;
+
+import org.springframework.security.core.GrantedAuthority;
+
+/**
+ * 权限类型，负责存储权限和角色
+ *
+ * @author zhaoxinguo on 2017/9/12.
+ */
+public class GrantedAuthorityImpl implements GrantedAuthority {
+
+ private String authority;
+
+ public GrantedAuthorityImpl(String authority) {
+ this.authority = authority;
+ }
+
+ public void setAuthority(String authority) {
+ this.authority = authority;
+ }
+
+ @Override
+ public String getAuthority() {
+ return this.authority;
+ }
+}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
similarity index 78%
rename from src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
index b5aa464d9ec55b2912b4f849b41f14d19786d7d6..d948a3a9ef6b9257468632cc21a1f459df85be23 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
@@ -1,23 +1,23 @@
-package org.micai.platform.auth.service.impl;
+package org.micai.platform.resourcesserver.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.bo.PermissionDelBo;
-import org.micai.platform.auth.bo.PermissionFindBo;
-import org.micai.platform.auth.bo.PermissionSaveBo;
-import org.micai.platform.auth.bo.PermissionUpdateBo;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.Permission;
-import org.micai.platform.auth.mapper.PermissionMapper;
-import org.micai.platform.auth.service.PermissionService;
-import org.micai.platform.auth.utils.AuthenticationManger;
-import org.micai.platform.auth.vo.RoleListVo;
+import org.micai.platform.common.base.constant.ConstantCode;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.PlatformException;
+import org.micai.platform.resourcesserver.bo.PermissionDelBo;
+import org.micai.platform.resourcesserver.bo.PermissionFindBo;
+import org.micai.platform.resourcesserver.bo.PermissionSaveBo;
+import org.micai.platform.resourcesserver.bo.PermissionUpdateBo;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
+import org.micai.platform.resourcesserver.entity.Permission;
+import org.micai.platform.resourcesserver.mapper.PermissionMapper;
+import org.micai.platform.resourcesserver.service.PermissionService;
+import org.micai.platform.resourcesserver.utils.AuthenticationManger;
+import org.micai.platform.resourcesserver.vo.RoleListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/RolePermissionServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RolePermissionServiceImpl.java
similarity index 77%
rename from src/main/java/org/micai/platform/auth/service/impl/RolePermissionServiceImpl.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RolePermissionServiceImpl.java
index 9e36ca867016634eb5d68fba1802e405e34b2936..bb91cd946af2a0aa87ef6381527616642eec2b3c 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/RolePermissionServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RolePermissionServiceImpl.java
@@ -1,19 +1,19 @@
-package org.micai.platform.auth.service.impl;
+package org.micai.platform.resourcesserver.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.bo.RolePermissionDelBo;
-import org.micai.platform.auth.bo.RolePermissionSaveBo;
-import org.micai.platform.auth.bo.RolePermissionUpdateBo;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.RolePermission;
-import org.micai.platform.auth.mapper.RolePermissionMapper;
-import org.micai.platform.auth.service.RolePermissionService;
-import org.micai.platform.auth.utils.AuthenticationManger;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.PlatformException;
+import org.micai.platform.resourcesserver.bo.RolePermissionDelBo;
+import org.micai.platform.resourcesserver.bo.RolePermissionSaveBo;
+import org.micai.platform.resourcesserver.bo.RolePermissionUpdateBo;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
+import org.micai.platform.resourcesserver.entity.RolePermission;
+import org.micai.platform.resourcesserver.mapper.RolePermissionMapper;
+import org.micai.platform.resourcesserver.service.RolePermissionService;
+import org.micai.platform.resourcesserver.utils.AuthenticationManger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
similarity index 78%
rename from src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
index 4f7d4126a7a5c6e51464cd094dfdccf8b89c1e02..4388d94dc13100dd22c7146be3ba61728d665283 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.service.impl;
+package org.micai.platform.resourcesserver.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -6,19 +6,19 @@ import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.bo.RoleDelBo;
-import org.micai.platform.auth.bo.RoleFindBo;
-import org.micai.platform.auth.bo.RoleSaveBo;
-import org.micai.platform.auth.bo.RoleUpdateBo;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.Role;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.mapper.RoleMapper;
-import org.micai.platform.auth.service.RoleService;
-import org.micai.platform.auth.utils.AuthenticationManger;
-import org.micai.platform.auth.vo.UserListVo;
+import org.micai.platform.common.base.constant.ConstantCode;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.PlatformException;
+import org.micai.platform.resourcesserver.bo.RoleDelBo;
+import org.micai.platform.resourcesserver.bo.RoleFindBo;
+import org.micai.platform.resourcesserver.bo.RoleSaveBo;
+import org.micai.platform.resourcesserver.bo.RoleUpdateBo;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
+import org.micai.platform.resourcesserver.entity.Role;
+import org.micai.platform.resourcesserver.mapper.RoleMapper;
+import org.micai.platform.resourcesserver.service.RoleService;
+import org.micai.platform.resourcesserver.utils.AuthenticationManger;
+import org.micai.platform.resourcesserver.vo.UserListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserDetailsServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserDetailsServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc9659a61d50b7c45e5cf3ddd62e9d8e0b519779
--- /dev/null
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserDetailsServiceImpl.java
@@ -0,0 +1,76 @@
+package org.micai.platform.resourcesserver.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.micai.platform.common.base.constant.ConstantCode;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.MyAuthException;
+import org.micai.platform.resourcesserver.entity.*;
+import org.micai.platform.resourcesserver.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author liuCong
+ * @Date 2022/11/24 下午 1:36
+ * @ClassName UserDetailsServiceImpl
+ * @Description
+ */
+public class UserDetailsServiceImpl implements UserDetailsService {
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private UserRoleService userRoleService;
+
+ @Autowired
+ private RoleService roleService;
+
+ @Autowired
+ private RolePermissionService rolePermissionService;
+
+ @Autowired
+ private PermissionService permissionService;
+
+ @Override
+ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+ User user = userService.getOne(new LambdaQueryWrapper().eq(User::getUsername,username));
+ if (user == null){
+ throw new UsernameNotFoundException("未找到该用户");
+ }
+ //获取用户权限
+ List userRoleList = userRoleService.list(new QueryWrapper().lambda().eq(UserRole::getUserId,user.getId()));
+ if (ObjectUtil.isEmpty(userRoleList)){
+ throw new MyAuthException(ConstantEnum.NO_ROLE);
+ }
+ List roleIdList = userRoleList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
+ List roleList = roleService.list(new QueryWrapper().lambda()
+ .in(Role::getId,roleIdList).eq(Role::getStatus, ConstantCode.STR_Z_ONE));
+ if (ObjectUtil.isEmpty(roleList)){
+ throw new MyAuthException(ConstantEnum.NO_ROLE);
+ }
+ List rolePermissionList = rolePermissionService.list(new QueryWrapper().lambda()
+ .in(RolePermission::getRoleId,roleIdList));
+ if (ObjectUtil.isEmpty(rolePermissionList)){
+ throw new MyAuthException(ConstantEnum.NO_PERMISSION);
+ }
+ List permissionIdList = rolePermissionList.stream().map(RolePermission::getPermissionId).collect(Collectors.toList());
+ List permissionList = permissionService.list(new QueryWrapper().lambda()
+ .in(Permission::getId,permissionIdList).eq(Permission::getStatus,ConstantCode.STR_Z_ONE));
+ if (ObjectUtil.isEmpty(permissionList)){
+ throw new MyAuthException(ConstantEnum.NO_PERMISSION);
+ }
+
+ String collect = permissionList.stream().map(Permission::getPermissionCode).collect(Collectors.joining(","));
+ return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(), AuthorityUtils.createAuthorityList(collect));
+ }
+
+}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/UserRoleServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserRoleServiceImpl.java
similarity index 76%
rename from src/main/java/org/micai/platform/auth/service/impl/UserRoleServiceImpl.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserRoleServiceImpl.java
index c9d7a45570fe4d79b562199a7062655375623f49..4fdfa8e3f38c1d137361894c1c3e4568a304ead1 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/UserRoleServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserRoleServiceImpl.java
@@ -1,19 +1,19 @@
-package org.micai.platform.auth.service.impl;
+package org.micai.platform.resourcesserver.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.bo.UserRoleDelBo;
-import org.micai.platform.auth.bo.UserRoleSaveBo;
-import org.micai.platform.auth.bo.UserRoleUpdateBo;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.UserRole;
-import org.micai.platform.auth.mapper.UserRoleMapper;
-import org.micai.platform.auth.service.UserRoleService;
-import org.micai.platform.auth.utils.AuthenticationManger;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.PlatformException;
+import org.micai.platform.resourcesserver.bo.UserRoleDelBo;
+import org.micai.platform.resourcesserver.bo.UserRoleSaveBo;
+import org.micai.platform.resourcesserver.bo.UserRoleUpdateBo;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
+import org.micai.platform.resourcesserver.entity.UserRole;
+import org.micai.platform.resourcesserver.mapper.UserRoleMapper;
+import org.micai.platform.resourcesserver.service.UserRoleService;
+import org.micai.platform.resourcesserver.utils.AuthenticationManger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserServiceImpl.java
similarity index 83%
rename from src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserServiceImpl.java
index a81eed7cdbe9c24fe5475878df7cc2c917b0762d..6f6753615b387c0cd1960a886fd3afb726a89f94 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/UserServiceImpl.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.service.impl;
+package org.micai.platform.resourcesserver.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -7,19 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.bo.UserDelBo;
-import org.micai.platform.auth.bo.UserFindBo;
-import org.micai.platform.auth.bo.UserSaveBo;
-import org.micai.platform.auth.bo.UserUpdateBo;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.mapper.UserMapper;
-import org.micai.platform.auth.service.UserService;
-import org.micai.platform.auth.utils.AuthenticationManger;
-import org.micai.platform.auth.vo.UserListVo;
+import org.micai.platform.common.base.constant.ConstantCode;
+import org.micai.platform.common.base.constant.ConstantEnum;
+import org.micai.platform.common.base.exception.PlatformException;
+import org.micai.platform.resourcesserver.bo.UserDelBo;
+import org.micai.platform.resourcesserver.bo.UserFindBo;
+import org.micai.platform.resourcesserver.bo.UserSaveBo;
+import org.micai.platform.resourcesserver.bo.UserUpdateBo;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
+import org.micai.platform.resourcesserver.entity.User;
+import org.micai.platform.resourcesserver.mapper.UserMapper;
+import org.micai.platform.resourcesserver.service.UserService;
+import org.micai.platform.resourcesserver.utils.AuthenticationManger;
+import org.micai.platform.resourcesserver.vo.UserListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/micai/platform/auth/utils/ApplicationUtil.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ApplicationUtil.java
similarity index 97%
rename from src/main/java/org/micai/platform/auth/utils/ApplicationUtil.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ApplicationUtil.java
index 4d7d882293018012ef6d103671127a49cd8fe9cc..62d073b4c3cef6bc0cccb2562cc8a7d1b5dc00f8 100644
--- a/src/main/java/org/micai/platform/auth/utils/ApplicationUtil.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ApplicationUtil.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.utils;
+package org.micai.platform.resourcesserver.utils;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/org/micai/platform/auth/utils/AuthenticationManger.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/AuthenticationManger.java
similarity index 90%
rename from src/main/java/org/micai/platform/auth/utils/AuthenticationManger.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/AuthenticationManger.java
index 89e180fdb6b3d373e1881c8499d1680fa0720446..89555c9a7511856fc3d18db95e4573ae74378b9a 100644
--- a/src/main/java/org/micai/platform/auth/utils/AuthenticationManger.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/AuthenticationManger.java
@@ -1,8 +1,8 @@
-package org.micai.platform.auth.utils;
+package org.micai.platform.resourcesserver.utils;
import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.constant.ConstantCode;
+import org.micai.platform.common.base.constant.ConstantCode;
+import org.micai.platform.resourcesserver.dto.UserAuthenticationDto;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/org/micai/platform/auth/utils/ImageUtils.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ImageUtils.java
similarity index 99%
rename from src/main/java/org/micai/platform/auth/utils/ImageUtils.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ImageUtils.java
index 0b14bcbbf129f86bdede44ba11937396e39cabb0..8c7edd2754f00348cf43898dc8ab3631942c0d6a 100644
--- a/src/main/java/org/micai/platform/auth/utils/ImageUtils.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/ImageUtils.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.utils;
+package org.micai.platform.resourcesserver.utils;
import lombok.extern.slf4j.Slf4j;
import net.coobird.thumbnailator.Thumbnails;
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/JwtHelper.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/JwtHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc37c4de6d423b5568bba3958e1a53ee34ec61e4
--- /dev/null
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/JwtHelper.java
@@ -0,0 +1,106 @@
+//package org.micai.platform.resourcesserver.utils;
+//
+//import io.jsonwebtoken.Claims;
+//import io.jsonwebtoken.JwtBuilder;
+//import io.jsonwebtoken.Jwts;
+//import io.jsonwebtoken.SignatureAlgorithm;
+//import org.springframework.beans.factory.annotation.Value;
+//
+//import javax.crypto.spec.SecretKeySpec;
+//import javax.xml.bind.DatatypeConverter;
+//import java.security.Key;
+//import java.util.Date;
+//
+///**
+// * @FileName: JwtHelper
+// * @Author: zhaoxinguo
+// * @Date: 2018/12/10 19:39
+// * @Description: 实现Jwt
+// */
+//public class JwtHelper {
+//
+// //token超时时间
+// @Value("${jwt.expiration}")
+// public long expiration;
+//
+// //生成token的秘钥
+// @Value("${jwt.secret}")
+// public String base64Security;
+//
+// /**
+// * 解析token
+// * @param jsonWebToken
+// * @return
+// */
+// public Claims parseToken(String jsonWebToken) {
+// Claims claims = Jwts.parser().setSigningKey(DatatypeConverter.parseBase64Binary(base64Security)).parseClaimsJws(jsonWebToken).getBody();
+// return claims;
+// }
+//
+// /**
+// * 新建token
+// * @param audience
+// * @param issuer
+// * @return
+// */
+// public String createToken(String audience, String issuer) {
+// SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
+//
+// long nowMillis = System.currentTimeMillis();
+// Date now = new Date(nowMillis);
+//
+// // 生成签名密钥
+// byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(base64Security);
+// Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
+//
+// // 添加构成JWT的参数
+// JwtBuilder builder = Jwts.builder().setHeaderParam("typ", "JWT").setIssuer(issuer).setAudience(audience)
+// .signWith(signatureAlgorithm, signingKey);
+//
+// // 添加Token签发时间
+// builder.setIssuedAt(now);
+// // 添加Token过期时间
+// if (expiration >= 0) {
+// long expMillis = nowMillis + expiration;
+// Date exp = new Date(expMillis);
+// builder.setExpiration(exp).setNotBefore(now);
+// }
+//
+// // 生成JWT
+// return builder.compact();
+// }
+//
+// /**
+// * 刷新令牌
+// *
+// * @param claims
+// * @return
+// */
+// public String refreshToken(Claims claims) {
+// SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
+//
+// long nowMillis = System.currentTimeMillis();
+// Date now = new Date(nowMillis);
+//
+// // 生成签名密钥
+// byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(base64Security);
+// Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
+//
+// // 添加构成JWT的参数
+// JwtBuilder builder = Jwts.builder().setHeaderParam("typ", "JWT")
+// .setIssuer((String) claims.get("iss")).setAudience((String) claims.get("aud"))
+// .signWith(signatureAlgorithm, signingKey);
+//
+// // 添加Token签发时间
+// builder.setIssuedAt(now);
+// // 添加Token过期时间
+// if (expiration >= 0) {
+// long expMillis = nowMillis + expiration;
+// Date exp = new Date(expMillis);
+// builder.setExpiration(exp).setNotBefore(now);
+// }
+//
+// // 生成Token
+// return builder.compact();
+// }
+//}
diff --git a/src/main/java/org/micai/platform/auth/utils/MD5.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/MD5.java
similarity index 90%
rename from src/main/java/org/micai/platform/auth/utils/MD5.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/MD5.java
index 5a3ecc8647628765ad9d8154c1b0c02c4c67c84d..92b172b1b2faed8ae953c2740a2da6c3f2bbf49e 100644
--- a/src/main/java/org/micai/platform/auth/utils/MD5.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/utils/MD5.java
@@ -1,7 +1,7 @@
-package org.micai.platform.auth.utils;
+package org.micai.platform.resourcesserver.utils;
import org.apache.commons.lang3.StringUtils;
-import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.common.base.exception.PlatformException;
import java.math.BigInteger;
import java.security.MessageDigest;
diff --git a/src/main/java/org/micai/platform/auth/vo/OrganListVo.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/OrganListVo.java
similarity index 95%
rename from src/main/java/org/micai/platform/auth/vo/OrganListVo.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/OrganListVo.java
index c799fe9d9fdfb0bea17561543ccac441a3de31ca..e3fc46c876e8d516d234041b7bbdac5b0ad675c7 100644
--- a/src/main/java/org/micai/platform/auth/vo/OrganListVo.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/OrganListVo.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.vo;
+package org.micai.platform.resourcesserver.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/org/micai/platform/auth/vo/PermissionListVo.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/PermissionListVo.java
similarity index 95%
rename from src/main/java/org/micai/platform/auth/vo/PermissionListVo.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/PermissionListVo.java
index 282c771b988c6470b8d0b16a32224c2442717611..9e5fd09ceb10075a1a024e283a1d87717e992385 100644
--- a/src/main/java/org/micai/platform/auth/vo/PermissionListVo.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/PermissionListVo.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.vo;
+package org.micai.platform.resourcesserver.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/org/micai/platform/auth/vo/RoleListVo.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/RoleListVo.java
similarity index 95%
rename from src/main/java/org/micai/platform/auth/vo/RoleListVo.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/RoleListVo.java
index d0d1d36642f03e15808aad933041cfd3eeeb28b6..0dcb67d49454ec72cb3eebe05f4e727cb0ad9645 100644
--- a/src/main/java/org/micai/platform/auth/vo/RoleListVo.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/RoleListVo.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.vo;
+package org.micai.platform.resourcesserver.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/org/micai/platform/auth/vo/UserListVo.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/UserListVo.java
similarity index 95%
rename from src/main/java/org/micai/platform/auth/vo/UserListVo.java
rename to platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/UserListVo.java
index d4796ec9bbcaacf8fa628b991b07b689b093e9e0..ad824c30474483c379f4abfb3f7eddfd533d8c4f 100644
--- a/src/main/java/org/micai/platform/auth/vo/UserListVo.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/vo/UserListVo.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.vo;
+package org.micai.platform.resourcesserver.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/platform-resources-server/src/main/resources/application-dev.yml b/platform-resources-server/src/main/resources/application-dev.yml
new file mode 100644
index 0000000000000000000000000000000000000000..91dde2b08682fa4999810744af333f7c417f57f6
--- /dev/null
+++ b/platform-resources-server/src/main/resources/application-dev.yml
@@ -0,0 +1,33 @@
+#dev 开发环境
+#服务
+server:
+ port: 8081
+#spring
+spring:
+ datasource:
+ driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
+ username: root
+ password: ly1218
+
+micai-platform-auth:
+ #jwt相关配置
+ token:
+ #sign key
+ sign-key: micai-security-@Jwt!&Secret^#
+ #jwt 过期时间 单位:分钟
+ timeout: 60
+ # token名称
+ token-name: Authorization
+ # token前缀
+ token-prefix: Bearer
+
+ oauth-resources:
+ #sign key
+ sign-key: micai-oauth2-@Jwt!&Secret^#
+ #资源id
+ resource-ids: resources-server
+ #过滤器匹配路径 可以使用**
+ request-matcher:
+ - /demo
+ - /user/list
diff --git a/platform-resources-server/src/main/resources/application-pro.yml b/platform-resources-server/src/main/resources/application-pro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/main/resources/application.yml b/platform-resources-server/src/main/resources/application.yml
similarity index 83%
rename from src/main/resources/application.yml
rename to platform-resources-server/src/main/resources/application.yml
index 7d5311584f65f23b5275edd230bdc3589400c492..91113168c57e797ecebbd8b518138b170e2d7d7b 100644
--- a/src/main/resources/application.yml
+++ b/platform-resources-server/src/main/resources/application.yml
@@ -22,12 +22,6 @@ mybatis-plus:
map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-#jwt config
-jwt:
- header: Authorization
- secret: NDU0NTY4amhmc3NkeHp6eGNxdzIlMjFAJTIxQCUyM2ZmNQ==
- expiration: 7200000
-
site:
location: ${user.dir}
options:
diff --git a/platform-resources-server/src/main/resources/logback-spring.xml b/platform-resources-server/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b02d2b726ae372eb59b0871db91d5cb2f08bc3e2
--- /dev/null
+++ b/platform-resources-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ logback
+
+
+
+
+
+
+
+ debug
+
+
+
+ ${PATTERN_COLOR}
+
+ UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 20e3007e99f9843cda7c0777c0482738b627c137..1cfbc9f04f027be66535d4b63757563f8899ea12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,21 @@
org.micai.platform
micai-platform-auth
0.0.1-SNAPSHOT
- micai-platform-auth
+ pom
+ micai-platform-auth
Micai platform project for Spring Boot
-
- 1.8
+
+ platform-auth-server
+ platform-resources-server
+ platform-common
+
+
+ 8
+ 8
+ UTF-8
5.1.30
0.7.0
1.2.78
- 5.7.16
2.7.0
1.3.2
1.3
@@ -29,15 +36,21 @@
2.8.3
7.2.18
3.4.3.4
- 1.9.2
3.4.0
- 3.4.0
3.16
3.16
2.0
+ 1.7.30
+ 2.2.6.RELEASE
+ 2.0.9
+ 1.18.24
+ 2.6.6
+ 5.7.16
+ 2.7.5
-
-
+
+
+
org.springframework.boot
spring-boot-starter
@@ -52,137 +65,176 @@
org.springframework.boot
spring-boot-starter-web
-
-
- com.baomidou
- mybatis-plus-boot-starter
- ${mybatis-plus-boot-starter.version}
-
-
-
- mysql
- mysql-connector-java
- ${mysql.version}
-
-
-
- org.springframework.boot
- spring-boot-starter-security
-
+
io.jsonwebtoken
jjwt
- ${jjwt.version}
-
-
-
- com.alibaba
- fastjson
- ${fastjson.version}
-
-
-
- cn.hutool
- hutool-all
- ${hutool.version}
-
-
-
- io.springfox
- springfox-swagger2
- ${springfox-swagger2.version}
-
-
-
- org.projectlombok
- lombok
-
-
- com.baomidou
- mybatis-plus-generator
- ${mybatis-plus-generator.version}
-
-
- com.baomidou
- mybatis-plus
- ${mybatis-plus.version}
-
-
- org.apache.velocity
- velocity-engine-core
- ${velocity-engine-core.version}
+
org.springframework.boot
- spring-boot-starter-validation
-
-
- com.github.xiaoymin
- swagger-bootstrap-ui
- ${swagger-bootstrap-ui.version}
-
-
- org.apache.commons
- commons-io
- ${commons.io}
-
-
- org.apache.commons
- commons-text
- ${commons.text}
-
-
-
- com.itextpdf
- itextpdf
- ${commons.itextpdf}
-
-
- com.itextpdf
- itext-asian
- ${commons.itext-asian}
-
-
- org.apache.poi
- poi
- ${poi.version}
-
-
- org.apache.poi
- poi-ooxml
- ${poi-ooxml.version}
-
-
- net.coobird
- thumbnailator
- ${coobird.thumbnailator}
-
-
-
- com.upyun
- java-sdk
- ${upyun.sdk.version}
-
-
-
- com.aliyun.oss
- aliyun-sdk-oss
- ${aliyun.sdk.version}
-
-
-
- com.qiniu
- qiniu-java-sdk
- ${qiniu.sdk.version}
+ spring-boot-starter-security
+
- org.springframework.boot
- spring-boot-devtools
- true
+ org.springframework.security.oauth.boot
+ spring-security-oauth2-autoconfigure
+
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatis-plus-boot-starter.version}
+
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+ ${security.version}
+
+
+
+ io.jsonwebtoken
+ jjwt
+ ${jjwt.version}
+
+
+
+ com.alibaba
+ fastjson
+ ${fastjson.version}
+
+
+
+ io.springfox
+ springfox-swagger2
+ ${springfox-swagger2.version}
+
+
+
+
+ org.projectlombok
+ lombok
+ ${lombok.version}
+ provided
+
+
+
+
+ com.baomidou
+ mybatis-plus-generator
+ ${mybatis-plus-generator.version}
+
+
+ org.apache.velocity
+ velocity-engine-core
+ ${velocity-engine-core.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+ ${validation.version}
+
+
+ org.apache.commons
+ commons-io
+ ${commons.io}
+
+
+ org.apache.commons
+ commons-text
+ ${commons.text}
+
+
+
+ com.itextpdf
+ itextpdf
+ ${commons.itextpdf}
+
+
+ com.itextpdf
+ itext-asian
+ ${commons.itext-asian}
+
+
+ org.apache.poi
+ poi
+ ${poi.version}
+
+
+ org.apache.poi
+ poi-ooxml
+ ${poi-ooxml.version}
+
+
+ net.coobird
+ thumbnailator
+ ${coobird.thumbnailator}
+
+
+
+ com.upyun
+ java-sdk
+ ${upyun.sdk.version}
+
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ ${aliyun.sdk.version}
+
+
+
+ com.qiniu
+ qiniu-java-sdk
+ ${qiniu.sdk.version}
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
+
+
+ org.springframework.security.oauth.boot
+ spring-security-oauth2-autoconfigure
+ ${oauth2.version}
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j-api.version}
+
+
+
+
+ com.github.xiaoymin
+
+ knife4j-spring-boot-starter
+ ${knife4j.version}
+
+
+
+
+ cn.hutool
+ hutool-all
+ ${hutool.version}
+
+
+
+
+
@@ -191,7 +243,7 @@
-
+
spring-milestones
diff --git a/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java b/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java
deleted file mode 100644
index 2d70094a17417247c57e10fe94d8a49cb47a0243..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.micai.platform.auth.base.exception;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.base.result.Result;
-import org.springframework.context.support.DefaultMessageSourceResolvable;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import java.util.stream.Collectors;
-
-@RestControllerAdvice
-@Slf4j
-public class DefaultException {
-
- @ExceptionHandler(MethodArgumentNotValidException.class)
- @ResponseBody
- public Result methodArgumentNotValidException(MethodArgumentNotValidException exception) {
- log.info("捕获异常MethodArgumentNotValidException");
- String message = exception.getBindingResult().getAllErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining());
- return new Result(ConstantEnum.FAIL,message);
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/base/sms/Sms.java b/src/main/java/org/micai/platform/auth/base/sms/Sms.java
deleted file mode 100644
index 1a43c9cc26a1fd3e3f962f4a6821a76aa3ff7f4a..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/sms/Sms.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.micai.platform.auth.base.sms;
-
-/**
- * @Author zhaoxinguo
- * @Date 2021-12-10 13:26
- * @ClassName Sms
- * @Description 短信发送接口
- */
-public interface Sms {
-
- /**
- * 发送短信
- * @param messageContent 短信内容
- * @param receiveNumber 接收人手机号
- * @return
- */
- String sendSms(String messageContent, String receiveNumber);
-}
diff --git a/src/main/java/org/micai/platform/auth/base/sms/impl/AbstractSms.java b/src/main/java/org/micai/platform/auth/base/sms/impl/AbstractSms.java
deleted file mode 100644
index 79f5a1082362228540c48f759de80d5bb94cdd1c..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/sms/impl/AbstractSms.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.micai.platform.auth.base.sms.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.sms.Sms;
-
-/**
- * 系统短信接口抽象实现类
- */
-@Slf4j
-public abstract class AbstractSms implements Sms {
-
-
-}
diff --git a/src/main/java/org/micai/platform/auth/base/sms/impl/QiniuSmsImpl.java b/src/main/java/org/micai/platform/auth/base/sms/impl/QiniuSmsImpl.java
deleted file mode 100644
index d8e3f6af1e6f361e3ade6bee24e947176606b8b9..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/sms/impl/QiniuSmsImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.micai.platform.auth.base.sms.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.sms.Sms;
-import org.springframework.stereotype.Component;
-
-/**
- * 七牛云-短信接口抽象实现类
- */
-@Slf4j
-@Component
-public class QiniuSmsImpl extends AbstractSms implements Sms {
-
- @Override
- public String sendSms(String messageContent, String receiveNumber) {
-
- return null;
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/Storage.java b/src/main/java/org/micai/platform/auth/base/storage/Storage.java
deleted file mode 100644
index f794eab0b3c044ec15a453ff24580805e6940dd2..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/Storage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.micai.platform.auth.base.storage;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * 系统存储接口
- */
-public interface Storage {
-
- /**
- * 存储图片
- *
- * @param file
- * @param basePath
- * @return
- * @throws IOException
- */
- String store(MultipartFile file, String basePath) throws Exception;
-
- /**
- * 存储压缩图片
- *
- * @param file
- * @param basePath
- * @return
- * @throws IOException
- */
- String storeScale(MultipartFile file, String basePath, int maxWidth) throws Exception;
-
- /**
- * 存储压缩图片
- *
- * @param file
- * @param basePath
- * @return
- * @throws IOException
- */
- String storeScale(MultipartFile file, String basePath, int width, int height) throws Exception;
-
- /**
- * 存储路径
- *
- * @param storePath
- */
- void deleteFile(String storePath);
-
- /**
- * 写入字节到指定的目录文件
- *
- * @param bytes
- * @param pathAndFileName
- * @return
- * @throws Exception
- */
- String writeToStore(byte[] bytes, String pathAndFileName) throws Exception;
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/StorageFactory.java b/src/main/java/org/micai/platform/auth/base/storage/StorageFactory.java
deleted file mode 100644
index ac8e0d19460857d0d066d247d232736d9ce4c65a..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/StorageFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.micai.platform.auth.base.storage;
-
-import org.apache.commons.lang3.StringUtils;
-import org.micai.platform.auth.base.storage.impl.NativeStorageImpl;
-import org.micai.platform.auth.base.storage.impl.OssStorageImpl;
-import org.micai.platform.auth.config.SiteOptions;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-public class StorageFactory implements InitializingBean {
-
- @Autowired
- private ApplicationContext applicationContext;
- @Autowired
- private SiteOptions siteOptions;
- private Map fileRepoMap = new HashMap<>();
-
- @Override
- public void afterPropertiesSet() throws Exception {
- fileRepoMap.put("native", applicationContext.getBean(NativeStorageImpl.class));
- fileRepoMap.put("aliyun", applicationContext.getBean(OssStorageImpl.class));
- }
-
- public boolean registry(String key, Storage storage) {
- if (fileRepoMap.containsKey(key)) {
- return false;
- }
- fileRepoMap.put(key, storage);
- return true;
- }
-
- public Storage get() {
- String scheme = siteOptions.getValue("storage_scheme");
- if (StringUtils.isBlank(scheme)) {
- scheme = "native";
- }
- return fileRepoMap.get(scheme);
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java b/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java
deleted file mode 100644
index fec60bb6282b72600d1cc330c76b4e4bded22490..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.storage.Storage;
-import org.micai.platform.auth.config.SiteOptions;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.utils.FileKit;
-import org.micai.platform.auth.utils.FilePathUtils;
-import org.micai.platform.auth.utils.ImageUtils;
-import org.micai.platform.auth.utils.MD5;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 系统存储接口抽象实现类
- */
-@Slf4j
-public abstract class AbstractStorage implements Storage {
-
- @Autowired
- protected SiteOptions siteOptions;
-
- /**
- * 验证文件
- *
- * @param file
- */
- protected void validateFile(MultipartFile file) {
- if (file == null || file.isEmpty()) {
- throw new PlatformException(ConstantEnum.NO_FILE);
- }
- if (!FileKit.checkFileType(file.getOriginalFilename())) {
- throw new PlatformException(ConstantEnum.TYPE);
- }
- }
-
- /**
- * 存储图片
- * @param file
- * @param basePath
- * @return
- * @throws Exception
- */
- @Override
- public String store(MultipartFile file, String basePath) throws Exception {
- validateFile(file);
- return writeToStore(file.getBytes(), basePath, file.getOriginalFilename());
- }
-
- /**
- * 存储压缩图片
- * @param file
- * @param basePath
- * @param maxWidth
- * @return
- * @throws Exception
- */
- @Override
- public String storeScale(MultipartFile file, String basePath, int maxWidth) throws Exception {
- validateFile(file);
- byte[] bytes = ImageUtils.scaleByWidth(file, maxWidth);
- return writeToStore(bytes, basePath, file.getOriginalFilename());
- }
-
- /**
- * 存储压缩图片
- * @param file
- * @param basePath
- * @param width
- * @param height
- * @return
- * @throws Exception
- */
- @Override
- public String storeScale(MultipartFile file, String basePath, int width, int height) throws Exception {
- validateFile(file);
- byte[] bytes = ImageUtils.screenshot(file, width, height);
- return writeToStore(bytes, basePath, file.getOriginalFilename());
- }
-
- public String writeToStore(byte[] bytes, String src, String originalFilename) throws Exception {
- String md5 = MD5.md5(bytes);
- /*Resource resource = resourceRepository.findByMd5(md5);
- if (resource != null){
- return resource.getPath();
- }*/
- String path = FilePathUtils.wholePathName(src, originalFilename, md5);
- path = writeToStore(bytes, path);
-
- // 图片入库
- /*resource = new Resource();
- resource.setMd5(md5);
- resource.setPath(path);
- resource.setCreateTime(LocalDateTime.now());
- resourceRepository.save(resource);*/
- return path;
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/MinioStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/MinioStorageImpl.java
deleted file mode 100644
index c167acfa3efc167185b1a88ea77966beb1869873..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/MinioStorageImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.storage.Storage;
-import org.springframework.stereotype.Component;
-
-/**
- * MinIO-存储接口抽象实现类
- */
-@Slf4j
-@Component
-public class MinioStorageImpl extends AbstractStorage implements Storage {
-
- @Override
- public void deleteFile(String storePath) {
-
- }
-
- @Override
- public String writeToStore(byte[] bytes, String pathAndFileName) throws Exception {
- return null;
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/NativeStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/NativeStorageImpl.java
deleted file mode 100644
index 69399bc434b033aad4574f81d3094f642841f9e8..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/NativeStorageImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.storage.Storage;
-import org.micai.platform.auth.utils.FileKit;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-
-/**
- * 本地-存储接口抽象实现类
- */
-@Slf4j
-@Component
-public class NativeStorageImpl extends AbstractStorage implements Storage {
-
- @Override
- public void deleteFile(String storePath) {
- File file = new File(getStoragePath() + storePath);
-
- // 文件存在, 且不是目录
- if (file.exists() && !file.isDirectory()) {
- file.delete();
- log.info("fileRepo delete " + storePath);
- }
- }
-
- @Override
- public String writeToStore(byte[] bytes, String pathAndFileName) throws Exception {
- String dest = getStoragePath() + pathAndFileName;
- FileKit.writeByteArrayToFile(bytes, dest);
- return pathAndFileName;
- }
-
- private String getStoragePath() {
- return siteOptions.getLocation();
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java
deleted file mode 100644
index b1a02bf1cc79d2c19cf863d2150dfa222bbcfd73..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import com.aliyun.oss.OSSClient;
-import com.upyun.UpYunUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.micai.platform.auth.base.storage.Storage;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.utils.FileKit;
-import org.springframework.stereotype.Component;
-import java.io.ByteArrayInputStream;
-
-/**
- * 阿里云OSS-存储接口抽象实现类
- */
-@Slf4j
-@Component
-public class OssStorageImpl extends AbstractStorage implements Storage {
-
- private static final String oss_endpoint = "aliyun_oss_endpoint";
- private static final String oss_bucket = "aliyun_oss_bucket";
- private static final String oss_key = "aliyun_oss_key";
- private static final String oss_secret = "aliyun_oss_secret";
- private static final String oss_src = "aliyun_oss_src";
-
- @Override
- public void deleteFile(String storePath) {
- String bucket = siteOptions.getValue(oss_bucket);
- String endpoint = siteOptions.getValue(oss_endpoint);
- String path = StringUtils.remove(storePath, "//" + bucket.trim() + "." + endpoint.trim() + "/");
- OSSClient client = builder();
- try {
- client.doesObjectExist(bucket, path);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- }
-
- @Override
- public String writeToStore(byte[] bytes, String pathAndFileName) throws Exception {
- String endpoint = siteOptions.getValue(oss_endpoint);
- String bucket = siteOptions.getValue(oss_bucket);
- String src = siteOptions.getValue(oss_src);
-
- if (StringUtils.isAnyBlank(endpoint, bucket)) {
- throw new PlatformException(ConstantEnum.NO_ALIYUN_CONFIG);
- }
-
- if (StringUtils.isBlank(src)) {
- src = "";
- } else {
- if (src.startsWith("/")) {
- src = src.substring(1);
- }
-
- if (!src.endsWith("/")) {
- src = src + "/";
- }
- }
-
- String key = UpYunUtils.md5(bytes);
- String path = src + key + FileKit.getSuffix(pathAndFileName);
- OSSClient client = builder();
- client.putObject(bucket, path, new ByteArrayInputStream(bytes));
- return "//" + bucket.trim() + "." + endpoint.trim() + "/" + path;
- }
-
- private OSSClient builder() {
- String endpoint = siteOptions.getValue(oss_endpoint);
- String accessKeyId = siteOptions.getValue(oss_key);
- String accessKeySecret = siteOptions.getValue(oss_secret);
-
- if (StringUtils.isAnyBlank(endpoint, accessKeyId, accessKeySecret)) {
- throw new PlatformException(ConstantEnum.NO_ALIYUN_CONFIG);
- }
- return new OSSClient(endpoint, accessKeyId, accessKeySecret);
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/QiniuStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/QiniuStorageImpl.java
deleted file mode 100644
index 4d441935c2e8a92e3b5cbbe19bee0a4f65d7ef96..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/QiniuStorageImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.storage.Storage;
-import org.springframework.stereotype.Component;
-
-/**
- * 七牛云OSS-存储接口抽象实现类
- */
-@Slf4j
-@Component
-public class QiniuStorageImpl extends AbstractStorage implements Storage {
-
- @Override
- public void deleteFile(String storePath) {
-
- }
-
- @Override
- public String writeToStore(byte[] bytes, String pathAndFileName) throws Exception {
- return null;
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/UpYunStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/UpYunStorageImpl.java
deleted file mode 100644
index a3895cac3a54f5964baae66beb38740d3d1e0beb..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/UpYunStorageImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.base.storage.impl;
-
-import org.micai.platform.auth.base.storage.Storage;
-
-public class UpYunStorageImpl extends AbstractStorage implements Storage {
-
- @Override
- public void deleteFile(String storePath) {
-
- }
-
- @Override
- public String writeToStore(byte[] bytes, String pathAndFileName) throws Exception {
- return null;
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/config/SiteOptions.java b/src/main/java/org/micai/platform/auth/config/SiteOptions.java
deleted file mode 100644
index 391e61bc68901d8e39dc3b18661cd2487b326634..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/config/SiteOptions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.micai.platform.auth.config;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author : langhsu
- * @version : 1.0
- * @date : 2019/01/18
- */
-@Component
-@ConfigurationProperties(prefix = "site")
-public class SiteOptions {
-
- /**
- * 运行文件存储路径
- */
- private String location;
-
- /**
- * 属性配置
- */
- private Map options = new HashMap<>();
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public Integer[] getIntegerArrayValue(String key, String separator) {
- String value = getValue(key);
- String[] array = value.split(separator);
- Integer[] ret = new Integer[array.length];
- for (int i = 0; i < array.length; i ++) {
- ret[i] = Integer.parseInt(array[i]);
- }
- return ret;
- }
-
- public Integer getIntegerValue(String key) {
- return Integer.parseInt(options.get(key));
- }
-
- public String getValue(String key) {
- String value = options.get(key);
- return null != value ? value.trim() : null;
- }
-
- public boolean hasValue(String key) {
- return StringUtils.isNotBlank(options.get(key));
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/config/ThreadConfig.java b/src/main/java/org/micai/platform/auth/config/ThreadConfig.java
deleted file mode 100644
index 5135f45cc91b5e63c37c659cf20a951b23d53eb9..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/config/ThreadConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.micai.platform.auth.config;
-
-import org.micai.platform.auth.utils.ApplicationUtil;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-/**
- * @FileName: ThreadConfig
- * @Author: zhaoxinguo
- * @Date: 2019/3/20 18:24
- * @Description: 线程池配置
- */
-@Configuration
-public class ThreadConfig {
-
- @Bean
- public ThreadPoolTaskExecutor taskExecutor() {
- ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setCorePoolSize(20);
- executor.setMaxPoolSize(100);
- executor.setKeepAliveSeconds(30000);
- executor.setQueueCapacity(100);
- executor.setThreadNamePrefix("default_task_executor_thread");
- executor.initialize();
- return executor;
- }
-
- @Bean
- public BCryptPasswordEncoder bCryptPasswordEncoder() {
- return new BCryptPasswordEncoder();
- }
-
- @Bean
- public ApplicationUtil applicationUtil() {
- return new ApplicationUtil();
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/controller/ImageCodeController.java b/src/main/java/org/micai/platform/auth/controller/ImageCodeController.java
deleted file mode 100644
index 64bbe2bfc5977cf477144e52985d430f8cbd970f..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/ImageCodeController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.micai.platform.auth.controller;
-
-import cn.hutool.captcha.CaptchaUtil;
-import cn.hutool.captcha.LineCaptcha;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @Author liuCong
- * @Date 2022/1/4 10:53
- * @ClassName ImageCodeController
- * @Description
- */
-@Controller
-@Api(tags = "图形验证码", value = "图形验证码")
-@RequestMapping("/image")
-@Slf4j
-public class ImageCodeController extends BaseController {
-
-
- @GetMapping("/code")
- @ApiOperation(value = "获取图形验证码", notes = "获取图形验证码")
- public void getImage(HttpServletRequest request, HttpServletResponse response) {
- try {
- LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(ConstantCode.INT_TWO_HUNDRED, ConstantCode.INT_ONE_HUNDRED);
- String code = lineCaptcha.getCode();
- log.info("code info:{}", code);
- request.getSession().setAttribute(ConstantCode.SESSION_KEY, code);
- ServletOutputStream outputStream = response.getOutputStream();
- lineCaptcha.write(outputStream);
- outputStream.flush();
- outputStream.close();
- } catch (Exception e) {
- log.error("error info:", e);
- }
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java b/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java
deleted file mode 100644
index 1a1cd034d6103bb444d9209c0c581f9a737c606f..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.micai.platform.auth.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.bo.*;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.base.result.Result;
-import org.micai.platform.auth.service.OrganInfoService;
-import org.micai.platform.auth.vo.OrganListVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@RestController
-@RequestMapping("/organ")
-@Api(tags = "组织管理", value = "组织管理")
-@Slf4j
-public class OrganInfoController {
-
- @Autowired
- private OrganInfoService organInfoService;
-
- @ApiOperation(value = "获取组织列表", notes = "获取组织列表")
- @PostMapping("/getOrganList")
- @PreAuthorize("hasAnyAuthority('root')")
- public Result getOrganList(@RequestBody OrganFindBo bo){
- Result result;
- try {
- Page page = organInfoService.getOrganList(bo);
- result = new Result(ConstantEnum.SUCCESS,page);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
-
- @ApiOperation(value = "更新组织信息", notes = "更新组织信息")
- @PostMapping("/updateOrgan")
- @PreAuthorize("hasAnyAuthority('root')")
- public Result updateOrgan(@RequestBody @Valid OrganUpdateBo bo){
- Result result;
- try {
- organInfoService.updateOrgan(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "新增组织", notes = "新增组织")
- @PostMapping("/saveOrgan")
- @PreAuthorize("hasAnyAuthority('root')")
- public Result saveOrgan(@RequestBody @Valid OrganSaveBo bo){
- Result result;
- try {
- organInfoService.saveOrgan(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "删除组织", notes = "删除组织")
- @PostMapping("/delOrgan")
- @PreAuthorize("hasAnyAuthority('root')")
- public Result delOrgan(@RequestBody @Valid OrganDelBo bo){
- Result result;
- try {
- organInfoService.delOrgan(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/OrganUserController.java b/src/main/java/org/micai/platform/auth/controller/OrganUserController.java
deleted file mode 100644
index b7afab99dd6fa18b973fad32b4850bf0231da081..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/OrganUserController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.micai.platform.auth.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author liucong
- * @since 2022-01-13
- */
-@RestController
-@RequestMapping("/Tb/organUser")
-public class OrganUserController {
-
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/PermissionMenuController.java b/src/main/java/org/micai/platform/auth/controller/PermissionMenuController.java
deleted file mode 100644
index 17a87072cde53c5042632d3ce785e8b433374694..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/PermissionMenuController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.micai.platform.auth.controller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.base.result.Result;
-import org.micai.platform.auth.bo.*;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.service.PermissionMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author liucong
- * @since 2022-01-13
- */
-@RestController
-@RequestMapping("/permissionMenu")
-@Slf4j
-@Api(tags = "权限菜单管理", value = "权限菜单管理")
-public class PermissionMenuController extends BaseController{
- @Autowired
- private PermissionMenuService permissionMenuService;
-
-
- @ApiOperation(value = "更新角色菜单权限", notes = "更新角色菜单权限")
- @PostMapping("/update")
- @PreAuthorize("hasAnyAuthority('sys:permissionMenu:update')")
- public Result updatePM(@RequestBody @Valid PermissionMenuUpdateBo bo){
- Result result;
- try {
- permissionMenuService.updatePM(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "新增角色菜单权限", notes = "新增角色菜单权限")
- @PostMapping("/save")
- @PreAuthorize("hasAnyAuthority('sys:permissionMenu:save')")
- public Result savePM(@RequestBody @Valid PermissionMenuSaveBo bo){
- Result result;
- try {
- permissionMenuService.savePM(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "删除角色菜单权限", notes = "删除角色菜单权限")
- @DeleteMapping("/del")
- @PreAuthorize("hasAnyAuthority('sys:permissionMenu:del')")
- public Result delPM(@RequestBody @Valid PermissionMenuDelBo bo){
- Result result;
- try {
- permissionMenuService.delPM(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/SysDictController.java b/src/main/java/org/micai/platform/auth/controller/SysDictController.java
deleted file mode 100644
index ef77b8ae517119de0837cab9f50598a9e2066b97..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/SysDictController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.micai.platform.auth.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@RestController
-@RequestMapping("/Tb/sysDict")
-public class SysDictController {
-
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java b/src/main/java/org/micai/platform/auth/controller/SysMenuController.java
deleted file mode 100644
index d593be81c3a4ebd5fc57450dafeef0681439ce30..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.micai.platform.auth.controller;
-
-
-import cn.hutool.core.lang.tree.Tree;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.base.result.Result;
-import org.micai.platform.auth.bo.MenuDelBo;
-import org.micai.platform.auth.bo.MenuSaveBo;
-import org.micai.platform.auth.bo.MenuUpdateBo;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.service.SysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@RestController
-@RequestMapping("/sysMenu")
-@Api(tags = "菜单管理", value = "菜单管理")
-@Slf4j
-public class SysMenuController extends BaseController{
-
- @Autowired
- private SysMenuService sysMenuService;
-
-
- @PostMapping("/list")
- @PreAuthorize("hasAnyAuthority('sys:sysMenu:list')")
- @ApiOperation(value = "查询菜单", notes = "登录后查询菜单列表")
- public Result find() {
- Result result;
- try {
- List> treeList = sysMenuService.find();
- result = new Result(ConstantEnum.SUCCESS,treeList);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
-
- @ApiOperation(value = "更新菜单", notes = "更新菜单")
- @PostMapping("/update")
- @PreAuthorize("hasAnyAuthority('sys:sysMenu:update')")
- public Result updateMenu(@RequestBody @Valid MenuUpdateBo bo){
- Result result;
- try {
- sysMenuService.updateMenu(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "新增菜单", notes = "新增菜单")
- @PostMapping("/save")
- @PreAuthorize("hasAnyAuthority('sys:sysMenu:save')")
- public Result saveMenu(@RequestBody @Valid MenuSaveBo bo){
- Result result;
- try {
- sysMenuService.saveMenu(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-
- @ApiOperation(value = "删除菜单", notes = "删除菜单")
- @DeleteMapping("/del")
- @PreAuthorize("hasAnyAuthority('sys:sysMenu:del')")
- public Result delMenu(@RequestBody @Valid MenuDelBo bo){
- Result result;
- try {
- sysMenuService.delMenu(bo);
- result = new Result(ConstantEnum.SUCCESS);
- } catch (PlatformException e) {
- log.error("error info:",e);
- result = new Result(e.getErrorCode(), e.getErrorMessage());
- } catch (Exception e) {
- log.error("error info:",e);
- result = new Result(ConstantEnum.FAIL);
- }
- return result;
- }
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/SysRegionController.java b/src/main/java/org/micai/platform/auth/controller/SysRegionController.java
deleted file mode 100644
index 75bc2aba7cf06f1f23c6a525b3334336add2c3f8..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/SysRegionController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.micai.platform.auth.controller;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.base.result.Result;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.entity.SysRegion;
-import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.service.SysRegionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 区域管理控制层
- * @author yangtao
- * @since 2021-12-31
- */
-@Slf4j
-@Api(tags = "区域管理", value = "区域管理")
-@RestController
-@RequestMapping("/sysRegion")
-public class SysRegionController {
-
- @Autowired
- private SysRegionService sysRegionService;
-
- @ApiOperation(value = "根据区域用户名查询",notes = "根据区域用户名查询")
- @PostMapping("/findByRegionName")
- public Result findByRegionName(@RequestBody SysRegion sysRegion) throws Exception {
- SysRegion sysRegion1 = sysRegionService.findByRegionName(sysRegion.getRegionName());
- return new Result(ConstantEnum.SUCCESS);
- }
-
-
- @ApiOperation(value = "获取区域列表",notes = "获取区域列表")
- @GetMapping("/sysRegionList")
- public Map sysRegionList() throws Exception{
- List sysRegions = sysRegionService.findSysRegionList();
- Map map = new HashMap();
- map.put("sysRegions",sysRegions);
- return map;
- }
-
-
-
-
-
-}
-
diff --git a/src/main/java/org/micai/platform/auth/controller/UploadController.java b/src/main/java/org/micai/platform/auth/controller/UploadController.java
deleted file mode 100644
index cc6ff85ddddc570e64931072715797e8b83b543a..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/controller/UploadController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.micai.platform.auth.controller;
-
-import cn.hutool.core.util.ObjectUtil;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.base.result.UploadResult;
-import org.micai.platform.auth.utils.FileKit;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.ServletRequestUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 文件上传
- *
- */
-@Controller
-@RequestMapping("/upload")
-@Api(tags = "文件上传", value = "文件上传")
-@Slf4j
-public class UploadController extends BaseController {
-
- @PostMapping("/store")
- @ResponseBody
- public UploadResult store(@RequestParam(value = "file", required = false) MultipartFile file,
- HttpServletRequest request){
- // 检查空
- if (ObjectUtil.isEmpty(file)) {
- return new UploadResult(ConstantEnum.NO_FILE);
- }
-
- String fileName = file.getOriginalFilename();
-
- // 检查类型
- if (!FileKit.checkFileType(fileName)) {
- return new UploadResult(ConstantEnum.TYPE);
- }
-
- // 检查大小
- String limitSize = siteOptions.getValue(ConstantCode.STORAGE_LIMIT_SIZE);
- if (ObjectUtil.isEmpty(limitSize)) {
- limitSize = ConstantCode.STR_TWO;
- }
- if (file.getSize() > (Long.parseLong(limitSize) * ConstantCode.DING * ConstantCode.DING)) {
- return new UploadResult(ConstantEnum.SIZE);
- }
-
- // 保存图片
- try {
- String path = storageFactory.get().store(file, ConstantCode.thumbnailPath);
- return new UploadResult(ConstantEnum.SUCCESS).setName(fileName).setPath(path).setSize(file.getSize());
- } catch (Exception e) {
- log.error("error info:",e);
- return new UploadResult(ConstantEnum.UNKNOWN);
- }
- }
-
- @PostMapping("/storeScale")
- @ResponseBody
- public UploadResult storeScale(@RequestParam(value = "file", required = false) MultipartFile file,
- HttpServletRequest request) {
- String crop = request.getParameter("crop");
- int size = ServletRequestUtils.getIntParameter(request, ConstantCode.SIZE, siteOptions.getIntegerValue(ConstantCode.STORAGE_MAX_WIDTH));
-
- // 检查空
- if (ObjectUtil.isEmpty(file)) {
- return new UploadResult(ConstantEnum.NO_FILE);
- }
-
- String fileName = file.getOriginalFilename();
-
- // 检查类型
- if (!FileKit.checkFileType(fileName)) {
- return new UploadResult(ConstantEnum.TYPE);
- }
-
- // 检查大小
- String limitSize = siteOptions.getValue(ConstantCode.STORAGE_LIMIT_SIZE);
- if (ObjectUtil.isEmpty(limitSize)) {
- limitSize = ConstantCode.STR_TWO;
- }
- if (file.getSize() > (Long.parseLong(limitSize) * ConstantCode.DING * ConstantCode.DING)) {
- return new UploadResult(ConstantEnum.SIZE);
- }
-
- // 保存图片
- try {
- String path;
- if (ObjectUtil.isEmpty(crop)) {
- Integer[] imageSize = siteOptions.getIntegerArrayValue(crop, ConstantCode.SEPARATOR_X);
- int width = ServletRequestUtils.getIntParameter(request, ConstantCode.WIDTH, imageSize[ConstantCode.INT_ZERO]);
- int height = ServletRequestUtils.getIntParameter(request, ConstantCode.HEIGHT, imageSize[ConstantCode.INT_ONE]);
- path = storageFactory.get().storeScale(file, ConstantCode.thumbnailPath, width, height);
- } else {
- path = storageFactory.get().storeScale(file, ConstantCode.thumbnailPath, size);
- }
- return new UploadResult(ConstantEnum.SUCCESS).setName(fileName).setPath(path).setSize(file.getSize());
- } catch (Exception e) {
- log.error("error info:",e);
- return new UploadResult(ConstantEnum.UNKNOWN);
- }
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java b/src/main/java/org/micai/platform/auth/entity/OrganInfo.java
deleted file mode 100644
index 9064c2153bc92e1f8f4058bd750e55bef97d9f78..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.micai.platform.auth.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- *
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="OrganInfo对象", description="")
-public class OrganInfo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键id")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "机构编码")
- private String code;
-
- @ApiModelProperty(value = "机构名称")
- private String name;
-
- @ApiModelProperty(value = "机构类型")
- private String type;
-
- @ApiModelProperty(value = "创建人")
- private Long createUserId;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- @ApiModelProperty(value = "修改人")
- private Long updateUserId;
-
- @ApiModelProperty(value = "修改时间")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- @ApiModelProperty(value = "状态 默认01 启用")
- private String status;
-
- @ApiModelProperty(value = "版本号")
- @Version
- private Long version;
-
-
-}
diff --git a/src/main/java/org/micai/platform/auth/entity/SysDict.java b/src/main/java/org/micai/platform/auth/entity/SysDict.java
deleted file mode 100644
index 59dc14bf505117044349dd5e9115373b0b4e33db..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/entity/SysDict.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.micai.platform.auth.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- *
- *
- *
- * @author liucong
- * @since 2021-12-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SysDict对象", description="")
-public class SysDict implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键id")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "字段名称")
- private String dictName;
-
- @ApiModelProperty(value = "字段编码")
- private String dictCode;
-
- @ApiModelProperty(value = "创建人id")
- private Long createUserId;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- @ApiModelProperty(value = "修改人id")
- private Long updateUserId;
-
- @ApiModelProperty(value = "修改时间")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- @ApiModelProperty(value = "状态: 01 启用 02停用")
- private String status;
-
- @ApiModelProperty(value = "版本号")
- @Version
- private Long version;
-
-
-}
diff --git a/src/main/java/org/micai/platform/auth/entity/SysMenu.java b/src/main/java/org/micai/platform/auth/entity/SysMenu.java
deleted file mode 100644
index 21698c7c05ec08a62318e434f6a96d48e539cded..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/entity/SysMenu.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.micai.platform.auth.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- *
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SysMenu对象", description="")
-public class SysMenu implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键id")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "菜单编码")
- private String menuCode;
-
- @ApiModelProperty(value = "菜单名称")
- private String menuName;
-
- @ApiModelProperty(value = "业务系统标识，区分不同业务系统菜单")
- private String systemCode;
-
- @ApiModelProperty(value = "业务系统名称")
- private String systemName;
-
- @ApiModelProperty(value = "终端类型，00：平台")
- private String application;
-
- @ApiModelProperty(value = "父级菜单编码")
- private String parentCode;
-
- @ApiModelProperty(value = "菜单图标")
- private String menuIcon;
-
- @ApiModelProperty(value = "菜单访问路径")
- private String url;
-
- @ApiModelProperty(value = "菜单打开类型，1:路由 2:新标签页 3:iframe")
- private String openType;
-
- @ApiModelProperty(value = "序号")
- private Integer sn;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- @ApiModelProperty(value = "创建人")
- private Long createUserId;
-
- @ApiModelProperty(value = "修改人")
- private Long updateUserId;
-
- @ApiModelProperty(value = "修改时间")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- @ApiModelProperty(value = "启用标识 01 启用")
- private String status;
-
- @ApiModelProperty(value = "版本号")
- @Version
- private Long version;
-
-
-}
diff --git a/src/main/java/org/micai/platform/auth/entity/SysRegion.java b/src/main/java/org/micai/platform/auth/entity/SysRegion.java
deleted file mode 100644
index f3f98e70809ab32e22c8b0a85a2063699a45af8c..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/entity/SysRegion.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.micai.platform.auth.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.Version;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- * 区域地址表
- *
- *
- * @author yangtao
- * @since 2021-12-31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SysRegion对象", description="区域地址表")
-public class SysRegion implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "区域主键编号")
- @TableId(value = "region_id", type = IdType.AUTO)
- private String regionId;
-
- @ApiModelProperty(value = "区域名称")
- private String regionName;
-
- @ApiModelProperty(value = "区域缩写")
- private String regionShortName;
-
- @ApiModelProperty(value = "行政区域编号")
- private String regionCode;
-
- @ApiModelProperty(value = "区域父id")
- private String regionParentId;
-
- @ApiModelProperty(value = "区域级别 1-省、自治区、直辖市 2-地级市、地区、自治州、盟 3-市辖区、县级市、县")
- private Integer regionLevel;
-
- @ApiModelProperty(value = "创建人")
- private Long createUserId;
-
- @ApiModelProperty(value = "创建时间")
- private Date createTime;
-
- @ApiModelProperty(value = "修改人")
- private Long updateUserId;
-
- @ApiModelProperty(value = "修改时间")
- private Date updateTime;
-
- @ApiModelProperty(value = "版本号")
- @Version
- private Long version;
-
-
-}
diff --git a/src/main/java/org/micai/platform/auth/filter/ImageCodeValidateFilter.java b/src/main/java/org/micai/platform/auth/filter/ImageCodeValidateFilter.java
deleted file mode 100644
index 6d733b8e23396f9df12c2eeba59f1177196b4da9..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/filter/ImageCodeValidateFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.micai.platform.auth.filter;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.micai.platform.auth.base.exception.MyAuthException;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.handler.CustomAuthenticationFailureHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @Author liuCong
- * @Date 2022/1/4 11:25
- * @ClassName ImageCodeValidateFilter
- * @Description
- */
-@Component
-public class ImageCodeValidateFilter extends OncePerRequestFilter {
- @Autowired
- private CustomAuthenticationFailureHandler customAuthenticationFailureHandler;
-
- @Value("${image.code.flag}")
- private boolean imageCodeFlag;
-
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
- try {
- if (imageCodeFlag){
- String code = request.getParameter(ConstantCode.IMAGE_CODE);
- if (ObjectUtil.isEmpty(code)) {
- throw new MyAuthException(ConstantEnum.IMAGE_ERROR);
- }
- String imageCode = (String) request.getSession().getAttribute(ConstantCode.SESSION_KEY);
- if (ObjectUtil.isEmpty(imageCode) && !imageCode.equals(code)){
- throw new MyAuthException(ConstantEnum.IMAGE_ERROR);
- }
- }
- } catch (MyAuthException e) {
- customAuthenticationFailureHandler.onAuthenticationFailure(request,response,e);
- }
-
- filterChain.doFilter(request,response);
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/OrganInfoMapper.java b/src/main/java/org/micai/platform/auth/mapper/OrganInfoMapper.java
deleted file mode 100644
index 1c8a58d7581b8ec0463cfcbd1d1ae4d7959ac82d..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/OrganInfoMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import org.micai.platform.auth.entity.OrganInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface OrganInfoMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/OrganUserMapper.java b/src/main/java/org/micai/platform/auth/mapper/OrganUserMapper.java
deleted file mode 100644
index bc426d37ac73a788d9dd88fdbaac4e8066523bb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/OrganUserMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import org.micai.platform.auth.entity.OrganUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface OrganUserMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/PermissionMenuMapper.java b/src/main/java/org/micai/platform/auth/mapper/PermissionMenuMapper.java
deleted file mode 100644
index 501110a4492697625896f03003a6e1a9bf6b00ff..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/PermissionMenuMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.micai.platform.auth.entity.PermissionMenu;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface PermissionMenuMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/SysDictItemMapper.java b/src/main/java/org/micai/platform/auth/mapper/SysDictItemMapper.java
deleted file mode 100644
index 78b16fdda9a3cc1e054566f6d6a0a356b05ec4a7..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/SysDictItemMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.micai.platform.auth.entity.SysDictItem;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-10
- */
-public interface SysDictItemMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/SysDictMapper.java b/src/main/java/org/micai/platform/auth/mapper/SysDictMapper.java
deleted file mode 100644
index 26a634adf60b440be0f6a5886d82cc9e40b664b7..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/SysDictMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import org.micai.platform.auth.entity.SysDict;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface SysDictMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/SysMenuMapper.java b/src/main/java/org/micai/platform/auth/mapper/SysMenuMapper.java
deleted file mode 100644
index 7c90b05a8636358233a32798c3161761f71a1cb6..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/SysMenuMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import org.micai.platform.auth.entity.SysMenu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface SysMenuMapper extends BaseMapper {
-
-}
diff --git a/src/main/java/org/micai/platform/auth/mapper/SysRegionMapper.java b/src/main/java/org/micai/platform/auth/mapper/SysRegionMapper.java
deleted file mode 100644
index 91ce6511d76e0acd4bb1483c3bab33695d4d7e52..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/mapper/SysRegionMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.micai.platform.auth.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.micai.platform.auth.entity.SysRegion;
-
-
-/**
- *
- * 区域地址表 Mapper 接口
- *
- *
- * @author yangtao
- * @since 2021-12-31
- */
-public interface SysRegionMapper extends BaseMapper {
-
- SysRegion findByRegionName(String regionName);
-
-}
diff --git a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java b/src/main/java/org/micai/platform/auth/service/OrganInfoService.java
deleted file mode 100644
index 5016f2fd37023816776621d50595f472d11800c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.micai.platform.auth.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.micai.platform.auth.bo.OrganDelBo;
-import org.micai.platform.auth.bo.OrganFindBo;
-import org.micai.platform.auth.bo.OrganSaveBo;
-import org.micai.platform.auth.bo.OrganUpdateBo;
-import org.micai.platform.auth.entity.OrganInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.vo.OrganListVo;
-
-/**
- *
- * 服务类
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface OrganInfoService extends IService {
-
- Page getOrganList(OrganFindBo bo);
-
- void updateOrgan(OrganUpdateBo bo);
-
- void saveOrgan(OrganSaveBo bo);
-
- void delOrgan(OrganDelBo bo);
-}
diff --git a/src/main/java/org/micai/platform/auth/service/PermissionMenuService.java b/src/main/java/org/micai/platform/auth/service/PermissionMenuService.java
deleted file mode 100644
index 68688ce6398bab193075995596531064ff8e0e5e..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/PermissionMenuService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.micai.platform.auth.service;
-
-import org.micai.platform.auth.bo.PermissionMenuDelBo;
-import org.micai.platform.auth.bo.PermissionMenuSaveBo;
-import org.micai.platform.auth.bo.PermissionMenuUpdateBo;
-
-/**
- * @Author liuCong
- * @Date 2022/1/13 16:54
- * @ClassName PermissionMenuService
- * @Description
- */
-public interface PermissionMenuService {
- void updatePM(PermissionMenuUpdateBo bo) throws Exception;
-
- void savePM(PermissionMenuSaveBo bo) throws Exception;
-
- void delPM(PermissionMenuDelBo bo) throws Exception;
-}
diff --git a/src/main/java/org/micai/platform/auth/service/SysMenuService.java b/src/main/java/org/micai/platform/auth/service/SysMenuService.java
deleted file mode 100644
index e9bccda623925552ba2f59184e747c115e643aed..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/SysMenuService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.micai.platform.auth.service;
-
-import cn.hutool.core.lang.tree.Tree;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.bo.MenuDelBo;
-import org.micai.platform.auth.bo.MenuSaveBo;
-import org.micai.platform.auth.bo.MenuUpdateBo;
-import org.micai.platform.auth.entity.SysMenu;
-
-import java.util.List;
-
-/**
- *
- * 服务类
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-public interface SysMenuService extends IService {
-
- List> find() throws Exception;
-
- void updateMenu(MenuUpdateBo bo) throws Exception;
-
- void saveMenu(MenuSaveBo bo) throws Exception;
-
- void delMenu(MenuDelBo bo) throws Exception;
-}
diff --git a/src/main/java/org/micai/platform/auth/service/SysRegionService.java b/src/main/java/org/micai/platform/auth/service/SysRegionService.java
deleted file mode 100644
index df1b2340cbbc0630bdebbba3d633a012af72775f..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/SysRegionService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.micai.platform.auth.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.micai.platform.auth.entity.SysRegion;
-import org.micai.platform.auth.entity.User;
-
-import java.util.List;
-
-/**
- *
- * 区域地址表 服务类
- *
- *
- * @author yangtao
- * @since 2021-12-31
- */
-public interface SysRegionService extends IService {
- /**
- * 根据区域名称进行查询
- * @param regionName
- * @return
- */
- SysRegion findByRegionName(String regionName) throws Exception;
-
- /**
- * 获取区域列表
- * @return
- */
- List findSysRegionList() throws Exception;
-
-}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/OrganInfoServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/OrganInfoServiceImpl.java
deleted file mode 100644
index 4960b044539eae614fccf17de52ac944956bfca2..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/impl/OrganInfoServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.micai.platform.auth.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.micai.platform.auth.bo.OrganDelBo;
-import org.micai.platform.auth.bo.OrganFindBo;
-import org.micai.platform.auth.bo.OrganSaveBo;
-import org.micai.platform.auth.bo.OrganUpdateBo;
-import org.micai.platform.auth.entity.OrganInfo;
-import org.micai.platform.auth.mapper.OrganInfoMapper;
-import org.micai.platform.auth.service.OrganInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.vo.OrganListVo;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@Service
-public class OrganInfoServiceImpl extends ServiceImpl implements OrganInfoService {
-
- @Override
- public Page getOrganList(OrganFindBo bo) {
- return null;
- }
-
- @Override
- public void updateOrgan(OrganUpdateBo bo) {
-
- }
-
- @Override
- public void saveOrgan(OrganSaveBo bo) {
-
- }
-
- @Override
- public void delOrgan(OrganDelBo bo) {
-
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/PermissionMenuServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/PermissionMenuServiceImpl.java
deleted file mode 100644
index 5bf5a2fbd605d447d10a0b5463752101e9a5a0f6..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/impl/PermissionMenuServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.micai.platform.auth.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.bo.PermissionMenuDelBo;
-import org.micai.platform.auth.bo.PermissionMenuSaveBo;
-import org.micai.platform.auth.bo.PermissionMenuUpdateBo;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.PermissionMenu;
-import org.micai.platform.auth.mapper.PermissionMenuMapper;
-import org.micai.platform.auth.service.PermissionMenuService;
-import org.micai.platform.auth.utils.AuthenticationManger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Author liuCong
- * @Date 2022/1/13 16:54
- * @ClassName PermissionMenuServiceImpl
- * @Description
- */
-@Service
-public class PermissionMenuServiceImpl extends ServiceImpl implements PermissionMenuService {
- @Autowired
- private PermissionMenuMapper permissionMenuMapper;
-
- @Override
- public void updatePM(PermissionMenuUpdateBo bo) throws Exception {
- PermissionMenu permissionMenu = BeanUtil.copyProperties(bo, PermissionMenu.class);
- UserAuthenticationDto authentication = AuthenticationManger.getAuthentication();
- permissionMenu.setUpdateUserId(authentication.getId());
- PermissionMenu permissionMenuEn = permissionMenuMapper.selectById(permissionMenu.getId());
- permissionMenu.setVersion(permissionMenuEn.getVersion());
- permissionMenuMapper.updateById(permissionMenu);
- }
-
- @Override
- public void savePM(PermissionMenuSaveBo bo) throws Exception {
- PermissionMenu permissionMenu = BeanUtil.copyProperties(bo, PermissionMenu.class);
-
- //不能有重复的
- List permissionMenus = permissionMenuMapper.selectList(new QueryWrapper().lambda()
- .eq(PermissionMenu::getPermissionId, bo.getPermissionId())
- .eq(PermissionMenu::getMenuId, bo.getMenuId()));
-
- if (ObjectUtil.isNotEmpty(permissionMenus)) {
- throw new PlatformException(ConstantEnum.DATA_DUPLICATION);
- }
-
- UserAuthenticationDto authentication = AuthenticationManger.getAuthentication();
- permissionMenu
- .setCreateUserId(authentication.getId())
- .setUpdateUserId(authentication.getId());
- permissionMenuMapper.insert(permissionMenu);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delPM(PermissionMenuDelBo bo) throws Exception {
- List idList = bo.getIdList();
- int deleteBatchIds = permissionMenuMapper.deleteBatchIds(idList);
- if (idList.size() != deleteBatchIds){
- throw new PlatformException(ConstantEnum.UPDATE_ERROR);
- }
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java
deleted file mode 100644
index 8edcb2d4a9bed483734d9afc6fa1c64b6822bcb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.micai.platform.auth.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNodeConfig;
-import cn.hutool.core.lang.tree.TreeUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.bo.MenuDelBo;
-import org.micai.platform.auth.bo.MenuSaveBo;
-import org.micai.platform.auth.bo.MenuUpdateBo;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.dto.UserAuthenticationDto;
-import org.micai.platform.auth.entity.Permission;
-import org.micai.platform.auth.entity.PermissionMenu;
-import org.micai.platform.auth.entity.SysMenu;
-import org.micai.platform.auth.base.exception.PlatformException;
-import org.micai.platform.auth.mapper.PermissionMapper;
-import org.micai.platform.auth.mapper.PermissionMenuMapper;
-import org.micai.platform.auth.mapper.SysMenuMapper;
-import org.micai.platform.auth.service.SysMenuService;
-import org.micai.platform.auth.utils.AuthenticationManger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author liucong
- * @since 2021-12-06
- */
-@Service
-public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService {
-
- @Autowired
- private PermissionMapper permissionMapper;
-
- @Autowired
- private PermissionMenuMapper permissionMenuMapper;
-
- @Autowired
- private SysMenuMapper sysMenuMapper;
-
- @Override
- public List> find() throws Exception{
- UserAuthenticationDto authentication = AuthenticationManger.getAuthentication();
- List permissions = authentication.getPermissions();
- List permissionList = permissionMapper.selectList(new QueryWrapper().lambda().in(Permission::getPermissionCode, permissions));
- List permissionCodeList = permissionList.stream().map(Permission::getId).collect(Collectors.toList());
- List permissionMenus = permissionMenuMapper.selectList(new QueryWrapper().in("permission_id",permissionCodeList));
- if (ObjectUtil.isEmpty(permissionMenus)){
- return null;
- }
- List menuIds = permissionMenus.stream().map(PermissionMenu::getMenuId).collect(Collectors.toList());
- List menuList = sysMenuMapper.selectList(new QueryWrapper().in("id", menuIds).eq("status", ConstantCode.STR_Z_ONE));
- if (ObjectUtil.isNotEmpty(menuList)){
- //配置
- TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
- // 自定义属性名 都要默认值的
- treeNodeConfig.setWeightKey("order");
- treeNodeConfig.setIdKey("rid");
- // 最大递归深度
- treeNodeConfig.setDeep(ConstantCode.INT_THREE);
- //转换器 00代表根目录
- return TreeUtil.build(menuList, ConstantCode.STR_DOUBLE_ZONE, treeNodeConfig,
- (treeNode, tree) -> {
- tree.setId(treeNode.getMenuCode());
- tree.setParentId(treeNode.getParentCode());
- tree.setWeight(treeNode.getSn());
- // 扩展属性 ...
- tree.putExtra("menuIcon", treeNode.getMenuIcon());
- tree.putExtra("url", treeNode.getUrl());
- tree.putExtra("openType", treeNode.getOpenType());
- tree.putExtra("sn", treeNode.getSn());
- tree.putExtra("menuName", treeNode.getMenuName());
- tree.putExtra("menuCode", treeNode.getMenuCode());
- });
- }
-
- return null;
- }
-
- @Override
- public void updateMenu(MenuUpdateBo bo) throws Exception {
- SysMenu sysMenu = BeanUtil.copyProperties(bo, SysMenu.class);
- UserAuthenticationDto authentication = AuthenticationManger.getAuthentication();
- sysMenu.setUpdateUserId(authentication.getId());
- SysMenu sysMenuEn = sysMenuMapper.selectById(sysMenu.getId());
- sysMenu.setVersion(sysMenuEn.getVersion());
- int i = sysMenuMapper.updateById(sysMenu);
- if (ConstantCode.INT_ONE != i){
- throw new PlatformException(ConstantEnum.UPDATE_ERROR);
- }
- }
-
- @Override
- public void saveMenu(MenuSaveBo bo) throws Exception {
- SysMenu sysMenu = BeanUtil.copyProperties(bo, SysMenu.class);
- UserAuthenticationDto authentication = AuthenticationManger.getAuthentication();
- sysMenu.setMenuCode(RandomUtil.randomString(ConstantCode.INT_TEN))
- .setCreateUserId(authentication.getId())
- .setUpdateUserId(authentication.getId())
- .setStatus(ConstantCode.STR_Z_ONE);
- int i = sysMenuMapper.insert(sysMenu);
- if (ConstantCode.INT_ONE != i){
- throw new PlatformException(ConstantEnum.UPDATE_ERROR);
- }
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delMenu(MenuDelBo bo) throws Exception {
- List idList = bo.getIdList();
- int deleteBatchIds = permissionMapper.deleteBatchIds(idList);
- if (idList.size() != deleteBatchIds){
- throw new PlatformException(ConstantEnum.UPDATE_ERROR);
- }
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/SysRegionServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/SysRegionServiceImpl.java
deleted file mode 100644
index cc2de03de2d506eb949fcc0fd83e078517d1a4ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/service/impl/SysRegionServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.micai.platform.auth.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.micai.platform.auth.entity.SysRegion;
-import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.mapper.SysRegionMapper;
-import org.micai.platform.auth.service.SysRegionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- *
- * 区域地址表 服务实现类
- *
- *
- * @author yangtao
- * @since 2021-12-31
- */
-@Service
-public class SysRegionServiceImpl extends ServiceImpl implements SysRegionService {
-
- @Autowired
- private SysRegionMapper sysRegionMapper;
-
- @Override
- public SysRegion findByRegionName(String regionName) {
- if (ObjectUtil.isNotEmpty(regionName)){
- SysRegion sysRegion = sysRegionMapper.selectOne(new QueryWrapper().lambda().eq(SysRegion::getRegionName, regionName));
- return sysRegion;
- }
- return null;
- }
-
- @Override
- public List findSysRegionList() {
- List sysRegionList = sysRegionMapper.selectList(Wrappers.lambdaQuery());
- return sysRegionList;
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/utils/FileKit.java b/src/main/java/org/micai/platform/auth/utils/FileKit.java
deleted file mode 100644
index 0b7b03c90af07bdd648869d4873ecfe85ef29f04..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/FileKit.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import com.sun.istack.internal.NotNull;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author - langhsu
- * @create - 2018/3/9
- */
-public class FileKit {
-
- // 文件允许格式
- private final static List allowFiles = Arrays.asList(".gif", ".png", ".jpg", ".jpeg", ".bmp");
- private final static String PREFIX_VIDEO = "video/";
- private final static String PREFIX_IMAGE = "image/";
-
- /**
- * 文件类型判断
- *
- * @param fileName
- * @return
- */
- public static boolean checkFileType(String fileName) {
- Iterator type = allowFiles.iterator();
- while (type.hasNext()) {
- String ext = type.next();
- if (fileName.toLowerCase().endsWith(ext)) {
- return true;
- }
- }
- return false;
- }
-
- public static String getFilename(@NotNull String filename) {
- int pos = filename.lastIndexOf(".");
- return filename.substring(0, pos);
- }
-
- public static String getSuffix(String filename) {
- int pos = filename.lastIndexOf(".");
- return filename.substring(pos);
- }
-
- public static void writeByteArrayToFile(byte[] bytes, String dest) throws IOException {
- FileUtils.writeByteArrayToFile(new File(dest), bytes);
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/utils/FilePathUtils.java b/src/main/java/org/micai/platform/auth/utils/FilePathUtils.java
deleted file mode 100644
index 5c49ce5cbec1b04d2ca825aab79d7c818ebb2f25..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/FilePathUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import org.apache.commons.text.RandomStringGenerator;
-
-/**
- * @author langhsu
- */
-public class FilePathUtils {
- private static final int[] AVATAR_GRIDS = new int[]{3, 3, 3};
- private static final int AVATAR_LENGTH = 9;
- private static final String Y = "/yyyy/";
- private static RandomStringGenerator randomString = new RandomStringGenerator.Builder().withinRange('a', 'z').build();
-
- public static String getAvatar(long key) {
- String r = String.format("%09d", key);
- StringBuffer buf = new StringBuffer(32);
- int pos = 0;
- for (int t : AVATAR_GRIDS) {
- buf.append(r.substring(pos, pos + t));
- pos += t;
- if (pos < AVATAR_LENGTH) {
- buf.append('/');
- }
- }
- return buf.toString();
- }
-
- /**
- * 生成路径和文件名
- * 以当前时间开头加4位随机数的文件名
- *
- * @param originalFilename 原始文件名
- * @return 10位长度文件名+文件后缀
- */
- public static String wholePathName(String originalFilename, String key) {
- StringBuilder builder = new StringBuilder(52);
- builder.append("/_signature/");
- builder.append(key);
- builder.append(FileKit.getSuffix(originalFilename));
- return builder.toString();
- }
-
- public static String wholePathName(String basePath, String ext, String key) {
- return basePath + wholePathName(ext, key);
- }
-
- public static void main(String[] args) {
- String base = FilePathUtils.getAvatar(50);
- System.out.println(String.format("/%s_%d.jpg", base, 100));
- System.out.println(FilePathUtils.wholePathName("a.jpg", "123"));
- }
-
-}
diff --git a/src/main/java/org/micai/platform/auth/utils/JwtHelper.java b/src/main/java/org/micai/platform/auth/utils/JwtHelper.java
deleted file mode 100644
index 0e05aec2fee83e798e750d1a3bade6da610a8cbb..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/JwtHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtBuilder;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import org.springframework.beans.factory.annotation.Value;
-
-import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
-import java.security.Key;
-import java.util.Date;
-
-/**
- * @FileName: JwtHelper
- * @Author: zhaoxinguo
- * @Date: 2018/12/10 19:39
- * @Description: 实现Jwt
- */
-public class JwtHelper {
-
- //token超时时间
- @Value("${jwt.expiration}")
- public long expiration;
-
- //生成token的秘钥
- @Value("${jwt.secret}")
- public String base64Security;
-
- /**
- * 解析token
- * @param jsonWebToken
- * @return
- */
- public Claims parseToken(String jsonWebToken) {
- Claims claims = Jwts.parser().setSigningKey(DatatypeConverter.parseBase64Binary(base64Security)).parseClaimsJws(jsonWebToken).getBody();
- return claims;
- }
-
- /**
- * 新建token
- * @param audience
- * @param issuer
- * @return
- */
- public String createToken(String audience, String issuer) {
- SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
-
- long nowMillis = System.currentTimeMillis();
- Date now = new Date(nowMillis);
-
- // 生成签名密钥
- byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(base64Security);
- Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
-
- // 添加构成JWT的参数
- JwtBuilder builder = Jwts.builder().setHeaderParam("typ", "JWT").setIssuer(issuer).setAudience(audience)
- .signWith(signatureAlgorithm, signingKey);
-
- // 添加Token签发时间
- builder.setIssuedAt(now);
- // 添加Token过期时间
- if (expiration >= 0) {
- long expMillis = nowMillis + expiration;
- Date exp = new Date(expMillis);
- builder.setExpiration(exp).setNotBefore(now);
- }
-
- // 生成JWT
- return builder.compact();
- }
-
- /**
- * 刷新令牌
- *
- * @param claims
- * @return
- */
- public String refreshToken(Claims claims) {
- SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
-
- long nowMillis = System.currentTimeMillis();
- Date now = new Date(nowMillis);
-
- // 生成签名密钥
- byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(base64Security);
- Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
-
- // 添加构成JWT的参数
- JwtBuilder builder = Jwts.builder().setHeaderParam("typ", "JWT")
- .setIssuer((String) claims.get("iss")).setAudience((String) claims.get("aud"))
- .signWith(signatureAlgorithm, signingKey);
-
- // 添加Token签发时间
- builder.setIssuedAt(now);
- // 添加Token过期时间
- if (expiration >= 0) {
- long expMillis = nowMillis + expiration;
- Date exp = new Date(expMillis);
- builder.setExpiration(exp).setNotBefore(now);
- }
-
- // 生成Token
- return builder.compact();
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/utils/PdfMergeUtils.java b/src/main/java/org/micai/platform/auth/utils/PdfMergeUtils.java
deleted file mode 100644
index 343c65800562f065170fff8c8a7dc9bd0484ad94..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/PdfMergeUtils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import com.itextpdf.text.Document;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfImportedPage;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfWriter;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @ClassName PdfMergeUtils
- * @Description This class is used to merge two or more existing pdf file using iText jar.
- * @Author zhaoxinguo
- * @Date 2021/11/23 17:33
- * @Version 1.0
- */
-public class PdfMergeUtils {
-
- /**
- * 合并多个pdf到一个pdf
- * @param inputPdfList
- * @param outputStream
- * @throws Exception
- */
- public static void mergePdfFiles(List inputPdfList, OutputStream outputStream) throws Exception{
- //Create document and pdfReader objects.
- Document document = new Document();
- List readers =
- new ArrayList();
- int totalPages = 0;
-
- //Create pdf Iterator object using inputPdfList.
- Iterator pdfIterator =
- inputPdfList.iterator();
-
- // Create reader list for the input pdf files.
- while (pdfIterator.hasNext()) {
- InputStream pdf = pdfIterator.next();
- PdfReader pdfReader = new PdfReader(pdf);
- readers.add(pdfReader);
- totalPages = totalPages + pdfReader.getNumberOfPages();
- }
-
- // Create writer for the outputStream
- PdfWriter writer = PdfWriter.getInstance(document, outputStream);
-
- //Open document.
- document.open();
-
- //Contain the pdf data.
- PdfContentByte pageContentByte = writer.getDirectContent();
-
- PdfImportedPage pdfImportedPage;
- int currentPdfReaderPage = 1;
- Iterator iteratorPDFReader = readers.iterator();
-
- // Iterate and process the reader list.
- while (iteratorPDFReader.hasNext()) {
- PdfReader pdfReader = iteratorPDFReader.next();
- //Create page and add content.
- while (currentPdfReaderPage <= pdfReader.getNumberOfPages()) {
- document.newPage();
- pdfImportedPage = writer.getImportedPage(
- pdfReader,currentPdfReaderPage);
- pageContentByte.addTemplate(pdfImportedPage, 0, 0);
- currentPdfReaderPage++;
- }
- currentPdfReaderPage = 1;
- }
-
- //Close document and outputStream.
- outputStream.flush();
- document.close();
- outputStream.close();
-
- System.out.println("Pdf files merged successfully.");
- }
-
- public static void main(String args[]){
- try {
- //Prepare input pdf file list as list of input stream.
- List inputPdfList = new ArrayList();
- inputPdfList.add(new FileInputStream("E:\\BaiduNetdiskDownload\\批示件系统内-打印审核 - 副本.pdf"));
- inputPdfList.add(new FileInputStream("E:\\BaiduNetdiskDownload\\批示件系统内-打印审核.pdf"));
-
- //Prepare output stream for merged pdf file.
- OutputStream outputStream =
- new FileOutputStream("E:\\BaiduNetdiskDownload\\批示件系统内-打印审核-MergeFile.pdf");
-
- //call method to merge pdf files.
- mergePdfFiles(inputPdfList, outputStream);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/main/java/org/micai/platform/auth/utils/WatermarkOffice.java b/src/main/java/org/micai/platform/auth/utils/WatermarkOffice.java
deleted file mode 100644
index 36bb9f253c6515289033c8f368439f1f82318750..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/WatermarkOffice.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFTextbox;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFTextBox;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-public final class WatermarkOffice {
-
- public static void main(String[] args) throws IOException, EncryptedDocumentException, InvalidFormatException {
- try {
- String src = "D:\\test.docx";
- String target = "D:\\test-watermark.docx";
- String text = "YLIYUN";
- word(src, target, text);
- System.out.println("ok");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- public static void word(String src, String target, String text) throws IOException {
- XWPFDocument doc = null;
- OutputStream out = null;
- try {
- doc = new XWPFDocument(new FileInputStream(src));
- XWPFHeaderFooterPolicy footer = new XWPFHeaderFooterPolicy(doc);
- footer.createWatermark(text);
- out = new FileOutputStream(target);
- doc.write(out);
- } finally {
- if (doc != null) {
- doc.close();
- }
- if (out != null) {
- out.close();
- }
- }
-
- }
-
- public static void excel2003(String src, String target, String text)
- throws IOException, EncryptedDocumentException, InvalidFormatException {
- HSSFWorkbook wb = null;
- OutputStream out = null;
- try {
- InputStream input = new FileInputStream(src);
-
- wb = (HSSFWorkbook) WorkbookFactory.create(input);
- HSSFSheet sheet = null;
-
- int sheetNumbers = wb.getNumberOfSheets();
-
- // sheet
- for (int i = 0; i < sheetNumbers; i++) {
- sheet = wb.getSheetAt(i);
- // sheet.createDrawingPatriarch();
-
- HSSFPatriarch dp = sheet.createDrawingPatriarch();
- HSSFClientAnchor anchor = new HSSFClientAnchor(0, 255, 550, 0, (short) 0, 1, (short) 6, 5);
-
- // HSSFComment comment = dp.createComment(anchor);
- HSSFTextbox txtbox = dp.createTextbox(anchor);
-
- HSSFRichTextString rtxt = new HSSFRichTextString(text);
- HSSFFont draftFont = (HSSFFont) wb.createFont();
- // 水印颜色
- draftFont.setColor((short) 55);
- draftFont.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
- // 字体大小
- draftFont.setFontHeightInPoints((short) 30);
- draftFont.setFontName("Verdana");
- rtxt.applyFont(draftFont);
- txtbox.setString(rtxt);
- // 倾斜度
- txtbox.setRotationDegree((short) 315);
- txtbox.setLineWidth(600);
- txtbox.setLineStyle(HSSFShape.LINESTYLE_NONE);
- txtbox.setNoFill(true);
- }
-
- out = new FileOutputStream(target);
- wb.write(out);
- } finally {
- if (wb != null) {
- wb.close();
- }
- if (out != null) {
- out.close();
- }
- }
-
- }
-
- public static void excel2007(String src, String target, String text)
- throws IOException, EncryptedDocumentException, InvalidFormatException {
- XSSFWorkbook wb = null;
- OutputStream out = null;
- try {
- InputStream input = new FileInputStream(src);
- wb = (XSSFWorkbook) WorkbookFactory.create(input);
-
- XSSFSheet sheet = null;
- int sheetNumbers = wb.getNumberOfSheets();
- for (int i = 0; i < sheetNumbers; i++) {
- sheet = wb.getSheetAt(i);
- XSSFDrawing dp = sheet.createDrawingPatriarch();
- XSSFClientAnchor anchor = new XSSFClientAnchor(0, 550, 550, 0, (short) 0, 1, (short) 6, 5);
- XSSFTextBox txtbox = dp.createTextbox(anchor);
- XSSFRichTextString rtxt = new XSSFRichTextString(text);
- XSSFFont draftFont = (XSSFFont) wb.createFont();
- draftFont.setColor((short) 55);
- draftFont.setBoldweight(HSSFFont.BOLDWEIGHT_NORMAL);
- draftFont.setFontHeightInPoints((short) 30);
- draftFont.setFontName("Verdana");
- rtxt.applyFont(draftFont);
- txtbox.setText(rtxt);
- // 倾斜度
- txtbox.setLineWidth(600);
- txtbox.setLineStyle(HSSFShape.LINESTYLE_NONE);
- txtbox.setNoFill(true);
- }
-
- out = new FileOutputStream(target);
- wb.write(out);
- } finally {
- if (wb != null) {
- wb.close();
- }
- if (out != null) {
- out.close();
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/micai/platform/auth/utils/WatermarkPdf.java b/src/main/java/org/micai/platform/auth/utils/WatermarkPdf.java
deleted file mode 100644
index 0085e1b4e0285aeb7d98c8360bf4fe46a1571bda..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/WatermarkPdf.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.micai.platform.auth.utils;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import com.itextpdf.text.BaseColor;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Element;
-import com.itextpdf.text.Rectangle;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfGState;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfStamper;
-
-public class WatermarkPdf {
-
- public static void main(String[] args) {
- try {
- String src = "E:\\BaiduNetdiskDownload\\Learn Microservices with Spring Boot.pdf";
- String target = "E:\\BaiduNetdiskDownload\\Learn Microservices with Spring Boot-watermark.pdf";
- String text = "YLIYUN";
- watermark(src, target, text);
- System.out.println("ok");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- public static void watermark(String src, String target, String text) throws IOException, DocumentException {
- PdfReader reader = null;
- PdfStamper pdfStamper = null;
- try {
- reader = new PdfReader(src);
- pdfStamper = new PdfStamper(reader, new FileOutputStream(target));
-
- addWatermark(pdfStamper, text);
- } finally {
- if (pdfStamper != null) {
- pdfStamper.close();
- }
- }
- }
-
- private static void addWatermark(PdfStamper pdfStamper, String watermark) throws DocumentException, IOException {
- PdfGState gs = new PdfGState();
- // 设置透明度为0.4
- gs.setFillOpacity(0.4f);
- gs.setStrokeOpacity(0.4f);
-
- // 设置字体
- BaseFont base = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H",BaseFont.EMBEDDED);
-
- int toPage = pdfStamper.getReader().getNumberOfPages();
-
- PdfContentByte content = null;
- Rectangle pageRect = null;
- for (int i = 1; i <= toPage; i++) {
- pageRect = pdfStamper.getReader().getPageSizeWithRotation(i);
- // 计算水印X,Y坐标
- float x = pageRect.getWidth() / 2;
- float y = pageRect.getHeight() / 2;
- //获得PDF最顶层
- content = pdfStamper.getOverContent(i);
- content.saveState();
- // set Transparency
- content.setGState(gs);
- content.beginText();
- content.setColorFill(BaseColor.GRAY);
- content.setFontAndSize(base, 100);
- // 水印文字成45度角倾斜
- content.showTextAligned(Element.ALIGN_CENTER, watermark, x, y, 315);
- content.endText();
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/org/micai/platform/auth/utils/WatermarkUtils.java b/src/main/java/org/micai/platform/auth/utils/WatermarkUtils.java
deleted file mode 100644
index 87fd700110649225318e7348e0707d1a45534c8d..0000000000000000000000000000000000000000
--- a/src/main/java/org/micai/platform/auth/utils/WatermarkUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.micai.platform.auth.utils;
-
-/**
- * @ClassName WatermarkUtils
- * @Description 水印工具类
- * @Author zhaoxinguo
- * @Date 2021/11/23 17:33
- * @Version 1.0
- */
-public class WatermarkUtils {
-
- public static boolean watermark(String src, String target, String text) throws Exception {
- String ext = getFileExt(src);
- if ("pdf".equalsIgnoreCase(ext)) {
- WatermarkPdf.watermark(src, target, text);
- return true;
- } else if ("docx".equalsIgnoreCase(ext)) {
- WatermarkOffice.word(src, target, text);
- return true;
- } else if ("xlsx".equalsIgnoreCase(ext)) {
- WatermarkOffice.excel2007(src, target, text);
- return true;
- } else if ("xls".equalsIgnoreCase(ext)) {
- WatermarkOffice.excel2003(src, target, text);
- return true;
- }
- return false;
- }
-
- private static String getFileExt(String file) {
- int index = file.lastIndexOf(".");
- if (index != -1) {
- return file.substring(index + 1);
- }
- return "";
- }
-
- public static void main(String[] args) {
- if (args == null || args.length < 3) {
- System.exit(1);
- }
-
- String src = args[0];
- String target = args[1];
- String text = args[2];
-
- try {
- boolean b = watermark(src, target, text);
- if (b) {
- System.exit(0);
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- System.exit(1);
- }
-}
diff --git a/src/test/java/org/micai/platform/auth/LogTests.java b/src/test/java/org/micai/platform/auth/LogTests.java
deleted file mode 100644
index c9d5418e23dbd2f2b28aa1e6d2c7600af20e138c..0000000000000000000000000000000000000000
--- a/src/test/java/org/micai/platform/auth/LogTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.micai.platform.auth;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @Author zhaoxinguo
- * @Date 2021-12-13 15:34
- * @ClassName LogTests
- * @Description 日志输出测试类
- */
-@SpringBootTest
-@RunWith(SpringJUnit4ClassRunner.class)
-public class LogTests {
-
- Logger logger = LoggerFactory.getLogger(Logger.class);
-
- @Test
- public void contextLoad() {
- // 可以调整日志级别、日志的输出会按照这个配置的级别及以上的级别生效
- // 日志级别从低到高分为:TRACE < DEBUG < INFO < WARN < ERROR < FATAL
- logger.trace("这是trace日志......");
- logger.debug("这是debug日志......");
- logger.info("这是info日志......");
- logger.warn("这是warn日志......");
- logger.error("这是error日志......");
- }
-
-
-}
diff --git a/src/test/java/org/micai/platform/auth/MicaiPlatformAuthApplicationTests.java b/src/test/java/org/micai/platform/auth/MicaiPlatformAuthApplicationTests.java
deleted file mode 100644
index 6a6b48f14cfdf8bf9dfef962e38b823b03c339ac..0000000000000000000000000000000000000000
--- a/src/test/java/org/micai/platform/auth/MicaiPlatformAuthApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.micai.platform.auth;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class MicaiPlatformAuthApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
deleted file mode 100644
index c92166330255f909afcecc127f53648643bb1dfb..0000000000000000000000000000000000000000
--- a/src/test/resources/application.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# MySQL
-spring.datasource.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
-spring.datasource.username=root
-spring.datasource.password=root
-
-# JPA
-#spring.jpa.hibernate.ddl-auto=update
-#spring.jpa.show-sql=true
-#spring.jackson.serialization.indent_output=true
-spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-
-# JWT Config
-jwt.header=Authorization
-jwt.secret=NDU0NTY4amhmc3NkeHp6eGNxdzIlMjFAJTIxQCUyM2ZmNQ==
-jwt.expiration=7200000
-
-#mybatis-plus
-mybatis-plus.global-config.db-config.insert-strategy=not_empty
-mybatis-plus.global-config.db-config.update-strategy=not_empty
-mybatis-plus.global-config.db-config.where-strategy=not_empty
-#mybatis-plus.mapper-locations=
-mybatis-plus.global-config.db-config.id-type=auto
-mybatis-plus.configuration.map-underscore-to-camel-case=true
-mybatis-plus.global-config.db-config.table-prefix=tb_
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
-#log level config
-logging.level.org.micai.platform.auto=warn
-logging.level.org.springframework.web=debug
-#logging.level.org.hibernate=error
-logging.file.name=auth.log
-logging.file.path=/opt/auth/logs
-
-site.location=${user.dir}
-site.options.storage_max_width=800
-site.options.storage_limit_size=2
-site.options.thumbnail_channel_size=200x112
-site.options.thumbnail_post_size=360x200
-
-
-