diff --git a/admin/admin-application/src/main/resources/application-test.yaml b/admin/admin-application/src/main/resources/application-test.yaml
new file mode 100644
index 000000000..e89519e99
--- /dev/null
+++ b/admin/admin-application/src/main/resources/application-test.yaml
@@ -0,0 +1,6 @@
+spring:
+ boot:
+ admin:
+ client:
+ enabled: true
+ url: http://127.0.0.1:8080
\ No newline at end of file
diff --git a/admin/admin-application/src/main/resources/application.yaml b/admin/admin-application/src/main/resources/application.yaml
index 68f4f820b..ca5273931 100644
--- a/admin/admin-application/src/main/resources/application.yaml
+++ b/admin/admin-application/src/main/resources/application.yaml
@@ -1,10 +1,6 @@
spring:
application:
name: admin-application
- boot:
- admin:
- client:
- url: http://127.0.0.1:8080
# server
server:
diff --git a/admin/admin-service-impl/pom.xml b/admin/admin-service-impl/pom.xml
index f8c288848..8345ba7b1 100644
--- a/admin/admin-service-impl/pom.xml
+++ b/admin/admin-service-impl/pom.xml
@@ -19,7 +19,6 @@
com.alibaba
dubbo
- 2.6.5
compile
diff --git a/ops/pom.xml b/ops/pom.xml
index 926038ebf..9e0891e56 100644
--- a/ops/pom.xml
+++ b/ops/pom.xml
@@ -31,4 +31,19 @@
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ad7f52cfe..27384ce24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,4 +23,24 @@
pom
+
+
+
+ com.alibaba
+ dubbo
+ 2.6.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/UserApplication.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/UserApplication.java
similarity index 88%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/UserApplication.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/UserApplication.java
index c915336dd..bb91d4848 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/UserApplication.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/UserApplication.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user;
+package cn.iocoder.mall.user.application;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/config/MVCConfiguration.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/config/MVCConfiguration.java
similarity index 97%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/config/MVCConfiguration.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/config/MVCConfiguration.java
index d3e420ffe..aceada20e 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/config/MVCConfiguration.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/config/MVCConfiguration.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.config;
+package cn.iocoder.mall.user.application.config;
import cn.iocoder.common.framework.config.GlobalExceptionHandler;
import cn.iocoder.mall.user.sdk.interceptor.UserSecurityInterceptor;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/config/SwaggerConfiguration.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/config/SwaggerConfiguration.java
similarity index 96%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/config/SwaggerConfiguration.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/config/SwaggerConfiguration.java
index 967f24e4a..e6987ada3 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/config/SwaggerConfiguration.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/config/SwaggerConfiguration.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.config;
+package cn.iocoder.mall.user.application.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/controller/PassportController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/PassportController.java
similarity index 94%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/controller/PassportController.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/PassportController.java
index 71c9112b4..27a25282a 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/controller/PassportController.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/PassportController.java
@@ -1,13 +1,13 @@
-package cn.iocoder.mall.user.controller;
+package cn.iocoder.mall.user.application.controller;
import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.user.convert.PassportConvert;
+import cn.iocoder.mall.user.application.convert.PassportConvert;
import cn.iocoder.mall.user.sdk.annotation.PermitAll;
import cn.iocoder.mall.user.service.api.MobileCodeService;
import cn.iocoder.mall.user.service.api.OAuth2Service;
import cn.iocoder.mall.user.service.api.UserService;
import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO;
-import cn.iocoder.mall.user.vo.MobileRegisterVO;
+import cn.iocoder.mall.user.application.vo.MobileRegisterVO;
import com.alibaba.dubbo.config.annotation.Reference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/controller/UserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/UserController.java
similarity index 87%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/controller/UserController.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/UserController.java
index e12d96bbd..f6ad37d30 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/controller/UserController.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/UserController.java
@@ -1,8 +1,8 @@
-package cn.iocoder.mall.user.controller;
+package cn.iocoder.mall.user.application.controller;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
-import cn.iocoder.mall.user.vo.UserInfoVO;
+import cn.iocoder.mall.user.application.vo.UserInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/convert/PassportConvert.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java
similarity index 83%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/convert/PassportConvert.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java
index 9ece6786b..3d45a34eb 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/convert/PassportConvert.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java
@@ -1,8 +1,8 @@
-package cn.iocoder.mall.user.convert;
+package cn.iocoder.mall.user.application.convert;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO;
-import cn.iocoder.mall.user.vo.MobileRegisterVO;
+import cn.iocoder.mall.user.application.vo.MobileRegisterVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/vo/MobileRegisterVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/MobileRegisterVO.java
similarity index 96%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/vo/MobileRegisterVO.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/MobileRegisterVO.java
index ce8334cb5..cf0e98c3d 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/vo/MobileRegisterVO.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/MobileRegisterVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.vo;
+package cn.iocoder.mall.user.application.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/vo/UserInfoVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/UserInfoVO.java
similarity index 89%
rename from user/user-application/src/main/java/cn/iocoder/mall/user/vo/UserInfoVO.java
rename to user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/UserInfoVO.java
index 5d416d0d9..df4df46fd 100644
--- a/user/user-application/src/main/java/cn/iocoder/mall/user/vo/UserInfoVO.java
+++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/UserInfoVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.vo;
+package cn.iocoder.mall.user.application.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/MobileCodeServiceImpl.class b/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/MobileCodeServiceImpl.class
index 831b2cecf..c82124c8e 100644
Binary files a/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/MobileCodeServiceImpl.class and b/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/MobileCodeServiceImpl.class differ
diff --git a/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/OAuth2ServiceImpl.class b/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/OAuth2ServiceImpl.class
index 7e78c0388..d8a3be03c 100644
Binary files a/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/OAuth2ServiceImpl.class and b/user/user-service-impl/target/classes/cn/iocoder/mall/user/service/OAuth2ServiceImpl.class differ
diff --git a/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/OAuth2ConvertImpl.java b/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/OAuth2ConvertImpl.java
index 6ad80f039..fdf9cf3fd 100644
--- a/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/OAuth2ConvertImpl.java
+++ b/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/OAuth2ConvertImpl.java
@@ -7,8 +7,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2019-03-05T10:35:05+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
+ date = "2019-03-08T17:14:01+0800",
+ comments = "version: 1.3.0.Final, compiler: javac, environment: Java 11.0.1 (Oracle Corporation)"
)
public class OAuth2ConvertImpl implements OAuth2Convert {
diff --git a/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/UserConvertImpl.java b/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/UserConvertImpl.java
index fb6885ae6..f60c914d1 100644
--- a/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/UserConvertImpl.java
+++ b/user/user-service-impl/target/generated-sources/annotations/cn/iocoder/mall/user/convert/UserConvertImpl.java
@@ -6,8 +6,8 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2019-03-05T10:35:05+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
+ date = "2019-03-08T17:14:01+0800",
+ comments = "version: 1.3.0.Final, compiler: javac, environment: Java 11.0.1 (Oracle Corporation)"
)
public class UserConvertImpl implements UserConvert {