Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-auth/mec-auth-server/src/main/resources/logback-spring.xml

@@ -27,8 +27,8 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
-	<root level="INFO">
+	<logger name="com.ym.mec" level="WARN" />
+	<root level="WARN">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
 import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -17,4 +18,6 @@ public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, Repla
     int countReplacements(Map<String, Object> params);
 
     ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationOrganId);
+
+    int openPay(@Param("cooperationOrganId") Integer cooperationOrganId);
 }

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

@@ -0,0 +1,15 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
+import org.apache.ibatis.annotations.Param;
+
+
+public interface ReplacementInstrumentCooperationDao extends com.ym.mec.common.dal.BaseDAO<Integer, ReplacementInstrumentCooperation> {
+
+    /**
+     * 获取合作单位的活动
+     * @param cooperationId
+     * @return
+     */
+    ReplacementInstrumentCooperation getByCooperationId(@Param("cooperationId") Integer cooperationId);
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentCooperation.java

@@ -0,0 +1,163 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value = "com-ym-mec-biz-dal-entity-ReplacementInstrumentCooperation")
+public class ReplacementInstrumentCooperation {
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 分部id
+     */
+    @ApiModelProperty(value = "分部id")
+    private Integer organId;
+
+    /**
+     * 合作单位id
+     */
+    @ApiModelProperty(value = "合作单位id")
+    private Integer cooperationOrganId;
+
+    /**
+     * 是否开启缴费 0-未开启 1-已开启
+     */
+    @ApiModelProperty(value = "是否开启缴费 0-未开启 1-已开启")
+    private YesOrNoEnum openPay = YesOrNoEnum.NO;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "分部")
+    private String organName;
+
+    @ApiModelProperty(value = "合作单位")
+    private String cooperationOrganName;
+
+    @ApiModelProperty(value = "调查人数")
+    private Integer activeNum = 0;
+
+    @ApiModelProperty(value = "置换人数")
+    private Integer replaceNum = 0;
+
+    @ApiModelProperty(value = "置换率")
+    private BigDecimal replaceScale = BigDecimal.ZERO;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public YesOrNoEnum getOpenPay() {
+        return openPay;
+    }
+
+    public void setOpenPay(YesOrNoEnum openPay) {
+        this.openPay = openPay;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", organId=").append(organId);
+        sb.append(", cooperationOrganId=").append(cooperationOrganId);
+        sb.append(", openPay=").append(openPay);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getCooperationOrganName() {
+        return cooperationOrganName;
+    }
+
+    public void setCooperationOrganName(String cooperationOrganName) {
+        this.cooperationOrganName = cooperationOrganName;
+    }
+
+    public Integer getActiveNum() {
+        return activeNum;
+    }
+
+    public void setActiveNum(Integer activeNum) {
+        this.activeNum = activeNum;
+    }
+
+    public Integer getReplaceNum() {
+        return replaceNum;
+    }
+
+    public void setReplaceNum(Integer replaceNum) {
+        this.replaceNum = replaceNum;
+    }
+
+    public BigDecimal getReplaceScale() {
+        return replaceScale;
+    }
+
+    public void setReplaceScale(BigDecimal replaceScale) {
+        this.replaceScale = replaceScale;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ReplacementInstrumentCooperationQueryInfo.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.page;
+
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class ReplacementInstrumentCooperationQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value="学校名称或编号")
+    private String search;
+
+    @ApiModelProperty(value="分部id")
+    private String organId;
+
+    @ApiModelProperty(value="是否开启缴费 0 -否 1-是")
+    private YesOrNoEnum openPay;
+
+    @Override
+    public String getSearch() {
+        return search;
+    }
+
+    @Override
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public YesOrNoEnum getOpenPay() {
+        return openPay;
+    }
+
+    public void setOpenPay(YesOrNoEnum openPay) {
+        this.openPay = openPay;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentCooperationService.java

@@ -0,0 +1,32 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.service.BaseService;
+
+public interface ReplacementInstrumentCooperationService extends BaseService<Integer, ReplacementInstrumentCooperation> {
+
+    /**
+     * 开启缴费
+     * @param id
+     * @return
+     */
+    ReplacementInstrumentCooperation openPay(Integer id);
+
+
+    /**
+     * 获取合作单位的活动
+     * @param cooperationId
+     * @return
+     */
+    ReplacementInstrumentCooperation getByCooperationId(Integer cooperationId);
+
+
+    /**
+     * 获取合作单位乐器置换列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo);
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentCooperationServiceImpl.java

@@ -0,0 +1,63 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
+import com.ym.mec.biz.dal.dao.ReplacementInstrumentCooperationDao;
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
+import com.ym.mec.biz.service.ReplacementInstrumentCooperationService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrumentCooperation> implements ReplacementInstrumentCooperationService {
+
+    @Autowired
+    private ReplacementInstrumentCooperationDao replacementInstrumentCooperationDao;
+    @Autowired
+    private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
+
+    @Override
+    public BaseDAO<Integer, ReplacementInstrumentCooperation> getDAO() {
+        return replacementInstrumentCooperationDao;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ReplacementInstrumentCooperation openPay(Integer id) {
+        ReplacementInstrumentCooperation replacementInstrumentCooperation = replacementInstrumentCooperationDao.get(id);
+        if (replacementInstrumentCooperation == null) {
+            throw new BizException("合作单位乐器置换活动不存在");
+        }
+        if (YesOrNoEnum.YES.equals(replacementInstrumentCooperation.getOpenPay())) {
+            throw new BizException("已开启缴费，不能重复开启");
+        }
+        replacementInstrumentCooperation.setOpenPay(YesOrNoEnum.YES);
+        replacementInstrumentCooperationDao.update(replacementInstrumentCooperation);
+
+        replacementInstrumentActivityDao.openPay(replacementInstrumentCooperation.getCooperationOrganId());
+
+        //发送推送链接
+
+        return replacementInstrumentCooperation;
+    }
+
+    @Override
+    public ReplacementInstrumentCooperation getByCooperationId(Integer cooperationId) {
+        return replacementInstrumentCooperationDao.getByCooperationId(cooperationId);
+    }
+
+    @Override
+    public PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo) {
+        PageInfo<ReplacementInstrumentCooperation> pageInfo = queryPage(queryInfo);
+        if (pageInfo.getRows().size() > 0) {
+
+        }
+        return pageInfo;
+    }
+}

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -27,7 +27,7 @@
 		<result property="brand" column="brand_"/>
 		<result property="specification" column="specification_"/>
 	</resultMap>
-	
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ReplacementInstrumentActivity" >
 		SELECT * FROM replacement_instrument_activity WHERE id_ = #{id} 
@@ -160,4 +160,8 @@
 			replacement_instrument_activity ria
 		WHERE ria.cooperation_organ_id_ = #{cooperationOrganId}
 	</select>
+
+	<update id="openPay" parameterType="integer">
+		UPDATE replacement_instrument_activity SET open_flag_ = 1 WHERE cooperation_organ_id_ = #{cooperationOrganId} AND open_flag_ = 0
+	</update>
 </mapper>

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentCooperationMapper.xml

@@ -0,0 +1,93 @@
+<?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.ym.mec.biz.dal.dao.ReplacementInstrumentCooperationDao">
+    <resultMap id="ReplacementInstrumentCooperation" type="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
+        <!--@mbg.generated-->
+        <!--@Table replacement_instrument_cooperation-->
+        <result column="id_" property="id"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="open_pay_" property="openPay" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="organName" property="organName"/>
+        <result column="cooperationOrganName" property="cooperationOrganName"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="ReplacementInstrumentCooperation">
+        SELECT *
+        FROM replacement_instrument_cooperation
+        WHERE id_ = #{id}
+    </select>
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
+        <!--@mbg.generated-->
+        insert into replacement_instrument_cooperation (id_, organ_id_, cooperation_organ_id_, open_pay_, create_time_,
+        update_time_
+        )
+        values (#{id}, #{organId}, #{cooperationOrganId},
+        #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{createTime}, #{updateTime}
+        )
+    </insert>
+
+    <delete id="delete">
+        <!--@mbg.generated-->
+        delete from replacement_instrument_cooperation WHERE id_ = #{id}
+    </delete>
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
+        <!--@mbg.generated-->
+        update replacement_instrument_cooperation
+        <set>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="cooperationOrganId != null">
+                cooperation_organ_id_ = #{cooperationOrganId},
+            </if>
+            <if test="openPay != null">
+                open_pay_ = #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = NOW(),
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="ReplacementInstrumentCooperation" parameterType="map">
+        SELECT ric*,o.name_ organName,co.name_ cooperationName FROM replacement_instrument_cooperation ric
+        LEFT JOIN cooperation_organ co on ric.cooperation_organ_id_ = co.id_
+        LEFT JOIN organization o on o.id_ = ric.organ_id_
+        <include refid="queryPageSql"/>
+        ORDER BY ric.id_ DESC
+        <include refid="global.limit"/>
+    </select>
+    <sql id="queryPageSql">
+        <where>
+            <if test="organId != null">
+                AND ric.organ_id_ = #{organId}
+            </if>
+            <if test="openPay != null">
+                AND ric.open_pay_ = #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="search != null and search != ''">
+                AND (ric.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%'))
+            </if>
+        </where>
+    </sql>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(*) FROM replacement_instrument_cooperation ric
+        <include refid="queryPageSql"/>
+    </select>
+
+    <select id="getByCooperationId" resultMap="ReplacementInstrumentCooperation">
+        SELECT * FROM replacement_instrument_cooperation WHERE cooperation_organ_id_ = #{cooperationId}
+    </select>
+
+</mapper>

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentController.java

@@ -1,18 +1,19 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
-import com.ym.mec.biz.service.ReplacementInstrumentService;
-import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
+import com.ym.mec.biz.service.ReplacementInstrumentService;
+import com.ym.mec.common.controller.BaseController;
+
 @RequestMapping("replacementInstrument")
 @Api(tags = "乐器置换商品服务")
 @RestController
@@ -25,7 +26,6 @@ public class ReplacementInstrumentController extends BaseController {
 
     @ApiOperation(value = "分页查询列表")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('managerDownload/queryPage')")
     public Object queryPage(ReplacementInstrumentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {

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

@@ -326,10 +326,7 @@ public class MusicGroupController extends BaseController {
 	@GetMapping("/getGradeList")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/getGradeList')")
 	@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
-	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId,Integer organId) {
-		if(StringUtils.isEmpty(musicGroupId)){
-			return succeed(organizationService.getGradeList(organId));
-		}
+	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId) {
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
 		return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
 	}

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

@@ -0,0 +1,82 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentCooperationQueryInfo;
+import com.ym.mec.biz.service.ReplacementInstrumentCooperationService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+@RequestMapping("replacementInstrumentCooperation")
+@Api(tags = "收费类型服务")
+@RestController
+public class ReplacementInstrumentCooperationController extends BaseController {
+
+    @Autowired
+    private ReplacementInstrumentCooperationService replacementInstrumentCooperationService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "分页查询列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('replacementInstrumentCooperation/queryPage')")
+    public HttpResponseResult<PageInfo<ReplacementInstrumentCooperation>> queryPage(ReplacementInstrumentCooperationQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
+            }
+        }
+        return succeed(replacementInstrumentCooperationService.getPageList(queryInfo));
+    }
+
+    @ApiOperation(value = "新增合作单位置换活动")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/add')")
+    public HttpResponseResult<ReplacementInstrumentCooperation> add(ReplacementInstrumentCooperation replacementInstrumentCooperation) {
+        ReplacementInstrumentCooperation hasOld = replacementInstrumentCooperationService.getByCooperationId(replacementInstrumentCooperation.getCooperationOrganId());
+        if (hasOld != null) {
+            return failed("合作单位链接已生成，不能重复生成");
+        }
+        Date nowDate = new Date();
+        replacementInstrumentCooperation.setCreateTime(nowDate);
+        replacementInstrumentCooperation.setUpdateTime(nowDate);
+        replacementInstrumentCooperationService.insert(replacementInstrumentCooperation);
+        return succeed(replacementInstrumentCooperation);
+    }
+
+    @ApiOperation(value = "开启缴费")
+    @PostMapping("/openPay")
+    @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/openPay')")
+    public HttpResponseResult<ReplacementInstrumentCooperation> openPay(Integer id) {
+        return succeed(replacementInstrumentCooperationService.openPay(id));
+    }
+}

mec-web/src/main/resources/logback-spring.xml

@@ -43,7 +43,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.ym.mec" level="WARN" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
 			additivity="false">
@@ -52,14 +52,14 @@
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
-		<root level="INFO">
+		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
 
 	<springProfile name="test">
-		<root level="INFO">
+		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>