xx

src/main/java/com/egolm/shop/pojo/TCommon.java → src/main/java/com/egolm/shop/bean/TCommon.java

-package com.egolm.shop.pojo;
+package com.egolm.shop.bean;
 
 import javax.persistence.Entity;
 

src/main/java/com/egolm/shop/pojo/TCustAddress.java → src/main/java/com/egolm/shop/bean/TCustAddress.java

-package com.egolm.shop.pojo;
+package com.egolm.shop.bean;
 
 import javax.persistence.Entity;
 

src/main/java/com/egolm/shop/pojo/TCustomer.java → src/main/java/com/egolm/shop/bean/TCustomer.java

-package com.egolm.shop.pojo;
+package com.egolm.shop.bean;
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/com/egolm/shop/pojo/TIPBrandAuthorize.java → src/main/java/com/egolm/shop/bean/TIPBrandAuthorize.java

-package com.egolm.shop.pojo;
+package com.egolm.shop.bean;
 
 import javax.persistence.Entity;
 

src/main/java/com/egolm/shop/pojo/model/TSalesOrder.java → src/main/java/com/egolm/shop/bean/TSalesOrder.java

-package com.egolm.shop.pojo.model;
+package com.egolm.shop.bean;
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/com/egolm/shop/pojo/model/TSalesOrderDtl.java → src/main/java/com/egolm/shop/bean/TSalesOrderDtl.java

-package com.egolm.shop.pojo.model;
+package com.egolm.shop.bean;
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/com/egolm/shop/pojo/TShop.java → src/main/java/com/egolm/shop/bean/TShop.java

-package com.egolm.shop.pojo;
+package com.egolm.shop.bean;
 
 import javax.persistence.Entity;
 

src/main/java/com/egolm/shop/encrypt/EgoPasswordEncoder.java → src/main/java/com/egolm/shop/common/EgoPasswordEncoder.java

-package com.egolm.shop.encrypt;
+package com.egolm.shop.common;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;

src/main/java/com/egolm/shop/encrypt/EgoShopPasswordEncoder.java → src/main/java/com/egolm/shop/common/EgoShopPasswordEncoder.java

-package com.egolm.shop.encrypt;
+package com.egolm.shop.common;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

src/main/java/com/egolm/shop/config/XException.java → src/main/java/com/egolm/shop/common/XException.java

-package com.egolm.shop.config;
+package com.egolm.shop.common;
 
 import com.egolm.common.bean.Rjx;
 

src/main/java/com/egolm/shop/config/DataSourceConfig.java → src/main/java/com/egolm/shop/common/config/DataSourceConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import javax.sql.DataSource;
 

src/main/java/com/egolm/shop/config/DruidConfig.java → src/main/java/com/egolm/shop/common/config/DruidConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import java.io.IOException;
 
@@ -15,15 +15,12 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.WebStatFilter;
 import com.alibaba.druid.util.Utils;
-import com.alibaba.druid.wall.WallConfig;
-import com.alibaba.druid.wall.WallFilter;
 
 @Configuration
 @ConditionalOnWebApplication

src/main/java/com/egolm/shop/config/ExceptionHandler.java → src/main/java/com/egolm/shop/common/config/ExceptionHandler.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -12,8 +12,9 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import com.egolm.common.bean.Rjx;
-import com.egolm.shop.aliyunLog.AliyunLogProducer;
-import com.egolm.shop.util.I18NUtils;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.plugins.aliyunLog.AliyunLogProducer;
+import com.egolm.shop.common.utils.I18NUtils;
 
 import io.netty.util.internal.ThrowableUtil;
 

src/main/java/com/egolm/shop/config/I18Config.java → src/main/java/com/egolm/shop/common/config/I18Config.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import java.util.Locale;
 

src/main/java/com/egolm/shop/config/LogProducerConfig.java → src/main/java/com/egolm/shop/common/config/LogProducerConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/egolm/shop/config/RedisConfig.java → src/main/java/com/egolm/shop/common/config/RedisConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;

src/main/java/com/egolm/shop/config/SolrConfig.java → src/main/java/com/egolm/shop/common/config/SolrConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;

src/main/java/com/egolm/shop/config/SwaggerConfig.java → src/main/java/com/egolm/shop/common/config/SwaggerConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/egolm/shop/config/WebMvcConfig.java → src/main/java/com/egolm/shop/common/config/WebMvcConfig.java

