命名规范，登录信息加密处理

src/main/java/com/uas/platform/b2bManage/config/RestTemplateConfig.java → src/main/java/com/uas/platform/b2b/manage/config/RestTemplateConfig.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.config;
+package com.uas.platform.b2b.manage.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/uas/platform/b2bManage/controller/AccountController.java → src/main/java/com/uas/platform/b2b/manage/controller/AccountController.java

@@ -1,16 +1,16 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.model.Constant;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.model.User;
-import com.uas.platform.b2bManage.page.exception.IllegalOperatorException;
-import com.uas.platform.b2bManage.service.UseLogService;
-import com.uas.platform.b2bManage.service.UserService;
-import com.uas.platform.b2bManage.support.MyException;
-import com.uas.platform.b2bManage.support.SecurityConstant;
-import com.uas.platform.b2bManage.web.BaseController;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.model.Constant;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.model.User;
+import com.uas.platform.b2b.manage.page.exception.IllegalOperatorException;
+import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.service.UserService;
+import com.uas.platform.b2b.manage.support.MyException;
+import com.uas.platform.b2b.manage.support.SecurityConstant;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/uas/platform/b2bManage/controller/EnterpriseCotroller.java → src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseCotroller.java

@@ -1,14 +1,14 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.model.AccessToken;
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.PageParams;
-import com.uas.platform.b2bManage.service.AccessTokenService;
-import com.uas.platform.b2bManage.service.EnterpriseBaseInfoService;
-import com.uas.platform.b2bManage.service.UseLogService;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.model.AccessToken;
+import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.PageParams;
+import com.uas.platform.b2b.manage.service.AccessTokenService;
+import com.uas.platform.b2b.manage.service.EnterpriseBaseInfoService;
+import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

src/main/java/com/uas/platform/b2bManage/controller/InviteController.java → src/main/java/com/uas/platform/b2b/manage/controller/InviteController.java

@@ -1,17 +1,16 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.model.Invite;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.service.InviteService;
-import com.uas.platform.b2bManage.service.UseLogService;
-import com.uas.platform.b2bManage.support.JxlsExcelView;
-import com.uas.platform.b2bManage.support.MyException;
-import com.uas.platform.b2bManage.web.BaseController;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.model.Invite;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.service.InviteService;
+import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.support.JxlsExcelView;
+import com.uas.platform.b2b.manage.support.MyException;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.AgentUtils;
-import javassist.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;

src/main/java/com/uas/platform/b2bManage/controller/LogsController.java → src/main/java/com/uas/platform/b2b/manage/controller/LogsController.java

