增加错题本相关的配置

pcloud-common-config/src/main/resources.prod/public_system.properties

@@ -95,3 +95,6 @@ product.parentTutor.proLabelId = 7461
 book.group.qrcode.domain = https://qrcode.5rs.me
 
 ownAgentIds = 2,1362
+
+## \u9519\u9898\u672C\u73AF\u5883\u57DF\u540D
+papercut.domain = papercut.5rs.me
\ No newline at end of file

pcloud-common-config/src/main/resources.uat/public_system.properties

@@ -96,3 +96,6 @@ product.parentTutor.proLabelId = 812
 book.group.qrcode.domain = https://qrcode.raysyun.com
 
 ownAgentIds = 12829
+
+## \u9519\u9898\u672C\u73AF\u5883\u57DF\u540D
+papercut.domain = papercut.raysyun.com
\ No newline at end of file

pcloud-common-core/src/main/java/com/pcloud/common/core/aspect/ParamLogAspect.java

@@ -20,7 +20,6 @@ import com.alibaba.fastjson.JSON;
 import com.pcloud.common.utils.string.StringUtil;
 
 /**
- * 
  * @author：songx
  * @date：2018年4月26日,下午2:32:36
  */
@@ -67,7 +66,8 @@ public class ParamLogAspect {
     /**
      * 方法执行完以后执行
      *
-	 * @param object
+     * @param joinPoint
+     * @param result
      */
     @AfterReturning(pointcut = "bizPoint()", returning = "result")
     public void doAfterReturn(JoinPoint joinPoint, Object result) {

pcloud-common-core/src/main/java/com/pcloud/common/core/enums/TranscodeFromEnum.java

@@ -52,7 +52,17 @@ public enum TranscodeFromEnum {
     /**
      * 文件管理中心
      */
-	CONVERT_PDF("CONVERT_PDF");
+    CONVERT_PDF("CONVERT_PDF"),
+
+    /**
+     * 错题本-题目
+     */
+    NOTE_SUBJECT("NOTE_SUBJECT"),
+
+    /**
+     * 错题本-答案
+     */
+    NOTE_ANSWER("NOTE_ANSWER");
 
     /**
      * 值

pcloud-common/src/main/java/com/pcloud/common/utils/aliyun/OssUtils.java

@@ -1693,7 +1693,6 @@ public class OssUtils {
 		style.append(",image_" + new String(Base64.encodeBase64URLSafe(watermarkImageUrl.getBytes())));
 		// 水印颜色，位置，偏移量
 		style.append(",g_nw,x_20,y_10");
-		System.out.println(style.toString());
 		String result = imageWatermarkHandle(fileUrl, style.toString());
 		LOGGER.info("【aliOSS】图片增加水印(图片),<END>.[result]=" + result);
 		return result;