update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -97,9 +97,9 @@ public class SysUser implements Serializable{
 
 	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
-
-	@ApiModelProperty(value = "e签宝唯一编号",required = false)
-	private String esignId;
+	
+	@ApiModelProperty(value = "是否是超管",required = false)
+	private Boolean isSuperAdmin;
 
 	public String getRealName() {
 		return realName;
@@ -277,13 +277,14 @@ public class SysUser implements Serializable{
 		this.wechatId = wechatId;
 	}
 
-	public String getEsignId() {
-		return esignId;
+	public Boolean getIsSuperAdmin() {
+		return isSuperAdmin;
 	}
 
-	public void setEsignId(String esignId) {
-		this.esignId = esignId;
+	public void setIsSuperAdmin(Boolean isSuperAdmin) {
+		this.isSuperAdmin = isSuperAdmin;
 	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -28,6 +28,7 @@
         <result column="im_token_" property="imToken"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
+        <result column="is_super_admin_" property="isSuperAdmin"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -65,8 +66,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
-        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
+        VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
     </insert>
 
@@ -134,6 +135,9 @@
             <if test="realName != null">
                 real_name = #{realName},
             </if>
+            <if test="isSuperAdmin != null">
+                is_super_admin_ = #{isSuperAdmin},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMessageConfigDao.java

@@ -1,9 +1,9 @@
 package com.ym.mec.biz.dal.dao;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.entity.SysMessageConfig;
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
 
 public interface SysMessageConfigDao extends BaseDAO<Integer, SysMessageConfig> {
 

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -10,12 +10,15 @@ import com.ym.mec.task.fallback.TaskRemoteServiceFallback;
 public interface TaskRemoteService {
 
 	@GetMapping(value = "task/refreshPaymentFeeStatus")
+	// 刷新付费状态
 	public void refreshPaymentFeeStatus();
 
 	@GetMapping(value = "task/vipGroupAwardedMonthlyRewards")
+	// vip课月度奖励
 	public void vipGroupAwardedMonthlyRewards();
 
 	@GetMapping(value = "task/updateCourseScheduleToOverStatus")
+	// 更新课程状态至已结束
 	boolean updateCourseScheduleToOverStatus();
 
 	@GetMapping("task/pushNoSignOutMessage")

mec-student/src/main/resources/application.yml

@@ -12,6 +12,10 @@ spring:
   application:
     name: student-server
     
+  server:
+    multipart:
+      max-file-size: 5M
+    
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai

mec-teacher/src/main/resources/application.yml

@@ -12,6 +12,10 @@ spring:
   application:
     name: teacher-server
     
+  server:
+    multipart:
+      max-file-size: 10M
+    
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai

mec-util/pom.xml

@@ -60,7 +60,18 @@
 		<dependency>
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
-			<version>2.3.20</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+    		<version>3.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+    		<version>3.12</version>
 		</dependency>
 	</dependencies>
 </project>

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -58,7 +58,7 @@ public class IndexController extends BaseController {
 		}
 
 		Integer organId = sysUser.getOrganId();
-		if ("admin".equals(sysUser.getUsername())) {
+		if (sysUser.getIsSuperAdmin()) {
 			organId = null;
 		}