[update] 將後端大部分程式拉近PamBusiness中，已便共用

wayne

2022-03-02 fb89f2f58fa36b61970af65b93c292720417e753

[update] 將後端大部分程式拉近PamBusiness中，已便共用

 pamapi/pom.xml

@@ -101,6 +101,11 @@

    <dependencies>
        <dependency>
            <groupId>com.pollex.pam.business</groupId>
            <artifactId>PamBusiness</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>tech.jhipster</groupId>
            <artifactId>jhipster-framework</artifactId>
        </dependency>

 pamapi/src/main/java/com/pollex/pam/aop/logging/LoggingAspect.java

@@ -42,7 +42,7 @@
    /**
     * Pointcut that matches all Spring beans in the application's main packages.
     */
    @Pointcut("within(com.pollex.pam.repository..*)" + " || within(com.pollex.pam.service..*)" + " || within(com.pollex.pam.web.rest..*)")
    @Pointcut("within(com.pollex.pam.business.repository..*)" + " || within(com.pollex.pam.business.service..*)" + " || within(com.pollex.pam.web.rest..*)")
    public void applicationPackagePointcut() {
        // Method is empty as this is just a Pointcut, the implementations are in the advices.
    }

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/AuditLoggingAspect.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/AuditLoggingInject.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/AuditLoggingType.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/AuditLoggingFactory.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/AuditLoggingStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/ConsultantReadAppointmentStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/DoNothingStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingAppointmentCloseStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingCancelAppointmentStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingCheckAppointmentStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingConsultantLoginStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingCreateAppointmentStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingCreateInterviewStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingCustomerLoginStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingEditAppointmentStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingEditConsultantStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingEditCustomerStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingFillSatisfactionStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingSendFillSatisfactionNoticeStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/aop/logging/audit/strategy/LoggingSendInterviewNoticeStrategy.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcess.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcessInterface.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/appointment/process/DoneProcess.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java

@@ -1,6 +1,9 @@
package com.pollex.pam.config;

import com.pollex.pam.enums.SendEmailMsgMethod;
import com.pollex.pam.business.config.AppProperties;
import com.pollex.pam.business.config.SendEmailProperties;
import com.pollex.pam.business.config.SendSMSProperties;
import com.pollex.pam.business.enums.SendEmailMsgMethod;
import org.springframework.boot.context.properties.ConfigurationProperties;

/**
@@ -10,7 +13,7 @@
 * See {@link tech.jhipster.config.JHipsterProperties} for a good example.
 */
@ConfigurationProperties(prefix = "application", ignoreUnknownFields = false)
public class ApplicationProperties {
public class ApplicationProperties implements AppProperties {

    private boolean mockLogin;
    private String otpWebServiceUrl;
@@ -20,8 +23,8 @@
    private String eServiceLoginFunc;
    private String eServiceLoginSys;
    private String frontEndDomain;
    private SMS sms;
    private Email email;
    private SendSMSProperties sms;
    private SendEmailProperties email;
    private String fileFolderPath;

    public boolean isMockLogin() {
@@ -88,126 +91,22 @@
        this.frontEndDomain = frontEndDomain;
    }