@@ -1,11 +1,9 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.model.ErrorLog;
-import com.uas.platform.b2bManage.model.NotExistOrders;
-import com.uas.platform.b2bManage.model.NotExistProduct;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.service.ErrorLogService;
-import com.uas.platform.b2bManage.service.UseLogService;
+import com.uas.platform.b2b.manage.model.ErrorLog;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.service.ErrorLogService;
+import com.uas.platform.b2b.manage.service.UseLogService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.AgentUtils;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 /**
  * 日志查询接口

src/main/java/com/uas/platform/b2bManage/controller/SaleNoticeController.java → src/main/java/com/uas/platform/b2b/manage/controller/SaleNoticeController.java

@@ -1,14 +1,13 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.model.NoticeRecord;
-import com.uas.platform.b2bManage.model.NoticeRecordInfo;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.PageParams;
-import com.uas.platform.b2bManage.service.NoticeRecordService;
-import com.uas.platform.b2bManage.service.UseLogService;
-import com.uas.platform.b2bManage.utils.SearchUtils;
-import com.uas.platform.b2bManage.web.BaseController;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.PageParams;
+import com.uas.platform.b2b.manage.service.NoticeRecordService;
+import com.uas.platform.b2b.manage.model.NoticeRecordInfo;
+import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.utils.SearchUtils;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

src/main/java/com/uas/platform/b2bManage/controller/UasSchedularController.java → src/main/java/com/uas/platform/b2b/manage/controller/UasSchedularController.java

@@ -1,13 +1,13 @@
-package com.uas.platform.b2bManage.controller;
+package com.uas.platform.b2b.manage.controller;
 
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.model.UasSchedular;
-import com.uas.platform.b2bManage.model.UseType;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.PageParams;
-import com.uas.platform.b2bManage.service.UasSchedularService;
-import com.uas.platform.b2bManage.service.UseLogService;
-import com.uas.platform.b2bManage.web.BaseController;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.model.UasSchedular;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.PageParams;
+import com.uas.platform.b2b.manage.service.UasSchedularService;
+import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

src/main/java/com/uas/platform/b2bManage/core/support/ApplicationContextRegister.java → src/main/java/com/uas/platform/b2b/manage/core/support/ApplicationContextRegister.java

@@ -1,10 +1,10 @@
-package com.uas.platform.b2bManage.core.support;
+package com.uas.platform.b2b.manage.core.support;
 
+import com.uas.platform.b2b.manage.core.util.ContextUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 
-import com.uas.platform.b2bManage.core.util.ContextUtils;
 import org.springframework.context.ApplicationContextAware;
 
 /**

src/main/java/com/uas/platform/b2bManage/core/support/SystemSession.java → src/main/java/com/uas/platform/b2b/manage/core/support/SystemSession.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.core.support;
+package com.uas.platform.b2b.manage.core.support;
 
-import com.uas.platform.b2bManage.model.User;
+import com.uas.platform.b2b.manage.model.User;
 
 import javax.servlet.http.HttpSession;
 
@@ -25,7 +25,7 @@ public class SystemSession {
 	}
 
 	public static void clear() {
-		local.set(null);
+		local.remove();
 	}
 
     public static void setSession(HttpSession session) {

src/main/java/com/uas/platform/b2bManage/core/util/ContextUtils.java → src/main/java/com/uas/platform/b2b/manage/core/util/ContextUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.core.util;
+package com.uas.platform.b2b.manage.core.util;
 
 import org.apache.log4j.Logger;
 import org.springframework.context.ApplicationContext;

src/main/java/com/uas/platform/b2bManage/core/util/FastjsonUtils.java → src/main/java/com/uas/platform/b2b/manage/core/util/FastjsonUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.core.util;
+package com.uas.platform.b2b.manage.core.util;
 
 import java.util.List;
 

src/main/java/com/uas/platform/b2bManage/core/util/StringUtils.java → src/main/java/com/uas/platform/b2b/manage/core/util/StringUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.core.util;
+package com.uas.platform.b2b.manage.core.util;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;

src/main/java/com/uas/platform/b2bManage/dao/AccessTokenDao.java → src/main/java/com/uas/platform/b2b/manage/dao/AccessTokenDao.java

@@ -1,7 +1,7 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
 
-import com.uas.platform.b2bManage.model.AccessToken;
+import com.uas.platform.b2b.manage.model.AccessToken;
 
 public interface AccessTokenDao {
 

src/main/java/com/uas/platform/b2bManage/dao/EnterpriseBaseInfoDao.java → src/main/java/com/uas/platform/b2b/manage/dao/EnterpriseBaseInfoDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/ErrorLogDao.java → src/main/java/com/uas/platform/b2b/manage/dao/ErrorLogDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.ErrorLog;
+import com.uas.platform.b2b.manage.model.ErrorLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/ErrorLogDetailDao.java → src/main/java/com/uas/platform/b2b/manage/dao/ErrorLogDetailDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.ErrorLogDetail;
+import com.uas.platform.b2b.manage.model.ErrorLogDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/InvitationRecordDao.java → src/main/java/com/uas/platform/b2b/manage/dao/InvitationRecordDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.InvitationRecord;
+import com.uas.platform.b2b.manage.model.InvitationRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/InviteDao.java → src/main/java/com/uas/platform/b2b/manage/dao/InviteDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.Invite;
+import com.uas.platform.b2b.manage.model.Invite;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/NotExistOrdersDao.java → src/main/java/com/uas/platform/b2b/manage/dao/NotExistOrdersDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.NotExistOrders;
+import com.uas.platform.b2b.manage.model.NotExistOrders;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/uas/platform/b2bManage/dao/NotExistProductDao.java → src/main/java/com/uas/platform/b2b/manage/dao/NotExistProductDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.NotExistProduct;
+import com.uas.platform.b2b.manage.model.NotExistProduct;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/uas/platform/b2bManage/dao/NoticeRecordDao.java → src/main/java/com/uas/platform/b2b/manage/dao/NoticeRecordDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.NoticeRecord;
+import com.uas.platform.b2b.manage.model.NoticeRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/uas/platform/b2bManage/dao/NoticeRecordInfoDao.java → src/main/java/com/uas/platform/b2b/manage/dao/NoticeRecordInfoDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.NoticeRecordInfo;
+import com.uas.platform.b2b.manage.model.NoticeRecordInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/SecretKeyRecordDao.java → src/main/java/com/uas/platform/b2b/manage/dao/SecretKeyRecordDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.SecretKeyRecord;
+import com.uas.platform.b2b.manage.model.SecretKeyRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/uas/platform/b2bManage/dao/UasSchedularDao.java → src/main/java/com/uas/platform/b2b/manage/dao/UasSchedularDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.UasSchedular;
+import com.uas.platform.b2b.manage.model.UasSchedular;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/UseLogDao.java → src/main/java/com/uas/platform/b2b/manage/dao/UseLogDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.UseLog;
+import com.uas.platform.b2b.manage.model.UseLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/UserBaseInfoDao.java → src/main/java/com/uas/platform/b2b/manage/dao/UserBaseInfoDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.UserBaseInfo;
+import com.uas.platform.b2b.manage.model.UserBaseInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/UserDao.java → src/main/java/com/uas/platform/b2b/manage/dao/UserDao.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.dao;
+package com.uas.platform.b2b.manage.dao;
 
-import com.uas.platform.b2bManage.model.User;
+import com.uas.platform.b2b.manage.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/com/uas/platform/b2bManage/dao/impl/AccessTokenDaoImpl.java → src/main/java/com/uas/platform/b2b/manage/dao/impl/AccessTokenDaoImpl.java

@@ -1,8 +1,8 @@
-package com.uas.platform.b2bManage.dao.impl;
+package com.uas.platform.b2b.manage.dao.impl;
 
-import com.uas.platform.b2bManage.core.util.FastjsonUtils;
-import com.uas.platform.b2bManage.dao.AccessTokenDao;
-import com.uas.platform.b2bManage.model.AccessToken;
+import com.uas.platform.b2b.manage.core.util.FastjsonUtils;
+import com.uas.platform.b2b.manage.dao.AccessTokenDao;
+import com.uas.platform.b2b.manage.model.AccessToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;

src/main/java/com/uas/platform/b2bManage/model/AccessToken.java → src/main/java/com/uas/platform/b2b/manage/model/AccessToken.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import com.uas.platform.core.util.StringUtil;
 

src/main/java/com/uas/platform/b2bManage/model/Constant.java → src/main/java/com/uas/platform/b2b/manage/model/Constant.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 /**
  * 常量
@@ -46,5 +46,5 @@ public class Constant {
     /**
      * 设置cookie名称
      */
-    public static final String COOKIE_NAME = "myCookie";
+    public static final String COOKIE_NAME = "user";
 }

src/main/java/com/uas/platform/b2bManage/model/EnterpriseBaseInfo.java → src/main/java/com/uas/platform/b2b/manage/model/EnterpriseBaseInfo.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/model/ErrorLog.java → src/main/java/com/uas/platform/b2b/manage/model/ErrorLog.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import org.hibernate.validator.constraints.Length;
 

