From 1c2acaa1054a356115bf2eba51c45046b92c0110 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 9 Mar 2019 00:50:19 +0800 Subject: [PATCH] =?UTF-8?q?user=20maven=20=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4=20ops=20=E5=A2=9E=E5=8A=A0=E6=89=93?= =?UTF-8?q?=E5=8C=85=20build=20admin=20application=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yaml | 6 ++++++ .../src/main/resources/application.yaml | 4 ---- admin/admin-service-impl/pom.xml | 1 - ops/pom.xml | 15 +++++++++++++ pom.xml | 20 ++++++++++++++++++ .../{ => application}/UserApplication.java | 2 +- .../config/MVCConfiguration.java | 2 +- .../config/SwaggerConfiguration.java | 2 +- .../controller/PassportController.java | 6 +++--- .../controller/UserController.java | 4 ++-- .../convert/PassportConvert.java | 4 ++-- .../vo/MobileRegisterVO.java | 2 +- .../user/{ => application}/vo/UserInfoVO.java | 2 +- .../user/service/MobileCodeServiceImpl.class | Bin 4783 -> 4774 bytes .../mall/user/service/OAuth2ServiceImpl.class | Bin 7282 -> 7273 bytes .../mall/user/convert/OAuth2ConvertImpl.java | 4 ++-- .../mall/user/convert/UserConvertImpl.java | 4 ++-- 17 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 admin/admin-application/src/main/resources/application-test.yaml rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/UserApplication.java (88%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/config/MVCConfiguration.java (97%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/config/SwaggerConfiguration.java (96%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/controller/PassportController.java (94%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/controller/UserController.java (87%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/convert/PassportConvert.java (83%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/vo/MobileRegisterVO.java (96%) rename user/user-application/src/main/java/cn/iocoder/mall/user/{ => application}/vo/UserInfoVO.java (89%) 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 831b2cecf95ec592142b62460b5b41dcb5f99409..c82124c8e94a889c1d780443c183ae84699ce645 100644 GIT binary patch delta 718 zcmXw%*H2Vo5XFCY7xKYnB5F{K@c~SDFrkPsMj!M^BQbWshNvsM>ark66D#)KFGfMY zj$OpHu1c|s{jc!Nzrdj1Eb%6D=FH6b&dkH@%IeH&8W@cA0F(LYl1m_&9M+~#MlhKW z>s$-#T{aMQDJSAmL8VI?8(qdyrQ&MUZPH$iOD%O;)@#||Qo?2}8(p@r)v!(50fp@< z-Jz^$XB-W?)G{p8esye8L9MZvI?Hy5eRM|0|9#7(g=93Di6i%zr z8G~nNHk@@xEvpKKW;IraYeGfg%22I?(>*xbA1z3zcf7vDUy*add0Gsu!Ufudb~+3f zg-cvEToJBv&2U}lWJ5lh&5I)i&Owmg|X>Y2s0cD?QaY&eEKj8~4!dJct-_`F2{n0)XP0CEm7@f|1`yV9x zD6nacjRiJ*EW}|Ei@oOIk=#OxYz5gATjnE^6noNK{QsX8+F`K`hovm@az^}iYQ1qI z^McE*$VV%wtcc6!SUFV_u+iP$whfsqFj1U1I!gT@Dm#wdy+_Hu=*Ub-}~fxTfrHV{P= zv5SZm1sgW(sUEOURz<7STB$E}xXtHAou_lJK ztaB}dU2@2E$s^yTfI^o+6uAs%y^4!fSE992momyV-JofO%SJY7y4ht5TMd<3&QhpS z>9z>luDHXnQynACT{?cZdhc=B%RaT(uc`yONVPT&YVDA+!^)0m_h>Z7G#*#*6i%qo zNy90_X~P+ZxU9nLP-;a{xHyy%&JUG1I4#}N{eHVzYid-P)5lQbFyBiLO!fW-8VhQL zv(y>R3FoO7F3@1OC|sh^a9L>Lis7nojqAbSl9bdir*o2cxQvd`2xL`|}f@P#_zE8m3g>i2_AugAoD zY5u{jzf5IxLR$Qgq0F&=M~sgdHq5kVu01}|ahPY{RCT}H<^<1Y4OV~^w^U9Jj)E4 g;j`dGYy(bYquy;+Seunr>0=e+Y;-LP+PE720d;qjC`=*itDC;lbDzLLYb`K>-Po2SpNI2+2)pNU^jA${--nJY5t;0g+K;l+l4%Mi~TDK#_X(#fP)bI(x6R_de(UZ+5xVrD50o^&5e5 zDfT?hlsMg(>Y2vNp67VQ;8lxF_q@jI25)5Yrspl*_EZ!3kbB3|i5bS;HT`>z_dPk5 zo5lxmKIEgU03Ta!rq!C2#cbxpnae!i5OBU{0Si5!@TsRgi#(6A*t3MCrdejO<(?I+ zwBstPwc4@9!c(ki(%4#q&kR0ytg|j(SeY*^vfj*J8T;BgZ*Xk1iBsk$HW~fKV6(Zt zHMYfIs~xvxv7H^BoqT7oE0gat+3nfGUdKMie#e1iHz~|W|G{xEnP@UVas=OVbVcR! zbyc-B!ySi``(6K7@nPi%1C*m2Q-0(p7nEN)Cp;Flix)*Je0IZmE;ueKm$*Z|0wtPSGiB46I6sol~~Y9nxs3)P-zk-6=#u5i3^=8YRal=D{2Q-4l5g) zsIHDW#`B^p&6+-`G=vewb3-M|K&7dWJtQ$QQ8uEks=BO4qOMZuP7kG@WUDljoG^(r zS7{+FRa(hILV37Wc`s!`s+8o0Dt7ta!4&j)CT*?shhW delta 929 zcmXYvS#Xs_5QV?KS?1ok4J05TCPV^4N-P3W=79&TLV+qlA5dQ@s;H1kp+&+fD8z^a z35aYzpt6X93$iI*1x;8)*#uV>S5yRV!s3F62rA3;m4`WVru&@kp85Y%{m%8P-+!fP zJ5V7#Ja;iOL4O)OvzYC9nmGo~SZuCm9`g+r#98QxSmasE5+8EUdiwI5vFA;{)UnKy zXSrD{Pq2a)k^xp)?nSHhQj%4yPVh3X`1*jadR}9V=XKV4y0gx6E9*TQ*l3zJEcT{n z6K~luWwqXRykp^+)^xM6Ee7uzyys}LF3nbEt3|e%dAqS4*7<$MPMbJmzWW2C9~$g3 z*KT8b4EEY_Uy_g5?>WH72A{Gs@s6*A`e!LL+ja$+?X0$eJZfTsKp1sm>Tsgtdp`ntdMR}ZhW7CvJc}!{Lq|hr`5HF4H z$kmWK#c9VG8>bO1r?E) zlPr~NiK*lSt>lVx5?4utYlycToi s55hXCg5`RB6UGQn5w+`F9$hFd$O@MWd_bq^nM?zN!tR4+M%bT%YxI896951J 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 {