update

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/LoginEntity.java

@@ -1,28 +1,26 @@
 package com.yonge.cooleshow.auth.api.entity;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
 
-public class LoginEntity extends BaseEntity {
-    private String smsCode;
+public class LoginEntity {
+
+	private String smsCode;
 
     private String clientId;
 
     private String clientSecret;
 
-    private Boolean isRegister;
+    private Boolean isSurportRegister;
 
     private String phone;
     
     private String deviceNum;
     
-    private String organId;
-
-    public Boolean getIsRegister() {
-		return isRegister;
+    public Boolean getIsSurportRegister() {
+		return isSurportRegister;
 	}
 
-	public void setIsRegister(Boolean isRegister) {
-		this.isRegister = isRegister;
+	public void setIsSurportRegister(Boolean isSurportRegister) {
+		this.isSurportRegister = isSurportRegister;
 	}
 
 	public String getSmsCode() {
@@ -65,11 +63,4 @@ public class LoginEntity extends BaseEntity {
 		this.deviceNum = deviceNum;
 	}
 
-	public String getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(String organId) {
-		this.organId = organId;
-	}
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -6,12 +6,10 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_role):
  */
-public class SysRole extends BaseEntity {
+public class SysRole {
 
 	/**  */
 	private Integer id;
@@ -38,8 +36,6 @@ public class SysRole extends BaseEntity {
 	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
 	private String delFlag;
 
-	private Integer organId;
-
 	@ApiModelProperty(value = "菜单列表",required = false)
 	private List<Integer> menuIds;
 
@@ -106,14 +102,6 @@ public class SysRole extends BaseEntity {
 	public String getDelFlag(){
 		return this.delFlag;
 	}
-			
-	public Integer getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
 
     @Override
 	public String toString() {

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRoleMenu.java

@@ -4,12 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_role_menu):
  */
-public class SysRoleMenu extends BaseEntity {
+public class SysRoleMenu {
 
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -10,12 +10,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.yonge.cooleshow.auth.api.enums.YesOrNoEnum;
-import com.yonge.cooleshow.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(sys_user):
  */
-public class SysUser extends BaseEntity implements Serializable{
+public class SysUser implements Serializable{
 
 	/**
 	 *
@@ -101,12 +100,6 @@ public class SysUser extends BaseEntity implements Serializable{
 	@ApiModelProperty(value = "用户角色",required = false)
 	private List<Integer> roles;
 
-	@ApiModelProperty(value = "联系地址",required = false)
-	private String contactAddress;
-
-	@ApiModelProperty(value = "邮编",required = false)
-	private String postalCode;
-
 	private String certificateType;
 
 	public String getCertificateType() {
@@ -311,21 +304,6 @@ public class SysUser extends BaseEntity implements Serializable{
 	public void setRoles(List<Integer> roles) {
 		this.roles = roles;
 	}
-	public String getContactAddress() {
-		return contactAddress;
-	}
-
-	public void setContactAddress(String contactAddress) {
-		this.contactAddress = contactAddress;
-	}
-
-	public String getPostalCode() {
-		return postalCode;
-	}
-
-	public void setPostalCode(String postalCode) {
-		this.postalCode = postalCode;
-	}
 
 	@Override
 	public String toString() {

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserDevice.java

@@ -4,12 +4,10 @@ import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_user_device):
  */
-public class SysUserDevice extends BaseEntity {
+public class SysUserDevice {
 
 	/**  */
 	private Integer id;

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserLogin.java

@@ -4,12 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_user_login):
  */
-public class SysUserLogin extends BaseEntity {
+public class SysUserLogin {
 
 	/**  */
 	@ApiModelProperty(value = "用户编号",required = false)

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserLoginLog.java

@@ -4,18 +4,19 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_user_login_log):
  */
-public class SysUserLoginLog extends BaseEntity {
+public class SysUserLoginLog {
 
 	private Long id;
 
 	/** 会员ID */
 	@ApiModelProperty(value = "会员ID",required = false)
 	private Integer userId;
+	
+	@ApiModelProperty(value = "客户端",required = false)
+	private String clientId;
 
 	/** 登录IP */
 	@ApiModelProperty(value = "登录IP",required = false)
@@ -45,6 +46,14 @@ public class SysUserLoginLog extends BaseEntity {
 		this.userId = userId;
 	}
 
+	public String getClientId() {
+		return clientId;
+	}
+
+	public void setClientId(String clientId) {
+		this.clientId = clientId;
+	}
+
 	public void setLoginIp(String loginIp) {
 		this.loginIp = loginIp;
 	}

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserRole.java

@@ -4,12 +4,10 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.common.entity.BaseEntity;
-
 /**
  * 对应数据库表(sys_user_role):
  */
-public class SysUserRole extends BaseEntity {
+public class SysUserRole {
 	/** 用户ID */
 	@ApiModelProperty(value = "用户ID",required = false)
 	private Integer userId;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -26,8 +26,6 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 	private static final String clientIdParameter = "clientId";
 	private static final String IS_SURPORT_REGISTER = "isSurportRegister";
 
-	private static final String ORGAN_ID = "organId";
-	
 	private static final String DEVICE_NUM = "deviceNum";
 
 	private static final String SPRING_SECURITY_RESTFUL_LOGIN_URL = "/smsLogin";
@@ -48,8 +46,6 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		String principal = obtainParameter(request, SPRING_SECURITY_RESTFUL_PHONE_KEY);
 		String credentials = obtainParameter(request, SPRING_SECURITY_RESTFUL_VERIFY_CODE_KEY);
 		
-		String organId = obtainParameter(request, ORGAN_ID);
-
 		boolean isRegister = StringUtils.equals("true", request.getParameter(IS_SURPORT_REGISTER));
 
 		String clientId = request.getParameter(clientIdParameter).toUpperCase();
@@ -66,9 +62,8 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		loginEntity.setClientId(clientId);
 		loginEntity.setPhone(principal);
 		loginEntity.setSmsCode(credentials);
-		loginEntity.setIsRegister(isRegister);
+		loginEntity.setIsSurportRegister(isRegister);
 		loginEntity.setDeviceNum(deviceNum);
-		loginEntity.setOrganId(organId);
 
 		authRequest = new PhoneAuthenticationToken(SecurityConstants.PHONE_PRINCIPAL_PREFIX + principal, loginEntity);
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -62,6 +62,13 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 
 	@Override
 	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication){
+		
+		String clientId = request.getParameter("clientId");
+		String clientSecret = request.getParameter("clientSecret");
+		if (clientId == null || clientSecret == null) {
+			throw new UnapprovedClientAuthenticationException("请求头中client信息为空");
+		}
+		
 		logger.info("用户：{} 登录成功", authentication.getPrincipal());
 		HashMap<String,String> hashMap = objectMapper.convertValue(authentication.getPrincipal(), HashMap.class);
 		String username = hashMap.get("username");
@@ -97,17 +104,13 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		}
 		//添加登录日志
 		SysUserLoginLog sysUserLoginLog = new SysUserLoginLog();
+		sysUserLoginLog.setClientId(clientId);
 		sysUserLoginLog.setLoginTime(date);
 		sysUserLoginLog.setLoginIp(request.getRemoteAddr());
 		sysUserLoginLog.setUserId(sysUser.getId());
 		sysUserLoginLogService.insert(sysUserLoginLog);
 		
 		try {
-			String clientId = request.getParameter("clientId");
-			String clientSecret = request.getParameter("clientSecret");
-			if (clientId == null || clientSecret == null) {
-				throw new UnapprovedClientAuthenticationException("请求头中client信息为空");
-			}
 			String base64ClientCredentials = Base64.getEncoder().encodeToString((clientId + ":" + clientSecret).getBytes());
 			HttpHeaders headers = new HttpHeaders();
 			headers.add("Authorization", "Basic " + base64ClientCredentials);

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -60,7 +60,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 
 		String clientId = loginEntity.getClientId();
 
-		Boolean isRegister = loginEntity.getIsRegister();
+		Boolean isRegister = loginEntity.getIsSurportRegister();
 		
 		String deviceNum = loginEntity.getDeviceNum();
 
@@ -71,7 +71,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 				throw new LockedException("用户不存在");
 			}
 			
-			userInfo = sysUserService.initUser(loginEntity.getOrganId(), loginEntity.getPhone(), clientId);
+			userInfo = sysUserService.registerUser(loginEntity.getPhone(), clientId);
 			
 			if (StringUtils.isNotBlank(deviceNum)) {
 				sysUserDeviceService.bindDevice(clientId, userInfo.getSysUser().getId(), deviceNum);

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -82,12 +82,6 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	Integer getTeacherOrganId(Integer userId);
 
 	/**
-	 * 创建租户账户表
-	 * @param userId
-	 */
-    void insertSysTenantAccount(Integer userId);
-
-	/**
 	 * 刷新用户token
 	 * @param userId
 	 * @param imToken

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -98,12 +98,12 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	SysUser queryUserInfo(Integer userId);
 
 	/**
-	 * 上线时初始化用户数据
+	 * 用户注册
 	 * @param phone
 	 * @param clientId
 	 * @return
 	 */
-	SysUserInfo initUser(String organId, String phone,String clientId);
+	SysUserInfo registerUser(String phone,String clientId);
 
 	/**
 	 * 刷新token

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -139,7 +139,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public SysUserInfo initUser(String organId, String phone,String clientId) {
+	public SysUserInfo registerUser(String phone,String clientId) {
 		if(StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);
@@ -149,7 +149,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			//imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 			//userFeignService.createCashAccount(sysUser.getId());
 			//sysTenantAccount
-			sysUserDao.insertSysTenantAccount(sysUser.getId());
 			//创建teacher表
 			sysUserDao.insertTeacher(sysUser.getId());
 			return queryUserInfoByPhone(phone);
@@ -160,8 +159,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 			
 			sysUserDao.insert(sysUser);
 			sysUserService.saveStudent(sysUser.getId());
-			//添加用户现金账户
-			//imFeignService.register(new ImUserModel(sysUser.getId().toString(),phone,null));
 			return queryUserInfoByPhone(phone);
 		}
 		return null;

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -14,7 +14,6 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
-        <result column="organ_id_" property="organId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -30,8 +29,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId})
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -53,9 +52,6 @@
             <if test="updateTime != null">
                 update_time_ = NOW(),
             </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
         </set>
         WHERE id_ = #{id}
     </update>

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserLoginLogMapper.xml

@@ -8,6 +8,7 @@
 	
 	<resultMap type="com.yonge.cooleshow.auth.api.entity.SysUserLoginLog" id="SysUserLoginLog">
 		<result column="id_" property="id"/>
+		<result column="client_id_" property="clientId" />
 		<result column="user_id_" property="userId" />
 		<result column="login_ip_" property="loginIp" />
 		<result column="login_time_" property="loginTime" />
@@ -27,7 +28,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_login_log (id_,user_id_,login_ip_,login_time_,source_) VALUES(#{id},#{userId},#{loginIp},#{loginTime},#{source})
+		INSERT INTO sys_user_login_log (id_,client_id_,user_id_,login_ip_,login_time_,source_) VALUES(#{id},#{clientId},#{userId},#{loginIp},#{loginTime},#{source})
 	</insert>
 	
 	

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -14,7 +14,6 @@
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>
         <result column="avatar_" property="avatar"/>
-        <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="lock_flag_" property="lockFlag"/>
@@ -30,9 +29,6 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
-        <result column="current_grade_" property="currentGrade"/>
-        <result column="current_grade_num_" property="currentGradeNum"/>
-        <result column="current_class_" property="currentClass"/>
         <result column="certificate_type_" property="certificateType"/>
     </resultMap>
 
@@ -47,15 +43,11 @@
         <if test="userType != null">
             and user_type_ = #{userType}
         </if>
-        <if test="organId != null">
-            and organ_id_ = #{organId}
-        </if>
     </sql>
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysUser">
-		SELECT su.*,s.current_class_,s.current_grade_num_
-        FROM sys_user su LEFT JOIN student s ON su.id_ = s.user_id_
+		SELECT su.* FROM sys_user su
         WHERE su.id_ = #{id}
 	</select>
 
@@ -68,22 +60,17 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_user
-        (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
+        (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
         gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_)
-        VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
+        VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
         #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType})
     </insert>
     <insert id="insertTeacher">
         INSERT INTO teacher
-        (id_,organ_id_,create_time_,update_time_)VALUES(#{userId},#{lesseeOrganId},NOW(),NOW())
-    </insert>
-    <insert id="insertSysTenantAccount">
-        INSERT INTO sys_tenant_account
-        (user_id_,available_minutes_,frozen_minutes_,status_,create_time_,update_time_)
-		VALUES(#{userId},0,0,1,NOW(),NOW())
+        (id_,create_time_,update_time_)VALUES(#{userId},NOW(),NOW())
     </insert>
     <insert id="saveStudent">
-        INSERT INTO student (user_id_,create_time_,update_time_,service_tag_,operating_tag_) VALUES(#{userId},NOW(),NOW(),0,0)
+        INSERT INTO student (user_id_,create_time_,update_time_) VALUES(#{userId},NOW(),NOW())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -132,9 +119,6 @@
             <if test="nation != null and nation != ''">
                 nation_ = #{nation},
             </if>
-            <if test="organId != null">
-                organ_id_ = #{organId},
-            </if>
             <if test="imToken != null and imToken != ''">
                 im_token_ = #{imToken},
             </if>

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/impl/BaseServiceImpl.java

@@ -29,7 +29,6 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.service.BaseService;
-import com.yonge.cooleshow.common.tenant.TenantContextHolder;
 import com.yonge.toolset.utils.collection.MapUtil;
 
 /**
@@ -87,11 +86,6 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 	 */
 	public List<T> findAll(Map<String, Object> params) {
 		
-		final String TENANT_ID = "tenantId";
-		
-		if(!params.containsKey(TENANT_ID)){
-			params.put(TENANT_ID, TenantContextHolder.getTenantId());
-		}
 		return this.getDAO().findAll(params);
 	}
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/tenant/TenantContextHolder.java

@@ -1,32 +0,0 @@
-package com.yonge.cooleshow.common.tenant;
-
-
-public class TenantContextHolder {
-	
-
-	private static final ThreadLocal<Integer> tenantContextHolder = new ThreadLocal<Integer>();
-
-	public static void setTenantId(Integer tenantId) {
-		tenantContextHolder.set(tenantId);
-	}
-
-	/**
-	 * 获取数据源
-	 * @return
-	 */
-	public static Integer getTenantId() {
-		Integer tenantId = tenantContextHolder.get();
-		if (tenantId == null){
-			return 0;
-		}
-		return tenantContextHolder.get();
-	}
-
-	/**
-	 * 重置数据源
-	 */
-	public static void clearTenantId() {
-		tenantContextHolder.remove();
-	}
-
-}

cooleshow-im/im-api/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>cooleshow-im</artifactId>
+    <version>1.0</version>
+  </parent>
+  <groupId>com.yonge.cooleshow</groupId>
+  <artifactId>im-api</artifactId>
+  <version>1.0</version>
+  <name>im-api</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

cooleshow-im/im-server/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>cooleshow-im</artifactId>
+    <version>1.0</version>
+  </parent>
+  <groupId>com.yonge.cooleshow</groupId>
+  <artifactId>im-server</artifactId>
+  <version>1.0</version>
+  <name>im-server</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

cooleshow-im/pom.xml

@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yonge.cooleshow</groupId>
-    <artifactId>cooleshow</artifactId>
-    <version>1.0</version>
-  </parent>
-  <groupId>com.yonge.cooleshow</groupId>
-  <artifactId>cooleshow-im</artifactId>
-  <version>1.0</version>
-  <name>cooleshow-im</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.yonge.cooleshow</groupId>
+		<artifactId>cooleshow</artifactId>
+		<version>1.0</version>
+	</parent>
+	<groupId>com.yonge.cooleshow</groupId>
+	<artifactId>cooleshow-im</artifactId>
+	<version>1.0</version>
+	<packaging>pom</packaging>
+
+	<name>cooleshow-im</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+	</dependencies>
+	<modules>
+		<module>im-api</module>
+		<module>im-server</module>
+	</modules>
 </project>

cooleshow-im/src/main/java/com/yonge/cooleshow/App.java

@@ -1,13 +0,0 @@
-package com.yonge.cooleshow;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

cooleshow-im/src/test/java/com/yonge/cooleshow/AppTest.java

@@ -1,38 +0,0 @@
-package com.yonge.cooleshow;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}