src/main/java/com/uas/platform/b2bManage/model/ErrorLogDetail.java → src/main/java/com/uas/platform/b2b/manage/model/ErrorLogDetail.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;

src/main/java/com/uas/platform/b2bManage/model/InvitationRecord.java → src/main/java/com/uas/platform/b2b/manage/model/InvitationRecord.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/model/Invite.java → src/main/java/com/uas/platform/b2b/manage/model/Invite.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 
 import javax.persistence.*;

src/main/java/com/uas/platform/b2bManage/model/InviteProdInfo.java → src/main/java/com/uas/platform/b2b/manage/model/InviteProdInfo.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import java.util.Date;
 

src/main/java/com/uas/platform/b2bManage/model/KeyEntity.java → src/main/java/com/uas/platform/b2b/manage/model/KeyEntity.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

src/main/java/com/uas/platform/b2bManage/model/NotExistOrders.java → src/main/java/com/uas/platform/b2b/manage/model/NotExistOrders.java

@@ -1,6 +1,4 @@
-package com.uas.platform.b2bManage.model;
-
-import com.uas.platform.core.model.Status;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/model/NotExistProduct.java → src/main/java/com/uas/platform/b2b/manage/model/NotExistProduct.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 
 import javax.persistence.*;

src/main/java/com/uas/platform/b2bManage/model/NoticeRecord.java → src/main/java/com/uas/platform/b2b/manage/model/NoticeRecord.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

src/main/java/com/uas/platform/b2bManage/model/NoticeRecordDetail.java → src/main/java/com/uas/platform/b2b/manage/model/NoticeRecordDetail.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 
 import com.alibaba.fastjson.annotation.JSONField;

src/main/java/com/uas/platform/b2bManage/model/NoticeRecordInfo.java → src/main/java/com/uas/platform/b2b/manage/model/NoticeRecordInfo.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

src/main/java/com/uas/platform/b2bManage/model/SecretKeyRecord.java → src/main/java/com/uas/platform/b2b/manage/model/SecretKeyRecord.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/model/UasSchedular.java → src/main/java/com/uas/platform/b2b/manage/model/UasSchedular.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/model/UseLog.java → src/main/java/com/uas/platform/b2b/manage/model/UseLog.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
 import org.hibernate.validator.constraints.Length;
 
 import javax.persistence.*;

