From ee117dea4ed1cb57a49f2da6c80ed6e47aa9d6de Mon Sep 17 00:00:00 2001 From: ManongJu <469863752@qq.com> Date: Fri, 7 Dec 2018 15:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skeleton/common/util/StatusCode.java | 16 ++ mss-gateway/pom.xml | 5 + .../gateway/filter/PreRequestFilter.java | 3 +- mss-modules/mss-resource/.gitignore | 24 -- mss-modules/mss-resource/pom.xml | 61 ----- .../resource/ResourceApplication.java | 17 -- .../resource/config/ResourceServerConfig.java | 26 -- .../resource/config/Swagger2Config.java | 43 ---- .../resource/controller/UserController.java | 19 -- .../src/main/resources/application.yml | 31 --- .../resource/ResourceApplicationTests.java | 16 -- mss-modules/mss-upms/.gitignore | 25 -- mss-modules/pom.xml | 36 --- mss-oauth/pom.xml | 6 +- .../config/AuthorizationServerConfig.java | 9 + .../auth/config/ResourceServerConfig.java | 6 + .../auth/controller/HelloController.java | 31 --- .../MssWebResponseExceptionTranslator.java | 159 +++++++++++++ {mss-modules => mss-upms}/.gitignore | 0 mss-upms/mvnw | 225 ++++++++++++++++++ mss-upms/mvnw.cmd | 143 +++++++++++ {mss-modules/mss-upms => mss-upms}/pom.xml | 19 +- .../skeleton/upms/UpmsApplication.java | 0 .../skeleton/upms/config/Swagger2Config.java | 0 .../upms/controller/PermissionController.java | 0 .../upms/controller/RoleController.java | 0 .../upms/controller/UserController.java | 0 .../skeleton/upms/entity/RcMenu.java | 0 .../skeleton/upms/entity/RcRole.java | 0 .../skeleton/upms/entity/RcUser.java | 0 .../skeleton/upms/mapper/RcMenuMapper.java | 0 .../skeleton/upms/mapper/RcRoleMapper.java | 0 .../skeleton/upms/mapper/RcUserMapper.java | 0 .../upms/service/PermissionService.java | 0 .../skeleton/upms/service/RoleService.java | 0 .../skeleton/upms/service/UserService.java | 0 .../service/impl/PermissionServiceImpl.java | 0 .../upms/service/impl/RoleServiceImpl.java | 0 .../upms/service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/mapper/RcMenuMapper.xml | 0 .../main/resources/mapper/RcRoleMapper.xml | 0 .../main/resources/mapper/RcUserMapper.xml | 0 .../skeleton/upms/GeneratorTests.java | 0 .../src/test/resources/generatorConfig.xml | 0 pom.xml | 4 +- 46 files changed, 575 insertions(+), 349 deletions(-) create mode 100644 mss-common/src/main/java/com/microservice/skeleton/common/util/StatusCode.java delete mode 100644 mss-modules/mss-resource/.gitignore delete mode 100644 mss-modules/mss-resource/pom.xml delete mode 100644 mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java delete mode 100644 mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java delete mode 100644 mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/Swagger2Config.java delete mode 100644 mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java delete mode 100644 mss-modules/mss-resource/src/main/resources/application.yml delete mode 100644 mss-modules/mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java delete mode 100644 mss-modules/mss-upms/.gitignore delete mode 100644 mss-modules/pom.xml delete mode 100644 mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java create mode 100644 mss-oauth/src/main/java/com/microservice/skeleton/auth/error/MssWebResponseExceptionTranslator.java rename {mss-modules => mss-upms}/.gitignore (100%) create mode 100644 mss-upms/mvnw create mode 100644 mss-upms/mvnw.cmd rename {mss-modules/mss-upms => mss-upms}/pom.xml (82%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/UpmsApplication.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/config/Swagger2Config.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/controller/PermissionController.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/controller/RoleController.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/controller/UserController.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/entity/RcMenu.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/entity/RcRole.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/entity/RcUser.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/mapper/RcMenuMapper.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/mapper/RcRoleMapper.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/mapper/RcUserMapper.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/PermissionService.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/RoleService.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/UserService.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/impl/PermissionServiceImpl.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/impl/RoleServiceImpl.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/java/com/microservice/skeleton/upms/service/impl/UserServiceImpl.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/resources/application.yml (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/resources/mapper/RcMenuMapper.xml (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/resources/mapper/RcRoleMapper.xml (100%) rename {mss-modules/mss-upms => mss-upms}/src/main/resources/mapper/RcUserMapper.xml (100%) rename {mss-modules/mss-upms => mss-upms}/src/test/java/com/microservice/skeleton/upms/GeneratorTests.java (100%) rename {mss-modules/mss-upms => mss-upms}/src/test/resources/generatorConfig.xml (100%) diff --git a/mss-common/src/main/java/com/microservice/skeleton/common/util/StatusCode.java b/mss-common/src/main/java/com/microservice/skeleton/common/util/StatusCode.java new file mode 100644 index 0000000..426373a --- /dev/null +++ b/mss-common/src/main/java/com/microservice/skeleton/common/util/StatusCode.java @@ -0,0 +1,16 @@ +package com.microservice.skeleton.common.util; + +/** + * Created with IntelliJ IDEA. + * Description: + * User: Mr.Yangxiufeng + * Date: 2018-12-07 + * Time: 14:02 + */ +public class StatusCode { + public static final int SUCCESS_CODE = 200; + public static final String SUCCESS_MSG = "操作成功"; + + public static final int FAILURE_CODE = 201; + public static final String FAILURE_MSG = "操作失败"; +} diff --git a/mss-gateway/pom.xml b/mss-gateway/pom.xml index 99e2420..a22a60f 100644 --- a/mss-gateway/pom.xml +++ b/mss-gateway/pom.xml @@ -28,6 +28,11 @@ org.springframework.cloud spring-cloud-starter-oauth2 + + org.springframework.security.oauth + spring-security-oauth2 + ${spring-security-oauth.version} + org.springframework.retry spring-retry diff --git a/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java index 83fc801..7948395 100644 --- a/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java +++ b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java @@ -4,6 +4,7 @@ import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class PreRequestFilter extends ZuulFilter { @Override public int filterOrder() { - return 0;//int值来定义过滤器的执行顺序,数值越小优先级越高 + return FilterConstants.PRE_DECORATION_FILTER_ORDER + 1;//int值来定义过滤器的执行顺序,数值越小优先级越高 } @Override diff --git a/mss-modules/mss-resource/.gitignore b/mss-modules/mss-resource/.gitignore deleted file mode 100644 index 2af7cef..0000000 --- a/mss-modules/mss-resource/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/mss-modules/mss-resource/pom.xml b/mss-modules/mss-resource/pom.xml deleted file mode 100644 index 3fa7d59..0000000 --- a/mss-modules/mss-resource/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - com.microservice.skeleton.modules - Micro-Service-Skeleton-modules - 0.0.1-SNAPSHOT - - Micro-Service-Skeleton-Resource - 0.0.1-SNAPSHOT - jar - - mss-resource - Demo project for Spring Boot - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - org.springframework.cloud - spring-cloud-starter-oauth2 - - - org.springframework.cloud - spring-cloud-starter-security - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - io.springfox - springfox-swagger2 - ${swagger2.version} - - - io.springfox - springfox-swagger-ui - ${swagger2.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java b/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java deleted file mode 100644 index c8df072..0000000 --- a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.microservice.skeleton.resource; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; - -@SpringBootApplication -@EnableDiscoveryClient -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class ResourceApplication { - - public static void main(String[] args) { - SpringApplication.run(ResourceApplication.class, args); - } -} diff --git a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java b/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java deleted file mode 100644 index 38799dc..0000000 --- a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.microservice.skeleton.resource.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; -import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; - -/** - * Created by Mr.Yangxiufeng on 2017/12/29. - * Time:9:41 - * ProjectName:Mirco-Service-Skeleton - */ -@Configuration -@EnableResourceServer -public class ResourceServerConfig extends ResourceServerConfigurerAdapter { - @Override - public void configure(HttpSecurity http) throws Exception { - http. - csrf().disable() - .authorizeRequests() - .mvcMatchers("/v2/api-docs").permitAll() - .anyRequest().authenticated() - .and() - .httpBasic(); - } -} diff --git a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/Swagger2Config.java b/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/Swagger2Config.java deleted file mode 100644 index 110caa0..0000000 --- a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/config/Swagger2Config.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.microservice.skeleton.resource.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * Created with IntelliJ IDEA. - * Description: - * User: Mr.Yangxiufeng - * Date: 2018-04-18 - * Time: 14:52 - */ -@EnableSwagger2 -@Configuration -public class Swagger2Config { - @Bean - public Docket createRestApi() { - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(apiInfo()) - .select() - .apis(RequestHandlerSelectors.basePackage("com.microservice.skeleton.resource.controller")) - .paths(PathSelectors.any()) - .build(); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("resource文档") - .description("resource接口说明文档") - .termsOfServiceUrl("") - .contact(new Contact("杨秀峰","franky.yang@foxmail.com","franky.yang@foxmail.com")) - .version("1.0") - .build(); - } -} diff --git a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java b/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java deleted file mode 100644 index cff543e..0000000 --- a/mss-modules/mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.microservice.skeleton.resource.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Created by Mr.Yangxiufeng on 2017/12/29. - * Time:9:23 - * ProjectName:Mirco-Service-Skeleton - */ -@RestController -public class UserController { - - @GetMapping(value = "getUser") - public String getUser(){ - return "order"; - } - -} diff --git a/mss-modules/mss-resource/src/main/resources/application.yml b/mss-modules/mss-resource/src/main/resources/application.yml deleted file mode 100644 index f973ef4..0000000 --- a/mss-modules/mss-resource/src/main/resources/application.yml +++ /dev/null @@ -1,31 +0,0 @@ -server: - port: 9023 -spring: - application: - name: resource - zipkin: - base-url: http://localhost:9050 -eureka: - instance: - prefer-ip-address: true - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - ##续约更新时间间隔设置5秒,m默认30s - lease-renewal-interval-in-seconds: 5 - ##续约到期时间10秒,默认是90秒 - lease-expiration-duration-in-seconds: 10 - client: - service-url: - defaultZone: http://mss-eureka1:9010/eureka/,http://mss-eureka2:9011/eureka/ -endpoints: - health: - sensitive: false - enabled: true -management: - security: - enabled: false -security: - oauth2: - resource: - id: resource - user-info-uri: http://localhost:9030/uaa/user - prefer-token-info: false \ No newline at end of file diff --git a/mss-modules/mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java b/mss-modules/mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java deleted file mode 100644 index ea572d7..0000000 --- a/mss-modules/mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.microservice.skeleton.resource; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class ResourceApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/mss-modules/mss-upms/.gitignore b/mss-modules/mss-upms/.gitignore deleted file mode 100644 index 82eca33..0000000 --- a/mss-modules/mss-upms/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -/target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/build/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ \ No newline at end of file diff --git a/mss-modules/pom.xml b/mss-modules/pom.xml deleted file mode 100644 index 53455a2..0000000 --- a/mss-modules/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - com.microservice.skeleton.modules - Micro-Service-Skeleton-modules - 2.0.0 - pom - - com.microservice.skeleton - Micro-Service-Skeleton-Parent - 2.0.0 - - mss-modules - - UTF-8 - UTF-8 - 1.8 - - - mss-upms - mss-resource - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/mss-oauth/pom.xml b/mss-oauth/pom.xml index 18ca196..02796d6 100644 --- a/mss-oauth/pom.xml +++ b/mss-oauth/pom.xml @@ -29,6 +29,10 @@ org.springframework.cloud spring-cloud-starter-netflix-eureka-client + + org.springframework.cloud + spring-cloud-starter-openfeign + org.springframework.cloud spring-cloud-starter-netflix-hystrix @@ -40,7 +44,7 @@ org.springframework.security.oauth spring-security-oauth2 - ${spring-security.version} + ${spring-security-oauth.version} org.springframework.cloud diff --git a/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java index 17d8883..c7fb84d 100644 --- a/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java +++ b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java @@ -1,5 +1,6 @@ package com.microservice.skeleton.auth.config; +import com.microservice.skeleton.auth.error.MssWebResponseExceptionTranslator; import com.microservice.skeleton.auth.service.impl.UserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -8,6 +9,7 @@ import org.springframework.context.annotation.Primary; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; @@ -15,6 +17,8 @@ import org.springframework.security.oauth2.config.annotation.web.configurers.Aut import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; import org.springframework.security.oauth2.provider.ClientDetailsService; import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService; +import org.springframework.security.oauth2.provider.error.DefaultWebResponseExceptionTranslator; +import org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator; import org.springframework.security.oauth2.provider.token.DefaultTokenServices; import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore; import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore; @@ -62,12 +66,17 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap public ClientDetailsService clientDetails() { return new JdbcClientDetailsService(dataSource); } + @Bean + public WebResponseExceptionTranslator webResponseExceptionTranslator(){ + return new MssWebResponseExceptionTranslator(); + } @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { endpoints.tokenStore(redisTokenStore()) .userDetailsService(userDetailsService) .authenticationManager(authenticationManager); endpoints.tokenServices(defaultTokenServices()); + endpoints.exceptionTranslator(webResponseExceptionTranslator());//认证异常翻译 } /** diff --git a/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java index 1f81fac..bb83e40 100644 --- a/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java +++ b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java @@ -5,6 +5,7 @@ import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; /** *

参看:https://github.com/spring-guides/tut-spring-security-and-angular-js/blob/master/oauth2-vanilla/README.adoc

@@ -23,4 +24,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter{ .and() .httpBasic(); } + + @Override + public void configure(ResourceServerSecurityConfigurer resources) throws Exception { + super.configure(resources); + } } diff --git a/mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java deleted file mode 100644 index c4bc32e..0000000 --- a/mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.microservice.skeleton.auth.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * Created by Mr.Yangxiufeng on 2017/12/27. - * Time:17:02 - * ProjectName:Mirco-Service-Skeleton - */ -@Controller -public class HelloController { - @RequestMapping("/") - public String index() { - return "index"; - } - - @RequestMapping("/hello") - public String hello() { - return "order"; - } - @RequestMapping("/login") - public String login() { - return "login"; - } - @RequestMapping(value = "/doLogin",method = RequestMethod.POST) - public void doLogin(String username,String password){ - System.out.println(username); - } -} diff --git a/mss-oauth/src/main/java/com/microservice/skeleton/auth/error/MssWebResponseExceptionTranslator.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/error/MssWebResponseExceptionTranslator.java new file mode 100644 index 0000000..22284a8 --- /dev/null +++ b/mss-oauth/src/main/java/com/microservice/skeleton/auth/error/MssWebResponseExceptionTranslator.java @@ -0,0 +1,159 @@ +package com.microservice.skeleton.auth.error; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.oauth2.common.DefaultThrowableAnalyzer; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.security.oauth2.common.exceptions.InsufficientScopeException; +import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; +import org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator; +import org.springframework.security.web.util.ThrowableAnalyzer; +import org.springframework.web.HttpRequestMethodNotSupportedException; + +import java.io.IOException; + +/** + * Created with IntelliJ IDEA. + * Description: + * User: Mr.Yangxiufeng + * Date: 2018-12-06 + * Time: 16:28 + */ +public class MssWebResponseExceptionTranslator implements WebResponseExceptionTranslator { + + private ThrowableAnalyzer throwableAnalyzer = new DefaultThrowableAnalyzer(); + + @Override + public ResponseEntity translate(Exception e) throws Exception { + + // Try to extract a SpringSecurityException from the stacktrace + Throwable[] causeChain = throwableAnalyzer.determineCauseChain(e); + Exception ase = (OAuth2Exception) throwableAnalyzer.getFirstThrowableOfType(OAuth2Exception.class, causeChain); + + if (ase != null) { + return handleOAuth2Exception((OAuth2Exception) ase); + } + + ase = (AuthenticationException) throwableAnalyzer.getFirstThrowableOfType(AuthenticationException.class, + causeChain); + if (ase != null) { + return handleOAuth2Exception(new MssWebResponseExceptionTranslator.UnauthorizedException(e.getMessage(), e)); + } + + ase = (AccessDeniedException) throwableAnalyzer + .getFirstThrowableOfType(AccessDeniedException.class, causeChain); + if (ase instanceof AccessDeniedException) { + return handleOAuth2Exception(new MssWebResponseExceptionTranslator.ForbiddenException(ase.getMessage(), ase)); + } + + ase = (HttpRequestMethodNotSupportedException) throwableAnalyzer.getFirstThrowableOfType( + HttpRequestMethodNotSupportedException.class, causeChain); + if (ase instanceof HttpRequestMethodNotSupportedException) { + return handleOAuth2Exception(new MssWebResponseExceptionTranslator.MethodNotAllowed(ase.getMessage(), ase)); + } + + return handleOAuth2Exception(new MssWebResponseExceptionTranslator.ServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase(), e)); + + } + + private ResponseEntity handleOAuth2Exception(OAuth2Exception e) throws IOException { + + int status = e.getHttpErrorCode(); + String error = e.getOAuth2ErrorCode(); + String summary = e.getSummary(); + HttpHeaders headers = new HttpHeaders(); + headers.set("Cache-Control", "no-store"); + headers.set("Pragma", "no-cache"); + if (status == HttpStatus.UNAUTHORIZED.value() || (e instanceof InsufficientScopeException)) { + headers.set("WWW-Authenticate", String.format("%s %s", OAuth2AccessToken.BEARER_TYPE, e.getSummary())); + } + + ResponseEntity response = new ResponseEntity(e, headers, + HttpStatus.valueOf(status)); + return response; + + } + + public void setThrowableAnalyzer(ThrowableAnalyzer throwableAnalyzer) { + this.throwableAnalyzer = throwableAnalyzer; + } + + @SuppressWarnings("serial") + private static class ForbiddenException extends OAuth2Exception { + + public ForbiddenException(String msg, Throwable t) { + super(msg, t); + } + + @Override + public String getOAuth2ErrorCode() { + return "access_denied"; + } + + @Override + public int getHttpErrorCode() { + return 403; + } + + } + + @SuppressWarnings("serial") + private static class ServerErrorException extends OAuth2Exception { + + public ServerErrorException(String msg, Throwable t) { + super(msg, t); + } + + @Override + public String getOAuth2ErrorCode() { + return "server_error"; + } + + @Override + public int getHttpErrorCode() { + return 500; + } + + } + + @SuppressWarnings("serial") + private static class UnauthorizedException extends OAuth2Exception { + + public UnauthorizedException(String msg, Throwable t) { + super(msg, t); + } + + @Override + public String getOAuth2ErrorCode() { + return "unauthorized"; + } + + @Override + public int getHttpErrorCode() { + return 401; + } + + } + + @SuppressWarnings("serial") + private static class MethodNotAllowed extends OAuth2Exception { + + public MethodNotAllowed(String msg, Throwable t) { + super(msg, t); + } + + @Override + public String getOAuth2ErrorCode() { + return "method_not_allowed"; + } + + @Override + public int getHttpErrorCode() { + return 405; + } + + } +} diff --git a/mss-modules/.gitignore b/mss-upms/.gitignore similarity index 100% rename from mss-modules/.gitignore rename to mss-upms/.gitignore diff --git a/mss-upms/mvnw b/mss-upms/mvnw new file mode 100644 index 0000000..ee13adf --- /dev/null +++ b/mss-upms/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -result /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mss-upms/mvnw.cmd b/mss-upms/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/mss-upms/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/mss-modules/mss-upms/pom.xml b/mss-upms/pom.xml similarity index 82% rename from mss-modules/mss-upms/pom.xml rename to mss-upms/pom.xml index c4da5a6..aaaaa2d 100644 --- a/mss-modules/mss-upms/pom.xml +++ b/mss-upms/pom.xml @@ -4,8 +4,8 @@ 4.0.0 - com.microservice.skeleton.modules - Micro-Service-Skeleton-modules + com.microservice.skeleton + Micro-Service-Skeleton-Parent 2.0.0 microservice.skeleton.upms @@ -35,8 +35,7 @@
org.springframework.boot - spring-boot-starter-test - test + spring-boot-starter-web tk.mybatis @@ -98,18 +97,6 @@ true true - - - mysql - mysql-connector-java - - - - tk.mybatis - mapper - - - diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/UpmsApplication.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/UpmsApplication.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/UpmsApplication.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/UpmsApplication.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/config/Swagger2Config.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/config/Swagger2Config.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/config/Swagger2Config.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/config/Swagger2Config.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/PermissionController.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/PermissionController.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/PermissionController.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/controller/PermissionController.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/RoleController.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/RoleController.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/RoleController.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/controller/RoleController.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/UserController.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/UserController.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/controller/UserController.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/controller/UserController.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcMenu.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcMenu.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcMenu.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcMenu.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcRole.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcRole.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcRole.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcRole.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcUser.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcUser.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcUser.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/entity/RcUser.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcMenuMapper.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcMenuMapper.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcMenuMapper.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcMenuMapper.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcRoleMapper.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcRoleMapper.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcRoleMapper.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcRoleMapper.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcUserMapper.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcUserMapper.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcUserMapper.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/mapper/RcUserMapper.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/PermissionService.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/PermissionService.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/PermissionService.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/PermissionService.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/RoleService.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/RoleService.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/RoleService.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/RoleService.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/UserService.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/UserService.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/UserService.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/UserService.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/PermissionServiceImpl.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/PermissionServiceImpl.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/PermissionServiceImpl.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/PermissionServiceImpl.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/RoleServiceImpl.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/RoleServiceImpl.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/RoleServiceImpl.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/RoleServiceImpl.java diff --git a/mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/UserServiceImpl.java b/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/UserServiceImpl.java similarity index 100% rename from mss-modules/mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/UserServiceImpl.java rename to mss-upms/src/main/java/com/microservice/skeleton/upms/service/impl/UserServiceImpl.java diff --git a/mss-modules/mss-upms/src/main/resources/application.yml b/mss-upms/src/main/resources/application.yml similarity index 100% rename from mss-modules/mss-upms/src/main/resources/application.yml rename to mss-upms/src/main/resources/application.yml diff --git a/mss-modules/mss-upms/src/main/resources/mapper/RcMenuMapper.xml b/mss-upms/src/main/resources/mapper/RcMenuMapper.xml similarity index 100% rename from mss-modules/mss-upms/src/main/resources/mapper/RcMenuMapper.xml rename to mss-upms/src/main/resources/mapper/RcMenuMapper.xml diff --git a/mss-modules/mss-upms/src/main/resources/mapper/RcRoleMapper.xml b/mss-upms/src/main/resources/mapper/RcRoleMapper.xml similarity index 100% rename from mss-modules/mss-upms/src/main/resources/mapper/RcRoleMapper.xml rename to mss-upms/src/main/resources/mapper/RcRoleMapper.xml diff --git a/mss-modules/mss-upms/src/main/resources/mapper/RcUserMapper.xml b/mss-upms/src/main/resources/mapper/RcUserMapper.xml similarity index 100% rename from mss-modules/mss-upms/src/main/resources/mapper/RcUserMapper.xml rename to mss-upms/src/main/resources/mapper/RcUserMapper.xml diff --git a/mss-modules/mss-upms/src/test/java/com/microservice/skeleton/upms/GeneratorTests.java b/mss-upms/src/test/java/com/microservice/skeleton/upms/GeneratorTests.java similarity index 100% rename from mss-modules/mss-upms/src/test/java/com/microservice/skeleton/upms/GeneratorTests.java rename to mss-upms/src/test/java/com/microservice/skeleton/upms/GeneratorTests.java diff --git a/mss-modules/mss-upms/src/test/resources/generatorConfig.xml b/mss-upms/src/test/resources/generatorConfig.xml similarity index 100% rename from mss-modules/mss-upms/src/test/resources/generatorConfig.xml rename to mss-upms/src/test/resources/generatorConfig.xml diff --git a/pom.xml b/pom.xml index 9d1c7df..0d6443d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - 2.3.2.RELEASE + 2.3.3.RELEASE org.springframework.boot @@ -37,7 +37,7 @@ mss-oauth mss-gateway mss-monitor - mss-modules + mss-upms -- GitLab