diff --git a/README.md b/README.md index dfd402d..0bd4d2e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ org.wfc │ └── wfc-common-swagger // 系统接口 ├── wfc-modules // 业务模块 │ └── wfc-system // 系统模块 [9201] -│ └── wfc-modules-user // 用户平台模块 [9208] +│ └── wfc-user // 用户平台模块 [9208] │ └── wfc-gen // 代码生成 [9202] │ └── wfc-job // 定时任务 [9203] │ └── wfc-file // 文件服务 [9300] diff --git a/docker/copy.bat b/docker/copy.bat index f604bbf..cce360c 100644 --- a/docker/copy.bat +++ b/docker/copy.bat @@ -27,7 +27,7 @@ echo begin copy wfc-modules-system copy ..\wfc-modules\wfc-system\target\wfc-modules-system.jar .\wfc\modules\system\jar echo begin copy wfc-modules-user -copy ..\wfc-modules\wfc-modules-user\target\wfc-modules-user.jar .\wfc\modules\user\jar +copy ..\wfc-modules\wfc-user\target\wfc-modules-user.jar .\wfc\modules\user\jar echo begin copy wfc-modules-file copy ..\wfc-modules\wfc-file\target\wfc-modules-file.jar .\wfc\modules\file\jar diff --git a/docker/copy.sh b/docker/copy.sh index b2d9991..b45b7c0 100755 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -39,7 +39,7 @@ echo "begin copy wfc-modules-system " cp ../wfc-modules/wfc-system/target/wfc-modules-system.jar ./wfc/modules/system/jar echo "begin copy wfc-modules-user " -cp ../wfc-modules/wfc-modules-user/target/wfc-modules-user.jar ./wfc/modules/user/jar +cp ../wfc-modules/wfc-user/target/wfc-modules-user.jar ./wfc/modules/user/jar echo "begin copy wfc-modules-file " cp ../wfc-modules/wfc-file/target/wfc-modules-file.jar ./wfc/modules/file/jar diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java index ace963e..ab81b6b 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java @@ -26,5 +26,5 @@ public class ServiceNameConstants /** * 用户平台模块的 service_id */ - public static final String USER_SERVICE = "wfc-modules-user"; + public static final String USER_SERVICE = "wfc-user"; } diff --git a/wfc-gateway/src/main/resources/application.yml b/wfc-gateway/src/main/resources/application.yml index 09e1a7e..b4e90ec 100644 --- a/wfc-gateway/src/main/resources/application.yml +++ b/wfc-gateway/src/main/resources/application.yml @@ -49,10 +49,17 @@ spring: filters: - StripPrefix=1 # 用户平台模块 - - id: wfc-modules-user - uri: lb://wfc-modules-user + - id: wfc-ser + uri: lb://wfc-user predicates: - Path=/u/** + filters: + - StripPrefix=1 + # payment module + - id: wfc-payment + uri: lb://wfc-payment + predicates: + - Path=/payment/** filters: - StripPrefix=1 diff --git a/wfc-modules/pom.xml b/wfc-modules/pom.xml index a932806..cc16959 100644 --- a/wfc-modules/pom.xml +++ b/wfc-modules/pom.xml @@ -13,7 +13,7 @@ wfc-gen wfc-job wfc-file - wfc-modules-user + wfc-user wfc-payment diff --git a/wfc-modules/wfc-payment/src/main/resources/application.yml b/wfc-modules/wfc-payment/src/main/resources/application.yml index 29d73a1..ec2b19e 100644 --- a/wfc-modules/wfc-payment/src/main/resources/application.yml +++ b/wfc-modules/wfc-payment/src/main/resources/application.yml @@ -77,7 +77,7 @@ logging: github: binarywang: debug file: - name: /home/wfc/logs/wfc-payment.log + name: /opt/wfc/logs/wfc-payment.log wxpay: appId: 121412414112 @@ -85,5 +85,5 @@ wxpay: mchKey: 1525342aa subAppId: #服务商模式下的子商户公众账号ID subMchId: #服务商模式下的子商户号 - keyPath: /home/wfc/config/payment/wxpay_key.pem + keyPath: /opt/wfc/config/payment/wxpay_key.pem useSandboxEnv: false diff --git a/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml b/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml index 8794ec3..93b3528 100644 --- a/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-payment/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9401 + port: ${WFC_PAYMENT_PORT:9204} # Spring spring: @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml diff --git a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml index bc42c83..79af505 100644 --- a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9201 + port: ${WFC_SYSTEM_PORT:9205} # Spring spring: @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml diff --git a/wfc-modules/wfc-modules-user/pom.xml b/wfc-modules/wfc-user/pom.xml similarity index 100% rename from wfc-modules/wfc-modules-user/pom.xml rename to wfc-modules/wfc-user/pom.xml diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/WfcUserApplication.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/WfcUserApplication.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/ClientController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/ClientController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/ClientController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/ClientController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UAccountController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UAccountController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UAccountController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UAccountController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UCdrController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UCdrController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UCdrHistoryController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrHistoryController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UCdrHistoryController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UCdrHistoryController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UClientController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UClientController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UClientController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UClientController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UConfigController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UConfigController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UConfigController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UConfigController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDeptController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDeptController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDeptController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDeptController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDeviceController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDeviceController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDeviceController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDeviceController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDictDataController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDictDataController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDictDataController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDictDataController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDictTypeController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDictTypeController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UDictTypeController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UDictTypeController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/ULogininforController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/ULogininforController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/ULogininforController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/ULogininforController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UMenuController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UMenuController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UMenuController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UMenuController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UOperlogController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOperlogController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UOperlogController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOperlogController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UOrderController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UOrderController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UPackageController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UPackageController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UPackageController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UPackageController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UPostController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UPostController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UPostController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UPostController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UProfileController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/URateLimitController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/URateLimitController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/URateLimitController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/URateLimitController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/URoleController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/URoleController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/URoleController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/URoleController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UUserController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UUserController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserOnlineController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UUserOnlineController.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserOnlineController.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UUserOnlineController.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UAccount.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UAccount.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UAccount.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UAccount.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UCdr.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UCdr.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UCdr.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UCdr.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UCdrHistory.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UCdrHistory.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UCdrHistory.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UCdrHistory.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UClient.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UClient.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UClient.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UClient.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UConfig.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UConfig.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UConfig.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UConfig.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UDevice.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UDevice.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UDevice.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UDevice.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UMenu.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UMenu.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UMenu.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UMenu.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UOrder.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UOrder.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UOrder.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UOrder.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UPackage.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UPackage.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UPackage.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UPackage.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UPost.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UPost.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UPost.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UPost.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URateLimit.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URateLimit.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URateLimit.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URateLimit.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URoleDept.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URoleDept.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URoleDept.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URoleDept.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URoleMenu.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URoleMenu.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/URoleMenu.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URoleMenu.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserOnline.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserOnline.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserOnline.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserOnline.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserPost.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserPost.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserPost.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserPost.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserRole.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserRole.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUserRole.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UUserRole.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/bo/UCdrClientBo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/bo/UCdrClientBo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/bo/UCdrClientBo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/bo/UCdrClientBo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/OrderStatusEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/OrderStatusEnum.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/OrderStatusEnum.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/OrderStatusEnum.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/OrderTypeEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/OrderTypeEnum.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/OrderTypeEnum.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/OrderTypeEnum.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/PeriodTypeEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/PeriodTypeEnum.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/constant/PeriodTypeEnum.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/PeriodTypeEnum.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/query/UserRepeatQuery.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/query/UserRepeatQuery.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/query/UserRepeatQuery.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/query/UserRepeatQuery.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/MetaVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/MetaVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/MetaVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/MetaVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/RouterVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/RouterVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/RouterVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/RouterVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/TreeSelect.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/TreeSelect.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/TreeSelect.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/TreeSelect.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrClientVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrClientVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrClientVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrClientVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrHistoryUserVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrHistoryUserVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrHistoryUserVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrHistoryUserVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrUserVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrUserVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UCdrUserVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UCdrUserVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UClientCurrentVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UClientCurrentVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UClientCurrentVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UClientCurrentVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UClientHistoryUserVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UClientHistoryUserVo.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UClientHistoryUserVo.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UClientHistoryUserVo.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UAccountMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UAccountMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UAccountMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UAccountMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UCdrHistoryMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrHistoryMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UCdrHistoryMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrHistoryMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UCdrMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UClientMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UClientMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UClientMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UClientMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UConfigMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UConfigMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UConfigMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UConfigMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDeptMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDeptMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDeptMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDeptMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDeviceMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDeviceMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDeviceMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDeviceMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDictDataMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDictDataMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDictDataMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDictDataMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDictTypeMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDictTypeMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UDictTypeMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UDictTypeMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/ULogininforMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/ULogininforMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/ULogininforMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/ULogininforMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UMenuMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UMenuMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UMenuMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UMenuMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UOperLogMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UOperLogMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UOperLogMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UOperLogMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UOrderMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UOrderMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UOrderMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UOrderMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UPackageMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UPackageMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UPackageMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UPackageMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UPostMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UPostMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UPostMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UPostMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URateLimitMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URateLimitMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URateLimitMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URateLimitMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleDeptMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleDeptMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleDeptMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleDeptMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleMenuMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleMenuMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/URoleMenuMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URoleMenuMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserPostMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserPostMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserPostMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserPostMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserRoleMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserRoleMapper.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserRoleMapper.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserRoleMapper.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUAccountService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUAccountService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUCdrHistoryService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrHistoryService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUCdrHistoryService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrHistoryService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUCdrService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUCdrService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUCdrService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUClientService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUClientService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUClientService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUClientService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUConfigService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUConfigService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUConfigService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUConfigService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDeptService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDeptService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDeptService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDeptService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDeviceService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDeviceService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDeviceService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDeviceService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDictDataService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDictDataService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDictDataService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDictDataService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDictTypeService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDictTypeService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUDictTypeService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUDictTypeService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IULogininforService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IULogininforService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IULogininforService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IULogininforService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUMenuService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUMenuService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUMenuService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUMenuService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUOperLogService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUOperLogService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUOperLogService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUOperLogService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUOrderService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUOrderService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUOrderService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUOrderService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPackageService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPackageService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPackageService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPackageService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPermissionService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPermissionService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPermissionService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPermissionService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPostService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPostService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUPostService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUPostService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IURateLimitService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IURateLimitService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IURateLimitService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IURateLimitService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IURoleService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IURoleService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IURoleService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IURoleService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserOnlineService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUUserOnlineService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserOnlineService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUUserOnlineService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUUserService.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserService.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUUserService.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrHistoryServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrHistoryServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrHistoryServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrHistoryServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UClientServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UConfigServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UConfigServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UConfigServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UConfigServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDeptServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDeptServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDeptServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDeptServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDeviceServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDeviceServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDeviceServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDeviceServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDictDataServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDictDataServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDictDataServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDictDataServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDictTypeServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDictTypeServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UDictTypeServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UDictTypeServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/ULogininforServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/ULogininforServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/ULogininforServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/ULogininforServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UMenuServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UMenuServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UMenuServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UMenuServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UOperLogServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOperLogServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UOperLogServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOperLogServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPackageServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPackageServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPackageServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPackageServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPermissionServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPermissionServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPermissionServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPermissionServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPostServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPostServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UPostServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UPostServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/URateLimitServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/URateLimitServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/URateLimitServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/URateLimitServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/URoleServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/URoleServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/URoleServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/URoleServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserOnlineServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UUserOnlineServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserOnlineServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UUserOnlineServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UUserServiceImpl.java diff --git a/wfc-modules/wfc-modules-user/src/main/resources/application.yml b/wfc-modules/wfc-user/src/main/resources/application.yml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/application.yml rename to wfc-modules/wfc-user/src/main/resources/application.yml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/banner.txt b/wfc-modules/wfc-user/src/main/resources/banner.txt similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/banner.txt rename to wfc-modules/wfc-user/src/main/resources/banner.txt diff --git a/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml b/wfc-modules/wfc-user/src/main/resources/bootstrap.yml similarity index 77% rename from wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml rename to wfc-modules/wfc-user/src/main/resources/bootstrap.yml index edc7291..e9a47a5 100644 --- a/wfc-modules/wfc-modules-user/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-user/src/main/resources/bootstrap.yml @@ -1,12 +1,12 @@ # Tomcat server: - port: 9208 + port: ${WFC_USER_PORT:9206} # Spring spring: application: # 应用名称 - name: wfc-modules-user + name: wfc-user profiles: # 环境配置 active: '@profileName@' @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} config: # 配置中心地址 - server-addr: ${NACOS_SERVER_ADDR} + server-addr: wfc-nacos:${NACOS_SERVER_PORT} namespace: ${NACOS_NAME_SPACE} # 配置文件格式 file-extension: yml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/logback.xml b/wfc-modules/wfc-user/src/main/resources/logback.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/logback.xml rename to wfc-modules/wfc-user/src/main/resources/logback.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UAccountMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UAccountMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UAccountMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UAccountMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrHistoryMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrHistoryMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrHistoryMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrHistoryMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UCdrMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UClientMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UClientMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UConfigMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UConfigMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UConfigMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UConfigMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDeptMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UDeptMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDeptMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UDeptMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDeviceMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UDeviceMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDeviceMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UDeviceMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDictDataMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UDictDataMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDictDataMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UDictDataMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDictTypeMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UDictTypeMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UDictTypeMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UDictTypeMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/ULogininforMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/ULogininforMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/ULogininforMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/ULogininforMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UMenuMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UMenuMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UMenuMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UMenuMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UOperLogMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UOperLogMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UOperLogMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UOperLogMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UOrderMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UOrderMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UOrderMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UOrderMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UPackageMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UPackageMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UPackageMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UPackageMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UPostMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UPostMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UPostMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UPostMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URateLimitMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/URateLimitMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URateLimitMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/URateLimitMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleDeptMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/URoleDeptMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleDeptMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/URoleDeptMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/URoleMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/URoleMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleMenuMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/URoleMenuMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/URoleMenuMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/URoleMenuMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserPostMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserPostMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserPostMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UUserPostMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserRoleMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserRoleMapper.xml similarity index 100% rename from wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserRoleMapper.xml rename to wfc-modules/wfc-user/src/main/resources/mapper/user/UUserRoleMapper.xml diff --git a/wfc-modules/wfc-modules-user/src/test/java/org/wfc/user/UClientTest.java b/wfc-modules/wfc-user/src/test/java/org/wfc/user/UClientTest.java similarity index 100% rename from wfc-modules/wfc-modules-user/src/test/java/org/wfc/user/UClientTest.java rename to wfc-modules/wfc-user/src/test/java/org/wfc/user/UClientTest.java