browser-backend

pom.xml

@@ -129,6 +129,29 @@
             <version>1.2.62</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>7.4.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>7.4.0</version>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/edgec/browserbackend/controller/account/AccountController.java → src/main/java/com/edgec/browserbackend/account/controller/AccountController.java

-package com.edgec.browserbackend.controller.account;
+package com.edgec.browserbackend.account.controller;
 
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
-import com.edgec.browserbackend.dto.BillQueryCriteriaDto;
+import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto;
 import com.edgec.browserbackend.common.auth.Securitys;
 import com.edgec.browserbackend.common.commons.utils.DateConverter;
-import com.edgec.browserbackend.service.account.AccountService;
-import com.edgec.browserbackend.service.account.AlipayCertificationService;
-import com.edgec.browserbackend.service.account.EmailService;
-import com.edgec.browserbackend.service.account.PaymentService;
+import com.edgec.browserbackend.account.service.AccountService;
+import com.edgec.browserbackend.account.service.EmailService;
+import com.edgec.browserbackend.account.service.PaymentService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
@@ -47,9 +45,6 @@ public class AccountController {
     @Autowired
     private EmailService emailService;
 
-    @Autowired
-    private AlipayCertificationService alipayCertificationService;
-
     private static final Logger logger = LoggerFactory.getLogger(AccountController.class);
 
     @PreAuthorize("#oauth2.hasScope('server')")
@@ -282,13 +277,6 @@ public class AccountController {
         return accountService.getUserPayment(pageable, principal.getName());
     }
 
-    @RequestMapping(path = "/queryauthresult", method = RequestMethod.GET)
-    public List<String> queryAuthResult(@RequestParam(value = "shortUrl") String shortUrl,
-                                        @RequestParam(value = "type") String type,
-                                        Principal principal) {
-        return alipayCertificationService.queryAuthenticationResults(principal.getName(), shortUrl, type);
-    }
-
 
     @RequestMapping(path = "/wirteinvoice", method = RequestMethod.POST)
     public boolean writeInvoice(Principal principal, @RequestBody Invoice invoice) {

src/main/java/com/edgec/browserbackend/controller/account/ErrorHandler.java → src/main/java/com/edgec/browserbackend/account/controller/AccountErrorHandler.java

-package com.edgec.browserbackend.controller.account;
+package com.edgec.browserbackend.account.controller;
 
-import com.edgec.browserbackend.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.common.commons.error.ApiError;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.commons.error.InternalServerErrorException;
@@ -17,7 +17,7 @@ import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 @ControllerAdvice
-public class ErrorHandler extends ResponseEntityExceptionHandler {
+public class AccountErrorHandler extends ResponseEntityExceptionHandler {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 

src/main/java/com/edgec/browserbackend/controller/account/AdministratorController.java → src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

-package com.edgec.browserbackend.controller.account;
+package com.edgec.browserbackend.account.controller;
 
 
+import com.edgec.browserbackend.account.service.*;
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
 import com.edgec.browserbackend.common.auth.Securitys;
-import com.edgec.browserbackend.service.account.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

src/main/java/com/edgec/browserbackend/controller/account/LimitedUsers.java → src/main/java/com/edgec/browserbackend/account/controller/LimitedUsers.java

-package com.edgec.browserbackend.controller.account;
+package com.edgec.browserbackend.account.controller;
 
-import com.edgec.browserbackend.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/edgec/browserbackend/domain/account/Account.java → src/main/java/com/edgec/browserbackend/account/domain/Account.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.validator.constraints.Length;
@@ -42,8 +42,6 @@ public class Account {
 
     private boolean isPrePaid = true;
 
-    private boolean isVpsUser = false;
-
     private String token;
 
     /**
@@ -59,14 +57,6 @@ public class Account {
         isQualified = qualified;
     }
 
-    public boolean isVpsUser() {
-        return isVpsUser;
-    }
-
-    public void setVpsUser(boolean vpsUser) {
-        isVpsUser = vpsUser;
-    }
-
     public int getIprate() {
         return iprate;
     }

src/main/java/com/edgec/browserbackend/domain/account/AccountDto.java → src/main/java/com/edgec/browserbackend/account/domain/AccountDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -42,10 +42,6 @@ public class AccountDto {
 
     private String parent;
 
-    private String realName;
-
-    private String idCard;
-
     private String token;
 
     public AccountDto(){
@@ -59,14 +55,11 @@ public class AccountDto {
         this.setCompanyName(account.getCompanyName());
         this.setCountry(account.getCountry());
         this.setEmail(account.getEmail());
-        this.setFullname(account.getFullname());
         this.setJobTitle(account.getJobTitle());
         this.setPhoneNumber(account.getPhoneNumber());
         this.setProvince(account.getProvince());
         this.setUserServices(account.getUserServices());
         this.setParent(account.getParent());
-        this.setRealName(account.getRealName());
-        this.setIdCard(account.getIdCard());
         this.setToken(account.getToken());
     }
 
@@ -225,21 +218,6 @@ public class AccountDto {
         this.parent = parent;
     }
 
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
 
     public String getToken() {
         return token;

src/main/java/com/edgec/browserbackend/domain/account/AccountServerUsingStatus.java → src/main/java/com/edgec/browserbackend/account/domain/AccountServerUsingStatus.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum AccountServerUsingStatus {
 

src/main/java/com/edgec/browserbackend/domain/account/Administrator.java → src/main/java/com/edgec/browserbackend/account/domain/Administrator.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/BillStatus.java → src/main/java/com/edgec/browserbackend/account/domain/BillStatus.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum BillStatus {
     NOTCREATED,

src/main/java/com/edgec/browserbackend/domain/account/CloudAccountDto.java → src/main/java/com/edgec/browserbackend/account/domain/CloudAccountDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class CloudAccountDto {
 

src/main/java/com/edgec/browserbackend/domain/account/CloudUserOrder.java → src/main/java/com/edgec/browserbackend/account/domain/CloudUserOrder.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
-import com.edgec.browserbackend.service.account.SmsUtils;
+import com.edgec.browserbackend.account.service.SmsUtils;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/edgec/browserbackend/domain/account/CompanyEarningsDto.java → src/main/java/com/edgec/browserbackend/account/domain/CompanyEarningsDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class CompanyEarningsDto {
 

src/main/java/com/edgec/browserbackend/domain/account/CompanyMonthReport.java → src/main/java/com/edgec/browserbackend/account/domain/CompanyMonthReport.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import org.springframework.data.mongodb.core.mapping.Document;
 

src/main/java/com/edgec/browserbackend/domain/account/ContactUs.java → src/main/java/com/edgec/browserbackend/account/domain/ContactUs.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class ContactUs {
 

src/main/java/com/edgec/browserbackend/domain/account/Currency.java → src/main/java/com/edgec/browserbackend/account/domain/Currency.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum Currency {
 

src/main/java/com/edgec/browserbackend/domain/account/DeductionRecord.java → src/main/java/com/edgec/browserbackend/account/domain/DeductionRecord.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class DeductionRecord {
 

src/main/java/com/edgec/browserbackend/domain/account/EarningsStatus.java → src/main/java/com/edgec/browserbackend/account/domain/EarningsStatus.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum EarningsStatus {
 

src/main/java/com/edgec/browserbackend/domain/account/Invoice.java → src/main/java/com/edgec/browserbackend/account/domain/Invoice.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import org.springframework.data.mongodb.core.mapping.Document;
 

src/main/java/com/edgec/browserbackend/domain/account/InvoiceType.java → src/main/java/com/edgec/browserbackend/account/domain/InvoiceType.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum InvoiceType {
 

src/main/java/com/edgec/browserbackend/domain/account/IpChargeRequestDto.java → src/main/java/com/edgec/browserbackend/account/domain/IpChargeRequestDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class IpChargeRequestDto {
     private int period;

src/main/java/com/edgec/browserbackend/domain/account/IpChargeResultDto.java → src/main/java/com/edgec/browserbackend/account/domain/IpChargeResultDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class IpChargeResultDto {
 

src/main/java/com/edgec/browserbackend/domain/account/Otp.java → src/main/java/com/edgec/browserbackend/account/domain/Otp.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/PaymentMethod.java → src/main/java/com/edgec/browserbackend/account/domain/PaymentMethod.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum PaymentMethod {
 

src/main/java/com/edgec/browserbackend/domain/account/PreOrder.java → src/main/java/com/edgec/browserbackend/account/domain/PreOrder.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/RealnameAuthRecord.java → src/main/java/com/edgec/browserbackend/account/domain/RealnameAuthRecord.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/ServiceType.java → src/main/java/com/edgec/browserbackend/account/domain/ServiceType.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum ServiceType {
     TRIAL,

src/main/java/com/edgec/browserbackend/domain/account/Services.java → src/main/java/com/edgec/browserbackend/account/domain/Services.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum Services {
 

src/main/java/com/edgec/browserbackend/domain/account/TimePeriod.java → src/main/java/com/edgec/browserbackend/account/domain/TimePeriod.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public enum TimePeriod {
 

src/main/java/com/edgec/browserbackend/domain/account/User.java → src/main/java/com/edgec/browserbackend/account/domain/User.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import org.hibernate.validator.constraints.Length;
 

src/main/java/com/edgec/browserbackend/domain/account/UserBalance.java → src/main/java/com/edgec/browserbackend/account/domain/UserBalance.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/edgec/browserbackend/domain/account/UserBillDto.java → src/main/java/com/edgec/browserbackend/account/domain/UserBillDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class UserBillDto {
 

src/main/java/com/edgec/browserbackend/domain/account/UserBillList.java → src/main/java/com/edgec/browserbackend/account/domain/UserBillList.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/edgec/browserbackend/domain/account/UserBilling.java → src/main/java/com/edgec/browserbackend/account/domain/UserBilling.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/UserDto.java → src/main/java/com/edgec/browserbackend/account/domain/UserDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/edgec/browserbackend/domain/account/UserLackMoney.java → src/main/java/com/edgec/browserbackend/account/domain/UserLackMoney.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/UserListDto.java → src/main/java/com/edgec/browserbackend/account/domain/UserListDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.util.List;
 

src/main/java/com/edgec/browserbackend/domain/account/UserPayment.java → src/main/java/com/edgec/browserbackend/account/domain/UserPayment.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
-import com.edgec.browserbackend.service.account.SmsUtils;
+import com.edgec.browserbackend.account.service.SmsUtils;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/edgec/browserbackend/domain/account/UserPaymentDto.java → src/main/java/com/edgec/browserbackend/account/domain/UserPaymentDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class UserPaymentDto {
 

src/main/java/com/edgec/browserbackend/domain/account/UserPrePaidBilling.java → src/main/java/com/edgec/browserbackend/account/domain/UserPrePaidBilling.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/edgec/browserbackend/domain/account/UserPrePaidBillingDto.java → src/main/java/com/edgec/browserbackend/account/domain/UserPrePaidBillingDto.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 public class UserPrePaidBillingDto {
 

src/main/java/com/edgec/browserbackend/domain/account/UserRate.java → src/main/java/com/edgec/browserbackend/account/domain/UserRate.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/account/UserService.java → src/main/java/com/edgec/browserbackend/account/domain/UserService.java

-package com.edgec.browserbackend.domain.account;
+package com.edgec.browserbackend.account.domain;
 
 import java.util.Date;
 

src/main/java/com/edgec/browserbackend/dto/BillQueryCriteriaDto.java → src/main/java/com/edgec/browserbackend/account/dto/BillQueryCriteriaDto.java

-package com.edgec.browserbackend.dto;
+package com.edgec.browserbackend.account.dto;
 
-
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.Services;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.Services;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/com/edgec/browserbackend/dto/CvmChargeRegion.java → src/main/java/com/edgec/browserbackend/account/dto/CvmChargeRegion.java

-package com.edgec.browserbackend.dto;
+package com.edgec.browserbackend.account.dto;
 
 // 购买，续费云主机时参数
 public class CvmChargeRegion {

src/main/java/com/edgec/browserbackend/exception/AccountErrorCode.java → src/main/java/com/edgec/browserbackend/account/exception/AccountErrorCode.java

-package com.edgec.browserbackend.exception;
+package com.edgec.browserbackend.account.exception;
 
 import com.edgec.browserbackend.common.commons.error.ErrorCode;
 import com.fasterxml.jackson.annotation.JsonValue;

src/main/java/com/edgec/browserbackend/repository/AccountRepository.java → src/main/java/com/edgec/browserbackend/account/repository/AccountRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.Account;
+import com.edgec.browserbackend.account.domain.Account;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;
@@ -22,15 +22,7 @@ public interface AccountRepository extends MongoRepository<Account, String>, Acc
 
     Page<Account> findByParentIsNull(Pageable request);
 
-    List<Account> findByAgencyID(String AgencyID);
-
     Page<Account> findAllBySignupDateBetween(Pageable pageable, Date startDate, Date endDate);
 
     Page<Account> findAll(Pageable pageable);
-
-    Page<Account> findBySignupDateBetweenAndIsVpsUser(Pageable pageable, Date beginDate, Date endDate, boolean isVpsUser);
-
-    Account findByNameAndIsVpsUser(String name, boolean isVpsUser);
-
-    List<Account> findByIdCard(String idCard);
 }

src/main/java/com/edgec/browserbackend/repository/AccountRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/AccountRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
 import java.util.List;
 

src/main/java/com/edgec/browserbackend/repository/AccountRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/AccountRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.Account;
+import com.edgec.browserbackend.account.domain.Account;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

src/main/java/com/edgec/browserbackend/repository/AdministratorRepository.java → src/main/java/com/edgec/browserbackend/account/repository/AdministratorRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.Administrator;
+import com.edgec.browserbackend.account.domain.Administrator;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/CloudUserOrderRepository.java → src/main/java/com/edgec/browserbackend/account/repository/CloudUserOrderRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.CloudUserOrder;
+import com.edgec.browserbackend.account.domain.CloudUserOrder;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/InvoiceRepository.java → src/main/java/com/edgec/browserbackend/account/repository/InvoiceRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.Invoice;
+import com.edgec.browserbackend.account.domain.Invoice;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/MonthReportRepository.java → src/main/java/com/edgec/browserbackend/account/repository/MonthReportRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.CompanyMonthReport;
+import com.edgec.browserbackend.account.domain.CompanyMonthReport;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;

src/main/java/com/edgec/browserbackend/repository/OtpRepository.java → src/main/java/com/edgec/browserbackend/account/repository/OtpRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
 
-import com.edgec.browserbackend.domain.account.Otp;
+import com.edgec.browserbackend.account.domain.Otp;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 public interface OtpRepository extends MongoRepository<Otp, String> {

src/main/java/com/edgec/browserbackend/repository/PreOrderRepository.java → src/main/java/com/edgec/browserbackend/account/repository/PreOrderRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.PreOrder;
+import com.edgec.browserbackend.account.domain.PreOrder;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/RealnameAuthRecordRepository.java → src/main/java/com/edgec/browserbackend/account/repository/RealnameAuthRecordRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.RealnameAuthRecord;
+import com.edgec.browserbackend.account.domain.RealnameAuthRecord;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/RealnameAuthRecordRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/RealnameAuthRecordRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
 public interface RealnameAuthRecordRepositoryCustom {
 

src/main/java/com/edgec/browserbackend/repository/RealnameAuthRecordRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/RealnameAuthRecordRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.RealnameAuthRecord;
+import com.edgec.browserbackend.account.domain.RealnameAuthRecord;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

src/main/java/com/edgec/browserbackend/repository/UserBalanceRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserBalanceRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserBalance;
+import com.edgec.browserbackend.account.domain.UserBalance;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/UserBalanceRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/UserBalanceRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserBalance;
+import com.edgec.browserbackend.account.domain.UserBalance;
 
 public interface UserBalanceRepositoryCustom {
 

src/main/java/com/edgec/browserbackend/repository/UserBalanceRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/UserBalanceRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserBalance;
+import com.edgec.browserbackend.account.domain.UserBalance;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

src/main/java/com/edgec/browserbackend/repository/UserBillingRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserBillingRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
 
-import com.edgec.browserbackend.domain.account.UserBilling;
+import com.edgec.browserbackend.account.domain.UserBilling;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/edgec/browserbackend/repository/UserLackMoneyRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserLackMoneyRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserLackMoney;
+import com.edgec.browserbackend.account.domain.UserLackMoney;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 public interface UserLackMoneyRepository extends MongoRepository<UserLackMoney, String>, UserLackMoneyRepositoryCustom {

src/main/java/com/edgec/browserbackend/repository/UserLackMoneyRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/UserLackMoneyRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserLackMoney;
+import com.edgec.browserbackend.account.domain.UserLackMoney;
 
 import java.util.List;
 

src/main/java/com/edgec/browserbackend/repository/UserLackMoneyRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/UserLackMoneyRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
-import com.edgec.browserbackend.domain.account.UserLackMoney;
+package com.edgec.browserbackend.account.repository;
+import com.edgec.browserbackend.account.domain.UserLackMoney;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/edgec/browserbackend/repository/UserPaymentRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserPaymentRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserPayment;
+import com.edgec.browserbackend.account.domain.UserPayment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;

src/main/java/com/edgec/browserbackend/repository/UserPaymentRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/UserPaymentRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
 
-import com.edgec.browserbackend.domain.account.UserPayment;
+import com.edgec.browserbackend.account.domain.UserPayment;
 
 public interface UserPaymentRepositoryCustom {
 

src/main/java/com/edgec/browserbackend/repository/UserPaymentRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/UserPaymentRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserPayment;
+import com.edgec.browserbackend.account.domain.UserPayment;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/edgec/browserbackend/repository/UserPrePaidBillingRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserPrePaidBillingRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;

src/main/java/com/edgec/browserbackend/repository/UserPrePaidBillingRepositoryCustom.java → src/main/java/com/edgec/browserbackend/account/repository/UserPrePaidBillingRepositoryCustom.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.DeductionRecord;
-import com.edgec.browserbackend.domain.account.Services;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
-import com.edgec.browserbackend.dto.BillQueryCriteriaDto;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.DeductionRecord;
+import com.edgec.browserbackend.account.domain.Services;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
+import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/edgec/browserbackend/repository/UserPrePaidBillingRepositoryCustomImpl.java → src/main/java/com/edgec/browserbackend/account/repository/UserPrePaidBillingRepositoryCustomImpl.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.DeductionRecord;
-import com.edgec.browserbackend.domain.account.Services;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
-import com.edgec.browserbackend.dto.BillQueryCriteriaDto;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.DeductionRecord;
+import com.edgec.browserbackend.account.domain.Services;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
+import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/edgec/browserbackend/repository/UserRateRepository.java → src/main/java/com/edgec/browserbackend/account/repository/UserRateRepository.java

-package com.edgec.browserbackend.repository;
+package com.edgec.browserbackend.account.repository;
 
-import com.edgec.browserbackend.domain.account.UserRate;
+import com.edgec.browserbackend.account.domain.UserRate;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.repository.MongoRepository;

src/main/java/com/edgec/browserbackend/service/account/AccountService.java → src/main/java/com/edgec/browserbackend/account/service/AccountService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
-import com.edgec.browserbackend.dto.BillQueryCriteriaDto;
-import com.edgec.browserbackend.dto.CloudUserOrderDto;
+import com.edgec.browserbackend.account.dto.BillQueryCriteriaDto;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -99,8 +94,6 @@ public interface AccountService {
 
     String deletePreOrder(String userName);
 
-    boolean isIdcardAuth(String idCard, String type);
-
     List<Invoice> findByUsername(String username);
 
     boolean writeInvoice(Invoice invoice);
@@ -109,31 +102,4 @@ public interface AccountService {
 
     void updateUserToken(String username, String token);
 
-    String createCloudUserOrder(String username, CloudUserOrderDto cloudUserOrderDto);
-
-    CloudUserOrder queryCloudUserOrder(String username, String tradeNo);
-
-    CloudUserOrderDto queryCloudUserOrderDto(String username, String tradeNo);
-
-    List<CloudUserOrder> queryAllCloudUserOrder(String username, String service, String status);
-
-    CloudUserOrder updateCloudUserOrder(String username, String tradeNo, String status);
-
-    void updateCloudUserOrder(String tradeNo, String status);
-
-    void payCloudUserOrderByAli(HttpServletRequest request, HttpServletResponse response, String tradeNo) throws IOException;
-
-    UserPaymentDto payCloudUserOrderByWx(String username, String tradeNo);
-
-    /**
-     * 查询是否具有免费试用资格
-     * @param username 用户名
-     * @return 是否有资格
-     */
-    boolean queryQualified(String username);
-
-    boolean bingdOrderWithCloudUser(String tradeNo, String username);
-
-    void removeQualified(String username);
-
 }

src/main/java/com/edgec/browserbackend/service/account/AdministratorService.java → src/main/java/com/edgec/browserbackend/account/service/AdministratorService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/edgec/browserbackend/service/account/DataCacheManager.java → src/main/java/com/edgec/browserbackend/account/service/DataCacheManager.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;

src/main/java/com/edgec/browserbackend/service/account/EmailService.java → src/main/java/com/edgec/browserbackend/account/service/EmailService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 public interface EmailService {
 

src/main/java/com/edgec/browserbackend/service/account/MonthReportService.java → src/main/java/com/edgec/browserbackend/account/service/MonthReportService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
-import com.edgec.browserbackend.domain.account.CompanyMonthReport;
+import com.edgec.browserbackend.account.domain.CompanyMonthReport;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/edgec/browserbackend/service/account/PaymentService.java → src/main/java/com/edgec/browserbackend/account/service/PaymentService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 
-import com.edgec.browserbackend.domain.account.UserBalance;
-import com.edgec.browserbackend.domain.account.UserPaymentDto;
+import com.edgec.browserbackend.account.domain.UserBalance;
+import com.edgec.browserbackend.account.domain.UserPaymentDto;
 
 public interface PaymentService {
 

src/main/java/com/edgec/browserbackend/service/account/SmsUtils.java → src/main/java/com/edgec/browserbackend/account/service/SmsUtils.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;
@@ -8,7 +8,7 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.edgec.browserbackend.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/edgec/browserbackend/service/account/UserLackMoneyService.java → src/main/java/com/edgec/browserbackend/account/service/UserLackMoneyService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
-import com.edgec.browserbackend.domain.account.UserLackMoney;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
+import com.edgec.browserbackend.account.domain.UserLackMoney;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
 
 import java.util.List;
 

src/main/java/com/edgec/browserbackend/service/account/UserPrePaidBillingService.java → src/main/java/com/edgec/browserbackend/account/service/UserPrePaidBillingService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
 
 import java.util.List;
 

src/main/java/com/edgec/browserbackend/service/account/UserRateService.java → src/main/java/com/edgec/browserbackend/account/service/UserRateService.java

-package com.edgec.browserbackend.service.account;
+package com.edgec.browserbackend.account.service;
 
-import com.edgec.browserbackend.domain.account.UserRate;
+import com.edgec.browserbackend.account.domain.UserRate;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/edgec/browserbackend/service/account/impl/AdministratorServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
-import com.edgec.browserbackend.exception.AccountErrorCode;
-import com.edgec.browserbackend.repository.*;
-import com.edgec.browserbackend.service.account.AdministratorService;
-import com.edgec.browserbackend.service.auth.UserAuthService;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.repository.*;
+import com.edgec.browserbackend.account.service.AdministratorService;
+import com.edgec.browserbackend.auth.service.UserAuthService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
 
 
 @Service
+@ComponentScan("com.edgec.browserbackend.account.repository")
 public class AdministratorServiceImpl implements AdministratorService {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -61,7 +62,7 @@ public class AdministratorServiceImpl implements AdministratorService {
         newUser.setPassword(administrator.getPassword());
         newUser.setEnabled(true);
 
-        userAuthService.create(new com.edgec.browserbackend.domain.auth.User(newUser));
+        userAuthService.create(new com.edgec.browserbackend.auth.domain.User(newUser));
 
         administrator1.setPassword("");
         administratorRepository.save(administrator1);
@@ -115,7 +116,7 @@ public class AdministratorServiceImpl implements AdministratorService {
 
         User newUser = new User();
         newUser.setUsername(name);
-        userAuthService.unlock(new com.edgec.browserbackend.domain.auth.User(newUser),"unlock");
+        userAuthService.unlock(new com.edgec.browserbackend.auth.domain.User(newUser),"unlock");
 
         return newAccount;
     }
@@ -130,7 +131,7 @@ public class AdministratorServiceImpl implements AdministratorService {
 
         User abnormalUser = new User();
         abnormalUser.setUsername(name);
-        userAuthService.lock(new com.edgec.browserbackend.domain.auth.User(abnormalUser),"lock");
+        userAuthService.lock(new com.edgec.browserbackend.auth.domain.User(abnormalUser),"lock");
 
         accountRepository.save(abnormalAccount);
 

src/main/java/com/edgec/browserbackend/service/account/impl/EmailServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/EmailServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
-import com.edgec.browserbackend.exception.AccountErrorCode;
-import com.edgec.browserbackend.service.account.EmailService;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.service.EmailService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/edgec/browserbackend/service/account/impl/MonthReportServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/MonthReportServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
-import com.edgec.browserbackend.domain.account.CompanyMonthReport;
-import com.edgec.browserbackend.repository.MonthReportRepository;
-import com.edgec.browserbackend.service.account.MonthReportService;
+import com.edgec.browserbackend.account.service.MonthReportService;
+import com.edgec.browserbackend.account.domain.CompanyMonthReport;
+import com.edgec.browserbackend.account.repository.MonthReportRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/edgec/browserbackend/service/account/impl/PaymentServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayClient;
@@ -7,15 +7,14 @@ import com.alipay.api.request.AlipayTradePagePayRequest;
 import com.alipay.api.request.AlipayTradeQueryRequest;
 import com.alipay.api.response.AlipayTradePagePayResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.repository.UserBalanceRepository;
+import com.edgec.browserbackend.account.repository.UserPaymentRepository;
+import com.edgec.browserbackend.account.service.AccountService;
+import com.edgec.browserbackend.account.service.PaymentService;
+import com.edgec.browserbackend.account.controller.AccountController;
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.controller.account.AccountController;
-import com.edgec.browserbackend.domain.account.*;
-import com.edgec.browserbackend.exception.AccountErrorCode;
-import com.edgec.browserbackend.repository.UserBalanceRepository;
-import com.edgec.browserbackend.repository.UserPaymentRepository;
-import com.edgec.browserbackend.service.account.AccountService;
-import com.edgec.browserbackend.service.account.PaymentService;
-import com.edgec.browserbackend.service.account.SmsUtils;
+import com.edgec.browserbackend.account.service.SmsUtils;
 import com.edgec.browserbackend.alipay.AlipayConfig;
 import com.edgec.browserbackend.alipay.CloudamAlipayConfig;
 import com.edgec.browserbackend.alipay.VpsAlipayConfig;
@@ -24,6 +23,7 @@ import com.edgec.browserbackend.wxpay.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -95,7 +95,7 @@ public class PaymentServiceImpl implements PaymentService {
             if (byName == null)
                 throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + byTradeNo.getUsername());
 
-            boolean isVpsClient = byName.isVpsUser();
+            boolean isVpsClient = true;
 
             WXPayConfig ourWxPayConfig = isVpsClient ? new FGLWxConfig() : new CloudamWxConfig();
             WXPay wxPay = new WXPay(ourWxPayConfig);
@@ -194,7 +194,7 @@ public class PaymentServiceImpl implements PaymentService {
             if (byName == null)
                 throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + byTradeNo.getUsername());
 
-            boolean isVpsClient = byName.isVpsUser();
+            boolean isVpsClient = true;
 
             AlipayConfig alipayConfig = isVpsClient ? new VpsAlipayConfig() : new CloudamAlipayConfig();
             AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getURL(), alipayConfig.getAPPID(), alipayConfig.getAPP_PRIVATE_KEY(),
@@ -246,7 +246,7 @@ public class PaymentServiceImpl implements PaymentService {
         if (byName == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
 
-        boolean isVpsClient = byName.isVpsUser();
+        boolean isVpsClient = true;
 
         UserPayment internalOrder = new UserPayment();
         internalOrder.setAmount(amount);
@@ -299,7 +299,7 @@ public class PaymentServiceImpl implements PaymentService {
         if (byName == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
 
-        boolean isVpsClient = byName.isVpsUser();
+        boolean isVpsClient = true;
 
         UserPayment internalOrder = new UserPayment();
         internalOrder.setAmount(amount);
@@ -376,7 +376,7 @@ public class PaymentServiceImpl implements PaymentService {
         if (byName == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST, "account does not exist: " + username);
 
-        boolean isVpsClient = byName.isVpsUser();
+        boolean isVpsClient = true;
 
         UserPayment internalOrder = new UserPayment();
         internalOrder.setAmount(amount);

src/main/java/com/edgec/browserbackend/service/account/impl/UserLackMoneyServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/UserLackMoneyServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.account.domain.*;
-import com.edgec.browserbackend.domain.account.*;
-import com.edgec.browserbackend.repository.AccountRepository;
-import com.edgec.browserbackend.repository.UserLackMoneyRepository;
-import com.edgec.browserbackend.service.account.UserLackMoneyService;
+import com.edgec.browserbackend.account.repository.AccountRepository;
+import com.edgec.browserbackend.account.repository.UserLackMoneyRepository;
+import com.edgec.browserbackend.account.service.UserLackMoneyService;
 import com.edgec.browserbackend.common.commons.utils.SmsUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/edgec/browserbackend/service/account/impl/UserPrePaidBillingServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/UserPrePaidBillingServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
-import com.edgec.browserbackend.domain.account.BillStatus;
-import com.edgec.browserbackend.domain.account.DeductionRecord;
-import com.edgec.browserbackend.domain.account.UserBalance;
-import com.edgec.browserbackend.domain.account.UserPrePaidBilling;
-import com.edgec.browserbackend.repository.UserBalanceRepository;
-import com.edgec.browserbackend.repository.UserPrePaidBillingRepository;
-import com.edgec.browserbackend.service.account.UserLackMoneyService;
-import com.edgec.browserbackend.service.account.UserPrePaidBillingService;
-import com.edgec.browserbackend.utils.AccountServicePool;
+import com.edgec.browserbackend.account.service.UserLackMoneyService;
+import com.edgec.browserbackend.account.service.UserPrePaidBillingService;
+import com.edgec.browserbackend.account.domain.BillStatus;
+import com.edgec.browserbackend.account.domain.DeductionRecord;
+import com.edgec.browserbackend.account.domain.UserBalance;
+import com.edgec.browserbackend.account.domain.UserPrePaidBilling;
+import com.edgec.browserbackend.account.repository.UserBalanceRepository;
+import com.edgec.browserbackend.account.repository.UserPrePaidBillingRepository;
+import com.edgec.browserbackend.account.utils.AccountServicePool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/edgec/browserbackend/service/account/impl/UserRateServiceImpl.java → src/main/java/com/edgec/browserbackend/account/service/impl/UserRateServiceImpl.java

-package com.edgec.browserbackend.service.account.impl;
+package com.edgec.browserbackend.account.service.impl;
 
-import com.edgec.browserbackend.domain.account.UserRate;
-import com.edgec.browserbackend.exception.AccountErrorCode;
-import com.edgec.browserbackend.repository.UserRateRepository;
-import com.edgec.browserbackend.service.account.UserRateService;
+import com.edgec.browserbackend.account.service.UserRateService;
+import com.edgec.browserbackend.account.domain.UserRate;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.repository.UserRateRepository;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

src/main/java/com/edgec/browserbackend/service/account/security/CustomUserInfoTokenServices.java → src/main/java/com/edgec/browserbackend/account/service/security/CustomUserInfoTokenServices.java

-package com.edgec.browserbackend.service.account.security;
+package com.edgec.browserbackend.account.service.security;
 
-import com.edgec.browserbackend.exception.AccountErrorCode;
+import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.common.commons.error.IntelligroupOauthException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/com/edgec/browserbackend/utils/AccountServicePool.java → src/main/java/com/edgec/browserbackend/account/utils/AccountServicePool.java

-package com.edgec.browserbackend.utils;
+package com.edgec.browserbackend.account.utils;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/main/java/com/edgec/browserbackend/config/OAuth2AuthorizationConfig.java → src/main/java/com/edgec/browserbackend/auth/config/OAuth2AuthorizationConfig.java

-package com.edgec.browserbackend.config;
+package com.edgec.browserbackend.auth.config;
 
 
-import com.edgec.browserbackend.service.auth.security.MongoUserDetailsService;
+import com.edgec.browserbackend.auth.service.security.MongoUserDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/edgec/browserbackend/config/OAuthResponseExceptionTranslator.java → src/main/java/com/edgec/browserbackend/auth/config/OAuthResponseExceptionTranslator.java

-package com.edgec.browserbackend.config;
+package com.edgec.browserbackend.auth.config;
 
-import com.edgec.browserbackend.error.AuthErrorCode;
+import com.edgec.browserbackend.auth.exception.AuthErrorCode;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.commons.error.IntelligroupOauthException;
 import org.springframework.http.HttpHeaders;

src/main/java/com/edgec/browserbackend/config/WebSecurityConfig.java → src/main/java/com/edgec/browserbackend/auth/config/WebSecurityConfig.java

-package com.edgec.browserbackend.config;
+package com.edgec.browserbackend.auth.config;
 
-import com.edgec.browserbackend.service.auth.security.MongoUserDetailsService;
+import com.edgec.browserbackend.auth.service.security.MongoUserDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/edgec/browserbackend/controller/auth/ErrorHandler.java → src/main/java/com/edgec/browserbackend/auth/controller/AuthErrorHandler.java

-package com.edgec.browserbackend.controller.auth;
+package com.edgec.browserbackend.auth.controller;
 
-import com.edgec.browserbackend.error.AuthErrorCode;
+import com.edgec.browserbackend.auth.exception.AuthErrorCode;
 import com.edgec.browserbackend.common.commons.error.ApiError;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.commons.error.InternalServerErrorException;
@@ -17,7 +17,7 @@ import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 @ControllerAdvice
-public class ErrorHandler extends ResponseEntityExceptionHandler {
+public class AuthErrorHandler extends ResponseEntityExceptionHandler {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 

src/main/java/com/edgec/browserbackend/controller/auth/UserController.java → src/main/java/com/edgec/browserbackend/auth/controller/UserController.java

-package com.edgec.browserbackend.controller.auth;
+package com.edgec.browserbackend.auth.controller;
 
-import com.edgec.browserbackend.domain.auth.User;
-import com.edgec.browserbackend.domain.auth.UserPasswordReset;
-import com.edgec.browserbackend.service.auth.UserAuthService;
+import com.edgec.browserbackend.auth.domain.User;
+import com.edgec.browserbackend.auth.domain.UserPasswordReset;
+import com.edgec.browserbackend.auth.service.UserAuthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/edgec/browserbackend/domain/auth/Roles.java → src/main/java/com/edgec/browserbackend/auth/domain/Roles.java

-package com.edgec.browserbackend.domain.auth;
+package com.edgec.browserbackend.auth.domain;
 
 
 import org.springframework.data.annotation.Id;

src/main/java/com/edgec/browserbackend/domain/auth/User.java → src/main/java/com/edgec/browserbackend/auth/domain/User.java

-package com.edgec.browserbackend.domain.auth;
+package com.edgec.browserbackend.auth.domain;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.annotation.Id;
@@ -101,7 +101,7 @@ public class User implements UserDetails {
         return enabled;
     }
 
-    public User(com.edgec.browserbackend.domain.User user) {
+    public User(com.edgec.browserbackend.account.domain.User user) {
         if (StringUtils.isNotEmpty(user.getEmail()))
         setEmail(user.getEmail());
         setPassword(user.getPassword());

src/main/java/com/edgec/browserbackend/domain/auth/UserAttemptsLogin.java → src/main/java/com/edgec/browserbackend/auth/domain/UserAttemptsLogin.java

-package com.edgec.browserbackend.domain.auth;
+package com.edgec.browserbackend.auth.domain;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;