    public SMS getSms() {
    public SendSMSProperties getSms() {
        return sms;
    }

    public void setSms(SMS sms) {
    public void setSms(SendSMSProperties sms) {
        this.sms = sms;
    }

    public Email getEmail() {
    public SendEmailProperties getEmail() {
        return email;
    }

    public void setEmail(Email email) {
    public void setEmail(SendEmailProperties email) {
        this.email = email;
    }

    public static class SMS {
        private String url;
        private String sourceCode;
        private String sender;
        private String smsType;
        private String subject;
        private boolean sendNotifyMsg;

        public String getUrl() {
            return url;
        }

        public void setUrl(String url) {
            this.url = url;
        }

        public String getSourceCode() {
            return sourceCode;
        }

        public void setSourceCode(String sourceCode) {
            this.sourceCode = sourceCode;
        }

        public String getSender() {
            return sender;
        }

        public void setSender(String sender) {
            this.sender = sender;
        }

        public String getSmsType() {
            return smsType;
        }

        public void setSmsType(String smsType) {
            this.smsType = smsType;
        }

        public String getSubject() {
            return subject;
        }

        public void setSubject(String subject) {
            this.subject = subject;
        }

        public boolean isSendNotifyMsg() {
            return sendNotifyMsg;
        }

        public void setSendNotifyMsg(boolean sendNotifyMsg) {
            this.sendNotifyMsg = sendNotifyMsg;
        }
    }

    public static class Email {
        private String url;
        private String functionId;
        private String senderEmail;
        private boolean sendNotifyMsg;
        private SendEmailMsgMethod method;

        public String getUrl() {
            return url;
        }

        public void setUrl(String url) {
            this.url = url;
        }

        public String getFunctionId() {
            return functionId;
        }

        public void setFunctionId(String functionId) {
            this.functionId = functionId;
        }

        public String getSenderEmail() {
            return senderEmail;
        }

        public void setSenderEmail(String senderEmail) {
            this.senderEmail = senderEmail;
        }

        public boolean isSendNotifyMsg() {
            return sendNotifyMsg;
        }

        public void setSendNotifyMsg(boolean sendNotifyMsg) {
            this.sendNotifyMsg = sendNotifyMsg;
        }

        public SendEmailMsgMethod getMethod() {
            return method;
        }

        public void setMethod(SendEmailMsgMethod method) {
            this.method = method;
        }
    }
    public String getFileFolderPath() {
        return fileFolderPath;
    }

 pamapi/src/main/java/com/pollex/pam/config/CacheConfiguration.java

@@ -43,11 +43,11 @@
    @Bean
    public JCacheManagerCustomizer cacheManagerCustomizer() {
        return cm -> {
            createCache(cm, com.pollex.pam.repository.UserRepository.USERS_BY_LOGIN_CACHE);
            createCache(cm, com.pollex.pam.repository.UserRepository.USERS_BY_EMAIL_CACHE);
            createCache(cm, com.pollex.pam.domain.User.class.getName());
            createCache(cm, com.pollex.pam.domain.Authority.class.getName());
            createCache(cm, com.pollex.pam.domain.User.class.getName() + ".authorities");
            createCache(cm, com.pollex.pam.business.repository.UserRepository.USERS_BY_LOGIN_CACHE);
            createCache(cm, com.pollex.pam.business.repository.UserRepository.USERS_BY_EMAIL_CACHE);
            createCache(cm, com.pollex.pam.business.domain.User.class.getName());
            createCache(cm, com.pollex.pam.business.domain.Authority.class.getName());
            createCache(cm, com.pollex.pam.business.domain.User.class.getName() + ".authorities");
            // jhipster-needle-ehcache-add-entry
        };
    }

 pamapi/src/main/java/com/pollex/pam/config/Constants.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/config/DatabaseConfiguration.java

@@ -1,16 +1,12 @@
package com.pollex.pam.config;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import tech.jhipster.config.JHipsterConstants;

@Configuration
@EnableJpaRepositories({ "com.pollex.pam.repository" })
@EnableJpaRepositories({"com.pollex.pam.business.repository"})
@EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware")
@EnableTransactionManagement
public class DatabaseConfiguration {}

 pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java

@@ -1,6 +1,6 @@
package com.pollex.pam.config;

import com.pollex.pam.security.*;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.security.jwt.*;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;

 pamapi/src/main/java/com/pollex/pam/config/WebsocketConfiguration.java

@@ -1,6 +1,6 @@
package com.pollex.pam.config;

import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.business.security.AuthoritiesConstants;
import java.security.Principal;
import java.util.*;
import org.springframework.context.annotation.Bean;

 pamapi/src/main/java/com/pollex/pam/config/WebsocketSecurityConfiguration.java

@@ -1,6 +1,6 @@
package com.pollex.pam.config;

import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.business.security.AuthoritiesConstants;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.security.config.annotation.web.messaging.MessageSecurityMetadataSourceRegistry;

 pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AbstractAuditingEntity.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/Appointment.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AppointmentClosedInfo.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AppointmentExpiringNotifyRecord.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AppointmentMemo.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AppointmentNoticeLog.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/AuditLogging.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/Authority.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/Consultant.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/Customer.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/CustomerFavoriteConsultant.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/InterviewRecord.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/OtpTmp.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/PersonalNotification.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/Satisfaction.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/User.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/domain/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/AppointmentStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/ConsultantDetailEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/ConsultantStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/ContactStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/CustomerDetailEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/GenderEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/InterviewRecordStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/LoginMethod.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/LoginResult.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/NotificationTypeEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/OtpLoginTypeEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/OtpTmpStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/PersonalNotificationRoleEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/SatisfactionStatusEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/SatisfactionTypeEnum.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/enums/SendEmailMsgMethod.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentClosedInfoRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentCustomerViewRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentExpiringNotifyRecordRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentMemoRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentNoticeLogRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AppointmentRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AuditLoggingRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/AuthorityRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/ConsultantRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/CustomerFavoriteConsultantRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/CustomerRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/InterviewRecordRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/OtpTmpRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/PersonalNotificationRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/UserRepository.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/repository/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/security/AuthoritiesConstants.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/security/DomainUserDetailsService.java

@@ -1,7 +1,7 @@
package com.pollex.pam.security;

import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import java.util.*;
import java.util.stream.Collectors;
import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;

 pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/security/SpringSecurityAuditorAware.java

@@ -1,7 +1,9 @@
package com.pollex.pam.security;

import com.pollex.pam.config.Constants;
import com.pollex.pam.business.config.Constants;
import java.util.Optional;

import com.pollex.pam.business.security.SecurityUtils;
import org.springframework.data.domain.AuditorAware;
import org.springframework.stereotype.Component;


 pamapi/src/main/java/com/pollex/pam/security/provider/CustomAuthenticationProvider.java

@@ -1,7 +1,8 @@
package com.pollex.pam.security.provider;

import com.pollex.pam.business.security.provider.EServiceAuthenticationProvider;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.security.token.EServiceAuthenticationToken;
import com.pollex.pam.business.security.token.EServiceAuthenticationToken;
import com.pollex.pam.security.token.OtpAuthenticationToken;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AbstractAuthenticationToken;

 pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/security/provider/OtpAuthenticationProvider.java

@@ -1,6 +1,7 @@
package com.pollex.pam.security.provider;

import com.pollex.pam.web.rest.errors.CustomerNotRegisteredException;
import com.pollex.pam.business.web.errors.CustomerNotRegisteredException;
import com.pollex.pam.security.token.OtpAuthenticationToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,13 +9,12 @@
import org.springframework.security.core.AuthenticationException;
import org.springframework.stereotype.Component;

import com.pollex.pam.domain.Customer;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.security.token.OtpAuthenticationToken;
import com.pollex.pam.business.domain.Customer;
import com.pollex.pam.business.repository.CustomerRepository;
import com.pollex.pam.service.CustomerAuthService;
import com.pollex.pam.service.OtpTmpService;
import com.pollex.pam.business.service.OtpTmpService;
import com.pollex.pam.service.OtpUtilService;
import com.pollex.pam.web.rest.vm.OtpAccount;
import com.pollex.pam.business.web.vm.OtpAccount;

@Component
public class OtpAuthenticationProvider {

 pamapi/src/main/java/com/pollex/pam/security/token/EServiceAuthenticationToken.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/security/token/OtpAuthenticationToken.java

@@ -1,12 +1,9 @@
package com.pollex.pam.security.token;

import com.pollex.pam.web.rest.vm.OtpAccount;
import com.pollex.pam.business.web.vm.OtpAccount;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.SpringSecurityCoreVersion;
import org.springframework.util.Assert;

import java.util.Collection;

public class OtpAuthenticationToken extends AbstractAuthenticationToken {


 pamapi/src/main/java/com/pollex/pam/service/AppointmentClosedInfoService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/AppointmentMemoService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/AppointmentNoticeLogService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/CustomerAuthService.java

@@ -15,12 +15,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.pollex.pam.domain.Customer;
import com.pollex.pam.enums.CustomerDetailEnum;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.business.domain.Customer;
import com.pollex.pam.business.enums.CustomerDetailEnum;
import com.pollex.pam.business.repository.CustomerRepository;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.security.token.OtpAuthenticationToken;
import com.pollex.pam.web.rest.vm.OtpAccount;
import com.pollex.pam.business.web.vm.OtpAccount;

@Service
@Transactional

 pamapi/src/main/java/com/pollex/pam/service/CustomerService.java

@@ -2,21 +2,23 @@

import java.util.Optional;

import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.CustomerDTO;
import com.pollex.pam.service.mapper.CustomerMapper;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.OtpTmpService;
import com.pollex.pam.business.service.UsernameAlreadyUsedException;
import com.pollex.pam.business.service.dto.CustomerDTO;
import com.pollex.pam.business.service.mapper.CustomerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.pollex.pam.domain.Customer;
import com.pollex.pam.domain.OtpTmp;
import com.pollex.pam.enums.OtpLoginTypeEnum;
import com.pollex.pam.enums.OtpTmpStatusEnum;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.service.dto.CustomerRegisterDTO;
import com.pollex.pam.service.mapper.CustomerDTOMapper;
import com.pollex.pam.business.domain.Customer;
import com.pollex.pam.business.domain.OtpTmp;
import com.pollex.pam.business.enums.OtpLoginTypeEnum;
import com.pollex.pam.business.enums.OtpTmpStatusEnum;
import com.pollex.pam.business.repository.CustomerRepository;
import com.pollex.pam.business.service.dto.CustomerRegisterDTO;
import com.pollex.pam.business.service.mapper.CustomerDTOMapper;

@Service
@Transactional

 pamapi/src/main/java/com/pollex/pam/service/EmailAlreadyUsedException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/InterviewRecordService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/InvalidPasswordException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/MailService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/NoticeService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/OtpTmpService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java

@@ -1,17 +1,17 @@
package com.pollex.pam.service;

import com.pollex.pam.domain.OtpTmp;
import com.pollex.pam.enums.OtpTmpStatusEnum;
import com.pollex.pam.web.rest.errors.OtpLoginFailException;
import com.pollex.pam.web.rest.vm.VerifyOtpVM;
import com.pollex.pam.business.domain.OtpTmp;
import com.pollex.pam.business.enums.OtpTmpStatusEnum;
import com.pollex.pam.business.service.OtpTmpService;
import com.pollex.pam.business.web.errors.OtpLoginFailException;
import com.pollex.pam.business.web.vm.VerifyOtpVM;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.stereotype.Service;

import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.service.dto.OtpResponseDTO;
import com.pollex.pam.business.service.dto.OtpResponseDTO;
import org.springframework.transaction.annotation.Transactional;

@Service

 pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java

@@ -1,7 +1,7 @@
package com.pollex.pam.service;

import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.service.dto.OtpResponseDTO;
import com.pollex.pam.business.service.dto.OtpResponseDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

 pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/UserService.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/UsernameAlreadyUsedException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AbstractAppointmentProcessDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AddConsultantData.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AddConsultantParam.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AdminUserDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCloseDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentMemoCreateDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentMemoUpdateDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentNoticeSendDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentUpdateDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/ClosedProcessDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/CustomerDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/CustomerFavoriteConsultantDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/CustomerRegisterDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/DoneProcessDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/EServiceRequest.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/EServiceResponse.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/InterviewRecordDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/OtpResponseDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/PasswordChangeDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SMSDetail.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SatisfactionCustomerScoreDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SatisfactionDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SatisfactionUpdateDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SendMailRequest.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SendMailResponse.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSRequest.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/SendSMSResponse.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/UserDTO.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/dto/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentDTOMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentMemoMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentNoticeSendMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/CustomerDTOMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/CustomerMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/InterviewRecordMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionDTOMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/UserMapper.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/mapper/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/util/FileUtil.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/util/HttpRequestUtil.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/util/StringUtils.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/service/util/VerifyCodeUtil.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/AccountResource.java

@@ -1,20 +1,16 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.security.jwt.JWTFilter;
import com.pollex.pam.service.CustomerAuthService;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.service.CustomerService;
import com.pollex.pam.service.MailService;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.service.dto.CustomerRegisterDTO;
import com.pollex.pam.service.dto.PasswordChangeDTO;
import com.pollex.pam.web.rest.UserJWTController.JWTToken;
import com.pollex.pam.web.rest.errors.*;
import com.pollex.pam.web.rest.vm.KeyAndPasswordVM;
import com.pollex.pam.web.rest.vm.ManagedUserVM;
import com.pollex.pam.business.service.MailService;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.service.dto.PasswordChangeDTO;
import com.pollex.pam.business.web.errors.*;
import com.pollex.pam.business.web.vm.KeyAndPasswordVM;
import com.pollex.pam.business.web.vm.ManagedUserVM;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -22,9 +18,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

/**
@@ -48,7 +41,7 @@
    private final UserService userService;

    private final MailService mailService;
    

    @Autowired
    CustomerService customerService;

@@ -75,8 +68,8 @@
//        User user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
//        mailService.sendActivationEmail(user);
//    }
    
    



    /**
     * {@code GET  /activate} : activate the registered user.

 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentMemoResource.java

@@ -10,36 +10,35 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.domain.AppointmentMemo;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.AppointmentMemoService;
import com.pollex.pam.service.dto.AppointmentMemoCreateDTO;
import com.pollex.pam.service.dto.AppointmentMemoUpdateDTO;
import com.pollex.pam.business.domain.AppointmentMemo;
import com.pollex.pam.business.service.AppointmentMemoService;
import com.pollex.pam.business.service.dto.AppointmentMemoCreateDTO;
import com.pollex.pam.business.service.dto.AppointmentMemoUpdateDTO;

@RestController
@RequestMapping("/api/appointment/memo")
public class AppointmentMemoResource {
	

    @Autowired
    AppointmentMemoService appointmentMemoService;
	

    @PostMapping("/create")
    public ResponseEntity<AppointmentMemo> createMemo(@RequestBody AppointmentMemoCreateDTO memoDTO) {
        appointmentMemoService.checkPermission(memoDTO.getAppointmentId());
        AppointmentMemo memo = appointmentMemoService.create(memoDTO);
        return new ResponseEntity<>(memo, HttpStatus.OK);
    }
	

    @PostMapping("/update")
    public ResponseEntity<AppointmentMemo> updateMemo(@RequestBody AppointmentMemoUpdateDTO memoDTO) {
        AppointmentMemo memo = appointmentMemoService.update(memoDTO);
        return new ResponseEntity<>(memo, HttpStatus.OK);
    }
	

    @DeleteMapping("/{memoId}")
    public void deleteMemo(@PathVariable Long memoId) {
        appointmentMemoService.delete(memoId);
    }
	
	


}

 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java

@@ -1,24 +1,24 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.appointment.process.AppointmentProcess;
import com.pollex.pam.business.domain.Appointment;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.SendMsgService;

import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.business.service.dto.*;
import com.pollex.pam.business.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.PersonalNotificationService;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.PersonalNotificationService;
import com.pollex.pam.business.service.SatisfactionService;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.*;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;

@RestController
@RequestMapping("/api/appointment")

 pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantLoginValidateResource.java

@@ -16,12 +16,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.service.util.VerifyCodeUtil;
import com.pollex.pam.business.service.util.VerifyCodeUtil;

@RestController
@RequestMapping("/api/login/validate")
public class ConsultantLoginValidateResource {
	

    @GetMapping("/get_img_code")
    public void getVerifyCodeImg(HttpServletResponse response, HttpServletRequest request) {
        try {
@@ -52,11 +52,11 @@
                || !StringUtils.hasText(imgCode)) {
            return false;
        }
		

        if (imgCode.equals(sessionImpCode)) {
            return true;
        }
		

        return false;
    }
}

 pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java

@@ -1,32 +1,25 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.ConsultantService;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.domain.Appointment;
import com.pollex.pam.business.domain.Consultant;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.ConsultantService;
import com.pollex.pam.business.service.dto.*;
import org.apache.commons.compress.utils.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_FILL_SATISFACTION_NOTICE;
import static com.pollex.pam.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_FILL_SATISFACTION_NOTICE;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA;

@RestController
@RequestMapping("/api/consultant")

 pamapi/src/main/java/com/pollex/pam/web/rest/CustomerInfoResource.java

@@ -1,8 +1,8 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.service.CustomerService;
import com.pollex.pam.service.dto.CustomerDTO;
import com.pollex.pam.business.service.dto.CustomerDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -10,7 +10,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.EDIT_CUSTOMER_DATA;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.EDIT_CUSTOMER_DATA;

@RestController
@RequestMapping("/api/customer/info")

 pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java

@@ -1,11 +1,10 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.security.jwt.JWTFilter;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.security.token.EServiceAuthenticationToken;
import com.pollex.pam.web.rest.vm.EServiceLoginVM;
import com.pollex.pam.business.security.token.EServiceAuthenticationToken;
import com.pollex.pam.business.web.vm.EServiceLoginVM;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -18,7 +17,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CONSULTANT_LOGIN;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_LOGIN;

@RestController
@RequestMapping("/api/eService")

 pamapi/src/main/java/com/pollex/pam/web/rest/InterviewRecordResource.java

@@ -1,7 +1,6 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -10,11 +9,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.domain.InterviewRecord;
import com.pollex.pam.service.InterviewRecordService;
import com.pollex.pam.service.dto.InterviewRecordDTO;
import com.pollex.pam.business.domain.InterviewRecord;
import com.pollex.pam.business.service.InterviewRecordService;
import com.pollex.pam.business.service.dto.InterviewRecordDTO;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CONSULTANT_CREATE_INTERVIEW;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_CREATE_INTERVIEW;

@RestController
@RequestMapping("/api/interview_record")

 pamapi/src/main/java/com/pollex/pam/web/rest/NoticeResource.java

@@ -1,22 +1,19 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.AppointmentNoticeLog;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.NoticeService;
import com.pollex.pam.service.dto.AppointmentNoticeSendDTO;
import com.pollex.pam.business.domain.Appointment;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.NoticeService;
import com.pollex.pam.business.service.dto.AppointmentNoticeSendDTO;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_INTERVIEW_NOTICE;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_INTERVIEW_NOTICE;

@RestController
@RequestMapping("/api/notice")

 pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java

@@ -3,7 +3,7 @@
import java.util.Arrays;
import java.util.UUID;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,22 +17,22 @@
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.domain.Customer;
import com.pollex.pam.enums.OtpLoginTypeEnum;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.business.domain.Customer;
import com.pollex.pam.business.enums.OtpLoginTypeEnum;
import com.pollex.pam.business.repository.CustomerRepository;
import com.pollex.pam.security.jwt.JWTFilter;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.service.CustomerAuthService;
import com.pollex.pam.service.CustomerService;
import com.pollex.pam.service.OtpTmpService;
import com.pollex.pam.business.service.OtpTmpService;
import com.pollex.pam.service.OtpUtilService;
import com.pollex.pam.service.OtpWebService;
import com.pollex.pam.service.dto.CustomerRegisterDTO;
import com.pollex.pam.service.dto.OtpResponseDTO;
import com.pollex.pam.web.rest.vm.OtpLoginVM;
import com.pollex.pam.web.rest.vm.VerifyOtpVM;
import com.pollex.pam.business.service.dto.CustomerRegisterDTO;
import com.pollex.pam.business.service.dto.OtpResponseDTO;
import com.pollex.pam.business.web.vm.OtpLoginVM;
import com.pollex.pam.business.web.vm.VerifyOtpVM;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CUSTOMER_LOGIN;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CUSTOMER_LOGIN;

@RestController
@RequestMapping("/api/otp")

 pamapi/src/main/java/com/pollex/pam/web/rest/PersonalNotificationResource.java

@@ -8,34 +8,31 @@
import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.PersonalNotification;
import com.pollex.pam.enums.NotificationTypeEnum;
import com.pollex.pam.enums.PersonalNotificationRoleEnum;
import com.pollex.pam.repository.PersonalNotificationRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.ConsultantService;
import com.pollex.pam.service.PersonalNotificationService;
import com.pollex.pam.business.domain.Consultant;
import com.pollex.pam.business.domain.PersonalNotification;
import com.pollex.pam.business.enums.PersonalNotificationRoleEnum;
import com.pollex.pam.business.repository.PersonalNotificationRepository;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.ConsultantService;
import com.pollex.pam.business.service.PersonalNotificationService;

@RestController
@RequestMapping("/api/personal_notification")
public class PersonalNotificationResource {
	

    @Autowired
    PersonalNotificationService personalNotificationService;
	

    @Autowired
    PersonalNotificationRepository personalNotificationRepository;
	

    @Autowired
    ConsultantService consultantService;
	

    @GetMapping("/getMyPersonalNotification")
    public ResponseEntity<List<PersonalNotification>> getMyPersonalNotification() {
        List<PersonalNotification> personalNotificationList = new ArrayList<>();
@@ -47,7 +44,7 @@
        }
        return new ResponseEntity<>(personalNotificationList, HttpStatus.OK);
    }
	

    @PostMapping("/readAllMyNotification")
    public void readAll() {
        personalNotificationService.readAllMyNotification();

 pamapi/src/main/java/com/pollex/pam/web/rest/PublicUserResource.java

@@ -1,7 +1,7 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.UserDTO;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.UserDTO;
import java.util.*;
import java.util.Collections;
import org.slf4j.Logger;

 pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java

@@ -2,9 +2,9 @@

import java.util.List;

import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.enums.SatisfactionTypeEnum;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.enums.SatisfactionTypeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,11 +15,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.SatisfactionCustomerScoreDTO;
import com.pollex.pam.service.dto.SatisfactionDTO;
import com.pollex.pam.business.domain.Satisfaction;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.SatisfactionService;
import com.pollex.pam.business.service.dto.SatisfactionCustomerScoreDTO;
import com.pollex.pam.business.service.dto.SatisfactionDTO;

@RestController
@RequestMapping("/api/satisfaction")

 pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java

@@ -3,8 +3,8 @@
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.service.OtpWebService;
import com.pollex.pam.service.dto.EServiceResponse;
import com.pollex.pam.service.dto.OtpResponseDTO;
import com.pollex.pam.business.service.dto.EServiceResponse;
import com.pollex.pam.business.service.dto.OtpResponseDTO;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;

 pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java

@@ -1,12 +1,11 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.SendSMSResponse;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.SendMsgService;
import com.pollex.pam.business.service.dto.SendSMSResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;

@Deprecated

 pamapi/src/main/java/com/pollex/pam/web/rest/UserJWTController.java

@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.pollex.pam.security.jwt.JWTFilter;
import com.pollex.pam.security.jwt.TokenProvider;
import com.pollex.pam.web.rest.vm.LoginVM;
import com.pollex.pam.business.web.vm.LoginVM;
import javax.validation.Valid;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;

 pamapi/src/main/java/com/pollex/pam/web/rest/UserResource.java

@@ -1,15 +1,15 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.config.Constants;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.service.MailService;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.web.rest.errors.BadRequestAlertException;
import com.pollex.pam.web.rest.errors.EmailAlreadyUsedException;
import com.pollex.pam.web.rest.errors.LoginAlreadyUsedException;
import com.pollex.pam.business.config.Constants;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.business.service.MailService;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.web.errors.BadRequestAlertException;
import com.pollex.pam.business.web.errors.EmailAlreadyUsedException;
import com.pollex.pam.business.web.errors.LoginAlreadyUsedException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/AppointmentClosedInfoNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/AppointmentMemoNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/AppointmentNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/BadRequestAlertException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/ConsultantDisableException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/ConsultantNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/CustomerNotRegisteredException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/EServiceErrorException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/EmailAlreadyUsedException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/ErrorConstants.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/ExceptionTranslator.java

@@ -9,6 +9,9 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;

import com.pollex.pam.business.service.UsernameAlreadyUsedException;
import com.pollex.pam.business.web.errors.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
@@ -117,7 +120,7 @@

    @ExceptionHandler
    public ResponseEntity<Problem> handleEmailAlreadyUsedException(
        com.pollex.pam.service.EmailAlreadyUsedException ex,
        com.pollex.pam.business.service.EmailAlreadyUsedException ex,
        NativeWebRequest request
    ) {
        EmailAlreadyUsedException problem = new EmailAlreadyUsedException();
@@ -130,7 +133,7 @@

    @ExceptionHandler
    public ResponseEntity<Problem> handleUsernameAlreadyUsedException(
        com.pollex.pam.service.UsernameAlreadyUsedException ex,
        UsernameAlreadyUsedException ex,
        NativeWebRequest request
    ) {
        LoginAlreadyUsedException problem = new LoginAlreadyUsedException();
@@ -143,7 +146,7 @@

    @ExceptionHandler
    public ResponseEntity<Problem> handleInvalidPasswordException(
        com.pollex.pam.service.InvalidPasswordException ex,
        com.pollex.pam.business.service.InvalidPasswordException ex,
        NativeWebRequest request
    ) {
        return create(new InvalidPasswordException(), request);

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/FieldErrorVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/InterviewRecordNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/InvalidPasswordException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/LoginAlreadyUsedException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/NotFoundExpiringAppointmentException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/NotLoginException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/OtpLoginFailException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/SatisfactionAlreadyExistException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/SatisfactionNotFoundException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendEmailFailException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/SendSMSFailException.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/errors/package-info.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/EServiceLoginVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/KeyAndPasswordVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/LoginVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/ManagedUserVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/OtpAccount.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/OtpEmailLoginVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/OtpLoginVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/OtpSMSLoginVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/VerifyOtpVM.java

檔案已刪除

 pamapi/src/main/java/com/pollex/pam/web/rest/vm/package-info.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/ArchTest.java

@@ -17,9 +17,9 @@

        noClasses()
            .that()
            .resideInAnyPackage("com.pollex.pam.service..")
            .resideInAnyPackage("com.pollex.pam.business.service..")
            .or()
            .resideInAnyPackage("com.pollex.pam.repository..")
            .resideInAnyPackage("com.pollex.pam.business.repository..")
            .should()
            .dependOnClassesThat()
            .resideInAnyPackage("..com.pollex.pam.web..")

 pamapi/src/test/java/com/pollex/pam/config/NoOpMailConfiguration.java

@@ -4,7 +4,7 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;

import com.pollex.pam.service.MailService;
import com.pollex.pam.business.service.MailService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;


 pamapi/src/test/java/com/pollex/pam/config/timezone/HibernateTimeZoneIT.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/repository/timezone/DateTimeWrapper.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/repository/timezone/DateTimeWrapperRepository.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/security/DomainUserDetailsServiceIT.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/security/SecurityUtilsUnitTest.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/security/jwt/JWTFilterTest.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/security/jwt/TokenProviderTest.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/service/MailServiceIT.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/service/UserServiceIT.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/service/mapper/UserMapperTest.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java

@@ -6,17 +6,16 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

import com.pollex.pam.IntegrationTest;
import com.pollex.pam.config.Constants;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.AuthorityRepository;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.service.dto.PasswordChangeDTO;
import com.pollex.pam.service.dto.UserDTO;
import com.pollex.pam.web.rest.vm.KeyAndPasswordVM;
import com.pollex.pam.web.rest.vm.ManagedUserVM;
import com.pollex.pam.business.config.Constants;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.AuthorityRepository;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.service.dto.PasswordChangeDTO;
import com.pollex.pam.business.web.vm.KeyAndPasswordVM;
import com.pollex.pam.business.web.vm.ManagedUserVM;
import java.time.Instant;
import java.util.*;
import org.apache.commons.lang3.RandomStringUtils;

 pamapi/src/test/java/com/pollex/pam/web/rest/PublicUserResourceIT.java

@@ -6,9 +6,9 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

import com.pollex.pam.IntegrationTest;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import javax.persistence.EntityManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

 pamapi/src/test/java/com/pollex/pam/web/rest/UserJWTControllerIT.java

@@ -10,9 +10,9 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import com.pollex.pam.IntegrationTest;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.web.rest.vm.LoginVM;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.web.vm.LoginVM;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;

 pamapi/src/test/java/com/pollex/pam/web/rest/UserResourceIT.java

@@ -7,13 +7,13 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

import com.pollex.pam.IntegrationTest;
import com.pollex.pam.domain.Authority;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.service.mapper.UserMapper;
import com.pollex.pam.web.rest.vm.ManagedUserVM;
import com.pollex.pam.business.domain.Authority;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.service.mapper.UserMapper;
import com.pollex.pam.business.web.vm.ManagedUserVM;
import java.time.Instant;
import java.util.*;
import java.util.function.Consumer;

 pamapi/src/test/java/com/pollex/pam/web/rest/errors/ExceptionTranslatorIT.java

檔案已刪除

 pamapi/src/test/java/com/pollex/pam/web/rest/errors/ExceptionTranslatorTestController.java

檔案已刪除