update

edu-cms/src/main/java/com/keao/edu/cms/CmsServerApplication.java → edu-cms/src/main/java/com/keao/edu/user/CmsServerApplication.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms;
+package com.keao.edu.user;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,7 +15,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.keao.edu")
-@ComponentScan(basePackages = { "com.keao.edu.cms", "com.keao.edu.im", "com.keao.edu.auth", "com.keao.edu.common.config", "com.keao.edu.common.security" })
+@ComponentScan(basePackages = {"com.keao.edu.user", "com.keao.edu.im", "com.keao.edu.auth", "com.keao.edu.common.config", "com.keao.edu.common.security" })
 @Configuration
 @EnableSwagger2Doc
 public class CmsServerApplication {

edu-cms/src/main/java/com/keao/edu/cms/config/ResourceServerConfig.java → edu-cms/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.config;
+package com.keao.edu.user.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

edu-cms/src/main/java/com/keao/edu/cms/config/WebMvcConfig.java → edu-cms/src/main/java/com/keao/edu/user/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.config;
+package com.keao.edu.user.config;
 
 import java.util.ArrayList;
 import java.util.List;

edu-cms/src/main/java/com/keao/edu/cms/controller/HelpCenterCatalogController.java → edu-cms/src/main/java/com/keao/edu/user/controller/HelpCenterCatalogController.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.controller;
+package com.keao.edu.user.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
-import com.keao.edu.cms.service.HelpCenterCatalogService;
-import com.keao.edu.cms.service.HelpCenterContentService;
+import com.keao.edu.user.dal.entity.HelpCenterCatalog;
+import com.keao.edu.user.service.HelpCenterCatalogService;
+import com.keao.edu.user.service.HelpCenterContentService;
 import com.keao.edu.common.controller.BaseController;
 
 @RestController

edu-cms/src/main/java/com/keao/edu/cms/controller/HelpCenterContentControlller.java → edu-cms/src/main/java/com/keao/edu/user/controller/HelpCenterContentControlller.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.controller;
+package com.keao.edu.user.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.cms.controller.queryinfo.HelpCenterContentQueryInfo;
-import com.keao.edu.cms.dal.entity.HelpCenterContent;
-import com.keao.edu.cms.service.HelpCenterCatalogService;
-import com.keao.edu.cms.service.HelpCenterContentService;
+import com.keao.edu.user.controller.queryinfo.HelpCenterContentQueryInfo;
+import com.keao.edu.user.dal.entity.HelpCenterContent;
+import com.keao.edu.user.service.HelpCenterCatalogService;
+import com.keao.edu.user.service.HelpCenterContentService;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.page.PageInfo;
 

edu-cms/src/main/java/com/keao/edu/cms/controller/NewsController.java → edu-cms/src/main/java/com/keao/edu/user/controller/NewsController.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.controller;
+package com.keao.edu.user.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.cms.dal.entity.SysNewsInformation;
-import com.keao.edu.cms.service.SysNewsInformationService;
+import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
+import com.keao.edu.user.dal.entity.SysNewsInformation;
+import com.keao.edu.user.service.SysNewsInformationService;
 import com.keao.edu.common.controller.BaseController;
 
 @RestController

edu-cms/src/main/java/com/keao/edu/cms/controller/queryinfo/HelpCenterContentQueryInfo.java → edu-cms/src/main/java/com/keao/edu/user/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.controller.queryinfo;
+package com.keao.edu.user.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/cms/controller/queryinfo/NewsInformationQueryInfo.java → edu-cms/src/main/java/com/keao/edu/user/controller/queryinfo/NewsInformationQueryInfo.java

@@ -1,10 +1,10 @@
-package com.keao.edu.cms.controller.queryinfo;
+package com.keao.edu.user.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-import com.keao.edu.cms.dal.entity.NewsStatusEnum;
+import com.keao.edu.user.dal.entity.NewsStatusEnum;
 import com.keao.edu.common.page.QueryInfo;
 
 public class NewsInformationQueryInfo extends QueryInfo {

edu-cms/src/main/java/com/keao/edu/cms/dal/dao/HelpCenterCatalogDao.java → edu-cms/src/main/java/com/keao/edu/user/dal/dao/HelpCenterCatalogDao.java

@@ -1,10 +1,10 @@
-package com.keao.edu.cms.dal.dao;
+package com.keao.edu.user.dal.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
+import com.keao.edu.user.dal.entity.HelpCenterCatalog;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface HelpCenterCatalogDao extends BaseDAO<Integer, HelpCenterCatalog> {

edu-cms/src/main/java/com/keao/edu/cms/dal/dao/HelpCenterContentDao.java → edu-cms/src/main/java/com/keao/edu/user/dal/dao/HelpCenterContentDao.java

@@ -1,8 +1,8 @@
-package com.keao.edu.cms.dal.dao;
+package com.keao.edu.user.dal.dao;
 
 import java.util.Map;
 
-import com.keao.edu.cms.dal.entity.HelpCenterContent;
+import com.keao.edu.user.dal.entity.HelpCenterContent;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface HelpCenterContentDao extends BaseDAO<Integer, HelpCenterContent> {

edu-cms/src/main/java/com/keao/edu/cms/dal/dao/SysNewsInformationDao.java → edu-cms/src/main/java/com/keao/edu/user/dal/dao/SysNewsInformationDao.java

@@ -1,9 +1,9 @@
-package com.keao.edu.cms.dal.dao;
+package com.keao.edu.user.dal.dao;
 
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.cms.dal.entity.SysNewsInformation;
+import com.keao.edu.user.dal.entity.SysNewsInformation;
 import com.keao.edu.common.dal.BaseDAO;
 
 public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation> {

edu-cms/src/main/java/com/keao/edu/cms/dal/entity/HelpCenterCatalog.java → edu-cms/src/main/java/com/keao/edu/user/dal/entity/HelpCenterCatalog.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.dal.entity;
+package com.keao.edu.user.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/cms/dal/entity/HelpCenterContent.java → edu-cms/src/main/java/com/keao/edu/user/dal/entity/HelpCenterContent.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.dal.entity;
+package com.keao.edu.user.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-cms/src/main/java/com/keao/edu/cms/dal/entity/NewsStatusEnum.java → edu-cms/src/main/java/com/keao/edu/user/dal/entity/NewsStatusEnum.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.dal.entity;
+package com.keao.edu.user.dal.entity;
 
 import com.keao.edu.common.enums.BaseEnum;
 

edu-cms/src/main/java/com/keao/edu/cms/dal/entity/SysNewsInformation.java → edu-cms/src/main/java/com/keao/edu/user/dal/entity/SysNewsInformation.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.dal.entity;
+package com.keao.edu.user.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-cms/src/main/java/com/keao/edu/cms/service/HelpCenterCatalogService.java → edu-cms/src/main/java/com/keao/edu/user/service/HelpCenterCatalogService.java

@@ -1,8 +1,8 @@
-package com.keao.edu.cms.service;
+package com.keao.edu.user.service;
 
 import java.util.List;
 
-import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
+import com.keao.edu.user.dal.entity.HelpCenterCatalog;
 import com.keao.edu.common.service.BaseService;
 
 public interface HelpCenterCatalogService extends BaseService<Integer, HelpCenterCatalog> {

edu-cms/src/main/java/com/keao/edu/cms/service/HelpCenterContentService.java → edu-cms/src/main/java/com/keao/edu/user/service/HelpCenterContentService.java

@@ -1,6 +1,6 @@
-package com.keao.edu.cms.service;
+package com.keao.edu.user.service;
 
-import com.keao.edu.cms.dal.entity.HelpCenterContent;
+import com.keao.edu.user.dal.entity.HelpCenterContent;
 import com.keao.edu.common.service.BaseService;
 
 public interface HelpCenterContentService extends BaseService<Integer,HelpCenterContent>{

edu-cms/src/main/java/com/keao/edu/cms/service/SysNewsInformationService.java → edu-cms/src/main/java/com/keao/edu/user/service/SysNewsInformationService.java

@@ -1,10 +1,10 @@
-package com.keao.edu.cms.service;
+package com.keao.edu.user.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.cms.dal.entity.SysNewsInformation;
+import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
+import com.keao.edu.user.dal.entity.SysNewsInformation;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 

edu-cms/src/main/java/com/keao/edu/cms/service/impl/HelpCenterCatalogServiceImpl.java → edu-cms/src/main/java/com/keao/edu/user/service/impl/HelpCenterCatalogServiceImpl.java

@@ -1,14 +1,14 @@
-package com.keao.edu.cms.service.impl;
+package com.keao.edu.user.service.impl;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.cms.dal.dao.HelpCenterCatalogDao;
-import com.keao.edu.cms.dal.entity.HelpCenterCatalog;
-import com.keao.edu.cms.service.HelpCenterCatalogService;
-import com.keao.edu.cms.service.HelpCenterContentService;
+import com.keao.edu.user.dal.dao.HelpCenterCatalogDao;
+import com.keao.edu.user.dal.entity.HelpCenterCatalog;
+import com.keao.edu.user.service.HelpCenterCatalogService;
+import com.keao.edu.user.service.HelpCenterContentService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 

edu-cms/src/main/java/com/keao/edu/cms/service/impl/HelpCenterContentServiceImpl.java → edu-cms/src/main/java/com/keao/edu/user/service/impl/HelpCenterContentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.service.impl;
+package com.keao.edu.user.service.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,9 +6,9 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.cms.dal.dao.HelpCenterContentDao;
-import com.keao.edu.cms.dal.entity.HelpCenterContent;
-import com.keao.edu.cms.service.HelpCenterContentService;
+import com.keao.edu.user.dal.dao.HelpCenterContentDao;
+import com.keao.edu.user.dal.entity.HelpCenterContent;
+import com.keao.edu.user.service.HelpCenterContentService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 

edu-cms/src/main/java/com/keao/edu/cms/service/impl/SysNewsInformationServiceImpl.java → edu-cms/src/main/java/com/keao/edu/user/service/impl/SysNewsInformationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.keao.edu.cms.service.impl;
+package com.keao.edu.user.service.impl;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.cms.controller.queryinfo.NewsInformationQueryInfo;
-import com.keao.edu.cms.dal.dao.SysNewsInformationDao;
-import com.keao.edu.cms.dal.entity.NewsStatusEnum;
-import com.keao.edu.cms.dal.entity.SysNewsInformation;
-import com.keao.edu.cms.service.SysNewsInformationService;
+import com.keao.edu.user.controller.queryinfo.NewsInformationQueryInfo;
+import com.keao.edu.user.dal.dao.SysNewsInformationDao;
+import com.keao.edu.user.dal.entity.NewsStatusEnum;
+import com.keao.edu.user.dal.entity.SysNewsInformation;
+import com.keao.edu.user.service.SysNewsInformationService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.page.QueryInfo;
@@ -26,7 +26,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 	@Autowired
 	private SysNewsInformationDao sysNewsInformationDao;
 	
-	@Value("${cms.server.context.path}")
+	@Value("${user.server.context.path}")
 	private String serverContextPath;
 	
 	public void setServerContextPath(String serverContextPath) {

edu-cms/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
       directory: /var/logs
       file-date-format: -yyyy-MM-dd
       pattern: common
-      prefix: tomcat-cms
+      prefix: tomcat-user
       rename-on-rotate: false
       request-attributes-enabled: false
       rotate: true
@@ -22,7 +22,7 @@ eureka:
 
 spring:
   application:
-    name: cms-server
+    name: user-server
     
   datasource:
     name: test
@@ -51,7 +51,7 @@ mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
     
 swagger:
-  base-package: com.ym.mec.cms.controller
+  base-package: com.ym.mec.user.controller
   
   
 ##认证 

edu-cms/src/main/resources/config/mybatis/HelpCenterCatalogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.keao.edu.cms.dal.dao.HelpCenterCatalogDao">
-	<resultMap id="HelpCenterCatalog" type="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
+<mapper namespace="com.keao.edu.user.dal.dao.HelpCenterCatalogDao">
+	<resultMap id="HelpCenterCatalog" type="com.keao.edu.user.dal.entity.HelpCenterCatalog">
 		<id column="id_" property="id" jdbcType="INTEGER" />
 		<result column="parent_id_" property="parentId" jdbcType="INTEGER" />
 		<result column="name_" property="text" jdbcType="VARCHAR" />
@@ -56,7 +56,7 @@
 		where id_ in #{ids}
 	</delete>
 	
-	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
+	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
 		insert into help_center_catalog (id_, parent_id_, name_,
 		description_, create_on_, modify_on_,
 		order_,status_)
@@ -66,7 +66,7 @@
 		#{order,jdbcType=INTEGER},#{status,jdbcType=INTEGER})
 	</insert>
 	
-	<update id="update" parameterType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
+	<update id="update" parameterType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
 		update help_center_catalog
 		<set>
 			<if test="parentId != null">

edu-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.keao.edu.cms.dal.dao.HelpCenterContentDao">
-	<resultMap id="HelpCenterContent" type="com.keao.edu.cms.dal.entity.HelpCenterContent">
+<mapper namespace="com.keao.edu.user.dal.dao.HelpCenterContentDao">
+	<resultMap id="HelpCenterContent" type="com.keao.edu.user.dal.entity.HelpCenterContent">
 		<id column="id_" property="id" jdbcType="INTEGER" />
 		<result column="title_" property="title" jdbcType="VARCHAR" />
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
@@ -10,14 +10,14 @@
 		<result column="order_" property="order" jdbcType="INTEGER" />
 		<result column="catalog_id_" property="catalogId" jdbcType="INTEGER" />
 		<association property="catalog" 
-			javaType="com.keao.edu.cms.dal.entity.HelpCenterCatalog">
+			javaType="com.keao.edu.user.dal.entity.HelpCenterCatalog">
 			<result column="catalog_id_" property="id" />
 			<result column="name_" property="text" />
 			<result column="parent_id_" property="parentId" />
 		</association>
 	</resultMap>
 
-	<resultMap id="HelpCenterContentBlobs" type="com.keao.edu.cms.dal.entity.HelpCenterContent"
+	<resultMap id="HelpCenterContentBlobs" type="com.keao.edu.user.dal.entity.HelpCenterContent"
 		extends="HelpCenterContent">
 		<result column="content_" property="content" jdbcType="LONGVARCHAR" />
 	</resultMap>
@@ -87,7 +87,7 @@
 		where catalog_id_ = #{catalogId,jdbcType=INTEGER}
 	</delete>
 
-	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
+	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
 		insert into help_center_content
 		(id_, title_, catalog_id_,
 		create_on_, modify_on_, content_,status_,order_
@@ -100,7 +100,7 @@
 		)
 	</insert>
 
-	<update id="update" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
+	<update id="update" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
 		update help_center_content
 		<set>
 			<if test="title != null">
@@ -128,7 +128,7 @@
 		where id_ = #{id,jdbcType=INTEGER}
 	</update>
 
-	<update id="updateBlobs" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
+	<update id="updateBlobs" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
 		update help_center_content
 		set title_ = #{title,jdbcType=VARCHAR},
 		catalog_id_ =
@@ -144,7 +144,7 @@
 		where id_ = #{id,jdbcType=INTEGER}
 	</update>
 
-	<update id="updateByKey" parameterType="com.keao.edu.cms.dal.entity.HelpCenterContent">
+	<update id="updateByKey" parameterType="com.keao.edu.user.dal.entity.HelpCenterContent">
 		update help_center_content
 		set title_ = #{title,jdbcType=VARCHAR},
 		catalog_id_ =

edu-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -4,9 +4,9 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.keao.edu.cms.dal.dao.SysNewsInformationDao">
+<mapper namespace="com.keao.edu.user.dal.dao.SysNewsInformationDao">
 	
-	<resultMap type="com.keao.edu.cms.dal.entity.SysNewsInformation" id="SysNewsInformation">
+	<resultMap type="com.keao.edu.user.dal.entity.SysNewsInformation" id="SysNewsInformation">
 		<result column="id_" property="id" />
 		<result column="title_" property="title" />
 		<result column="content_" property="content" />
@@ -55,13 +55,13 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+	<insert id="insert" parameterType="com.keao.edu.user.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,memo_,tenant_id_)
 		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{memo},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.cms.dal.entity.SysNewsInformation">
+	<update id="update" parameterType="com.keao.edu.user.dal.entity.SysNewsInformation">
 		UPDATE sys_news_information
 		<set>
 			<if test="status != null">

edu-common/src/main/java/com/keao/edu/common/entity/Employee.java

@@ -1,5 +1,6 @@
 package com.keao.edu.common.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,42 +12,50 @@ public class Employee {
 	private Integer userId;
 	
 	/** 工作性质（兼职、全职、临时） */
+	@ApiModelProperty(value = "工作性质（兼职、全职、临时）", required = true)
 	private String jobNature;
-	
-	/** 学历 */
+
+	@ApiModelProperty(value = "学历", required = true)
 	private String educationBackground;
 	
 	/** 毕业学校 */
+	@ApiModelProperty(value = "毕业学校", required = true)
 	private String graduateSchool;
 	
 	/** 技术职称 */
+	@ApiModelProperty(value = "技术职称", required = true)
 	private String technicalTitles;
 	
 	/** 入职时间 */
+	@ApiModelProperty(value = "入职时间", required = true)
 	private java.util.Date entryDate;
 	
 	/** 证件类型 */
+	@ApiModelProperty(value = "证件类型", required = true)
 	private String certificateType;
 	
 	/** 证件号码 */
+	@ApiModelProperty(value = "证件号码", required = true)
 	private String certificateNum;
 	
-	/**  */
 	private java.util.Date updateTime;
 	
-	/**  */
 	private java.util.Date createTime;
 	
 	/** 介绍 */
+	@ApiModelProperty(value = "介绍", required = true)
 	private String introduction;
 	
 	/** 离职日期 */
+	@ApiModelProperty(value = "离职日期", required = true)
 	private java.util.Date demissionDate;
 	
 	/** 联系地址 */
+	@ApiModelProperty(value = "联系地址", required = true)
 	private String contactAddress;
 	
 	/** 邮政编码 */
+	@ApiModelProperty(value = "邮政编码", required = true)
 	private String postalCode;
 	
 	public void setUserId(Integer userId){

edu-user/edu-user-server/pom.xml

@@ -16,5 +16,29 @@
 	</properties>
 
 	<dependencies>
-	</dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+			<version>2.1.2.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-openfeign-core</artifactId>
+			<version>2.1.2.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.spring4all</groupId>
+			<artifactId>swagger-spring-boot-starter</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>com.keao.edu</groupId>
+            <artifactId>edu-common</artifactId>
+        </dependency>
+    </dependencies>
 </project>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/UserServerApplication.java

@@ -0,0 +1,31 @@
+package com.keao.edu.user;
+
+import com.spring4all.swagger.EnableSwagger2Doc;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients("com.keao.edu")
+@ComponentScan(basePackages = "com.keao.edu")
+@Configuration
+@EnableSwagger2Doc
+public class UserServerApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(UserServerApplication.class, args);
+	}
+
+	@Bean
+	@LoadBalanced
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -0,0 +1,42 @@
+package com.keao.edu.user.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+
+import com.keao.edu.common.security.BaseAccessDeniedHandler;
+import com.keao.edu.common.security.BaseAuthenticationEntryPoint;
+
+@Configuration
+@EnableResourceServer
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
+
+	@Autowired
+	private BaseAccessDeniedHandler baseAccessDeniedHandler;
+
+	@Autowired
+	private BaseAuthenticationEntryPoint baseAuthenticationEntryPoint;
+
+	@Override
+	public void configure(HttpSecurity http) throws Exception {
+		http.authorizeRequests()
+				.antMatchers("/v2/api-docs", "/news/list", "/news/query", "/news/homeList")
+				.permitAll()
+				// 任何人不登录都可以获取的资源
+				// .antMatchers("/ipController/**").hasIpAddress("127.0.0.1") //特定ip可以不登录获取资源
+				// .antMatchers("/ipControll/**").access("isAuthenticated() and hasIpAddress('127.0.0.1')")// 特定ip必须登录才能获取
+				.anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
+				.authenticationEntryPoint(baseAuthenticationEntryPoint).and();
+	}
+
+	@Override
+	public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
+		resources.authenticationEntryPoint(baseAuthenticationEntryPoint).accessDeniedHandler(baseAccessDeniedHandler);
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/WebMvcConfig.java

@@ -0,0 +1,36 @@
+package com.keao.edu.user.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.keao.edu.common.config.EnumConverterFactory;
+import com.keao.edu.common.config.LocalFastJsonHttpMessageConverter;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+	/**
+	 * 枚举类的转换器 addConverterFactory
+	 */
+	@Override
+	public void addFormatters(FormatterRegistry registry) {
+		registry.addConverterFactory(new EnumConverterFactory());
+	}
+	
+	@Bean
+    public HttpMessageConverters fastJsonHttpMessageConverters(){
+		LocalFastJsonHttpMessageConverter converter = new LocalFastJsonHttpMessageConverter();
+        List<MediaType> fastMediaTypes =  new ArrayList<MediaType>();
+        fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
+        converter.setSupportedMediaTypes(fastMediaTypes);
+        return new HttpMessageConverters(converter);
+    }
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -0,0 +1,57 @@
+package com.keao.edu.user.controller;
+
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.Employee;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.common.service.EmployeeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RestController
+@RequestMapping("employee")
+@Api(tags = "员工服务")
+public class EmployeeController extends BaseController {
+
+	@Autowired
+	private EmployeeService employeeService;
+	
+	@ApiOperation("员工服务分页查询")
+	@GetMapping(value = "/list")
+	public HttpResponseResult getList(QueryInfo queryInfo) {
+		return succeed(employeeService.queryPage(queryInfo));
+	}
+
+	@ApiOperation("查询员工详情")
+	@ApiImplicitParam(name = "id", value = "员工ID", required = true, dataType = "Integer", paramType = "path")
+	@GetMapping(value = "/query")
+	public HttpResponseResult query(Integer id) {
+		return succeed(employeeService.get(id));
+	}
+
+	@ApiOperation("新增员工")
+	@PostMapping(value = "/add")
+	public HttpResponseResult add(Employee employee) {
+		return succeed(employeeService.insert(employee));
+	}
+
+	@ApiOperation("更新资讯")
+	@PostMapping(value = "/update")
+	public HttpResponseResult update(Employee employee) {
+		Date date = new Date();
+		employee.setUpdateTime(date);
+		return succeed(employeeService.update(employee));
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "/del/{id}")
+	public HttpResponseResult add(@PathVariable("id") Integer id) {
+		return succeed(employeeService.delete(id));
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -0,0 +1,42 @@
+package com.keao.edu.user.controller.queryinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import com.keao.edu.common.page.QueryInfo;
+
+public class HelpCenterContentQueryInfo extends QueryInfo {
+
+	@ApiModelProperty(value = "父分类ID，多个用逗号分隔", required = false)
+	private String catalogIds;
+
+	@ApiModelProperty(value = "标题", required = false)
+	private String title;
+
+	@ApiModelProperty(value = "状态（1-显示 0-隐藏）", required = false)
+	private Integer status;
+
+	public String getCatalogIds() {
+		return catalogIds;
+	}
+
+	public void setCatalogIds(String catalogIds) {
+		this.catalogIds = catalogIds;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/queryinfo/NewsInformationQueryInfo.java

@@ -0,0 +1,76 @@
+package com.keao.edu.user.controller.queryinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import com.keao.edu.user.dal.entity.NewsStatusEnum;
+import com.keao.edu.common.page.QueryInfo;
+
+public class NewsInformationQueryInfo extends QueryInfo {
+
+	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯,3banner类型", required = false)
+	private Integer type;
+
+	@ApiModelProperty(value = "资讯状态", required = false)
+	private NewsStatusEnum status;
+
+	@ApiModelProperty(value = "标题", required = false)
+	private String title;
+
+	@ApiModelProperty(value = "备注", required = false)
+	private String memo;
+	
+	@ApiModelProperty(value = "租客编号", required = false)
+	private Integer tenantId;
+	
+	private Date date;
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public NewsStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(NewsStatusEnum status) {
+		this.status = status;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
+	}
+}

edu-user/edu-user-server/src/main/resources/application.yml

@@ -0,0 +1,79 @@
+server:
+  port: 8006
+  tomcat:
+    accesslog:
+      enabled: true
+      buffered: true
+      directory: /var/logs
+      file-date-format: -yyyy-MM-dd
+      pattern: common
+      prefix: tomcat-user
+      rename-on-rotate: false
+      request-attributes-enabled: false
+      rotate: true
+      suffix: .log
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
+
+spring:
+  application:
+    name: user-server
+    
+  datasource:
+    name: test
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
+    # 使用druid数据源
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    
+
+mybatis:
+    mapperLocations: classpath:config/mybatis/*.xml
+    
+swagger:
+  base-package: com.ym.mec.user.controller
+  
+  
+##认证 
+security:
+  oauth2:
+    client:
+      client-id: app
+      client-secret: app
+    resource:
+      token-info-uri: http://localhost:8001/oauth/check_token
+  
+#spring boot admin 相关配置
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

edu-user/edu-user-server/src/main/resources/bootstrap-dev.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=cms
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

edu-user/edu-user-server/src/main/resources/bootstrap-prod.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=47.96.80.97:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=cms
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

edu-user/edu-user-server/src/main/resources/bootstrap-test.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=cms
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

edu-user/edu-user-server/src/main/resources/logback-spring.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="10 seconds">
+
+	<property name="LOG_HOME" value="/mdata/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="CONSOLE_LOG_PATTERN"
+		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+
+	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder charset="UTF-8">
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="file"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<FileNamePattern>${LOG_HOME}</FileNamePattern>
+			<MaxHistory>90</MaxHistory>
+			<TimeBasedFileNamingAndTriggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<MaxFileSize>20MB</MaxFileSize>
+			</TimeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="com.ym.mec" level="INFO" />
+
+	<!--开发环境:打印控制台 -->
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+	
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<!--生产环境:输出到文件 -->
+	<springProfile name="prod">
+		<root level="WARN">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+</configuration>

edu-zuul/src/main/java/com/keao/edu/zuul/web/config/SwaggerDocumentConfig.java

@@ -19,7 +19,7 @@ public class SwaggerDocumentConfig implements SwaggerResourcesProvider {
 
 		// 增加服务信息
 		resources.add(swaggerResource("授权服务", "/auth-server/v2/api-docs", "2.0"));
-		resources.add(swaggerResource("CMS服务", "/cms-server/v2/api-docs", "2.0"));
+		resources.add(swaggerResource("CMS服务", "/user-server/v2/api-docs", "2.0"));
 		resources.add(swaggerResource("WEB服务", "/web-server/v2/api-docs", "2.0"));
 		resources.add(swaggerResource("TASK服务", "/task-server/v2/api-docs", "2.0"));
 		resources.add(swaggerResource("STUDENT服务", "/student-server/v2/api-docs", "2.0"));