Change to wdcy

0.2
lishengzhao 2014-03-20 11:39:10 +08:00
parent 16949ef2f9
commit 96c87f890d
54 changed files with 109 additions and 111 deletions

View File

@ -9,10 +9,10 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain;
package cc.wdcy.domain;
import cc.honyee.infrastructure.DateUtils;
import cc.honyee.domain.shared.GuidGenerator;
import cc.wdcy.infrastructure.DateUtils;
import cc.wdcy.domain.shared.GuidGenerator;
import java.io.Serializable;
import java.util.Date;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.dto;
package cc.wdcy.domain.dto;
import org.apache.commons.lang.StringUtils;

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.dto.user;
package cc.wdcy.domain.dto.user;
import cc.honyee.domain.dto.AbstractDto;
import cc.honyee.domain.user.User;
import cc.honyee.infrastructure.DateUtils;
import cc.wdcy.domain.dto.AbstractDto;
import cc.wdcy.domain.user.User;
import cc.wdcy.infrastructure.DateUtils;
import java.util.ArrayList;
import java.util.List;

View File

@ -9,10 +9,10 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.dto.user;
package cc.wdcy.domain.dto.user;
import cc.honyee.domain.user.User;
import cc.honyee.infrastructure.PasswordHandler;
import cc.wdcy.domain.user.User;
import cc.wdcy.infrastructure.PasswordHandler;
/**
* @author Shengzhao Li

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.oauth;
package cc.wdcy.domain.oauth;
import org.springframework.security.oauth2.provider.JdbcClientDetailsService;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.oauth;
package cc.wdcy.domain.oauth;
import cc.honyee.infrastructure.DateUtils;
import cc.wdcy.infrastructure.DateUtils;
import java.io.Serializable;
import java.util.Date;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.oauth;
package cc.wdcy.domain.oauth;
import cc.honyee.domain.shared.Repository;
import cc.wdcy.domain.shared.Repository;
/**
* @author Shengzhao Li

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared;
package cc.wdcy.domain.shared;
import org.springframework.context.ApplicationContext;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared;
package cc.wdcy.domain.shared;
import java.util.UUID;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared;
package cc.wdcy.domain.shared;
/**
* @author Shengzhao Li

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.paginated;
package cc.wdcy.domain.shared.paginated;
import cc.honyee.domain.shared.security.SecurityUtils;
import cc.wdcy.domain.shared.security.SecurityUtils;
import org.displaytag.pagination.PaginatedList;
import org.displaytag.properties.SortOrderEnum;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.paginated;
package cc.wdcy.domain.shared.paginated;
import java.util.List;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.paginated;
package cc.wdcy.domain.shared.paginated;
import java.util.List;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.paginated;
package cc.wdcy.domain.shared.paginated;
/**
* @author Shengzhao Li

View File

@ -9,10 +9,10 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.security;
package cc.wdcy.domain.shared.security;
import cc.honyee.infrastructure.DateUtils;
import cc.honyee.domain.user.User;
import cc.wdcy.infrastructure.DateUtils;
import cc.wdcy.domain.user.User;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.security;
package cc.wdcy.domain.shared.security;
/**
* @author Shengzhao Li

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.shared.security;
package cc.wdcy.domain.shared.security;
import cc.honyee.domain.user.User;
import cc.wdcy.domain.user.User;
/**
* @author Shengzhao Li

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.user;
package cc.wdcy.domain.user;
import cc.honyee.domain.AbstractDomain;
import cc.honyee.domain.shared.BeanProvider;
import cc.honyee.infrastructure.PasswordHandler;
import cc.wdcy.domain.AbstractDomain;
import cc.wdcy.domain.shared.BeanProvider;
import cc.wdcy.infrastructure.PasswordHandler;
import java.util.Date;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.domain.user;
package cc.wdcy.domain.user;
import cc.honyee.domain.shared.Repository;
import cc.wdcy.domain.shared.Repository;
/**
* @author Shengzhao Li

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import org.apache.commons.lang.StringUtils;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import org.apache.commons.lang.StringUtils;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import cc.honyee.domain.shared.GuidGenerator;
import cc.wdcy.domain.shared.GuidGenerator;
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
import org.springframework.util.StringUtils;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure.mybatis;
package cc.wdcy.infrastructure.mybatis;
import cc.honyee.domain.oauth.OauthRepository;
import cc.wdcy.domain.oauth.OauthRepository;
/**
* @author Shengzhao Li

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure.mybatis;
package cc.wdcy.infrastructure.mybatis;
import cc.honyee.domain.user.UserRepository;
import cc.wdcy.domain.user.UserRepository;
/**
* @author Shengzhao Li

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.service;
package cc.wdcy.service;
import cc.honyee.domain.oauth.OauthClientDetails;
import cc.wdcy.domain.oauth.OauthClientDetails;
/**
* @author Shengzhao Li

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.service;
package cc.wdcy.service;
import org.springframework.security.core.userdetails.UserDetailsService;

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.service.impl;
package cc.wdcy.service.impl;
import cc.honyee.domain.oauth.OauthClientDetails;
import cc.honyee.domain.oauth.OauthRepository;
import cc.honyee.service.OauthService;
import cc.wdcy.domain.oauth.OauthClientDetails;
import cc.wdcy.domain.oauth.OauthRepository;
import cc.wdcy.service.OauthService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

View File

@ -9,17 +9,15 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.service.impl;
package cc.wdcy.service.impl;
import cc.honyee.domain.shared.security.HonyeeUserDetails;
import cc.honyee.domain.user.User;
import cc.honyee.domain.user.UserRepository;
import cc.honyee.service.UserService;
import cc.wdcy.domain.shared.security.HonyeeUserDetails;
import cc.wdcy.domain.user.User;
import cc.wdcy.domain.user.UserRepository;
import cc.wdcy.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.oauth2.provider.BaseClientDetails;
import org.springframework.security.oauth2.provider.ClientDetails;
import org.springframework.stereotype.Service;
/**

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.context;
package cc.wdcy.web.context;
import cc.honyee.domain.shared.BeanProvider;
import cc.wdcy.domain.shared.BeanProvider;
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;

View File

@ -9,10 +9,10 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.context;
package cc.wdcy.web.context;
import cc.honyee.domain.shared.security.HonyeeUserDetails;
import cc.honyee.domain.shared.security.SecurityHolder;
import cc.wdcy.domain.shared.security.HonyeeUserDetails;
import cc.wdcy.domain.shared.security.SecurityHolder;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;

View File

@ -9,10 +9,10 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.controller;
package cc.wdcy.web.controller;
import cc.honyee.service.UserService;
import cc.honyee.web.validator.UserFormDtoValidator;
import cc.wdcy.service.UserService;
import cc.wdcy.web.validator.UserFormDtoValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.controller.mobile;
package cc.wdcy.web.controller.mobile;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.controller.unity;
package cc.wdcy.web.controller.unity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -10,10 +10,10 @@
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.oauth;
package cc.wdcy.web.oauth;
import cc.honyee.domain.oauth.OauthClientDetails;
import cc.honyee.service.OauthService;
import cc.wdcy.domain.oauth.OauthClientDetails;
import cc.wdcy.service.OauthService;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.provider.AuthorizationRequest;
import org.springframework.security.oauth2.provider.approval.TokenServicesUserApprovalHandler;

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.web.validator;
package cc.wdcy.web.validator;
import cc.honyee.domain.dto.user.UserFormDto;
import cc.honyee.infrastructure.MatchUtils;
import cc.honyee.service.UserService;
import cc.wdcy.domain.dto.user.UserFormDto;
import cc.wdcy.infrastructure.MatchUtils;
import cc.wdcy.service.UserService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.honyee.infrastructure.mybatis.OauthRepositoryMyBatis">
<mapper namespace="cc.wdcy.infrastructure.mybatis.OauthRepositoryMyBatis">
<resultMap type="OauthClientDetails" id="oauthClientDetailsMap">
<id property="clientId" column="client_id"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.honyee.infrastructure.mybatis.UserRepositoryMyBatis">
<mapper namespace="cc.wdcy.infrastructure.mybatis.UserRepositoryMyBatis">
<resultMap type="User" id="userMap">
<id property="id" column="id"/>

View File

@ -9,8 +9,8 @@
<setting name="useGeneratedKeys" value="true"/>
</settings>
<typeAliases>
<typeAlias alias="User" type="cc.honyee.domain.user.User"/>
<typeAlias alias="OauthClientDetails" type="cc.honyee.domain.oauth.OauthClientDetails"/>
<typeAlias alias="User" type="cc.wdcy.domain.user.User"/>
<typeAlias alias="OauthClientDetails" type="cc.wdcy.domain.oauth.OauthClientDetails"/>
</typeAliases>

View File

@ -10,7 +10,7 @@
<!--annotation configuration -->
<context:annotation-config/>
<context:component-scan base-package="cc.honyee.service"/>
<context:component-scan base-package="cc.wdcy.service"/>
<!-- property configuration -->
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@ -58,7 +58,7 @@
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" value="cc.honyee.infrastructure.mybatis"/>
<property name="basePackage" value="cc.wdcy.infrastructure.mybatis"/>
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
</bean>

View File

@ -80,7 +80,7 @@
<!--</oauth2:client-details-service>-->
<beans:bean id="clientDetailsService" class="cc.honyee.domain.oauth.CustomJdbcClientDetailsService">
<beans:bean id="clientDetailsService" class="cc.wdcy.domain.oauth.CustomJdbcClientDetailsService">
<beans:constructor-arg index="0" ref="dataSource"/>
</beans:bean>
@ -103,7 +103,7 @@
<!--<oauth2:expression-handler id="oauth2ExpressionHandler"/>-->
<!--<oauth2:web-expression-handler id="oauth2WebExpressionHandler"/>-->
<beans:bean id="oauthUserApprovalHandler" class="cc.honyee.web.oauth.OauthUserApprovalHandler">
<beans:bean id="oauthUserApprovalHandler" class="cc.wdcy.web.oauth.OauthUserApprovalHandler">
<beans:property name="tokenServices" ref="tokenServices"/>
<beans:property name="oauthService" ref="oauthService"/>
</beans:bean>
@ -172,9 +172,9 @@
-->
<!--security holder-->
<beans:bean id="springSecurityHolder" class="cc.honyee.web.context.SpringSecurityHolder"/>
<beans:bean id="springSecurityHolder" class="cc.wdcy.web.context.SpringSecurityHolder"/>
<beans:bean id="securityHolderFactory" class="cc.honyee.domain.shared.security.SecurityUtils">
<beans:bean id="securityHolderFactory" class="cc.wdcy.domain.shared.security.SecurityUtils">
<beans:property name="securityHolder" ref="springSecurityHolder"/>
</beans:bean>

View File

@ -7,7 +7,7 @@
<!--aop-->
<aop:config>
<aop:advisor advice-ref="applicationAdvisor" pointcut="execution(* cc.honyee.service.*.*(..))"/>
<aop:advisor advice-ref="applicationAdvisor" pointcut="execution(* cc.wdcy.service.*.*(..))"/>
</aop:config>
<!--advisor-->

View File

@ -12,7 +12,7 @@
<!--annotation configuration -->
<context:annotation-config/>
<context:component-scan base-package="cc.honyee.web"/>
<context:component-scan base-package="cc.wdcy.web"/>
<!--static resource-->
<mvc:resources mapping="/index.jsp*" location="/index.jsp"/>

View File

@ -108,7 +108,7 @@
<!-- Spring context listener -->
<listener>
<listener-class>cc.honyee.web.context.BeanContextLoaderListener</listener-class>
<listener-class>cc.wdcy.web.context.BeanContextLoaderListener</listener-class>
</listener>
<!--hy mvc-->

View File

@ -9,12 +9,12 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee;
package cc.wdcy;
import cc.honyee.domain.shared.BeanProvider;
import cc.honyee.domain.shared.security.HonyeeUserDetails;
import cc.honyee.domain.shared.security.SecurityUtils;
import cc.honyee.web.context.SpringSecurityHolder;
import cc.wdcy.domain.shared.BeanProvider;
import cc.wdcy.domain.shared.security.HonyeeUserDetails;
import cc.wdcy.domain.shared.security.SecurityUtils;
import cc.wdcy.web.context.SpringSecurityHolder;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
import org.springframework.test.context.transaction.BeforeTransaction;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import cc.honyee.ContextTest;
import cc.wdcy.ContextTest;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import org.testng.annotations.Test;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import com.google.zxing.*;
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;

View File

@ -9,9 +9,9 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import cc.honyee.domain.shared.GuidGenerator;
import cc.wdcy.domain.shared.GuidGenerator;
import org.testng.annotations.Test;
/**

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
import org.testng.annotations.Test;

View File

@ -9,7 +9,7 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure;
package cc.wdcy.infrastructure;
import org.testng.annotations.Test;

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure.mybatis;
package cc.wdcy.infrastructure.mybatis;
import cc.honyee.domain.oauth.OauthClientDetails;
import cc.honyee.domain.oauth.OauthRepository;
import cc.honyee.infrastructure.AbstractRepositoryTest;
import cc.wdcy.domain.oauth.OauthClientDetails;
import cc.wdcy.domain.oauth.OauthRepository;
import cc.wdcy.infrastructure.AbstractRepositoryTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.testng.annotations.Test;

View File

@ -9,11 +9,11 @@
* it only in accordance with the terms of the license agreement you
* entered into with Honyee Industry Group Co., Ltd.
*/
package cc.honyee.infrastructure.mybatis;
package cc.wdcy.infrastructure.mybatis;
import cc.honyee.domain.user.User;
import cc.honyee.domain.user.UserRepository;
import cc.honyee.infrastructure.AbstractRepositoryTest;
import cc.wdcy.domain.user.User;
import cc.wdcy.domain.user.UserRepository;
import cc.wdcy.infrastructure.AbstractRepositoryTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.testng.annotations.Test;

View File

@ -41,7 +41,7 @@
</bean>
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" value="cc.honyee.infrastructure.mybatis"/>
<property name="basePackage" value="cc.wdcy.infrastructure.mybatis"/>
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
</bean>