diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml index defdae26..38b2f63f 100644 --- a/api-gateway/pom.xml +++ b/api-gateway/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/auth-center/auth-center-biz/pom.xml b/auth-center/auth-center-biz/pom.xml new file mode 100644 index 00000000..0b28e200 --- /dev/null +++ b/auth-center/auth-center-biz/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + auth-center-biz + Muscle and Fitness Server :: Auth Center - Biz + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + + + + com.jmsoftware.maf + auth-center-domain + + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java similarity index 100% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java similarity index 91% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java index ce7c5bdc..53abc5c9 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/PermissionService.java @@ -1,8 +1,8 @@ package com.jmsoftware.maf.authcenter.permission.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jmsoftware.maf.authcenter.permission.entity.GetServicesInfoResponse; -import com.jmsoftware.maf.authcenter.permission.entity.persistence.Permission; +import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse; +import com.jmsoftware.maf.authcenter.permission.persistence.Permission; import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListPayload; import com.jmsoftware.maf.common.domain.authcenter.permission.GetPermissionListByRoleIdListResponse; import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java similarity index 94% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java index 47153320..391976d6 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.databind.ObjectMapper; import com.jmsoftware.maf.authcenter.permission.configuration.PermissionConfiguration; -import com.jmsoftware.maf.authcenter.permission.entity.GetServicesInfoResponse; -import com.jmsoftware.maf.authcenter.permission.entity.persistence.Permission; +import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse; +import com.jmsoftware.maf.authcenter.permission.persistence.Permission; import com.jmsoftware.maf.authcenter.permission.mapper.PermissionMapper; import com.jmsoftware.maf.authcenter.permission.service.PermissionService; import com.jmsoftware.maf.authcenter.role.service.RoleService; @@ -39,7 +39,9 @@ @Slf4j @Service @RequiredArgsConstructor -public class PermissionServiceImpl extends ServiceImpl implements PermissionService { +public class PermissionServiceImpl + extends ServiceImpl + implements PermissionService { private final RoleService roleService; private final DiscoveryClient discoveryClient; private final RestTemplate restTemplate; diff --git a/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/package-info.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/package-info.java new file mode 100644 index 00000000..abf521f5 --- /dev/null +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/package-info.java @@ -0,0 +1 @@ +package com.jmsoftware.maf.authcenter.role; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java similarity index 93% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java index a9ac9518..0c798e78 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/RoleService.java @@ -1,8 +1,8 @@ package com.jmsoftware.maf.authcenter.role.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jmsoftware.maf.authcenter.role.entity.RoleExcelBean; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; +import com.jmsoftware.maf.authcenter.role.RoleExcelBean; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdResponse; import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdSingleResponse; import lombok.NonNull; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java similarity index 90% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java index cf5ef5a7..a9892e5d 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/role/service/impl/RoleServiceImpl.java @@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.jmsoftware.maf.authcenter.role.entity.RoleExcelBean; -import com.jmsoftware.maf.authcenter.role.entity.constant.RoleRedisKey; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; +import com.jmsoftware.maf.authcenter.role.RoleExcelBean; +import com.jmsoftware.maf.authcenter.role.constant.RoleRedisKey; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.authcenter.role.mapper.RoleMapper; import com.jmsoftware.maf.authcenter.role.service.RoleService; import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdResponse; @@ -46,7 +46,9 @@ @Slf4j @Service @RequiredArgsConstructor -public class RoleServiceImpl extends ServiceImpl implements RoleService { +public class RoleServiceImpl + extends ServiceImpl + implements RoleService { private final MafProjectProperties mafProjectProperties; private final MafConfigurationProperties mafConfigurationProperties; private final RedisTemplate redisTemplate; @@ -55,8 +57,8 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override @SneakyThrows({JsonProcessingException.class}) public GetRoleListByUserIdResponse getRoleList(@NotNull Long userId) { - val key = String.format(this.mafProjectProperties.getProjectParentArtifactId() - + RoleRedisKey.GET_ROLE_LIST_BY_USER_ID.getKeyInfixFormat(), userId); + val key = String.format(String.format("%s%s", this.mafProjectProperties.getProjectParentArtifactId(), + RoleRedisKey.GET_ROLE_LIST_BY_USER_ID.getKeyInfixFormat()), userId); val hasKey = this.redisTemplate.hasKey(key); if (BooleanUtil.isTrue(hasKey)) { return this.objectMapper.readValue(this.redisTemplate.opsForValue().get(key), diff --git a/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/package-info.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/package-info.java new file mode 100644 index 00000000..7b8988ba --- /dev/null +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/package-info.java @@ -0,0 +1 @@ +package com.jmsoftware.maf.authcenter.security; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/service/JwtService.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/service/JwtService.java similarity index 100% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/service/JwtService.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/service/JwtService.java diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java similarity index 96% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java index f99c04a2..7c00d499 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/security/service/impl/JwtServiceImpl.java @@ -1,8 +1,8 @@ package com.jmsoftware.maf.authcenter.security.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.jmsoftware.maf.authcenter.security.service.JwtService; import com.jmsoftware.maf.common.domain.authcenter.security.ParseJwtResponse; import com.jmsoftware.maf.common.domain.authcenter.security.UserPrincipal; @@ -64,6 +64,7 @@ public String createJwt(Authentication authentication, Boolean rememberMe) { } @Override + @SuppressWarnings("scwjava-time_ReplacenewDatewithjava.time") public String createJwt(Boolean rememberMe, Long id, String subject, List roles, Collection authorities) { val now = new Date(); @@ -120,7 +121,7 @@ public Claims parseJwt(String jwt) throws SecurityException { // If it's noe equal, that indicates current user has signed out or logged in before. // Both situations reveal the JWT has expired. val jwtInRedis = (String) this.redisTemplate.opsForValue().get(redisKeyOfJwt); - if (!StrUtil.equals(jwt, jwtInRedis)) { + if (!CharSequenceUtil.equals(jwt, jwtInRedis)) { throw new SecurityException(HttpStatus.UNAUTHORIZED, "JWT is expired (Not equaled)"); } return claims; @@ -151,7 +152,8 @@ public String getUsernameFromRequest(HttpServletRequest request) throws Security @Override public String getJwtFromRequest(HttpServletRequest request) { val bearerToken = request.getHeader(HttpHeaders.AUTHORIZATION); - if (StrUtil.isNotBlank(bearerToken) && bearerToken.startsWith(JwtConfigurationProperties.TOKEN_PREFIX)) { + if (CharSequenceUtil.isNotBlank(bearerToken) + && bearerToken.startsWith(JwtConfigurationProperties.TOKEN_PREFIX)) { return bearerToken.substring(JwtConfigurationProperties.TOKEN_PREFIX.length()); } return null; diff --git a/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/package-info.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/package-info.java new file mode 100644 index 00000000..069059ce --- /dev/null +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/package-info.java @@ -0,0 +1 @@ +package com.jmsoftware.maf.authcenter.user; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java similarity index 82% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java index bd17de20..2f56a80c 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserRoleService.java @@ -1,8 +1,8 @@ package com.jmsoftware.maf.authcenter.user.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; -import com.jmsoftware.maf.authcenter.user.entity.persistence.UserRole; +import com.jmsoftware.maf.authcenter.user.persistence.User; +import com.jmsoftware.maf.authcenter.user.persistence.UserRole; import lombok.NonNull; import org.springframework.validation.annotation.Validated; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java similarity index 90% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java index 161ddceb..6dbab97b 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/UserService.java @@ -1,9 +1,9 @@ package com.jmsoftware.maf.authcenter.user.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jmsoftware.maf.authcenter.user.entity.GetUserPageListPayload; -import com.jmsoftware.maf.authcenter.user.entity.GetUserStatusPayload; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; +import com.jmsoftware.maf.authcenter.user.payload.GetUserPageListPayload; +import com.jmsoftware.maf.authcenter.user.payload.GetUserStatusPayload; +import com.jmsoftware.maf.authcenter.user.persistence.User; import com.jmsoftware.maf.common.bean.PageResponseBodyBean; import com.jmsoftware.maf.common.domain.authcenter.user.*; import com.jmsoftware.maf.common.exception.SecurityException; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java similarity index 84% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java index e0e65879..99a7ad13 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserRoleServiceImpl.java @@ -2,11 +2,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.authcenter.role.service.RoleService; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; -import com.jmsoftware.maf.authcenter.user.entity.persistence.UserRole; import com.jmsoftware.maf.authcenter.user.mapper.UserRoleMapper; +import com.jmsoftware.maf.authcenter.user.persistence.User; +import com.jmsoftware.maf.authcenter.user.persistence.UserRole; import com.jmsoftware.maf.authcenter.user.service.UserRoleService; import com.jmsoftware.maf.common.exception.BizException; import lombok.NonNull; @@ -27,7 +27,9 @@ @Slf4j @Service @RequiredArgsConstructor -public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { +public class UserRoleServiceImpl + extends ServiceImpl + implements UserRoleService { private final RoleService roleService; @Override diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java similarity index 93% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java rename to auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java index c77a9702..21ce6205 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java +++ b/auth-center/auth-center-biz/src/main/java/com/jmsoftware/maf/authcenter/user/service/impl/UserServiceImpl.java @@ -2,21 +2,21 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jmsoftware.maf.authcenter.security.service.JwtService; -import com.jmsoftware.maf.authcenter.user.entity.GetUserPageListPayload; -import com.jmsoftware.maf.authcenter.user.entity.GetUserStatusPayload; -import com.jmsoftware.maf.authcenter.user.entity.constant.UserRedisKey; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; +import com.jmsoftware.maf.authcenter.user.constant.UserRedisKey; import com.jmsoftware.maf.authcenter.user.mapper.UserMapper; +import com.jmsoftware.maf.authcenter.user.payload.GetUserPageListPayload; +import com.jmsoftware.maf.authcenter.user.payload.GetUserStatusPayload; +import com.jmsoftware.maf.authcenter.user.persistence.User; import com.jmsoftware.maf.authcenter.user.service.UserRoleService; import com.jmsoftware.maf.authcenter.user.service.UserService; import com.jmsoftware.maf.common.bean.PageResponseBodyBean; @@ -55,7 +55,9 @@ @Service @RequiredArgsConstructor @CacheConfig(cacheNames = "user-service-cache") -public class UserServiceImpl extends ServiceImpl implements UserService { +public class UserServiceImpl + extends ServiceImpl + implements UserService { private final BCryptPasswordEncoder bCryptPasswordEncoder; private final JwtService jwtService; private final MessageSource messageSource; @@ -140,7 +142,7 @@ public PageResponseBodyBean getUserPageList(@Valid @NotNull GetUserPageLis log.info("{}", payload); val page = new Page(payload.getCurrentPage(), payload.getPageSize()); val queryWrapper = Wrappers.lambdaQuery(User.class); - if (StrUtil.isNotBlank(payload.getUsername())) { + if (CharSequenceUtil.isNotBlank(payload.getUsername())) { queryWrapper.like(User::getUsername, payload.getUsername()); } page.setOrders(ListUtil.of(OrderItem.desc(payload.getOrderBy()))); diff --git a/auth-center/auth-center-bootstrap/pom.xml b/auth-center/auth-center-bootstrap/pom.xml new file mode 100644 index 00000000..c48dff84 --- /dev/null +++ b/auth-center/auth-center-bootstrap/pom.xml @@ -0,0 +1,185 @@ + + + 4.0.0 + + + auth-center-bootstrap + Muscle and Fitness Server :: Auth Center - Bootstrap + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + build-info + compile + + build-info + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + ${project.build.sourceEncoding} + ${java.version} + true + + rulesets/java/ali-comment.xml + rulesets/java/ali-concurrent.xml + rulesets/java/ali-constant.xml + rulesets/java/ali-exception.xml + rulesets/java/ali-flowcontrol.xml + rulesets/java/ali-naming.xml + rulesets/java/ali-oop.xml + rulesets/java/ali-orm.xml + rulesets/java/ali-other.xml + rulesets/java/ali-set.xml + + + + + verify + + check + + + + + + com.alibaba.p3c + p3c-pmd + ${p3c-pmd.version} + + + + + + + com.google.cloud.tools + jib-maven-plugin + ${jib-maven-plugin.version} + + + com.google.cloud.tools + jib-spring-boot-extension-maven + ${jib-spring-boot-extension-maven.version} + + + + + + + buildAndPushDockerImagePhase + install + + build + + + + + + + adoptopenjdk/openjdk11:${adoptopenjdk11.tag} + + + docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId} + + ${git.commit.id.abbrev}-${project.version} + + + + + /${project.artifactId} + + -Dfile.encoding=${project.build.sourceEncoding} + + + ${auth-center.port} + + USE_CURRENT_TIMESTAMP + + + + + com.google.cloud.tools.jib.maven.extension.springboot.JibSpringBootExtension + + + true + + + + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + 5.0.0 + + + get-the-git-info + + revision + + initialize + + + + true + ${project.build.outputDirectory}/git.properties + + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + + + + + com.jmsoftware.maf + auth-center-web + + + com.jmsoftware.maf + auth-center-message + + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java b/auth-center/auth-center-bootstrap/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java similarity index 92% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java rename to auth-center/auth-center-bootstrap/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java index 479e796a..365fbf03 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java +++ b/auth-center/auth-center-bootstrap/src/main/java/com/jmsoftware/maf/authcenter/AuthCenterApplication.java @@ -20,6 +20,7 @@ @EnableFeignClients @EnableDiscoveryClient @SpringBootApplication +@SuppressWarnings("scwjava_Createprivateconstructorforutilityclassallfieldsmethodsarestatic") public class AuthCenterApplication { public static void main(String[] args) { val stopWatch = new StopWatch(); diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/auth-center-bootstrap/src/main/resources/application-development-docker.yml similarity index 100% rename from auth-center/src/main/resources/application-development-docker.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application-development-docker.yml diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/auth-center-bootstrap/src/main/resources/application-development-local.yml similarity index 100% rename from auth-center/src/main/resources/application-development-local.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application-development-local.yml diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/auth-center-bootstrap/src/main/resources/application-production.yml similarity index 100% rename from auth-center/src/main/resources/application-production.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application-production.yml diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/auth-center-bootstrap/src/main/resources/application-stage.yml similarity index 100% rename from auth-center/src/main/resources/application-stage.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application-stage.yml diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/auth-center-bootstrap/src/main/resources/application-test.yml similarity index 100% rename from auth-center/src/main/resources/application-test.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application-test.yml diff --git a/auth-center/src/main/resources/application.yml b/auth-center/auth-center-bootstrap/src/main/resources/application.yml similarity index 99% rename from auth-center/src/main/resources/application.yml rename to auth-center/auth-center-bootstrap/src/main/resources/application.yml index 8ad4b567..9c74cc3a 100644 --- a/auth-center/src/main/resources/application.yml +++ b/auth-center/auth-center-bootstrap/src/main/resources/application.yml @@ -125,7 +125,6 @@ feign: enabled: true response: enabled: true - useGzipDecoder: true management: endpoints: diff --git a/auth-center/src/main/resources/banner.txt b/auth-center/auth-center-bootstrap/src/main/resources/banner.txt similarity index 100% rename from auth-center/src/main/resources/banner.txt rename to auth-center/auth-center-bootstrap/src/main/resources/banner.txt diff --git a/auth-center/src/main/resources/bootstrap.yml b/auth-center/auth-center-bootstrap/src/main/resources/bootstrap.yml similarity index 92% rename from auth-center/src/main/resources/bootstrap.yml rename to auth-center/auth-center-bootstrap/src/main/resources/bootstrap.yml index 79e3552f..5fe4a997 100644 --- a/auth-center/src/main/resources/bootstrap.yml +++ b/auth-center/auth-center-bootstrap/src/main/resources/bootstrap.yml @@ -7,7 +7,6 @@ spring: port: 8500 config: enabled: true - prefix: config # `default-context` should be equal to Spring application name default-context: @project.artifactId@ profile-separator: "::" @@ -16,3 +15,5 @@ spring: watch: enabled: true delay: 1000 + prefixes: + - config diff --git a/auth-center/src/main/resources/logback-configuration/logback-base.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-base.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-base.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-base.xml diff --git a/auth-center/src/main/resources/logback-configuration/logback-development-docker.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-development-docker.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-development-docker.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-development-docker.xml diff --git a/auth-center/src/main/resources/logback-configuration/logback-development-local.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-development-local.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-development-local.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-development-local.xml diff --git a/auth-center/src/main/resources/logback-configuration/logback-production.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-production.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-production.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-production.xml diff --git a/auth-center/src/main/resources/logback-configuration/logback-stage.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-stage.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-stage.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-stage.xml diff --git a/auth-center/src/main/resources/logback-configuration/logback-test.xml b/auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-test.xml similarity index 100% rename from auth-center/src/main/resources/logback-configuration/logback-test.xml rename to auth-center/auth-center-bootstrap/src/main/resources/logback-configuration/logback-test.xml diff --git a/auth-center/src/test/java/com/jmsoftware/maf/authcenter/AuthCenterApplicationTests.java b/auth-center/auth-center-bootstrap/src/test/java/com/jmsoftware/maf/authcenter/AuthCenterApplicationTests.java similarity index 100% rename from auth-center/src/test/java/com/jmsoftware/maf/authcenter/AuthCenterApplicationTests.java rename to auth-center/auth-center-bootstrap/src/test/java/com/jmsoftware/maf/authcenter/AuthCenterApplicationTests.java diff --git a/auth-center/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java b/auth-center/auth-center-bootstrap/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java similarity index 92% rename from auth-center/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java rename to auth-center/auth-center-bootstrap/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java index ad40eaec..dab7b16b 100644 --- a/auth-center/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java +++ b/auth-center/auth-center-bootstrap/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java @@ -1,8 +1,8 @@ package com.jmsoftware.maf.authcenter.mybatis; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; import com.jmsoftware.maf.authcenter.role.mapper.RoleMapper; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.authcenter.role.service.RoleService; import com.jmsoftware.maf.common.domain.DeletedField; import lombok.extern.slf4j.Slf4j; @@ -21,7 +21,8 @@ @Slf4j @SpringBootTest @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class MyBatisPlusTests { +class MyBatisPlusTests { + private static final int AFFECTED = 0; @Autowired private RoleService roleService; @Autowired @@ -41,7 +42,7 @@ void insertAutoFillTest() { return; } log.info("insertAutoFillTest saved: {}", inserted); - Assertions.assertEquals(inserted, 1); + Assertions.assertEquals(AFFECTED, inserted); } @Test @@ -61,7 +62,7 @@ void logicDeleteTest() { } val deleted = roleService.getBaseMapper().delete(lambdaQuery); log.info("Logic delete result: {}", deleted); - Assertions.assertEquals(deleted, 1); + Assertions.assertEquals(AFFECTED, deleted); lambdaQuery.eq(Role::getDeleted, DeletedField.DELETED.getValue()); val rolePersistence2 = roleMapper.selectByName(rolePersistence.getName()); log.info("Deleted role: {}", rolePersistence2); diff --git a/auth-center/auth-center-domain/pom.xml b/auth-center/auth-center-domain/pom.xml new file mode 100644 index 00000000..1f6a61fb --- /dev/null +++ b/auth-center/auth-center-domain/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + auth-center-domain + Muscle and Fitness Server :: Auth Center - Domain + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + + + + com.jmsoftware.maf + auth-center-infra + + + diff --git a/auth-center/auth-center-domain/src/main/java/com/jmsoftware/maf/authcenter/package-info.java b/auth-center/auth-center-domain/src/main/java/com/jmsoftware/maf/authcenter/package-info.java new file mode 100644 index 00000000..e702ef59 --- /dev/null +++ b/auth-center/auth-center-domain/src/main/java/com/jmsoftware/maf/authcenter/package-info.java @@ -0,0 +1 @@ +package com.jmsoftware.maf.authcenter; diff --git a/auth-center/auth-center-infra/pom.xml b/auth-center/auth-center-infra/pom.xml new file mode 100644 index 00000000..2c3f668d --- /dev/null +++ b/auth-center/auth-center-infra/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + auth-center-infra + Muscle and Fitness Server :: Auth Center - Infra + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java similarity index 71% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java index bc31588f..c4d72251 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/mapper/PermissionMapper.java @@ -1,7 +1,7 @@ package com.jmsoftware.maf.authcenter.permission.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jmsoftware.maf.authcenter.permission.entity.persistence.Permission; +import com.jmsoftware.maf.authcenter.permission.persistence.Permission; import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,6 +25,8 @@ public interface PermissionMapper extends BaseMapper { * @param permissionTypeList the permission type list * @return the list */ - List selectPermissionListByRoleIdList(@Param("roleIdList") List roleIdList, - @Param("permissionTypeList") List permissionTypeList); + List selectPermissionListByRoleIdList( + @Param("roleIdList") List roleIdList, + @Param("permissionTypeList") List permissionTypeList + ); } diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/persistence/Permission.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/persistence/Permission.java similarity index 97% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/persistence/Permission.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/persistence/Permission.java index 52f4462d..7323ac92 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/persistence/Permission.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/persistence/Permission.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.permission.entity.persistence; +package com.jmsoftware.maf.authcenter.permission.persistence; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/GetServicesInfoResponse.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/response/GetServicesInfoResponse.java similarity index 90% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/GetServicesInfoResponse.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/response/GetServicesInfoResponse.java index ba8807a3..6bebf385 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/entity/GetServicesInfoResponse.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/permission/response/GetServicesInfoResponse.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.permission.entity; +package com.jmsoftware.maf.authcenter.permission.response; import com.google.common.collect.Lists; import com.jmsoftware.maf.common.domain.springbootstarter.HttpApiResourcesResponse; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/osscenter/OssCenterRemoteApi.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/remote/OssCenterRemoteApi.java similarity index 95% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/osscenter/OssCenterRemoteApi.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/remote/OssCenterRemoteApi.java index c8b8573b..5ae76ab1 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/osscenter/OssCenterRemoteApi.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/remote/OssCenterRemoteApi.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.remoteapi.osscenter; +package com.jmsoftware.maf.authcenter.remote; import com.jmsoftware.maf.common.bean.ResponseBodyBean; import com.jmsoftware.maf.common.domain.osscenter.write.ObjectResponse; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/RoleExcelBean.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/RoleExcelBean.java similarity index 91% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/RoleExcelBean.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/RoleExcelBean.java index 6fac6800..526101e9 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/RoleExcelBean.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/RoleExcelBean.java @@ -1,6 +1,6 @@ -package com.jmsoftware.maf.authcenter.role.entity; +package com.jmsoftware.maf.authcenter.role; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.springcloudstarter.poi.ExcelColumn; import lombok.Data; import lombok.val; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/constant/RoleRedisKey.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/constant/RoleRedisKey.java similarity index 88% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/constant/RoleRedisKey.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/constant/RoleRedisKey.java index da13f1c8..baff6d64 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/constant/RoleRedisKey.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/constant/RoleRedisKey.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.role.entity.constant; +package com.jmsoftware.maf.authcenter.role.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java similarity index 92% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java index 77e86f1c..928d531e 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/mapper/RoleMapper.java @@ -1,7 +1,7 @@ package com.jmsoftware.maf.authcenter.role.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jmsoftware.maf.authcenter.role.entity.persistence.Role; +import com.jmsoftware.maf.authcenter.role.persistence.Role; import com.jmsoftware.maf.common.domain.authcenter.role.GetRoleListByUserIdSingleResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/persistence/Role.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/persistence/Role.java similarity index 97% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/persistence/Role.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/persistence/Role.java index 3699ad2a..2503ae3f 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/persistence/Role.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/role/persistence/Role.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.role.entity.persistence; +package com.jmsoftware.maf.authcenter.role.persistence; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/constant/UserRedisKey.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/constant/UserRedisKey.java similarity index 88% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/constant/UserRedisKey.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/constant/UserRedisKey.java index 28cf2361..5c906b55 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/constant/UserRedisKey.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/constant/UserRedisKey.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.entity.constant; +package com.jmsoftware.maf.authcenter.user.constant; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java similarity index 85% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java index e7a22b9b..0a832051 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserMapper.java @@ -1,7 +1,7 @@ package com.jmsoftware.maf.authcenter.user.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; +import com.jmsoftware.maf.authcenter.user.persistence.User; import org.apache.ibatis.annotations.Mapper; /** diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java similarity index 84% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java index 597b49c9..c2253e90 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/mapper/UserRoleMapper.java @@ -1,7 +1,7 @@ package com.jmsoftware.maf.authcenter.user.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jmsoftware.maf.authcenter.user.entity.persistence.UserRole; +import com.jmsoftware.maf.authcenter.user.persistence.UserRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserPageListPayload.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.java similarity index 95% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserPageListPayload.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.java index c0b293c1..f4ace9fc 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserPageListPayload.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.entity; +package com.jmsoftware.maf.authcenter.user.payload; import com.jmsoftware.maf.common.bean.PaginationBase; import com.jmsoftware.maf.springcloudstarter.validation.annotation.DateTimeRangeConstraints; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserStatusPayload.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserStatusPayload.java similarity index 92% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserStatusPayload.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserStatusPayload.java index af7a007a..178259cd 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/GetUserStatusPayload.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/payload/GetUserStatusPayload.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.entity; +package com.jmsoftware.maf.authcenter.user.payload; import com.jmsoftware.maf.common.domain.authcenter.user.UserStatus; import com.jmsoftware.maf.common.domain.authcenter.user.UserStatus2; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/User.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/User.java similarity index 98% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/User.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/User.java index 5cbdccdf..bd00675a 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/User.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/User.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.entity.persistence; +package com.jmsoftware.maf.authcenter.user.persistence; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/UserRole.java b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/UserRole.java similarity index 94% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/UserRole.java rename to auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/UserRole.java index 0d4907a2..8fe9bf03 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/entity/persistence/UserRole.java +++ b/auth-center/auth-center-infra/src/main/java/com/jmsoftware/maf/authcenter/user/persistence/UserRole.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.entity.persistence; +package com.jmsoftware.maf.authcenter.user.persistence; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-center/src/main/resources/mapper/permission/PermissionMapper.xml b/auth-center/auth-center-infra/src/main/resources/mapper/permission/PermissionMapper.xml similarity index 98% rename from auth-center/src/main/resources/mapper/permission/PermissionMapper.xml rename to auth-center/auth-center-infra/src/main/resources/mapper/permission/PermissionMapper.xml index dd9ace1b..39349c8d 100644 --- a/auth-center/src/main/resources/mapper/permission/PermissionMapper.xml +++ b/auth-center/auth-center-infra/src/main/resources/mapper/permission/PermissionMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/auth-center/src/main/resources/mapper/role/RoleMapper.xml b/auth-center/auth-center-infra/src/main/resources/mapper/role/RoleMapper.xml similarity index 97% rename from auth-center/src/main/resources/mapper/role/RoleMapper.xml rename to auth-center/auth-center-infra/src/main/resources/mapper/role/RoleMapper.xml index fdf2c2b3..7cc6125b 100644 --- a/auth-center/src/main/resources/mapper/role/RoleMapper.xml +++ b/auth-center/auth-center-infra/src/main/resources/mapper/role/RoleMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/auth-center/src/main/resources/mapper/user/UserMapper.xml b/auth-center/auth-center-infra/src/main/resources/mapper/user/UserMapper.xml similarity index 97% rename from auth-center/src/main/resources/mapper/user/UserMapper.xml rename to auth-center/auth-center-infra/src/main/resources/mapper/user/UserMapper.xml index 8eda1119..c2144e0a 100644 --- a/auth-center/src/main/resources/mapper/user/UserMapper.xml +++ b/auth-center/auth-center-infra/src/main/resources/mapper/user/UserMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/auth-center/src/main/resources/mapper/user/UserRoleMapper.xml b/auth-center/auth-center-infra/src/main/resources/mapper/user/UserRoleMapper.xml similarity index 94% rename from auth-center/src/main/resources/mapper/user/UserRoleMapper.xml rename to auth-center/auth-center-infra/src/main/resources/mapper/user/UserRoleMapper.xml index 391b87fe..1824bfb8 100644 --- a/auth-center/src/main/resources/mapper/user/UserRoleMapper.xml +++ b/auth-center/auth-center-infra/src/main/resources/mapper/user/UserRoleMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/auth-center/src/main/resources/messages.properties b/auth-center/auth-center-infra/src/main/resources/messages.properties similarity index 100% rename from auth-center/src/main/resources/messages.properties rename to auth-center/auth-center-infra/src/main/resources/messages.properties diff --git a/auth-center/src/main/resources/messages_zh_CN.properties b/auth-center/auth-center-infra/src/main/resources/messages_zh_CN.properties similarity index 100% rename from auth-center/src/main/resources/messages_zh_CN.properties rename to auth-center/auth-center-infra/src/main/resources/messages_zh_CN.properties diff --git a/auth-center/auth-center-message/pom.xml b/auth-center/auth-center-message/pom.xml new file mode 100644 index 00000000..c6a08a4c --- /dev/null +++ b/auth-center/auth-center-message/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + auth-center-message + Muscle and Fitness Server :: Auth Center - Message + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + + + + com.jmsoftware.maf + auth-center-biz + + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/DelayedMessageSender.java b/auth-center/auth-center-message/src/main/java/com/jmsoftware/maf/authcenter/DelayedMessageSender.java similarity index 97% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/DelayedMessageSender.java rename to auth-center/auth-center-message/src/main/java/com/jmsoftware/maf/authcenter/DelayedMessageSender.java index 3474fb77..96b08fcb 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/DelayedMessageSender.java +++ b/auth-center/auth-center-message/src/main/java/com/jmsoftware/maf/authcenter/DelayedMessageSender.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.configuration; +package com.jmsoftware.maf.authcenter; import com.google.common.collect.Maps; import com.jmsoftware.maf.springcloudstarter.property.MafProjectProperties; diff --git a/auth-center/auth-center-web/pom.xml b/auth-center/auth-center-web/pom.xml new file mode 100644 index 00000000..932875c7 --- /dev/null +++ b/auth-center/auth-center-web/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + auth-center-web + Muscle and Fitness Server :: Auth Center - Web + Authentication and Authorization Center (AAC) for incoming requests from clients. + + com.jmsoftware.maf + auth-center + 0.0.8-SNAPSHOT + ../pom.xml + + + + + com.jmsoftware.maf + auth-center-biz + + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java similarity index 93% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java index 4e1df18c..a6a89fcf 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/configuration/OssConfiguration.java @@ -1,6 +1,6 @@ package com.jmsoftware.maf.authcenter.configuration; -import com.jmsoftware.maf.authcenter.remoteapi.osscenter.OssCenterRemoteApi; +import com.jmsoftware.maf.authcenter.remote.OssCenterRemoteApi; import com.jmsoftware.maf.springcloudstarter.poi.OssUploader; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionController.java similarity index 90% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionController.java index b8de451c..70eedb38 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionController.java @@ -1,6 +1,6 @@ -package com.jmsoftware.maf.authcenter.permission.controller; +package com.jmsoftware.maf.authcenter.permission; -import com.jmsoftware.maf.authcenter.permission.entity.GetServicesInfoResponse; +import com.jmsoftware.maf.authcenter.permission.response.GetServicesInfoResponse; import com.jmsoftware.maf.authcenter.permission.service.PermissionService; import com.jmsoftware.maf.common.bean.ResponseBodyBean; import com.jmsoftware.maf.common.exception.BizException; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionRemoteApiController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionRemoteApiController.java similarity index 95% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionRemoteApiController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionRemoteApiController.java index c3e8463a..9ce0c316 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/permission/controller/PermissionRemoteApiController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/permission/PermissionRemoteApiController.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.permission.controller; +package com.jmsoftware.maf.authcenter.permission; import com.jmsoftware.maf.authcenter.permission.service.PermissionService; import com.jmsoftware.maf.common.bean.ResponseBodyBean; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleController.java similarity index 93% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleController.java index 9a58382d..f49c75cb 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleController.java @@ -1,6 +1,5 @@ -package com.jmsoftware.maf.authcenter.role.controller; +package com.jmsoftware.maf.authcenter.role; -import com.jmsoftware.maf.authcenter.role.entity.RoleExcelBean; import com.jmsoftware.maf.authcenter.role.service.RoleService; import com.jmsoftware.maf.springcloudstarter.poi.AbstractExcelDataController; import lombok.RequiredArgsConstructor; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleRemoteApiController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleRemoteApiController.java similarity index 95% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleRemoteApiController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleRemoteApiController.java index c6beb658..bb09815e 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/controller/RoleRemoteApiController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/role/RoleRemoteApiController.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.role.controller; +package com.jmsoftware.maf.authcenter.role; import com.jmsoftware.maf.authcenter.role.service.RoleService; import com.jmsoftware.maf.common.bean.ResponseBodyBean; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/controller/JwtRemoteApiController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/security/JwtRemoteApiController.java similarity index 95% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/controller/JwtRemoteApiController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/security/JwtRemoteApiController.java index e429b383..37c6049a 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/security/controller/JwtRemoteApiController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/security/JwtRemoteApiController.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.security.controller; +package com.jmsoftware.maf.authcenter.security; import com.jmsoftware.maf.authcenter.security.service.JwtService; import com.jmsoftware.maf.common.bean.ResponseBodyBean; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserController.java similarity index 97% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserController.java index 70d30cb4..91b4544c 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserController.java @@ -1,4 +1,4 @@ -package com.jmsoftware.maf.authcenter.user.controller; +package com.jmsoftware.maf.authcenter.user; import com.jmsoftware.maf.authcenter.user.service.UserService; import com.jmsoftware.maf.common.bean.ResponseBodyBean; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserRemoteApiController.java b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserRemoteApiController.java similarity index 86% rename from auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserRemoteApiController.java rename to auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserRemoteApiController.java index 80a6ac55..541659a4 100644 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/user/controller/UserRemoteApiController.java +++ b/auth-center/auth-center-web/src/main/java/com/jmsoftware/maf/authcenter/user/UserRemoteApiController.java @@ -1,8 +1,8 @@ -package com.jmsoftware.maf.authcenter.user.controller; +package com.jmsoftware.maf.authcenter.user; -import com.jmsoftware.maf.authcenter.user.entity.GetUserPageListPayload; -import com.jmsoftware.maf.authcenter.user.entity.GetUserStatusPayload; -import com.jmsoftware.maf.authcenter.user.entity.persistence.User; +import com.jmsoftware.maf.authcenter.user.payload.GetUserPageListPayload; +import com.jmsoftware.maf.authcenter.user.payload.GetUserStatusPayload; +import com.jmsoftware.maf.authcenter.user.persistence.User; import com.jmsoftware.maf.authcenter.user.service.UserService; import com.jmsoftware.maf.common.bean.PageResponseBodyBean; import com.jmsoftware.maf.common.bean.ResponseBodyBean; diff --git a/auth-center/pom.xml b/auth-center/pom.xml index a89c59f2..e02c7012 100644 --- a/auth-center/pom.xml +++ b/auth-center/pom.xml @@ -10,165 +10,54 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT + pom - - - - - org.springframework.boot - spring-boot-maven-plugin - - - build-info - compile - - build-info - - - - + + + auth-center-bootstrap + auth-center-web + auth-center-message + auth-center-biz + auth-center-domain + auth-center-infra + - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - ${project.build.sourceEncoding} - ${java.version} - true - - rulesets/java/ali-comment.xml - rulesets/java/ali-concurrent.xml - rulesets/java/ali-constant.xml - rulesets/java/ali-exception.xml - rulesets/java/ali-flowcontrol.xml - rulesets/java/ali-naming.xml - rulesets/java/ali-oop.xml - rulesets/java/ali-orm.xml - rulesets/java/ali-other.xml - rulesets/java/ali-set.xml - - - - - verify - - check - - - - - - com.alibaba.p3c - p3c-pmd - ${p3c-pmd.version} - - - - - - - com.google.cloud.tools - jib-maven-plugin - ${jib-maven-plugin.version} - - - com.google.cloud.tools - jib-spring-boot-extension-maven - ${jib-spring-boot-extension-maven.version} - - - - - - - buildAndPushDockerImagePhase - install - - build - - - - - - - adoptopenjdk/openjdk11:${adoptopenjdk11.tag} - - - docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId} - - ${git.commit.id.abbrev}-${project.version} - - - - - /${project.artifactId} - - -Dfile.encoding=${project.build.sourceEncoding} - - - ${auth-center.port} - - USE_CURRENT_TIMESTAMP - - - - - com.google.cloud.tools.jib.maven.extension.springboot.JibSpringBootExtension - - - true - - - - - - - - - io.github.git-commit-id - git-commit-id-maven-plugin - 5.0.0 - - - get-the-git-info - - revision - - initialize - - - - true - ${project.build.outputDirectory}/git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - + + + + com.jmsoftware.maf + auth-center-bootstrap + ${project.version} + + + com.jmsoftware.maf + auth-center-web + ${project.version} + + + com.jmsoftware.maf + auth-center-message + ${project.version} + + + com.jmsoftware.maf + auth-center-biz + ${project.version} + + + com.jmsoftware.maf + auth-center-domain + ${project.version} + + + com.jmsoftware.maf + auth-center-infra + ${project.version} + + + diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/package-info.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/package-info.java deleted file mode 100644 index 68fc894e..00000000 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/remoteapi/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.jmsoftware.maf.authcenter.remoteapi; diff --git a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/package-info.java b/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/package-info.java deleted file mode 100644 index 8db13650..00000000 --- a/auth-center/src/main/java/com/jmsoftware/maf/authcenter/role/entity/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.jmsoftware.maf.authcenter.role.entity; diff --git a/common/pom.xml b/common/pom.xml index ca51274f..b3e22d73 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/maf-mis/pom.xml b/maf-mis/pom.xml index be269737..90123990 100644 --- a/maf-mis/pom.xml +++ b/maf-mis/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/oss-center/pom.xml b/oss-center/pom.xml index d65d1a84..facd8d29 100644 --- a/oss-center/pom.xml +++ b/oss-center/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1403cef5..a43e9ccc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT Muscle and Fitness Server Muscle and Fitness Server (M&F, maf), a Spring Cloud microservice based, back-end server for managing data of muscle and fitness. diff --git a/reactive-spring-cloud-starter/pom.xml b/reactive-spring-cloud-starter/pom.xml index 409af265..7a39af9c 100644 --- a/reactive-spring-cloud-starter/pom.xml +++ b/reactive-spring-cloud-starter/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml index 3bb118bb..d566272a 100644 --- a/spring-boot-admin/pom.xml +++ b/spring-boot-admin/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 4dac4375..fd098e08 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -10,7 +10,7 @@ com.jmsoftware.maf muscle-and-fitness-server - 0.0.7 + 0.0.8-SNAPSHOT diff --git a/universal-ui/pom.xml b/universal-ui/pom.xml index 87dfaedf..3c40b0a9 100644 --- a/universal-ui/pom.xml +++ b/universal-ui/pom.xml @@ -11,7 +11,7 @@ muscle-and-fitness-server com.jmsoftware.maf - 0.0.7 + 0.0.8-SNAPSHOT