src/main/java/com/uas/platform/b2bManage/model/UseType.java → src/main/java/com/uas/platform/b2b/manage/model/UseType.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 /**
  * 操作类型

src/main/java/com/uas/platform/b2bManage/model/User.java → src/main/java/com/uas/platform/b2b/manage/model/User.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -142,4 +142,19 @@ public class User implements Serializable {
     public void setIp(String ip) {
         this.ip = ip;
     }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", email='" + email + '\'' +
+                ", enable=" + enable +
+                ", name='" + name + '\'' +
+                ", password='" + password + '\'' +
+                ", tel='" + tel + '\'' +
+                ", fullName='" + fullName + '\'' +
+                ", role='" + role + '\'' +
+                ", ip='" + ip + '\'' +
+                '}';
+    }
 }

src/main/java/com/uas/platform/b2bManage/model/UserBaseInfo.java → src/main/java/com/uas/platform/b2b/manage/model/UserBaseInfo.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.model;
+package com.uas.platform.b2b.manage.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/platform/b2bManage/page/IPage.java → src/main/java/com/uas/platform/b2b/manage/page/IPage.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page;
+package com.uas.platform.b2b.manage.page;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/com/uas/platform/b2bManage/page/PageInfo.java → src/main/java/com/uas/platform/b2b/manage/page/PageInfo.java

@@ -1,10 +1,10 @@
-package com.uas.platform.b2bManage.page;
+package com.uas.platform.b2b.manage.page;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2bManage.page.criteria.CriterionExpression;
-import com.uas.platform.b2bManage.page.criteria.PredicateUtils;
-import com.uas.platform.b2bManage.page.exception.IllegalOperatorException;
-import com.uas.platform.b2bManage.support.JxlsExcelView;
+import com.uas.platform.b2b.manage.page.exception.IllegalOperatorException;
+import com.uas.platform.b2b.manage.page.criteria.CriterionExpression;
+import com.uas.platform.b2b.manage.page.criteria.PredicateUtils;
+import com.uas.platform.b2b.manage.support.JxlsExcelView;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;

src/main/java/com/uas/platform/b2bManage/page/PageParams.java → src/main/java/com/uas/platform/b2b/manage/page/PageParams.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page;
+package com.uas.platform.b2b.manage.page;
 
 import java.io.Serializable;
 

src/main/java/com/uas/platform/b2bManage/page/SearchFilter.java → src/main/java/com/uas/platform/b2b/manage/page/SearchFilter.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page;
+package com.uas.platform.b2b.manage.page;
 
 import java.util.Collection;
 

src/main/java/com/uas/platform/b2bManage/page/criteria/CriterionExpression.java → src/main/java/com/uas/platform/b2b/manage/page/criteria/CriterionExpression.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.criteria;
+package com.uas.platform.b2b.manage.page.criteria;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;

src/main/java/com/uas/platform/b2bManage/page/criteria/LogicalExpression.java → src/main/java/com/uas/platform/b2b/manage/page/criteria/LogicalExpression.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.criteria;
+package com.uas.platform.b2b.manage.page.criteria;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;

src/main/java/com/uas/platform/b2bManage/page/criteria/PredicateFactory.java → src/main/java/com/uas/platform/b2b/manage/page/criteria/PredicateFactory.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.criteria;
+package com.uas.platform.b2b.manage.page.criteria;
 
 import org.springframework.data.jpa.domain.Specification;
 

src/main/java/com/uas/platform/b2bManage/page/criteria/PredicateUtils.java → src/main/java/com/uas/platform/b2b/manage/page/criteria/PredicateUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.criteria;
+package com.uas.platform.b2b.manage.page.criteria;
 
 import org.hibernate.criterion.MatchMode;
 import org.springframework.util.StringUtils;

src/main/java/com/uas/platform/b2bManage/page/criteria/SimpleExpression.java → src/main/java/com/uas/platform/b2b/manage/page/criteria/SimpleExpression.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.criteria;
+package com.uas.platform.b2b.manage.page.criteria;
 
 import org.springframework.util.StringUtils;
 

src/main/java/com/uas/platform/b2bManage/page/exception/IllegalOperatorException.java → src/main/java/com/uas/platform/b2b/manage/page/exception/IllegalOperatorException.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.page.exception;
+package com.uas.platform.b2b.manage.page.exception;
 
 /**
  * 非法操作

src/main/java/com/uas/platform/b2bManage/service/AccessTokenService.java → src/main/java/com/uas/platform/b2b/manage/service/AccessTokenService.java

@@ -1,7 +1,7 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
 
-import com.uas.platform.b2bManage.model.AccessToken;
+import com.uas.platform.b2b.manage.model.AccessToken;
 
 /**
  * token相关功能

src/main/java/com/uas/platform/b2bManage/service/EnterpriseBaseInfoService.java → src/main/java/com/uas/platform/b2b/manage/service/EnterpriseBaseInfoService.java

@@ -1,8 +1,8 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
 
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
-import com.uas.platform.b2bManage.page.PageInfo;
+import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.manage.page.PageInfo;
 import org.springframework.data.domain.Page;
 
 /**

src/main/java/com/uas/platform/b2bManage/service/ErrorLogService.java → src/main/java/com/uas/platform/b2b/manage/service/ErrorLogService.java

@@ -1,14 +1,10 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.ErrorLog;
-import com.uas.platform.b2bManage.model.NotExistOrders;
-import com.uas.platform.b2bManage.model.NotExistProduct;
+import com.uas.platform.b2b.manage.model.ErrorLog;
 import com.uas.platform.core.model.PageInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 
-import java.util.List;
-
 /**
  * B2B接口错误日志记录
  *

src/main/java/com/uas/platform/b2bManage/service/InviteService.java → src/main/java/com/uas/platform/b2b/manage/service/InviteService.java

@@ -1,9 +1,8 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.Invite;
-import com.uas.platform.b2bManage.support.MyException;
+import com.uas.platform.b2b.manage.model.Invite;
+import com.uas.platform.b2b.manage.support.MyException;
 import com.uas.platform.core.model.PageInfo;
-import javassist.NotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 

src/main/java/com/uas/platform/b2bManage/service/NoticeRecordService.java → src/main/java/com/uas/platform/b2b/manage/service/NoticeRecordService.java

@@ -1,8 +1,8 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.NoticeRecord;
-import com.uas.platform.b2bManage.model.NoticeRecordInfo;
-import com.uas.platform.b2bManage.page.PageInfo;
+import com.uas.platform.b2b.manage.model.NoticeRecord;
+import com.uas.platform.b2b.manage.model.NoticeRecordInfo;
+import com.uas.platform.b2b.manage.page.PageInfo;
 import org.springframework.data.domain.Page;
 
 /**

src/main/java/com/uas/platform/b2bManage/service/ProductService.java → src/main/java/com/uas/platform/b2b/manage/service/ProductService.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.InviteProdInfo;
+import com.uas.platform.b2b.manage.model.InviteProdInfo;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/uas/platform/b2bManage/service/UasSchedularService.java → src/main/java/com/uas/platform/b2b/manage/service/UasSchedularService.java

@@ -1,8 +1,7 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
-import com.uas.platform.b2bManage.model.UasSchedular;
-import com.uas.platform.b2bManage.page.PageInfo;
+import com.uas.platform.b2b.manage.model.UasSchedular;
+import com.uas.platform.b2b.manage.page.PageInfo;
 import org.springframework.data.domain.Page;
 
 /**

src/main/java/com/uas/platform/b2bManage/service/UseLogService.java → src/main/java/com/uas/platform/b2b/manage/service/UseLogService.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
 /**
  * 日志接口

src/main/java/com/uas/platform/b2bManage/service/UserService.java → src/main/java/com/uas/platform/b2b/manage/service/UserService.java

@@ -1,8 +1,7 @@
-package com.uas.platform.b2bManage.service;
+package com.uas.platform.b2b.manage.service;
 
-import com.uas.platform.b2bManage.model.User;
-import com.uas.platform.b2bManage.support.MyException;
-import javassist.NotFoundException;
+import com.uas.platform.b2b.manage.model.User;
+import com.uas.platform.b2b.manage.support.MyException;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/uas/platform/b2bManage/service/impl/AccessTokenServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/AccessTokenServiceImpl.java

@@ -1,9 +1,9 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.dao.AccessTokenDao;
-import com.uas.platform.b2bManage.model.AccessToken;
-import com.uas.platform.b2bManage.service.AccessTokenService;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.dao.AccessTokenDao;
+import com.uas.platform.b2b.manage.model.AccessToken;
+import com.uas.platform.b2b.manage.service.AccessTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/uas/platform/b2bManage/service/impl/BaseService.java → src/main/java/com/uas/platform/b2b/manage/service/impl/BaseService.java

@@ -1,11 +1,9 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 /**
  * @author hejq

src/main/java/com/uas/platform/b2bManage/service/impl/EnterpriseBaseInfoServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/EnterpriseBaseInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.criteria.CriterionExpression;
-import com.uas.platform.b2bManage.page.criteria.LogicalExpression;
-import com.uas.platform.b2bManage.page.criteria.SimpleExpression;
-import com.uas.platform.b2bManage.service.EnterpriseBaseInfoService;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.criteria.CriterionExpression;
+import com.uas.platform.b2b.manage.page.criteria.SimpleExpression;
+import com.uas.platform.b2b.manage.service.EnterpriseBaseInfoService;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.EnterpriseBaseInfoDao;
+import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.manage.page.criteria.LogicalExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/com/uas/platform/b2bManage/service/impl/ErrorLogServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/ErrorLogServiceImpl.java

@@ -1,12 +1,12 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.ErrorLogDao;
-import com.uas.platform.b2bManage.dao.NotExistOrdersDao;
-import com.uas.platform.b2bManage.dao.NotExistProductDao;
-import com.uas.platform.b2bManage.model.ErrorLog;
-import com.uas.platform.b2bManage.service.ErrorLogService;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.ErrorLogDao;
+import com.uas.platform.b2b.manage.dao.NotExistOrdersDao;
+import com.uas.platform.b2b.manage.dao.NotExistProductDao;
+import com.uas.platform.b2b.manage.model.ErrorLog;
+import com.uas.platform.b2b.manage.service.ErrorLogService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;

src/main/java/com/uas/platform/b2bManage/service/impl/InviteServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/InviteServiceImpl.java

@@ -1,22 +1,25 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2bManage.dao.InvitationRecordDao;
-import com.uas.platform.b2bManage.dao.InviteDao;
-import com.uas.platform.b2bManage.dao.UserBaseInfoDao;
-import com.uas.platform.b2bManage.model.*;
-import com.uas.platform.b2bManage.page.exception.IllegalOperatorException;
-import com.uas.platform.b2bManage.service.InviteService;
-import com.uas.platform.b2bManage.service.ProductService;
-import com.uas.platform.b2bManage.support.*;
+import com.uas.platform.b2b.manage.dao.InvitationRecordDao;
+import com.uas.platform.b2b.manage.dao.InviteDao;
+import com.uas.platform.b2b.manage.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.manage.model.*;
+import com.uas.platform.b2b.manage.service.InviteService;
+import com.uas.platform.b2b.manage.service.ProductService;
+import com.uas.platform.b2b.manage.support.CollectionUtil;
+import com.uas.platform.b2b.manage.support.MyException;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.EnterpriseBaseInfoDao;
+import com.uas.platform.b2b.manage.support.MyThread;
+import com.uas.platform.b2b.manage.support.MyThreadPoolExecutor;
+import com.uas.platform.b2b.manage.model.*;
+import com.uas.platform.b2b.manage.support.*;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
-import org.apache.curator.utils.ThreadUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/com/uas/platform/b2bManage/service/impl/NoticeRecordServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/NoticeRecordServiceImpl.java

@@ -1,14 +1,14 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.NoticeRecordDao;
-import com.uas.platform.b2bManage.dao.NoticeRecordInfoDao;
-import com.uas.platform.b2bManage.model.NoticeRecord;
-import com.uas.platform.b2bManage.model.NoticeRecordInfo;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.criteria.PredicateUtils;
-import com.uas.platform.b2bManage.service.NoticeRecordService;
-import com.uas.platform.b2bManage.utils.SearchUtils;
+import com.uas.platform.b2b.manage.dao.NoticeRecordDao;
+import com.uas.platform.b2b.manage.dao.NoticeRecordInfoDao;
+import com.uas.platform.b2b.manage.model.NoticeRecordInfo;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.criteria.PredicateUtils;
+import com.uas.platform.b2b.manage.service.NoticeRecordService;
+import com.uas.platform.b2b.manage.utils.SearchUtils;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.model.NoticeRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;

src/main/java/com/uas/platform/b2bManage/service/impl/ProductServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/ProductServiceImpl.java

@@ -1,8 +1,8 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2bManage.model.InviteProdInfo;
-import com.uas.platform.b2bManage.service.ProductService;
+import com.uas.platform.b2b.manage.model.InviteProdInfo;
+import com.uas.platform.b2b.manage.service.ProductService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/uas/platform/b2bManage/service/impl/UasSchedularServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/UasSchedularServiceImpl.java

@@ -1,15 +1,14 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.UasSchedularDao;
-import com.uas.platform.b2bManage.model.EnterpriseBaseInfo;
-import com.uas.platform.b2bManage.model.UasSchedular;
-import com.uas.platform.b2bManage.page.PageInfo;
-import com.uas.platform.b2bManage.page.criteria.CriterionExpression;
-import com.uas.platform.b2bManage.page.criteria.LogicalExpression;
-import com.uas.platform.b2bManage.page.criteria.SimpleExpression;
-import com.uas.platform.b2bManage.service.UasSchedularService;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.dao.UasSchedularDao;
+import com.uas.platform.b2b.manage.model.UasSchedular;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.criteria.CriterionExpression;
+import com.uas.platform.b2b.manage.page.criteria.SimpleExpression;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.page.criteria.LogicalExpression;
+import com.uas.platform.b2b.manage.service.UasSchedularService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/com/uas/platform/b2bManage/service/impl/UseLogServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/UseLogServiceImpl.java

@@ -1,8 +1,8 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
-import com.uas.platform.b2bManage.dao.UseLogDao;
-import com.uas.platform.b2bManage.model.UseLog;
-import com.uas.platform.b2bManage.service.UseLogService;
+import com.uas.platform.b2b.manage.model.UseLog;
+import com.uas.platform.b2b.manage.dao.UseLogDao;
+import com.uas.platform.b2b.manage.service.UseLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/uas/platform/b2bManage/service/impl/UserServiceImpl.java → src/main/java/com/uas/platform/b2b/manage/service/impl/UserServiceImpl.java

@@ -1,18 +1,19 @@
-package com.uas.platform.b2bManage.service.impl;
+package com.uas.platform.b2b.manage.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.core.util.StringUtils;
-import com.uas.platform.b2bManage.dao.SecretKeyRecordDao;
-import com.uas.platform.b2bManage.dao.UserDao;
-import com.uas.platform.b2bManage.model.Constant;
-import com.uas.platform.b2bManage.model.SecretKeyRecord;
-import com.uas.platform.b2bManage.model.User;
-import com.uas.platform.b2bManage.service.UserService;
-import com.uas.platform.b2bManage.support.MyException;
-import com.uas.platform.b2bManage.support.SecurityConstant;
-import com.uas.platform.b2bManage.support.StringUtil;
-import com.uas.platform.core.util.AgentUtils;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.dao.UserDao;
+import com.uas.platform.b2b.manage.model.Constant;
+import com.uas.platform.b2b.manage.service.UserService;
+import com.uas.platform.b2b.manage.support.StringUtil;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.SecretKeyRecordDao;
+import com.uas.platform.b2b.manage.model.SecretKeyRecord;
+import com.uas.platform.b2b.manage.model.User;
+import com.uas.platform.b2b.manage.support.MyException;
+import com.uas.platform.b2b.manage.support.SecurityConstant;
+import com.uas.platform.b2b.manage.utils.EncryptUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -24,7 +25,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -107,9 +107,8 @@ public class UserServiceImpl implements UserService {
         }
         User user = users.get(0);
         if (Md5Utils.encode(passWord, user.getName()).equals(user.getPassword())) {
-            HttpSession session = request.getSession();
-            session.setAttribute("user", user);
-            Cookie cookie = new Cookie(Constant.COOKIE_NAME,  Md5Utils.encode(AgentUtils.getIp(request), null));
+            String result = EncryptUtils.aesEncode(JSON.toJSONString(user));
+            Cookie cookie = new Cookie(Constant.COOKIE_NAME, result);
             response.addCookie(cookie);
             SystemSession.setUser(user);
         } else {

src/main/java/com/uas/platform/b2bManage/support/CollectionUtil.java → src/main/java/com/uas/platform/b2b/manage/support/CollectionUtil.java

@@ -1,6 +1,6 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
-import com.uas.platform.b2bManage.model.KeyEntity;
+import com.uas.platform.b2b.manage.model.KeyEntity;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;

src/main/java/com/uas/platform/b2bManage/support/DS.java → src/main/java/com/uas/platform/b2b/manage/support/DS.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 public class DS {
 

src/main/java/com/uas/platform/b2bManage/support/DSUtils.java → src/main/java/com/uas/platform/b2b/manage/support/DSUtils.java

@@ -1,7 +1,7 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.uas.platform.b2bManage.core.util.ContextUtils;
+import com.uas.platform.b2b.manage.core.util.ContextUtils;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;

src/main/java/com/uas/platform/b2bManage/support/DateFormatUtils.java → src/main/java/com/uas/platform/b2b/manage/support/DateFormatUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import org.apache.commons.lang3.time.FastDateFormat;
 

src/main/java/com/uas/platform/b2bManage/support/JxlsExcelView.java → src/main/java/com/uas/platform/b2b/manage/support/JxlsExcelView.java

@@ -1,7 +1,7 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.core.util.ContextUtils;
+import com.uas.platform.b2b.manage.core.util.ContextUtils;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
 import net.sf.jxls.transformer.XLSTransformer;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;

src/main/java/com/uas/platform/b2bManage/support/MultiDataSource.java → src/main/java/com/uas/platform/b2b/manage/support/MultiDataSource.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidPooledConnection;

src/main/java/com/uas/platform/b2bManage/support/MyException.java → src/main/java/com/uas/platform/b2b/manage/support/MyException.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 /**
  * 自定义异常

src/main/java/com/uas/platform/b2bManage/support/MyThread.java → src/main/java/com/uas/platform/b2b/manage/support/MyThread.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import javax.validation.constraints.NotNull;
 import java.util.concurrent.ThreadFactory;

src/main/java/com/uas/platform/b2bManage/support/MyThreadPoolExecutor.java → src/main/java/com/uas/platform/b2b/manage/support/MyThreadPoolExecutor.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

src/main/java/com/uas/platform/b2bManage/support/SecurityConstant.java → src/main/java/com/uas/platform/b2b/manage/support/SecurityConstant.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 /**
  * 系统路径

src/main/java/com/uas/platform/b2bManage/support/SpObserver.java → src/main/java/com/uas/platform/b2b/manage/support/SpObserver.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 /**
  * 

src/main/java/com/uas/platform/b2bManage/support/StringUtil.java → src/main/java/com/uas/platform/b2b/manage/support/StringUtil.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.support;
+package com.uas.platform.b2b.manage.support;
 
 import java.util.Random;
 import java.util.UUID;

src/main/java/com/uas/platform/b2b/manage/utils/EncryptUtils.java

@@ -0,0 +1,176 @@
+package com.uas.platform.b2b.manage.utils;
+
+import org.springframework.security.crypto.codec.Hex;
+
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * 加密工具
+ *
+ * @author hejq
+ * @date 2018/9/5 22:29
+ */
+public class EncryptUtils {
+
+    /**
+     * 加密规则
+     */
+    private static final String KEY = "587e6f52-fc99-49d6-ae21-da97bd89fe70";
+
+    /**
+     * 算法
+     */
+    private static final String ALGORITHM = "AES";
+
+    /**
+     * 编码
+     *
+     */
+    private static final String CODE_STYLE = "UTF-8";
+
+    /**
+     * 加密
+     *  <pre>
+     *      1.根据指定算法AES自成密码器
+     *      2.初始化密码器，第一个参数为加密(Encrypt_mode)或者解密解密(Decrypt_mode)操作，第二个参数为使用的KEY
+     *      3.获取加密内容的字节数组(这里要设置为utf-8)不然内容中如果有中文和英文混合中文就会解密为乱码
+     *      4.根据密码器的初始化方式--加密：将数据加密
+     *      5.将加密后的数据转换为字符串
+     *  </pre>
+     * @param content 需要加密的内容
+     * @return 加密后的字符串
+     */
+    public static String aesEncode(String content){
+        try {
+            SecretKey key = createSecretKey();
+
+            //1.根据指定算法AES自成密码器
+            Cipher cipher = Cipher.getInstance(ALGORITHM);
+
+            //2.初始化密码器，第一个参数为加密(Encrypt_mode)或者解密解密(Decrypt_mode)操作，第二个参数为使用的KEY
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+
+            //3.获取加密内容的字节数组(这里要设置为utf-8)不然内容中如果有中文和英文混合中文就会解密为乱码
+            byte [] byteEncode = content.getBytes(CODE_STYLE);
+
+            //4.根据密码器的初始化方式--加密：将数据加密
+            byte [] byteAes = cipher.doFinal(byteEncode);
+
+            //5.将加密后的数据转换为字符串
+            //这里用Base64Encoder中会找不到包
+            //解决办法：
+            //在项目的Build path中先移除JRE System Library，再添加库JRE System Library，重新编译后就一切正常了。
+
+            String aesEncode = new String(Hex.encode(byteAes));
+
+            //11.将字符串返回
+            return aesEncode;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //如果有错就返回null
+        return null;
+    }
+
+    /**
+     * 解密
+     * <pre>
+     *     解密过程：
+     *     1.同加密1-4步
+     *     2.将加密后的字符串反纺成byte[]数组
+     *     3.将加密内容解密
+     * </pre>
+     * @param content 加密内容
+     * @return 解密后的数据
+     */
+    public static String aesDecode(String content){
+        try {
+
+            SecretKey key = createSecretKey();
+
+            //1.根据指定算法AES自成密码器
+            Cipher cipher = Cipher.getInstance("AES");
+
+            //2.初始化密码器，第一个参数为加密(Encrypt_mode)或者解密(Decrypt_mode)操作，第二个参数为使用的KEY
+            cipher.init(Cipher.DECRYPT_MODE, key);
+
+            //3.将加密并编码后的内容解码成字节数组
+            byte [] byteContent = Hex.decode(content);
+
+            /*
+             * 解密
+             */
+            byte [] byteDecode = cipher.doFinal(byteContent);
+            String aesDecode = new String(byteDecode, CODE_STYLE);
+            return aesDecode;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        }
+
+        //如果有错就返回null
+        return null;
+    }
+
+    /**
+     * 构造密钥生成器
+     * <pre>
+     *     1.构造密钥生成器
+     *     2.根据ecnodeRules规则初始化密钥生成器
+     *     3.产生密钥
+     *     4.创建和初始化密码器
+     *     5.内容加密
+     *     6.返回字符串
+     * </pre>
+     * @return SecretKey
+     * @throws NoSuchAlgorithmException
+     * @throws UnsupportedEncodingException
+     */
+    public static SecretKey createSecretKey() throws NoSuchAlgorithmException, UnsupportedEncodingException {
+
+        //1.构造密钥生成器，指定为AES算法,不区分大小写
+        KeyGenerator keygen = KeyGenerator.getInstance(ALGORITHM);
+
+        //2.根据KEY初始化密钥生成器，生成一个128位的随机源,根据传入的字节数组
+        SecureRandom random = new SecureRandom(KEY.getBytes(CODE_STYLE));
+
+        keygen.init(128, random);
+
+        //3.产生原始对称密钥
+        SecretKey originalKey = keygen.generateKey();
+
+        //4.获得原始对称密钥的字节数组
+        byte [] raw = originalKey.getEncoded();
+
+        //5.根据字节数组生成AES密钥
+        SecretKey key = new SecretKeySpec(raw, ALGORITHM);
+
+        return key;
+    }
+}

src/main/java/com/uas/platform/b2bManage/utils/SearchUtils.java → src/main/java/com/uas/platform/b2b/manage/utils/SearchUtils.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.utils;
+package com.uas.platform.b2b.manage.utils;
 
 /**
  * @author hejq

src/main/java/com/uas/platform/b2bManage/web/BaseController.java → src/main/java/com/uas/platform/b2b/manage/web/BaseController.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.web;
+package com.uas.platform.b2b.manage.web;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -6,9 +6,6 @@ import java.io.PrintWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.model.User;
-import com.uas.platform.b2bManage.support.SecurityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/com/uas/platform/b2bManage/web/GlobalExceptionHandler.java → src/main/java/com/uas/platform/b2b/manage/web/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.uas.platform.b2bManage.web;
+package com.uas.platform.b2b.manage.web;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/com/uas/platform/b2bManage/web/filter/SSOInterceptor.java → src/main/java/com/uas/platform/b2b/manage/web/filter/SSOInterceptor.java

@@ -1,12 +1,11 @@
-package com.uas.platform.b2bManage.web.filter;
-
-import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.model.Constant;
-import com.uas.platform.b2bManage.model.User;
-import com.uas.platform.b2bManage.support.SecurityConstant;
-import com.uas.platform.core.util.AgentUtils;
-import com.uas.platform.core.util.encry.Md5Utils;
+package com.uas.platform.b2b.manage.web.filter;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.model.Constant;
+import com.uas.platform.b2b.manage.model.User;
+import com.uas.platform.b2b.manage.support.SecurityConstant;
+import com.uas.platform.b2b.manage.utils.EncryptUtils;
 import org.apache.log4j.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.ModelAndView;
@@ -16,7 +15,6 @@ import javax.servlet.*;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -83,14 +81,11 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
      * @param request HttpServletRequest
      */
     private boolean checkCookie(boolean[] cookieExist, List<Cookie> cookieList, HttpServletRequest request) {
-        String ipMd5 = Md5Utils.encode(AgentUtils.getIp(request), null);
         cookieList.forEach(cookie -> {
             switch (cookie.getName()) {
                 case (Constant.COOKIE_NAME):
-                    if (cookie.getValue().equals(ipMd5)) {
-                        cookieExist[0] = true;
-                        break;
-                    }
+                    cookieExist[0] = true;
+                    break;
                 default:
             }
         });
@@ -116,10 +111,21 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
      * @param request HttpServletRequest
      */
     private void logSession(HttpServletRequest request) throws UnsupportedEncodingException {
-        Object user = request.getSession().getAttribute("user");
-        if (user != null) {
-            SystemSession.setUser((User) user);
-            log.info("登录成功，" + JSON.toJSONString(user));
+        Cookie[] cookies = request.getCookies();
+        if (null != cookies) {
+            Arrays.asList(cookies).forEach(cookie -> {
+                switch (cookie.getName()) {
+                    case (Constant.COOKIE_NAME):
+                        String result = EncryptUtils.aesDecode(cookie.getValue());
+                        User user = JSONObject.parseObject(result, User.class);
+                        if (user != null) {
+                            SystemSession.setUser(user);
+                            log.info("登录成功，" + user.toString());
+                        }
+                        break;
+                    default:
+                }
+            });
         }
     }
 
@@ -140,8 +146,7 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
      * @throws IOException IO异常
      */
     private boolean onAuthenticateFailed(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        HttpSession session = request.getSession();
-        removeLocalSession(session);
+        removeLocalSession(request);
         if (SecurityConstant.AUTHENTICATION_URL.equals(request.getRequestURI())) {
             return true;
         }
@@ -153,14 +158,20 @@ public class SSOInterceptor extends HandlerInterceptorAdapter implements Filter
     /**
      * 清除登录信息
      *
-     * @param session HttpSession
+     * @param request HttpServletRequest
      */
-    private void removeLocalSession(HttpSession session) {
+    private void removeLocalSession(HttpServletRequest request) {
         SystemSession.clear();
-        session.invalidate();
+        Cookie[] cookies = request.getCookies();
+        if (null != cookies) {
+            Arrays.asList(cookies).forEach(cookie -> {
+                cookie.setMaxAge(0);
+                cookie.setPath("/");
+            });
+        }
         User user = SystemSession.getUser();
         if (null != user) {
-            removeLocalSession(session);
+            removeLocalSession(request);
         }
     }
 

src/main/java/com/uas/platform/b2bManage/web/filter/SystemSessionInterceptor.java → src/main/java/com/uas/platform/b2b/manage/web/filter/SystemSessionInterceptor.java

@@ -1,7 +1,7 @@
-package com.uas.platform.b2bManage.web.filter;
+package com.uas.platform.b2b.manage.web.filter;
 
-import com.uas.platform.b2bManage.core.support.SystemSession;
-import com.uas.platform.b2bManage.model.User;
+import com.uas.platform.b2b.manage.core.support.SystemSession;
+import com.uas.platform.b2b.manage.model.User;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;

src/main/resources/spring/applicationContext.xml

@@ -6,18 +6,18 @@
 	   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
 
 	<!-- 注册spring上下文对象 -->
-	<bean class="com.uas.platform.b2bManage.core.support.ApplicationContextRegister" />
+	<bean class="com.uas.platform.b2b.manage.core.support.ApplicationContextRegister" />
 
 	<!-- 扫描注解 -->
 	<context:annotation-config />
 	<!-- 扫描的包 -->
-	<context:component-scan base-package="com.uas.platform.b2bManage" />
+	<context:component-scan base-package="com.uas.platform.b2b.manage" />
 
     <context:property-placeholder location="classpath*:conf/*.properties" />
 
-    <jpa:repositories base-package="com.uas.platform.b2bManage.dao"/>
+    <jpa:repositories base-package="com.uas.platform.b2b.manage.dao"/>
 
-    <bean id="dataSource" class="com.uas.platform.b2bManage.support.MultiDataSource">
+    <bean id="dataSource" class="com.uas.platform.b2b.manage.support.MultiDataSource">
 		<property name="dataSource">
 			<ref bean="defaultDataSource" />
 		</property>
@@ -66,7 +66,7 @@
           class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <!--<property name="persistenceUnitName" value="persistenceUnit" />-->
         <property name="persistenceXmlLocation" value="classpath*:META-INF/persistence.xml" />
-        <property name="packagesToScan" value="com.uas.platform.b2bManage" />
+        <property name="packagesToScan" value="com.uas.platform.b2b.manage" />
         <property name="dataSource" ref="dataSource" />
         <property name="jpaVendorAdapter">
             <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">

src/main/webapp/WEB-INF/web.xml

@@ -7,7 +7,7 @@
   
   <context-param>
 		<param-name>webAppRootKey</param-name>
-		<param-value>spring.webapp.platform.b2bManage</param-value>
+		<param-value>spring.webapp.platform.b2b.manage</param-value>
 	</context-param>
 	<context-param>
 		<param-name>spring.profiles.active</param-name>

src/main/webapp/WEB-INF/webmvc.xml

@@ -27,7 +27,7 @@
 
 	<mvc:resources mapping="/static/**" location="/resources/" />
 
-	<context:component-scan base-package="com.uas.platform.b2bManage" />
+	<context:component-scan base-package="com.uas.platform.b2b.manage" />
 
 	<bean
 		class="org.springframework.mobile.device.view.LiteDeviceDelegatingViewResolver">
@@ -70,12 +70,12 @@
 			<mvc:exclude-mapping path="/**/valid/**"/>
             <mvc:exclude-mapping path="/**/resetPwd/**"/>
             <mvc:exclude-mapping path="/**/*invalid*"/>
-			<bean class="com.uas.platform.b2bManage.web.filter.SSOInterceptor"></bean>
+			<bean class="com.uas.platform.b2b.manage.web.filter.SSOInterceptor"></bean>
 		</mvc:interceptor>
 		<!-- 对所有的请求拦截，将Session中的User信息设置进SystemSession -->
 		<mvc:interceptor>
 			<mvc:mapping path="/**"></mvc:mapping>
-			<bean class="com.uas.platform.b2bManage.web.filter.SystemSessionInterceptor"></bean>
+			<bean class="com.uas.platform.b2b.manage.web.filter.SystemSessionInterceptor"></bean>
 		</mvc:interceptor>
 	</mvc:interceptors>