Skip to content

M
midjourney-proxy
Commit 3b48cfc7 by gaopeng
Options

modify 更新主干代码

parent edadc760
Showing with 431 additions and 270 deletions
pcloud-common-config/src/main/resources.prod/public_system.properties
......@@ -84,4 +84,6 @@ liveRunEnvironment = prod_
uedThirdPartyOrderUrl=https://rayscloud.chubanyun.net
## \u7CFB\u7EDF\u73AF\u5883
system.env = pro
\ No newline at end of file
system.env = pro
jsbj.agent.id = 1000009100
\ No newline at end of file
pcloud-common-config/src/main/resources.uat/public_system.properties
......@@ -86,4 +86,6 @@ liveRunEnvironment = uat_
uedThirdPartyOrderUrl=http://deveapi.chubanyun.net
## \u7CFB\u7EDF\u73AF\u5883
system.env = uat
\ No newline at end of file
system.env = uat
jsbj.agent.id = 12829
\ No newline at end of file
pcloud-common-core/src/main/java/com/pcloud/common/core/aspect/ParamLogAspect.java
......@@ -51,6 +51,7 @@ public class ParamLogAspect {
Signature signature = joinPoint.getSignature();
String methodName = signature.getName();
String description = paramLog.description();
description = StringUtil.isEmpty(description) ? paramLog.value() : description;
StringBuffer msg = new StringBuffer("【" + methodName + " before】");
if (StringUtil.isEmpty(description)) {
msg.append(joinPoint.getSignature().toString());
......@@ -79,6 +80,7 @@ public class ParamLogAspect {
Signature signature = joinPoint.getSignature();
String methodName = signature.getName();
String description = paramLog.description();
description = StringUtil.isEmpty(description) ? paramLog.value() : description;
StringBuffer msg = new StringBuffer("【" + methodName + " afterReturn】");
if (StringUtil.isEmpty(description)) {
msg.append(joinPoint.getSignature().toString());
......
pcloud-common-core/src/main/java/com/pcloud/common/core/constant/AppTypeEnum.java
......@@ -70,6 +70,11 @@ public enum AppTypeEnum {
TB("tb"),
/**
* 直播
*/
LIVE("live"),
/**
* 打卡
*/
CLOCK("clock");
......
pcloud-common-core/src/main/java/com/pcloud/common/core/dto/FrontEventDto.java
package com.pcloud.common.core.dto;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* 事件埋点
*
* @author 石纯山
* @date 2018/4/16
*/
public class FrontEventDto implements Serializable {
/**
*
*/
private static final long serialVersionUID = 3065716090982449711L;
/**
* 事件id
*/
private String eventId;
/**
* 漏斗id，当为漏斗事件时
*/
private String funnelId;
/**
* 编辑id
*/
private Long adviserId;
/**
* 渠道id
*/
private Long channelId;
/**
* 来源类型0 后端，1 h5，2 小程序，3 app
*/
private short sourceType;
/**
* 触发时间
*/
private Long timestamp;
/**
* 1:RAYS
*/
private String platCode;
/**
* 0:不是读者，1：读者
*/
private short isReader;
/**
* 当事人id
*/
private Long partyId;
/**
* 用户角色编码
*/
private String systemCode;
/**
* 读者所在的公众号
*/
private Long officeAccountId;
/**
* 平台读者id
*/
private Long wechatUserId;
/**
* 场景id
*/
private Long sceneId;
/**
* 出版id
*/
private Long agentId;
private String Exp1;
private String Exp2;
private String Exp3;
public String getEventId() {
return eventId;
}
public void setEventId(String eventId) {
this.eventId = eventId;
}
public String getFunnelId() {
return funnelId;
}
public void setFunnelId(String funnelId) {
this.funnelId = funnelId;
}
public Long getAdviserId() {
return adviserId;
}
public void setAdviserId(Long adviserId) {
this.adviserId = adviserId;
}
public Long getChannelId() {
return channelId;
}
public void setChannelId(Long channelId) {
this.channelId = channelId;
}
public short getSourceType() {
return sourceType;
}
public void setSourceType(short sourceType) {
this.sourceType = sourceType;
}
public Long getTimestamp() {
return timestamp;
}
public void setTimestamp(Long timestamp) {
this.timestamp = timestamp;
}
public String getPlatCode() {
return platCode;
}
public void setPlatCode(String platCode) {
this.platCode = platCode;
}
public short getIsReader() {
return isReader;
}
public void setIsReader(short isReader) {
this.isReader = isReader;
}
public Long getOfficeAccountId() {
return officeAccountId;
}
public void setOfficeAccountId(Long officeAccountId) {
this.officeAccountId = officeAccountId;
}
public Long getWechatUserId() {
return wechatUserId;
}
public void setWechatUserId(Long wechatUserId) {
this.wechatUserId = wechatUserId;
}
public Long getSceneId() {
return sceneId;
}
public void setSceneId(Long sceneId) {
this.sceneId = sceneId;
}
public Long getAgentId() {
return agentId;
}
public void setAgentId(Long agentId) {
this.agentId = agentId;
}
public String getExp1() {
return Exp1;
}
public void setExp1(String exp1) {
Exp1 = exp1;
}
public String getExp2() {
return Exp2;
}
public void setExp2(String exp2) {
Exp2 = exp2;
}
public String getExp3() {
return Exp3;
}
public void setExp3(String exp3) {
Exp3 = exp3;
}
public Long getPartyId() {
return partyId;
}
public void setPartyId(Long partyId) {
this.partyId = partyId;
}
public String getSystemCode() {
return systemCode;
}
public void setSystemCode(String systemCode) {
this.systemCode = systemCode;
}
@Override
public String toString() {
return "PaymentEventDto{" + "eventId='" + eventId + '\'' + ", funnelId='" + funnelId + '\'' + ", adviserId="
+ adviserId + ", channelId=" + channelId + ", sourceType=" + sourceType + ", timestamp=" + timestamp
+ ", platCode='" + platCode + '\'' + ", isReader=" + isReader + ", partyId=" + partyId
+ ", systemCode='" + systemCode + '\'' + ", officeAccountId=" + officeAccountId + ", wechatUserId="
+ wechatUserId + ", sceneId=" + sceneId + ", agentId=" + agentId + ", Exp1='" + Exp1 + '\'' + ", Exp2='"
+ Exp2 + '\'' + ", Exp3='" + Exp3 + '\'' + '}';
}
private static final long serialVersionUID = 7668311875701119389L;
/**
* 事件id
*/
private String eventId;
/**
* 漏斗id，当为漏斗事件时
*/
private String funnelId;
/**
* 事件id集合
*/
private Map<String,String> eventMap;
/**
* 编辑id
*/
private Long adviserId;
/**
* 渠道id
*/
private Long channelId;
/**
* 来源类型0 后端，1 h5，2 小程序，3 app
*/
private short sourceType;
/**
* 触发时间
*/
private Long timestamp;
/**
* 1:RAYS
*/
private String platCode;
/**
* 0:不是读者，1：读者
*/
private short isReader;
/**
* 当事人id
*/
private Long partyId;
/**
* 用户角色编码
*/
private String systemCode;
/**
* 读者所在的公众号
*/
private Long officeAccountId;
/**
* 平台读者id
*/
private Long wechatUserId;
/**
* 场景id
*/
private Long sceneId;
/**
* 出版id
*/
private Long agentId;
private String Exp1;
private String Exp2;
private String Exp3;
public String getEventId() {
return eventId;
}
public void setEventId(String eventId) {
this.eventId = eventId;
}
public String getFunnelId() {
return funnelId;
}
public void setFunnelId(String funnelId) {
this.funnelId = funnelId;
}
public Long getAdviserId() {
return adviserId;
}
public void setAdviserId(Long adviserId) {
this.adviserId = adviserId;
}
public Long getChannelId() {
return channelId;
}
public void setChannelId(Long channelId) {
this.channelId = channelId;
}
public short getSourceType() {
return sourceType;
}
public void setSourceType(short sourceType) {
this.sourceType = sourceType;
}
public Long getTimestamp() {
return timestamp;
}
public void setTimestamp(Long timestamp) {
this.timestamp = timestamp;
}
public String getPlatCode() {
return platCode;
}
public void setPlatCode(String platCode) {
this.platCode = platCode;
}
public short getIsReader() {
return isReader;
}
public void setIsReader(short isReader) {
this.isReader = isReader;
}
public Long getOfficeAccountId() {
return officeAccountId;
}
public void setOfficeAccountId(Long officeAccountId) {
this.officeAccountId = officeAccountId;
}
public Long getWechatUserId() {
return wechatUserId;
}
public void setWechatUserId(Long wechatUserId) {
this.wechatUserId = wechatUserId;
}
public Long getSceneId() {
return sceneId;
}
public void setSceneId(Long sceneId) {
this.sceneId = sceneId;
}
public Long getAgentId() {
return agentId;
}
public void setAgentId(Long agentId) {
this.agentId = agentId;
}
public String getExp1() {
return Exp1;
}
public void setExp1(String exp1) {
Exp1 = exp1;
}
public String getExp2() {
return Exp2;
}
public void setExp2(String exp2) {
Exp2 = exp2;
}
public String getExp3() {
return Exp3;
}
public void setExp3(String exp3) {
Exp3 = exp3;
}
public Long getPartyId() {
return partyId;
}
public void setPartyId(Long partyId) {
this.partyId = partyId;
}
public String getSystemCode() {
return systemCode;
}
public void setSystemCode(String systemCode) {
this.systemCode = systemCode;
}
public Map<String, String> getEventMap() {
return eventMap;
}
public void setEventMap(Map<String, String> eventMap) {
this.eventMap = eventMap;
}
public void setEventMap(String eventId, String funnelId) {
if(eventMap == null){
eventMap = new HashMap<>();
}
eventMap.put(eventId,funnelId);
}
@Override
public String toString() {
return "FrontEventDto{" +
"eventId='" + eventId + '\'' +
", funnelId='" + funnelId + '\'' +
", eventMap=" + eventMap +
", adviserId=" + adviserId +
", channelId=" + channelId +
", sourceType=" + sourceType +
", timestamp=" + timestamp +
", platCode='" + platCode + '\'' +
", isReader=" + isReader +
", partyId=" + partyId +
", systemCode='" + systemCode + '\'' +
", officeAccountId=" + officeAccountId +
", wechatUserId=" + wechatUserId +
", sceneId=" + sceneId +
", agentId=" + agentId +
", Exp1='" + Exp1 + '\'' +
", Exp2='" + Exp2 + '\'' +
", Exp3='" + Exp3 + '\'' +
'}';
}
}
pcloud-common/src/main/java/com/pcloud/common/enums/AppTypeEnum.java
/**
*
*/
package com.pcloud.common.enums;
import com.google.common.collect.Maps;
import java.util.Arrays;
import java.util.Map;
/**
* @描述：应用类型常量枚举
* @作者：songx
......@@ -10,55 +12,66 @@ package com.pcloud.common.enums;
*/
public enum AppTypeEnum {
MASTER("MASTER"), // 主应用
RECOMMEND("RECOMMEND"), // 推荐应用
CHARGE("CHARGE"), // 付费应用
MASTER("MASTER"), // 主应用
RECOMMEND("RECOMMEND"), // 推荐应用
CHARGE("CHARGE"), // 付费应用
ARTICLE("ARTICLE"), // 文章
KK("KK"), // 看一看
LIVE("LIVE"), // 直播
VOTE("VOTE"), // 投票
ENROLL("ENROLL"), // 编创赛报名
BM("BM"), // 报名
NAIRE("NAIRE"), // 问卷调查
DA("DA"), // 数据采集
BOOKCARD("BOOKCARD"), // 读书卡片
TUTOR("TUTOR"), // 一对一辅导
GROUP("GROUP"), // 与你同行（圈子）（add by gaop at 2017-6-13 16:52:07）
ITEM_BANK("ITEM_BANK"), // 题库
VOICE_MSG("VOICE_MSG"), // 语音留言
AUDIO("AUDIO"), // 音频
VIDEO("VIDEO"), // 视频
IMAGE("IMAGE"), // 图片
PDF("PDF"), // PDF
BOOK("BOOK"), // 图书
EF("EF"), // 教育表格
QA("QA"), // 问答
LISTEN("LISTEN"), // 听力
ANSWER("ANSWER"), // 答案
ACTIVITY("ACTIVITY"), // 分享互动
ZSCORE("ZSCORE"), // 标准分
RECITE_WORD("RECITE_WORD"), // 背单词
INTERACT("INTERACT"), // 互动墙
SPECIAL("SPECIAL"), // 专题
CLOCK("CLOCK"), // 打卡
TEST("TEST"), // 测试
LIVE_TIMETABLE("LIVE_TIMETABLE"), // 直播课表
DRAW("DRAW"), // 抽奖
WISH("WISH"); // 愿望单
/**
* 枚举转换
*/
public static final Map<String, AppTypeEnum> APP_TYPE_MAP = Maps.newHashMap();
ARTICLE("ARTICLE"), // 文章
KK("KK"), // 看一看
LIVE("LIVE"), // 直播
VOTE("VOTE"), // 投票
ENROLL("ENROLL"), // 编创赛报名
BM("BM"), // 报名
NAIRE("NAIRE"), // 问卷调查
DA("DA"), // 数据采集
BOOKCARD("BOOKCARD"), // 读书卡片
TUTOR("TUTOR"), // 一对一辅导
GROUP("GROUP"), // 与你同行（圈子）（add by gaop at 2017-6-13 16:52:07）
ITEM_BANK("ITEM_BANK"), // 题库
VOICE_MSG("VOICE_MSG"), // 语音留言
AUDIO("AUDIO"), // 音频
VIDEO("VIDEO"), // 视频
IMAGE("IMAGE"), // 图片
PDF("PDF"), // PDF
BOOK("BOOK"), // 图书
EF("EF"), // 教育表格
QA("QA"), // 问答
LISTEN("LISTEN"), // 听力
ANSWER("ANSWER"), // 答案
ACTIVITY("ACTIVITY"), // 分享互动
ZSCORE("ZSCORE"), // 标准分
RECITE_WORD("RECITE_WORD"), // 背单词
INTERACT("INTERACT"), // 互动墙
SPECIAL("SPECIAL"), // 专题
CLOCK("CLOCK"), // 打卡
TEST("TEST"), // 测试
LIVE_TIMETABLE("LIVE_TIMETABLE"), // 直播课表
DRAW("DRAW"), // 抽奖
WISH("WISH"); // 愿望单
static {
Arrays.asList(AppTypeEnum.values()).forEach(m -> {
APP_TYPE_MAP.put(m.value, m);
});
}
/**
* 值
*/
public final String value;
/**
* 值
*/
public final String value;
/**
* 构造
*
* @param value
*/
private AppTypeEnum(String value) {
this.value = value;
}
/**
* 构造
*
* @param value
*/
private AppTypeEnum(String value) {
this.value = value;
}
}
pcloud-common/src/main/java/com/pcloud/common/utils/BeanNewUtils.java 0 → 100644
package com.pcloud.common.utils;
import org.springframework.beans.BeanUtils;
/**
*
*
* @author：songx
* @date：2018年8月24日,下午2:18:40
*/
public class BeanNewUtils {
/**
* 实体类之间的转换
*
* @param source
* 来源
* @param clazz
* 目标对象
* @return
*/
public static <T> T copyProperties(Object source, T t) {
if (source == null || t == null) {
return t;
}
BeanUtils.copyProperties(source, t);
return t;
}
}
pcloud-common/src/main/java/com/pcloud/common/utils/DateUtils.java
......@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import org.slf4j.Logger;
......@@ -1603,4 +1604,78 @@ public class DateUtils extends org.apache.commons.lang.time.DateUtils {
return calendar.getTime();
}
/**
* 获取今天开始时间
* @return
*/
public static Date getDayBegin() {
Calendar cal = new GregorianCalendar();
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
return cal.getTime();
}
/**
* 获取今天结束时间
* @return
*/
public static Date getDayEnd() {
Calendar cal = new GregorianCalendar();
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
return cal.getTime();
}
/**
* 获取某个日期的开始时间
* @param day
* @return
*/
public static Timestamp getDayStartTime(Date day) {
Calendar calendar = Calendar.getInstance();
if (null != day) calendar.setTime(day);
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
calendar.set(Calendar.MILLISECOND, 0);
return new Timestamp(calendar.getTimeInMillis());
}
/**
* 获取某个日期的结束时间
* @param day 日期
* @return
*/
public static Timestamp getDayEndTime(Date day) {
Calendar calendar = Calendar.getInstance();
if (null != day) calendar.setTime(day);
calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
calendar.set(Calendar.MILLISECOND, 999);
return new Timestamp(calendar.getTimeInMillis());
}
/**
* 获取昨天开始时间
*
* @return
*/
public static Date getBeginDayOfYesterday() {
Calendar cal = new GregorianCalendar();
cal.setTime(getDayBegin());
cal.add(Calendar.DAY_OF_MONTH, -1);
return cal.getTime();
}
/**
* 获取昨天的结束时间
* @return
*/
public static Date getEndDayOfYesterDay() {
Calendar cal = new GregorianCalendar();
cal.setTime(getDayEnd());
cal.add(Calendar.DAY_OF_MONTH, -1);
return cal.getTime();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment