和并invoice项目和messageBoard项目到card项目
This commit is contained in:
parent
a6f8dacd6f
commit
18065db621
@ -18,9 +18,9 @@
|
||||
<module>xhpc-order</module>
|
||||
<module>xhpc-wxma</module>
|
||||
<module>xhpc-tradebill</module>
|
||||
<module>xhpc-message-board</module>
|
||||
<!-- <module>xhpc-message-board</module>-->
|
||||
<module>xhpc-card</module>
|
||||
<module>xhpc-data-big-screen</module>
|
||||
<!-- <module>xhpc-data-big-screen</module>-->
|
||||
<module>xhpc-workorder</module>
|
||||
<module>xhpc-activity</module>
|
||||
<module>xhpc-log</module>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xhpc.board.api;
|
||||
package com.xhpc.card.api;
|
||||
|
||||
import com.xhpc.board.domain.QueryUserMassageResponse;
|
||||
import com.xhpc.board.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.board.domain.UserQueryCondition;
|
||||
import com.xhpc.board.service.XhpcMessageBoardService;
|
||||
import com.xhpc.card.domain.QueryUserMassageResponse;
|
||||
import com.xhpc.card.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.card.domain.UserQueryCondition;
|
||||
import com.xhpc.card.service.XhpcMessageBoardService;
|
||||
import com.xhpc.common.core.web.controller.BaseController;
|
||||
import com.xhpc.common.core.web.domain.AjaxResult;
|
||||
import com.xhpc.common.log.annotation.Log;
|
||||
@ -1,12 +1,12 @@
|
||||
package com.xhpc.databigscreen.controller;
|
||||
package com.xhpc.card.controller;
|
||||
|
||||
import com.xhpc.common.core.domain.R;
|
||||
import com.xhpc.common.core.web.controller.BaseController;
|
||||
import com.xhpc.databigscreen.domain.CoreParam;
|
||||
import com.xhpc.databigscreen.domain.OrderRatio;
|
||||
import com.xhpc.databigscreen.domain.OrderTrend;
|
||||
import com.xhpc.databigscreen.domain.RealtimeOrders;
|
||||
import com.xhpc.databigscreen.service.XhpcDataBigScreenService;
|
||||
import com.xhpc.card.domain.CoreParam;
|
||||
import com.xhpc.card.domain.OrderRatio;
|
||||
import com.xhpc.card.domain.OrderTrend;
|
||||
import com.xhpc.card.domain.RealtimeOrders;
|
||||
import com.xhpc.card.service.XhpcDataBigScreenService;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
@ -1,7 +1,7 @@
|
||||
package com.xhpc.board.controller;
|
||||
package com.xhpc.card.controller;
|
||||
|
||||
import com.xhpc.board.domain.*;
|
||||
import com.xhpc.board.service.XhpcMessageBoardService;
|
||||
import com.xhpc.card.domain.*;
|
||||
import com.xhpc.card.service.XhpcMessageBoardService;
|
||||
import com.xhpc.common.core.web.domain.AjaxResult;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.domain;
|
||||
package com.xhpc.card.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@ -47,4 +47,17 @@ public interface XhpcAppUserMapper {
|
||||
*/
|
||||
XhpcAppUser selectByPhone(String userAccount);
|
||||
|
||||
|
||||
/**
|
||||
* query user total count by according one or multiple tenant id
|
||||
*
|
||||
* @param tenantIdList 租户集合
|
||||
* @return 租户数量
|
||||
* @author WH
|
||||
* @date 2022/3/4 10:37
|
||||
* @since version-1.0
|
||||
*/
|
||||
Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List<String> tenantIdList, @Param("currentTime") String currentTime);
|
||||
|
||||
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
package com.xhpc.databigscreen.mapper;
|
||||
package com.xhpc.card.mapper;
|
||||
|
||||
import com.xhpc.databigscreen.pojo.XhpcChargingStation;
|
||||
import com.xhpc.card.pojo.XhpcChargingStation;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.xhpc.databigscreen.mapper;
|
||||
package com.xhpc.card.mapper;
|
||||
|
||||
import com.xhpc.databigscreen.pojo.XhpcHistoryOrder;
|
||||
import com.xhpc.card.pojo.XhpcHistoryOrder;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xhpc.board.mapper;
|
||||
package com.xhpc.card.mapper;
|
||||
|
||||
import com.xhpc.board.domain.PlatformSendMessageToUserRequest;
|
||||
import com.xhpc.board.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.board.domain.UserQueryCondition;
|
||||
import com.xhpc.board.pojo.XhpcMessageBoard;
|
||||
import com.xhpc.card.domain.PlatformSendMessageToUserRequest;
|
||||
import com.xhpc.card.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.card.domain.UserQueryCondition;
|
||||
import com.xhpc.card.pojo.XhpcMessageBoard;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xhpc.board.mapper;
|
||||
package com.xhpc.card.mapper;
|
||||
|
||||
import com.xhpc.board.domain.QueryUserListRequest;
|
||||
import com.xhpc.board.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.board.domain.UserQueryCondition;
|
||||
import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser;
|
||||
import com.xhpc.card.domain.QueryUserListRequest;
|
||||
import com.xhpc.card.domain.SendMessageToPlatformRequest;
|
||||
import com.xhpc.card.domain.UserQueryCondition;
|
||||
import com.xhpc.card.pojo.XhpcMessageBoardReceiveUser;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.xhpc.databigscreen.mapper;
|
||||
package com.xhpc.card.mapper;
|
||||
|
||||
import com.xhpc.databigscreen.pojo.XhpcRateTime;
|
||||
import com.xhpc.card.pojo.XhpcRateTime;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.pojo;
|
||||
package com.xhpc.card.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.pojo;
|
||||
package com.xhpc.card.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.pojo;
|
||||
package com.xhpc.card.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.board.pojo;
|
||||
package com.xhpc.card.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xhpc.databigscreen.pojo;
|
||||
package com.xhpc.card.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
package com.xhpc.databigscreen.service;
|
||||
package com.xhpc.card.service;
|
||||
|
||||
import com.xhpc.common.core.domain.R;
|
||||
import com.xhpc.databigscreen.domain.CoreParam;
|
||||
import com.xhpc.databigscreen.domain.OrderRatio;
|
||||
import com.xhpc.databigscreen.domain.OrderTrend;
|
||||
import com.xhpc.databigscreen.domain.RealtimeOrders;
|
||||
import com.xhpc.card.domain.CoreParam;
|
||||
import com.xhpc.card.domain.OrderRatio;
|
||||
import com.xhpc.card.domain.OrderTrend;
|
||||
import com.xhpc.card.domain.RealtimeOrders;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -1,6 +1,6 @@
|
||||
package com.xhpc.board.service;
|
||||
package com.xhpc.card.service;
|
||||
|
||||
import com.xhpc.board.domain.*;
|
||||
import com.xhpc.card.domain.*;
|
||||
|
||||
/**
|
||||
* 留言板服务的Service
|
||||
@ -1,20 +1,19 @@
|
||||
package com.xhpc.databigscreen.service.impl;
|
||||
package com.xhpc.card.service.impl;
|
||||
|
||||
import com.xhpc.common.constant.ConstantClass;
|
||||
import com.xhpc.common.core.domain.R;
|
||||
import com.xhpc.common.redis.service.RedisService;
|
||||
import com.xhpc.common.util.MyDateUtil;
|
||||
import com.xhpc.common.util.UserTypeUtil;
|
||||
import com.xhpc.databigscreen.domain.CoreParam;
|
||||
import com.xhpc.databigscreen.domain.OrderRatio;
|
||||
import com.xhpc.databigscreen.domain.OrderTrend;
|
||||
import com.xhpc.databigscreen.domain.RealtimeOrders;
|
||||
import com.xhpc.databigscreen.mapper.XhpcAppUserMapper;
|
||||
import com.xhpc.databigscreen.mapper.XhpcChargingStationMapper;
|
||||
import com.xhpc.databigscreen.mapper.XhpcHistoryOrderMapper;
|
||||
import com.xhpc.databigscreen.mapper.XhpcRateTimeMapper;
|
||||
import com.xhpc.databigscreen.service.XhpcDataBigScreenService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import com.xhpc.card.domain.CoreParam;
|
||||
import com.xhpc.card.domain.OrderRatio;
|
||||
import com.xhpc.card.domain.OrderTrend;
|
||||
import com.xhpc.card.domain.RealtimeOrders;
|
||||
import com.xhpc.card.mapper.XhpcAppUserMapper;
|
||||
import com.xhpc.card.mapper.XhpcChargingStationMapper;
|
||||
import com.xhpc.card.mapper.XhpcHistoryOrderMapper;
|
||||
import com.xhpc.card.mapper.XhpcRateTimeMapper;
|
||||
import com.xhpc.card.service.XhpcDataBigScreenService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@ -1,11 +1,11 @@
|
||||
package com.xhpc.board.service.impl;
|
||||
package com.xhpc.card.service.impl;
|
||||
|
||||
import com.xhpc.board.domain.*;
|
||||
import com.xhpc.board.mapper.XhpcMessageBoardMapper;
|
||||
import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper;
|
||||
import com.xhpc.board.pojo.XhpcMessageBoard;
|
||||
import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser;
|
||||
import com.xhpc.board.service.XhpcMessageBoardService;
|
||||
import com.xhpc.card.domain.*;
|
||||
import com.xhpc.card.mapper.XhpcMessageBoardMapper;
|
||||
import com.xhpc.card.mapper.XhpcMessageBoardReceiveUserMapper;
|
||||
import com.xhpc.card.pojo.XhpcMessageBoard;
|
||||
import com.xhpc.card.pojo.XhpcMessageBoardReceiveUser;
|
||||
import com.xhpc.card.service.XhpcMessageBoardService;
|
||||
import com.xhpc.common.api.UserTypeService;
|
||||
import com.xhpc.common.core.domain.R;
|
||||
import com.xhpc.common.core.utils.DateUtils;
|
||||
@ -317,4 +317,28 @@
|
||||
soc_protect = #{socProtect,jdbcType=INTEGER}
|
||||
where app_user_id = #{appUserId,jdbcType=BIGINT}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="selectTotalCountByTenantIdAndCurrentTime" resultType="java.lang.Long">
|
||||
SELECT
|
||||
count(phone)
|
||||
FROM
|
||||
(
|
||||
SELECT DISTINCT
|
||||
(phone)
|
||||
FROM
|
||||
xhpc_app_user
|
||||
<where>
|
||||
<if test="tenantIdList!=null and tenantIdList.size()!=0 ">
|
||||
and tenant_id IN
|
||||
<foreach collection="tenantIdList" separator="," open="(" close=")" item="tenantId">
|
||||
#{tenantId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="currentTime!=null and currentTime!='' ">
|
||||
and create_time <![CDATA[>=]]> DATE_ADD(#{currentTime},INTERVAL -3 MONTH)
|
||||
</if>
|
||||
</where>
|
||||
) AS a
|
||||
</select>
|
||||
</mapper>
|
||||
@ -1,8 +1,8 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.databigscreen.mapper.XhpcChargingStationMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.databigscreen.pojo.XhpcChargingStation">
|
||||
<mapper namespace="com.xhpc.card.mapper.XhpcChargingStationMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.card.pojo.XhpcChargingStation">
|
||||
<id column="charging_station_id" jdbcType="BIGINT" property="chargingStationId"/>
|
||||
<result column="name" jdbcType="VARCHAR" property="name"/>
|
||||
<result column="operator_id" jdbcType="BIGINT" property="operatorId"/>
|
||||
@ -116,7 +116,7 @@
|
||||
where charging_station_id = #{chargingStationId,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" keyColumn="charging_station_id" keyProperty="chargingStationId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcChargingStation" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcChargingStation" useGeneratedKeys="true">
|
||||
insert into xhpc_charging_station (`name`, operator_id, `type`,
|
||||
construction_site, service_facilities, periphery_facilities,
|
||||
area_code, address, detailed_address,
|
||||
@ -143,7 +143,7 @@
|
||||
#{tenantId,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="charging_station_id" keyProperty="chargingStationId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcChargingStation" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcChargingStation" useGeneratedKeys="true">
|
||||
insert into xhpc_charging_station
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="name != null">
|
||||
@ -336,7 +336,7 @@
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.databigscreen.pojo.XhpcChargingStation">
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.card.pojo.XhpcChargingStation">
|
||||
update xhpc_charging_station
|
||||
<set>
|
||||
<if test="name != null">
|
||||
@ -435,7 +435,7 @@
|
||||
</set>
|
||||
where charging_station_id = #{chargingStationId,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.databigscreen.pojo.XhpcChargingStation">
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.card.pojo.XhpcChargingStation">
|
||||
update xhpc_charging_station
|
||||
set `name` = #{name,jdbcType=VARCHAR},
|
||||
operator_id = #{operatorId,jdbcType=BIGINT},
|
||||
@ -1,8 +1,8 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.databigscreen.mapper.XhpcHistoryOrderMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.databigscreen.pojo.XhpcHistoryOrder">
|
||||
<mapper namespace="com.xhpc.card.mapper.XhpcHistoryOrderMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.card.pojo.XhpcHistoryOrder">
|
||||
<id column="history_order_id" jdbcType="BIGINT" property="historyOrderId"/>
|
||||
<result column="charging_station_id" jdbcType="BIGINT" property="chargingStationId"/>
|
||||
<result column="charge_order_id" jdbcType="BIGINT" property="chargeOrderId"/>
|
||||
@ -220,7 +220,7 @@
|
||||
where history_order_id = #{historyOrderId,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" keyColumn="history_order_id" keyProperty="historyOrderId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcHistoryOrder" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcHistoryOrder" useGeneratedKeys="true">
|
||||
insert into xhpc_history_order (charging_station_id, charge_order_id, user_id,
|
||||
terminal_id, serial_number, internet_serial_number,
|
||||
power_price_total, service_price_total, total_price,
|
||||
@ -266,7 +266,7 @@
|
||||
#{source,jdbcType=INTEGER}, #{tenantId,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="history_order_id" keyProperty="historyOrderId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcHistoryOrder" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcHistoryOrder" useGeneratedKeys="true">
|
||||
insert into xhpc_history_order
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="chargingStationId != null">
|
||||
@ -591,7 +591,7 @@
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.databigscreen.pojo.XhpcHistoryOrder">
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.card.pojo.XhpcHistoryOrder">
|
||||
update xhpc_history_order
|
||||
<set>
|
||||
<if test="chargingStationId != null">
|
||||
@ -756,7 +756,7 @@
|
||||
</set>
|
||||
where history_order_id = #{historyOrderId,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.databigscreen.pojo.XhpcHistoryOrder">
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.card.pojo.XhpcHistoryOrder">
|
||||
update xhpc_history_order
|
||||
set charging_station_id = #{chargingStationId,jdbcType=BIGINT},
|
||||
charge_order_id = #{chargeOrderId,jdbcType=BIGINT},
|
||||
@ -1,8 +1,8 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.board.mapper.XhpcMessageBoardMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.board.pojo.XhpcMessageBoard">
|
||||
<mapper namespace="com.xhpc.card.mapper.XhpcMessageBoardMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.card.pojo.XhpcMessageBoard">
|
||||
<id column="message_id" jdbcType="BIGINT" property="messageId"/>
|
||||
<result column="sender_type" jdbcType="TINYINT" property="senderType"/>
|
||||
<result column="sender_account" jdbcType="VARCHAR" property="senderAccount"/>
|
||||
@ -58,7 +58,7 @@
|
||||
where message_id = #{messageId,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" keyColumn="message_id" keyProperty="messageId"
|
||||
parameterType="com.xhpc.board.pojo.XhpcMessageBoard" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcMessageBoard" useGeneratedKeys="true">
|
||||
insert into xhpc_message_board (sender_type, sender_account, send_message_time,
|
||||
message_content, tenant_type, tenant_id,
|
||||
have_new_info, del_flag, sender)
|
||||
@ -68,7 +68,7 @@
|
||||
#{haveNewInfo,jdbcType=BOOLEAN}, #{delFlag,jdbcType=BOOLEAN}, #{sender,jdbcType=BOOLEAN})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="message_id" keyProperty="messageId"
|
||||
parameterType="com.xhpc.board.pojo.XhpcMessageBoard" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcMessageBoard" useGeneratedKeys="true">
|
||||
insert into xhpc_message_board
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="senderType != null">
|
||||
@ -233,7 +233,7 @@
|
||||
(sender_type, sender_account, send_message_time, tenant_type, tenant_id, have_new_info, sender)
|
||||
values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 0, 1)
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.board.pojo.XhpcMessageBoard">
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.card.pojo.XhpcMessageBoard">
|
||||
update xhpc_message_board
|
||||
<set>
|
||||
<if test="senderType != null">
|
||||
@ -266,7 +266,7 @@
|
||||
</set>
|
||||
where message_id = #{messageId,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.board.pojo.XhpcMessageBoard">
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.card.pojo.XhpcMessageBoard">
|
||||
update xhpc_message_board
|
||||
set sender_type = #{senderType,jdbcType=TINYINT},
|
||||
sender_account = #{senderAccount,jdbcType=VARCHAR},
|
||||
@ -1,8 +1,8 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.board.pojo.XhpcMessageBoardReceiveUser">
|
||||
<mapper namespace="com.xhpc.card.mapper.XhpcMessageBoardReceiveUserMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.card.pojo.XhpcMessageBoardReceiveUser">
|
||||
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
|
||||
<result column="tenant_type" jdbcType="INTEGER" property="tenantType"/>
|
||||
<result column="sender_account" jdbcType="VARCHAR" property="senderAccount"/>
|
||||
@ -21,7 +21,7 @@
|
||||
have_new_info,
|
||||
del_flag
|
||||
</sql>
|
||||
<insert id="insert" parameterType="com.xhpc.board.pojo.XhpcMessageBoardReceiveUser">
|
||||
<insert id="insert" parameterType="com.xhpc.card.pojo.XhpcMessageBoardReceiveUser">
|
||||
insert into xhpc_message_board_receive_user (tenant_id, tenant_type, sender_account,
|
||||
sender_type, user_icon, have_new_info,
|
||||
del_flag)
|
||||
@ -29,7 +29,7 @@
|
||||
#{senderType,jdbcType=INTEGER}, #{userIcon,jdbcType=VARCHAR}, #{haveNewInfo,jdbcType=BOOLEAN},
|
||||
#{delFlag,jdbcType=BOOLEAN})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.xhpc.board.pojo.XhpcMessageBoardReceiveUser">
|
||||
<insert id="insertSelective" parameterType="com.xhpc.card.pojo.XhpcMessageBoardReceiveUser">
|
||||
insert into xhpc_message_board_receive_user
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="tenantId != null">
|
||||
@ -1,8 +1,8 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.databigscreen.mapper.XhpcRateTimeMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.databigscreen.pojo.XhpcRateTime">
|
||||
<mapper namespace="com.xhpc.card.mapper.XhpcRateTimeMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.card.pojo.XhpcRateTime">
|
||||
<id column="rate_time_id" jdbcType="BIGINT" property="rateTimeId"/>
|
||||
<result column="charging_station_id" jdbcType="BIGINT" property="chargingStationId"/>
|
||||
<result column="rate_id" jdbcType="BIGINT" property="rateId"/>
|
||||
@ -98,7 +98,7 @@
|
||||
where rate_time_id = #{rateTimeId,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" keyColumn="rate_time_id" keyProperty="rateTimeId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcRateTime" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcRateTime" useGeneratedKeys="true">
|
||||
insert into xhpc_rate_time (charging_station_id, rate_id, start_time,
|
||||
end_time, `status`, del_flag,
|
||||
create_time, create_by, update_time,
|
||||
@ -113,7 +113,7 @@
|
||||
#{tenantId,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="rate_time_id" keyProperty="rateTimeId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcRateTime" useGeneratedKeys="true">
|
||||
parameterType="com.xhpc.card.pojo.XhpcRateTime" useGeneratedKeys="true">
|
||||
insert into xhpc_rate_time
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="chargingStationId != null">
|
||||
@ -216,7 +216,7 @@
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.databigscreen.pojo.XhpcRateTime">
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.card.pojo.XhpcRateTime">
|
||||
update xhpc_rate_time
|
||||
<set>
|
||||
<if test="chargingStationId != null">
|
||||
@ -270,7 +270,7 @@
|
||||
</set>
|
||||
where rate_time_id = #{rateTimeId,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.databigscreen.pojo.XhpcRateTime">
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.card.pojo.XhpcRateTime">
|
||||
update xhpc_rate_time
|
||||
set charging_station_id = #{chargingStationId,jdbcType=BIGINT},
|
||||
rate_id = #{rateId,jdbcType=BIGINT},
|
||||
@ -1,143 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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">
|
||||
<parent>
|
||||
<artifactId>xhpc-modules</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>xhpc-data-big-screen</artifactId>
|
||||
|
||||
<description>
|
||||
数据大屏服务
|
||||
</description>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!--单元测试依赖-->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos Config -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Sentinel -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringBoot Actuator -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Swagger UI -->
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>${swagger.fox.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Mysql Connector -->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataSource -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-datasource</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataScope -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-datascope</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Log -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Swagger -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-swagger</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
<artifactId>okhttp</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>xhpc-common</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>3.10.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<includes>
|
||||
<include>**/*.xml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -1,37 +0,0 @@
|
||||
package com.xhpc;
|
||||
|
||||
import com.xhpc.common.security.annotation.EnableCustomConfig;
|
||||
import com.xhpc.common.swagger.annotation.EnableCustomSwagger2;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
/**
|
||||
* @author WH
|
||||
* @date 2021/12/7 14:55
|
||||
* @since version-1.0
|
||||
*/
|
||||
@EnableCustomConfig
|
||||
@EnableCustomSwagger2
|
||||
@EnableFeignClients
|
||||
@SpringBootApplication
|
||||
@MapperScan("com.xhpc.databigscreen.mapper")
|
||||
public class XhpcDataBigScreenApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
SpringApplication.run(XhpcDataBigScreenApplication.class, args);
|
||||
System.out.println("(♥◠‿◠)ノ゙ 数据大屏模块启动成功 ლ(´ڡ`ლ)゙ \n" +
|
||||
" .-------. ____ __ \n" +
|
||||
" | _ _ \\ \\ \\ / / \n" +
|
||||
" | ( ' ) | \\ _. / ' \n" +
|
||||
" |(_ o _) / _( )_ .' \n" +
|
||||
" | (_,_).' __ ___(_ o _)' \n" +
|
||||
" | |\\ \\ | || |(_,_)' \n" +
|
||||
" | | \\ `' /| `-' / \n" +
|
||||
" | | \\ / \\ / \n" +
|
||||
" ''-' `'-' `-..-' ");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
package com.xhpc.databigscreen.mapper;
|
||||
|
||||
import com.xhpc.databigscreen.pojo.XhpcAppUser;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface XhpcAppUserMapper {
|
||||
|
||||
int deleteByPrimaryKey(Long appUserId);
|
||||
|
||||
int insert(XhpcAppUser record);
|
||||
|
||||
int insertSelective(XhpcAppUser record);
|
||||
|
||||
XhpcAppUser selectByPrimaryKey(Long appUserId);
|
||||
|
||||
int updateByPrimaryKeySelective(XhpcAppUser record);
|
||||
|
||||
int updateByPrimaryKey(XhpcAppUser record);
|
||||
|
||||
/**
|
||||
* query user total count by according one or multiple tenant id
|
||||
*
|
||||
* @param tenantIdList 租户集合
|
||||
* @return 租户数量
|
||||
* @author WH
|
||||
* @date 2022/3/4 10:37
|
||||
* @since version-1.0
|
||||
*/
|
||||
Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List<String> tenantIdList, @Param("currentTime") String currentTime);
|
||||
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
package com.xhpc.databigscreen.pojo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* xhpc_app_user
|
||||
*
|
||||
* @author
|
||||
*/
|
||||
@Data
|
||||
public class XhpcAppUser implements Serializable {
|
||||
|
||||
/**
|
||||
* 用户ID
|
||||
*/
|
||||
private Long appUserId;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
private String weixinOpenId;
|
||||
|
||||
private String alipayOpenId;
|
||||
|
||||
/**
|
||||
* 微信是否登录(0未登录 1已登录)
|
||||
*/
|
||||
private Integer weixinLogin;
|
||||
|
||||
/**
|
||||
* 支付宝是否登录(0未登录 1已登录)
|
||||
*/
|
||||
private Integer alipayLogin;
|
||||
|
||||
/**
|
||||
* 头像地址
|
||||
*/
|
||||
private String avatar;
|
||||
|
||||
/**
|
||||
* 余额
|
||||
*/
|
||||
private BigDecimal balance;
|
||||
|
||||
/**
|
||||
* 密码(加密)
|
||||
*/
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 帐号状态
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 是否有退款订单审核(0无 1有)
|
||||
*/
|
||||
private Integer isRefundApplication;
|
||||
|
||||
/**
|
||||
* 删除标志(0代表存在 2代表删除)
|
||||
*/
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 用户设置的SOC
|
||||
*/
|
||||
private Integer soc;
|
||||
|
||||
/**
|
||||
* 是否退款 0 不退款 1 退款
|
||||
*/
|
||||
private Integer isRefund;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
private String tenantId;
|
||||
|
||||
/**
|
||||
* 是否开启电池保护 0 未开启 1开启
|
||||
*/
|
||||
private Integer socProtect;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
Spring Boot Version: ${spring-boot.version}
|
||||
Spring Application Name: ${spring.application.name}
|
||||
_ __ _ _
|
||||
(_) / _|(_)| |
|
||||
_ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
|
||||
| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
|
||||
| | | |_| || (_) || |_| || | | | | || || __/
|
||||
|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
|
||||
__/ |
|
||||
|___/
|
||||
@ -1,28 +0,0 @@
|
||||
# Tomcat
|
||||
server:
|
||||
port: 9806
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: xhpc-data-big-screen
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 172.31.183.135:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 172.31.183.135:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
logging:
|
||||
level:
|
||||
com.xhpc.databigscreen.mapper: debug
|
||||
@ -1,75 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="logs/xhpc-data-big-screen"/>
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern"
|
||||
value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- 系统日志输出 -->
|
||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/info.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>INFO</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/error.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>ERROR</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- 系统模块日志级别控制 -->
|
||||
<logger name="com.xhpc" level="info"/>
|
||||
<!-- Spring日志级别控制 -->
|
||||
<logger name="org.springframework" level="warn"/>
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="console"/>
|
||||
</root>
|
||||
|
||||
<!--系统操作日志-->
|
||||
<root level="info">
|
||||
<appender-ref ref="file_info"/>
|
||||
<appender-ref ref="file_error"/>
|
||||
</root>
|
||||
</configuration>
|
||||
@ -1,302 +0,0 @@
|
||||
<?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">
|
||||
<!--suppress ALL -->
|
||||
<mapper namespace="com.xhpc.databigscreen.mapper.XhpcAppUserMapper">
|
||||
<resultMap id="BaseResultMap" type="com.xhpc.databigscreen.pojo.XhpcAppUser">
|
||||
<id column="app_user_id" jdbcType="BIGINT" property="appUserId"/>
|
||||
<result column="phone" jdbcType="VARCHAR" property="phone"/>
|
||||
<result column="weixin_open_id" jdbcType="VARCHAR" property="weixinOpenId"/>
|
||||
<result column="alipay_open_id" jdbcType="VARCHAR" property="alipayOpenId"/>
|
||||
<result column="weixin_login" jdbcType="INTEGER" property="weixinLogin"/>
|
||||
<result column="alipay_login" jdbcType="INTEGER" property="alipayLogin"/>
|
||||
<result column="avatar" jdbcType="VARCHAR" property="avatar"/>
|
||||
<result column="balance" jdbcType="DECIMAL" property="balance"/>
|
||||
<result column="password" jdbcType="VARCHAR" property="password"/>
|
||||
<result column="status" jdbcType="INTEGER" property="status"/>
|
||||
<result column="is_refund_application" jdbcType="INTEGER" property="isRefundApplication"/>
|
||||
<result column="del_flag" jdbcType="CHAR" property="delFlag"/>
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark"/>
|
||||
<result column="soc" jdbcType="INTEGER" property="soc"/>
|
||||
<result column="is_refund" jdbcType="INTEGER" property="isRefund"/>
|
||||
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
|
||||
<result column="soc_protect" jdbcType="INTEGER" property="socProtect"/>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
app_user_id
|
||||
, phone, weixin_open_id, alipay_open_id, weixin_login, alipay_login, avatar,
|
||||
balance, `password`, `status`, is_refund_application, del_flag, create_by, create_time,
|
||||
update_by, update_time, remark, soc, is_refund, tenant_id, soc_protect
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List"/>
|
||||
from xhpc_app_user
|
||||
where app_user_id = #{appUserId,jdbcType=BIGINT}
|
||||
</select>
|
||||
<select id="selectTotalCountByTenantIdAndCurrentTime" resultType="java.lang.Long">
|
||||
SELECT
|
||||
count(phone)
|
||||
FROM
|
||||
(
|
||||
SELECT DISTINCT
|
||||
(phone)
|
||||
FROM
|
||||
xhpc_app_user
|
||||
<where>
|
||||
<if test="tenantIdList!=null and tenantIdList.size()!=0 ">
|
||||
and tenant_id IN
|
||||
<foreach collection="tenantIdList" separator="," open="(" close=")" item="tenantId">
|
||||
#{tenantId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="currentTime!=null and currentTime!='' ">
|
||||
and create_time <![CDATA[>=]]> DATE_ADD(#{currentTime},INTERVAL -3 MONTH)
|
||||
</if>
|
||||
</where>
|
||||
) AS a
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete
|
||||
from xhpc_app_user
|
||||
where app_user_id = #{appUserId,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" keyColumn="app_user_id" keyProperty="appUserId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcAppUser" useGeneratedKeys="true">
|
||||
insert into xhpc_app_user (phone, weixin_open_id, alipay_open_id,
|
||||
weixin_login, alipay_login, avatar,
|
||||
balance, `password`, `status`,
|
||||
is_refund_application, del_flag, create_by,
|
||||
create_time, update_by, update_time,
|
||||
remark, soc, is_refund,
|
||||
tenant_id, soc_protect)
|
||||
values (#{phone,jdbcType=VARCHAR}, #{weixinOpenId,jdbcType=VARCHAR}, #{alipayOpenId,jdbcType=VARCHAR},
|
||||
#{weixinLogin,jdbcType=INTEGER}, #{alipayLogin,jdbcType=INTEGER}, #{avatar,jdbcType=VARCHAR},
|
||||
#{balance,jdbcType=DECIMAL}, #{password,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
|
||||
#{isRefundApplication,jdbcType=INTEGER}, #{delFlag,jdbcType=CHAR}, #{createBy,jdbcType=VARCHAR},
|
||||
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
|
||||
#{remark,jdbcType=VARCHAR}, #{soc,jdbcType=INTEGER}, #{isRefund,jdbcType=INTEGER},
|
||||
#{tenantId,jdbcType=VARCHAR}, #{socProtect,jdbcType=INTEGER})
|
||||
</insert>
|
||||
<insert id="insertSelective" keyColumn="app_user_id" keyProperty="appUserId"
|
||||
parameterType="com.xhpc.databigscreen.pojo.XhpcAppUser" useGeneratedKeys="true">
|
||||
insert into xhpc_app_user
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="phone != null">
|
||||
phone,
|
||||
</if>
|
||||
<if test="weixinOpenId != null">
|
||||
weixin_open_id,
|
||||
</if>
|
||||
<if test="alipayOpenId != null">
|
||||
alipay_open_id,
|
||||
</if>
|
||||
<if test="weixinLogin != null">
|
||||
weixin_login,
|
||||
</if>
|
||||
<if test="alipayLogin != null">
|
||||
alipay_login,
|
||||
</if>
|
||||
<if test="avatar != null">
|
||||
avatar,
|
||||
</if>
|
||||
<if test="balance != null">
|
||||
balance,
|
||||
</if>
|
||||
<if test="password != null">
|
||||
`password`,
|
||||
</if>
|
||||
<if test="status != null">
|
||||
`status`,
|
||||
</if>
|
||||
<if test="isRefundApplication != null">
|
||||
is_refund_application,
|
||||
</if>
|
||||
<if test="delFlag != null">
|
||||
del_flag,
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
create_by,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
update_by,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark,
|
||||
</if>
|
||||
<if test="soc != null">
|
||||
soc,
|
||||
</if>
|
||||
<if test="isRefund != null">
|
||||
is_refund,
|
||||
</if>
|
||||
<if test="tenantId != null">
|
||||
tenant_id,
|
||||
</if>
|
||||
<if test="socProtect != null">
|
||||
soc_protect,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="phone != null">
|
||||
#{phone,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="weixinOpenId != null">
|
||||
#{weixinOpenId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="alipayOpenId != null">
|
||||
#{alipayOpenId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="weixinLogin != null">
|
||||
#{weixinLogin,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="alipayLogin != null">
|
||||
#{alipayLogin,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="avatar != null">
|
||||
#{avatar,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="balance != null">
|
||||
#{balance,jdbcType=DECIMAL},
|
||||
</if>
|
||||
<if test="password != null">
|
||||
#{password,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
#{status,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="isRefundApplication != null">
|
||||
#{isRefundApplication,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="delFlag != null">
|
||||
#{delFlag,jdbcType=CHAR},
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
#{createBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
#{updateBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
#{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="soc != null">
|
||||
#{soc,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="isRefund != null">
|
||||
#{isRefund,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="tenantId != null">
|
||||
#{tenantId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="socProtect != null">
|
||||
#{socProtect,jdbcType=INTEGER},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.xhpc.databigscreen.pojo.XhpcAppUser">
|
||||
update xhpc_app_user
|
||||
<set>
|
||||
<if test="phone != null">
|
||||
phone = #{phone,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="weixinOpenId != null">
|
||||
weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="alipayOpenId != null">
|
||||
alipay_open_id = #{alipayOpenId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="weixinLogin != null">
|
||||
weixin_login = #{weixinLogin,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="alipayLogin != null">
|
||||
alipay_login = #{alipayLogin,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="avatar != null">
|
||||
avatar = #{avatar,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="balance != null">
|
||||
balance = #{balance,jdbcType=DECIMAL},
|
||||
</if>
|
||||
<if test="password != null">
|
||||
`password` = #{password,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
`status` = #{status,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="isRefundApplication != null">
|
||||
is_refund_application = #{isRefundApplication,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="delFlag != null">
|
||||
del_flag = #{delFlag,jdbcType=CHAR},
|
||||
</if>
|
||||
<if test="createBy != null">
|
||||
create_by = #{createBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateBy != null">
|
||||
update_by = #{updateBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="remark != null">
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="soc != null">
|
||||
soc = #{soc,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="isRefund != null">
|
||||
is_refund = #{isRefund,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="tenantId != null">
|
||||
tenant_id = #{tenantId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="socProtect != null">
|
||||
soc_protect = #{socProtect,jdbcType=INTEGER},
|
||||
</if>
|
||||
</set>
|
||||
where app_user_id = #{appUserId,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.xhpc.databigscreen.pojo.XhpcAppUser">
|
||||
update xhpc_app_user
|
||||
set phone = #{phone,jdbcType=VARCHAR},
|
||||
weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR},
|
||||
alipay_open_id = #{alipayOpenId,jdbcType=VARCHAR},
|
||||
weixin_login = #{weixinLogin,jdbcType=INTEGER},
|
||||
alipay_login = #{alipayLogin,jdbcType=INTEGER},
|
||||
avatar = #{avatar,jdbcType=VARCHAR},
|
||||
balance = #{balance,jdbcType=DECIMAL},
|
||||
`password` = #{password,jdbcType=VARCHAR},
|
||||
`status` = #{status,jdbcType=INTEGER},
|
||||
is_refund_application = #{isRefundApplication,jdbcType=INTEGER},
|
||||
del_flag = #{delFlag,jdbcType=CHAR},
|
||||
create_by = #{createBy,jdbcType=VARCHAR},
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
update_by = #{updateBy,jdbcType=VARCHAR},
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
soc = #{soc,jdbcType=INTEGER},
|
||||
is_refund = #{isRefund,jdbcType=INTEGER},
|
||||
tenant_id = #{tenantId,jdbcType=VARCHAR},
|
||||
soc_protect = #{socProtect,jdbcType=INTEGER}
|
||||
where app_user_id = #{appUserId,jdbcType=BIGINT}
|
||||
</update>
|
||||
</mapper>
|
||||
@ -1,143 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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">
|
||||
<parent>
|
||||
<artifactId>xhpc-modules</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<version>3.0.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>xhpc-message-board</artifactId>
|
||||
|
||||
<description>
|
||||
留言板服务
|
||||
</description>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!--单元测试依赖-->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Nacos Config -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Alibaba Sentinel -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringBoot Actuator -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Swagger UI -->
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>${swagger.fox.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Mysql Connector -->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataSource -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-datasource</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataScope -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-datascope</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Log -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Swagger -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-swagger</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>ruoyi-common-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
<artifactId>okhttp</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<artifactId>xhpc-common</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>3.10.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>${project.artifactId}</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<includes>
|
||||
<include>**/*.xml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -1,37 +0,0 @@
|
||||
package com.xhpc;
|
||||
|
||||
import com.xhpc.common.security.annotation.EnableCustomConfig;
|
||||
import com.xhpc.common.swagger.annotation.EnableCustomSwagger2;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
/**
|
||||
* @author WH
|
||||
* @date 2021/12/7 14:55
|
||||
* @since version-1.0
|
||||
*/
|
||||
@EnableCustomConfig
|
||||
@EnableCustomSwagger2
|
||||
@EnableFeignClients
|
||||
@SpringBootApplication
|
||||
@MapperScan("com.xhpc.board.mapper")
|
||||
public class XhpcMessageBoardApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
SpringApplication.run(XhpcMessageBoardApplication.class, args);
|
||||
System.out.println("(♥◠‿◠)ノ゙ 留言板模块启动成功 ლ(´ڡ`ლ)゙ \n" +
|
||||
" .-------. ____ __ \n" +
|
||||
" | _ _ \\ \\ \\ / / \n" +
|
||||
" | ( ' ) | \\ _. / ' \n" +
|
||||
" |(_ o _) / _( )_ .' \n" +
|
||||
" | (_,_).' __ ___(_ o _)' \n" +
|
||||
" | |\\ \\ | || |(_,_)' \n" +
|
||||
" | | \\ `' /| `-' / \n" +
|
||||
" | | \\ / \\ / \n" +
|
||||
" ''-' `'-' `-..-' ");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
Spring Boot Version: ${spring-boot.version}
|
||||
Spring Application Name: ${spring.application.name}
|
||||
_ __ _ _
|
||||
(_) / _|(_)| |
|
||||
_ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
|
||||
| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
|
||||
| | | |_| || (_) || |_| || | | | | || || __/
|
||||
|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
|
||||
__/ |
|
||||
|___/
|
||||
@ -1,28 +0,0 @@
|
||||
# Tomcat
|
||||
server:
|
||||
port: 9805
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: xhpc-message-board
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 172.31.183.135:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 172.31.183.135:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
#logging:
|
||||
# level:
|
||||
# com.xhpc.board.mapper: debug
|
||||
@ -1,75 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="logs/xhpc-message-board"/>
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern"
|
||||
value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- 系统日志输出 -->
|
||||
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/info.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>INFO</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${log.path}/error.log</file>
|
||||
<!-- 循环政策:基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>ERROR</level>
|
||||
<!-- 匹配时的操作:接收(记录) -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作:拒绝(不记录) -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- 系统模块日志级别控制 -->
|
||||
<logger name="com.xhpc" level="info"/>
|
||||
<!-- Spring日志级别控制 -->
|
||||
<logger name="org.springframework" level="warn"/>
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="console"/>
|
||||
</root>
|
||||
|
||||
<!--系统操作日志-->
|
||||
<root level="info">
|
||||
<appender-ref ref="file_info"/>
|
||||
<appender-ref ref="file_error"/>
|
||||
</root>
|
||||
</configuration>
|
||||
Loading…
x
Reference in New Issue
Block a user