-package com.egolm.shop.config;
+package com.egolm.shop.common.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -6,8 +6,8 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistration
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.egolm.shop.config.interceptor.LogInterceptor;
-import com.egolm.shop.config.interceptor.OpenInterceptor;
+import com.egolm.shop.common.interceptor.LogInterceptor;
+import com.egolm.shop.common.interceptor.OpenInterceptor;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

src/main/java/com/egolm/shop/config/interceptor/LogInterceptor.java → src/main/java/com/egolm/shop/common/interceptor/LogInterceptor.java

-package com.egolm.shop.config.interceptor;
+package com.egolm.shop.common.interceptor;
 
 import java.util.Date;
 import java.util.HashMap;

src/main/java/com/egolm/shop/config/interceptor/OpenInterceptor.java → src/main/java/com/egolm/shop/common/interceptor/OpenInterceptor.java

-package com.egolm.shop.config.interceptor;
+package com.egolm.shop.common.interceptor;
 
 import java.util.Map;
 import java.util.Set;
@@ -15,13 +15,12 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.alibaba.fastjson.JSON;
 import com.egolm.common.GsonUtil;
 import com.egolm.common.MD5Util;
 import com.egolm.common.StringUtil;
-import com.egolm.shop.config.XException;
-import com.egolm.shop.util.I18NUtils;
-import com.egolm.shop.util.ShopContstrant; 
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
+import com.egolm.shop.common.utils.ShopContstrant; 
 
 @Component
 public class OpenInterceptor extends HandlerInterceptorAdapter {

src/main/java/com/egolm/shop/aliyunLog/AliyunLogProducer.java → src/main/java/com/egolm/shop/common/plugins/aliyunLog/AliyunLogProducer.java

-package com.egolm.shop.aliyunLog;
+package com.egolm.shop.common.plugins.aliyunLog;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/egolm/shop/util/Express.java → src/main/java/com/egolm/shop/common/utils/Express.java

-package com.egolm.shop.util;
+package com.egolm.shop.common.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -17,8 +17,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.egolm.common.HttpUtil;
 import com.egolm.common.StringUtil;
-import com.egolm.shop.config.ExceptionHandler;
-import com.egolm.shop.config.XException;
+import com.egolm.shop.common.XException;
 
 @Component
 public class Express {

src/main/java/com/egolm/shop/util/I18NUtils.java → src/main/java/com/egolm/shop/common/utils/I18NUtils.java

-package com.egolm.shop.util;
+package com.egolm.shop.common.utils;
 
 import java.text.MessageFormat;
 import java.util.Locale;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
-import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 

src/main/java/com/egolm/shop/util/ShopContstrant.java → src/main/java/com/egolm/shop/common/utils/ShopContstrant.java

-package com.egolm.shop.util;
+package com.egolm.shop.common.utils;
 
 public class ShopContstrant {
   

src/main/java/com/egolm/shop/util/Usage.java → src/main/java/com/egolm/shop/common/utils/Usage.java

-package com.egolm.shop.util;
+package com.egolm.shop.common.utils;
 
 import java.net.InetAddress;
 import java.util.ArrayList;

src/main/java/com/egolm/shop/util/XmlUtil.java → src/main/java/com/egolm/shop/common/utils/XmlUtil.java

-package com.egolm.shop.util;
+package com.egolm.shop.common.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

src/main/java/com/egolm/shop/controller/ActivityController.java

@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.ActivityService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/AddressController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
-import com.egolm.shop.pojo.TCustAddress;
+import com.egolm.shop.bean.TCustAddress;
 import com.egolm.shop.service.AddressService;
 
 import io.swagger.annotations.Api;

src/main/java/com/egolm/shop/controller/BrandController.java

@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.BrandService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/CommonController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
-import com.egolm.shop.config.XException;
+import com.egolm.shop.common.XException;
 import com.egolm.shop.service.CommonService;
 
 import io.swagger.annotations.Api;

src/main/java/com/egolm/shop/controller/ExpressController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONArray;
 import com.egolm.common.bean.Rjx;
-import com.egolm.shop.util.Express;
+import com.egolm.shop.common.utils.Express;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/GoodsController.java

@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
-import com.egolm.shop.config.XException;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.GoodsService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/OrderController.java

@@ -26,8 +26,8 @@ import com.egolm.common.HttpUtil;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
+import com.egolm.shop.common.utils.XmlUtil;
 import com.egolm.shop.service.OrderService;
-import com.egolm.shop.util.XmlUtil;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/PageController.java

@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.Page;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.PageService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/SystemCtrlController.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.egolm.common.bean.Rjx;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.SystemCtrlService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/UserController.java

 package com.egolm.shop.controller;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,13 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.egolm.common.DateUtil;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
-import com.egolm.shop.config.XException;
-import com.egolm.shop.pojo.TCustomer;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.UserService;
-import com.egolm.shop.util.I18NUtils;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/egolm/shop/controller/YunController.java

@@ -22,8 +22,8 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
+import com.egolm.shop.common.utils.ShopContstrant;
 import com.egolm.shop.service.SystemCtrlService;
-import com.egolm.shop.util.ShopContstrant;
 import com.tencent.cloud.CosStsClient;
 
 import io.swagger.annotations.Api;

src/main/java/com/egolm/shop/pojo/DB.java

-package com.egolm.shop.pojo;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.egolm.common.FileUtil;
-import com.egolm.common.StringUtil;
-import com.egolm.common.jdbc.dialect.MysqlTo;
-import com.egolm.common.jdbc.dialect.SqlServerTo;
- 
-
-public class DB {
-
-	private static final String top = "D:\\pojo";
-	private static final String root = top ;//+ "\\egolm-domain\\src\\main\\java";
-	private static final Set<Field> columns = new HashSet<Field>();
-	private static final String regex = "^[a-z][A-Z].*$";
-	
-	public static void main(String[] args) throws Exception { 
-		
-		createDomain();
-	}
-	
-	public static void checkJsp(File file) throws Exception {
-		if(file.exists()) {
-			if(file.isDirectory()) {
-				File[] files = file.listFiles();
-				for(File f : files) {
-					checkJsp(f);
-				}
-			} else {
-				String extName = FileUtil.getExtName(file);
-				if("JSP".equals(extName)) {
-					BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-					String text = StringUtil.read(br);
-					for(Field field : columns) {
-						String fieldName = field.getName();
-						if(fieldName.matches(regex)) {
-							String name = StringUtil.upperFirst(fieldName);
-							if(text.contains("\\." + name)) {
-								System.out.println(file.getAbsolutePath());
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	public static void foo(File file) throws FileNotFoundException {
-		if(file.exists()) {
-			if(file.isDirectory()) {
-				File[] files = file.listFiles();
-				for(File f : files) {
-					foo(f);
-				}
-			} else {
-				String extName = FileUtil.getExtName(file);
-				if("JAVA".equals(extName)) {
-					BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-					String text = StringUtil.read(br);
-					try {
-						br.close();
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-					boolean boo = false;
-					for(Field field : columns) {
-						String columnName = field.getName();
-						String oname = StringUtil.upperFirst(columnName);
-						String name = (columnName.matches(regex) ? columnName : StringUtil.upperFirst(columnName));
-						String osetName = "set" + oname;
-						String setName = "set" + name;
-						String ogetName = "get" + oname;
-						String getName = "get" + name;
-						if(text.contains(osetName)) {
-							boo = true;
-							System.out.println(osetName);
-							text = text.replaceAll("\\.\\s*" + osetName + "\\s*\\(", "." + setName + "(");
-							text = text.replaceAll("\\s+" + osetName + "\\s*\\(", " " + setName + "(");
-						}
-						if(text.contains(ogetName)) {
-							boo = true;
-							System.out.println(ogetName);
-							text = text.replaceAll("\\.\\s*" + ogetName + "\\s*\\(", "." + getName + "(");
-							text = text.replaceAll("\\s+" + ogetName + "\\s*\\(", " " + getName + "(");
-						}
-					}
-					if(boo) {
-						System.out.println(text);
-						PrintWriter writer = new PrintWriter(new FileOutputStream(file));
-						writer.append(text);
-						writer.close();
-					}
-				}
-			}
-		}
-	}
-	
-	public static void cache(File folder) throws FileNotFoundException, ClassNotFoundException, InstantiationException, IllegalAccessException {
-		File[] files = folder.listFiles();
-		if(files != null) {
-			for(File file : files) {
-				if(file.isDirectory()) {
-					cache(file);
-				} else {
-					String extName = FileUtil.getExtName(file);
-					if("JAVA".equals(extName)) {
-						String javaName = getClassFullName(file, null);
-						//System.out.println(javaName);
-						String className = javaName.substring(0, javaName.lastIndexOf("."));
-						try {
-							Class<?> clz = Class.forName(className);
-							Field[] fields = clz.getDeclaredFields();
-							for(Field field : fields) {
-								columns.add(field);
-							}
-						} catch (Exception e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	public static void createDomain() throws SQLException {
-		System.out.println("Directory: " + root);
-		File[] files = new File(root).listFiles();
-		for(File file : files) {
-			System.out.println("Delete: " + file.getAbsolutePath());
-			file.deleteOnExit();
-		}
-		new SqlServerTo(root, "com.egolm.shop.pojo", "曲欣亮", "10.10.0.22:1433", "B2BDB", "ERP", "qiyang@2013").execute();
-	}
-	
-	
-	public static String getClassFullName(File file, String x) {
-		String name = file.getName() + (StringUtil.isBlank(x) ? "" : ("." + x));
-		if(file.getName().equals("com")) {
-			return name;
-		} else {
-			return getClassFullName(file.getParentFile(), name);
-		}
-	}
-}

src/main/java/com/egolm/shop/schedules/AbstractSolrApi.java

@@ -8,7 +8,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.common.SolrInputDocument;
 
 import com.egolm.common.StringUtil;
-import com.egolm.shop.config.XException;
+import com.egolm.shop.common.XException;
 import com.google.common.collect.Lists;
 
 public abstract class AbstractSolrApi implements SolrApi {

src/main/java/com/egolm/shop/service/AddressService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.egolm.common.jdbc.Page;
-import com.egolm.shop.pojo.TCustAddress;
+import com.egolm.shop.bean.TCustAddress;
 
 public interface AddressService {
 	public List<Map<String,Object>> query(Map<String,Object> params ,Page page);

src/main/java/com/egolm/shop/service/CommonService.java

@@ -3,7 +3,7 @@ package com.egolm.shop.service;
 import java.util.List;
 import java.util.Map;
 
-import com.egolm.shop.pojo.TCommon;
+import com.egolm.shop.bean.TCommon;
 
 public interface CommonService {
 	/**

src/main/java/com/egolm/shop/service/UserService.java

@@ -3,8 +3,8 @@ package com.egolm.shop.service;
 import java.util.List;
 import java.util.Map;
 
-import com.egolm.shop.pojo.TCustomer;
-import com.egolm.shop.pojo.TShop;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.bean.TShop;
 
 public interface UserService {
 	public TCustomer getCustomer(String custNO,String shopNO);

src/main/java/com/egolm/shop/service/WeixinTokenService.java

+package com.egolm.shop.service;
+
+public interface WeixinTokenService {
+
+}

src/main/java/com/egolm/shop/service/impl/AddressServiceImpl.java

@@ -14,10 +14,10 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
-import com.egolm.shop.pojo.TCustAddress;
+import com.egolm.shop.bean.TCustAddress;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.AddressService;
 import com.egolm.shop.service.UserService;
-import com.egolm.shop.util.I18NUtils;
 
 @Service
 public class AddressServiceImpl implements AddressService {

src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java

@@ -15,9 +15,9 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
-import com.egolm.shop.pojo.TCustomer;
-import com.egolm.shop.pojo.TIPBrandAuthorize;
-import com.egolm.shop.pojo.TShop;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.bean.TIPBrandAuthorize;
+import com.egolm.shop.bean.TShop;
 import com.egolm.shop.service.BrandService;
 import com.egolm.shop.service.UserService;
 @Service

src/main/java/com/egolm/shop/service/impl/CommonServiceImpl.java

@@ -13,9 +13,9 @@ import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
-import com.egolm.shop.pojo.TCommon;
+import com.egolm.shop.bean.TCommon;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.CommonService;
-import com.egolm.shop.util.I18NUtils;
 
 @Service
 public class CommonServiceImpl  implements  CommonService{

src/main/java/com/egolm/shop/service/impl/CouponServiceImpl.java

@@ -13,10 +13,10 @@ import org.springframework.stereotype.Service;
 import com.egolm.common.Util;
 import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
-import com.egolm.shop.pojo.TCustomer;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.CouponService;
 import com.egolm.shop.service.UserService;
-import com.egolm.shop.util.I18NUtils;
 @Service
 public class CouponServiceImpl implements CouponService {
 	private static final Log logger = LogFactory.getLog(CouponServiceImpl.class);

src/main/java/com/egolm/shop/service/impl/GoodsServiceImpl.java

@@ -21,9 +21,9 @@ import com.egolm.common.bean.Rjx;
 import com.egolm.common.jdbc.JdbcTemplate;
 import com.egolm.common.jdbc.Page;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
-import com.egolm.shop.config.XException;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.GoodsService;
-import com.egolm.shop.util.I18NUtils;
 @Service
 public class GoodsServiceImpl implements GoodsService {
 	
@@ -217,10 +217,6 @@ public class GoodsServiceImpl implements GoodsService {
 		return pics;
 	}
 	
-	public static void main(String[] args) {
-		System.out.println((154&3));
-	}
-	
 	/**
 	  *  收藏及取消收藏
 	 * @Title: updateFlavor   
@@ -292,4 +288,14 @@ public class GoodsServiceImpl implements GoodsService {
 	}
 	
 	
+	
+	public static void main(String[] arg) {
+		String orgNo = "1001";
+		List<String> args = new ArrayList<String>();
+		args.add("(t.sAgentContractNO = '600001001' and t.nGoodsID = 519)");
+		String sql1 = "select t.sAgentContractNO, t.nGoodsID, p.sPromoTheme, p.sPromoName, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO sPromoGroupNO from tYWPromoDtl t, tYWPromoMain p where p.sPromoActionTypeID != '3' and t.sPromoPaperNO = p.sPromoPaperNO and p.nTag&3 = 2 and p.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args) + " group by t.sAgentContractNO, t.nGoodsID, p.sPromoTheme, p.sPromoName, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO";
+		System.out.println(sql1);
+	}
+	
+	
 }

src/main/java/com/egolm/shop/service/impl/GoodsSql.java

@@ -3,9 +3,9 @@ package com.egolm.shop.service.impl;
 import java.util.Map;
 
 import com.egolm.common.StringUtil;
-import com.egolm.shop.pojo.TCustomer;
-import com.egolm.shop.pojo.TShop;
-import com.egolm.shop.util.ShopContstrant;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.bean.TShop;
+import com.egolm.shop.common.utils.ShopContstrant;
 
 public class GoodsSql {
     

src/main/java/com/egolm/shop/service/impl/OrderServiceImpl.java

@@ -24,11 +24,11 @@ import com.egolm.common.jdbc.Page;
 import com.egolm.common.jdbc.dialect.Dialect;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
 import com.egolm.common.jdbc.dialect.bean.Sql;
-import com.egolm.shop.config.XException;
-import com.egolm.shop.pojo.model.TSalesOrder;
-import com.egolm.shop.pojo.model.TSalesOrderDtl;
+import com.egolm.shop.bean.TSalesOrder;
+import com.egolm.shop.bean.TSalesOrderDtl;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
 import com.egolm.shop.service.OrderService;
-import com.egolm.shop.util.I18NUtils;
 @Service
 public class OrderServiceImpl implements OrderService {
 	

src/main/java/com/egolm/shop/service/impl/UserServiceImpl.java

@@ -34,16 +34,16 @@ import com.egolm.common.jdbc.ResultMutil;
 import com.egolm.common.jdbc.dialect.Dialect;
 import com.egolm.common.jdbc.dialect.SqlServerDialect;
 import com.egolm.common.jdbc.dialect.bean.Sql;
-import com.egolm.shop.config.XException;
-import com.egolm.shop.encrypt.EgoPasswordEncoder;
-import com.egolm.shop.pojo.TCommon;
-import com.egolm.shop.pojo.TCustomer;
-import com.egolm.shop.pojo.TShop;
+import com.egolm.shop.bean.TCommon;
+import com.egolm.shop.bean.TCustomer;
+import com.egolm.shop.bean.TShop;
+import com.egolm.shop.common.EgoPasswordEncoder;
+import com.egolm.shop.common.XException;
+import com.egolm.shop.common.utils.I18NUtils;
+import com.egolm.shop.common.utils.ShopContstrant;
 import com.egolm.shop.service.CommonService;
 import com.egolm.shop.service.SystemCtrlService;
 import com.egolm.shop.service.UserService;
-import com.egolm.shop.util.I18NUtils;
-import com.egolm.shop.util.ShopContstrant;
 @Service
 public class UserServiceImpl implements UserService {
 	private static final Log logger = LogFactory.getLog(UserServiceImpl.class);

src/main/java/com/egolm/shop/service/impl/WeixinTokenServiceImpl.java

+package com.egolm.shop.service.impl;
+
+import com.egolm.shop.service.WeixinTokenService;
+
+public class WeixinTokenServiceImpl implements WeixinTokenService {
+
+}

src/main/java/com/egolm/shop/util/SolrUtil.java

-package com.egolm.shop.util;
-
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import com.egolm.common.MD5Util;
-
-public class SolrUtil {
-
-	public static void main(String[] args) {
-		SortedMap<Object,Object> parameters = new TreeMap<Object,Object>(); 
-		parameters.put("timestamp", System.currentTimeMillis());
-		parameters.put("langID", "zh_CN");
-		parameters.put("terminal", "wechat");
-		parameters.put("md5Key", "E67720C4E7B84615D7EAF106EBC8E677");
-		String createSign = MD5Util.createSign("UTF-8", parameters);
-		parameters.put("sign", createSign);
-	}
-	
-}