Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-common-parent into hzk

pcloud-common-config/src/main/resources.prod/bootstrap.yml

@@ -35,9 +35,10 @@ spring:
       enabled: true
   zipkin: 
     base-url: http://192.168.1.175:9399
-    locator:
-      discovery:
-        enabled: true
+    sender: 
+      type: rabbit
+    rabbitmq:
+      queue: zipkin
   sleuth: 
     sampler:
       percentage: 0.02

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

@@ -91,3 +91,5 @@ system.env = pro
 jsbj.agent.id = 1000009100
 
 product.parentTutor.proLabelId = 7461
+
+ownAgentIds = 2,1362
\ No newline at end of file

pcloud-common-config/src/main/resources.uat/bootstrap.yml

@@ -31,16 +31,17 @@ spring:
     influx:
       uri: http://192.168.89.200:8086/write
       step: PT10S
-      db: ${spring.application.name}
+      db: rays-uat
       enabled: false
   zipkin: 
     base-url: http://192.168.93.57:9393
-    locator:
-      discovery:
-        enabled: true
+    sender: 
+      type: rabbit
+    rabbitmq:
+      queue: zipkin
   sleuth: 
     sampler:
-      percentage: 1
+      percentage: 0.5
   rabbitmq:
     addresses: 192.168.92.56:5673,192.168.92.57:5673,192.168.92.58:5673
     username: pcloud
@@ -55,7 +56,7 @@ spring:
     solr:
       zkHost: 192.168.89.13:9983,192.168.89.13:8574
     elasticsearch:
-      cluster-nodes: 192.168.1.102:9303
+      cluster-nodes: 192.168.92.47:9303
       cluster-name: elasticsearch-uat
 redis:
   cluster:

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

@@ -92,3 +92,5 @@ system.env = uat
 jsbj.agent.id = 12829
 
 product.parentTutor.proLabelId = 812
+
+ownAgentIds = 12829
\ No newline at end of file

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -268,6 +268,31 @@ public class ProductTypeConstant {
     public static final String WORD_DICTATION = "WORD_DICTATION";
 
     /**
+     * 笔顺动图
+     */
+    public static final String STROKE_ORDER_APP = "STROKE_ORDER_APP";
+
+    /**
+     * 高清大图
+     */
+    public static final String IMAGE_APP = "IMAGE_APP";
+
+    /**
+     * 会员应用
+     */
+    public static final String MEMBER_APP = "MEMBER_APP";
+
+    /**
+     * 课文诵读
+     */
+    public static final String ARTICLE_READING = "ARTICLE_READING";
+
+    /**
+     * 英语随身听
+     */
+    public static final String ENGLISH_WALKMAN = "ENGLISH_WALKMAN";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -293,8 +318,9 @@ public class ProductTypeConstant {
      * 应用型作品（伴随应用使用）
      */
     public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER,
-            EF, MUSIC, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC, TEACH_RESOURCE_APP,
-            COURSE_WARE, TEST_PAPER_APP, MATCH_LISTEN, WORD_DICTATION};
+            EF, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC, TEACH_RESOURCE_APP,
+            COURSE_WARE, TEST_PAPER_APP, MATCH_LISTEN, WORD_DICTATION, STROKE_ORDER_APP, IMAGE_APP, MEMBER_APP,
+            ARTICLE_READING,ENGLISH_WALKMAN};
 
     /**
      * 数据平台埋点型作品
@@ -306,6 +332,4 @@ public class ProductTypeConstant {
      * 作品下资源来源于content中心的作品
      */
     public static final String[] RESOURCE_CONTENT_PRODUCT = {AUDIO, VIDEO, BOOK, LISTEN, PDF, ALBUM, FORMAT, EBOOK};
-
-
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/WeektaskCode.java

@@ -50,6 +50,19 @@ public enum WeektaskCode {
     SET_STEP("set_step"),
     //确定回复
     DEFINITE_REPLY("definite_reply"),
+    // 下载预习书指南
+    DOWNLOAD_GUIDE_PREVIEW("download_guide_preview"),
+
+    // 分享测试结果到朋友圈
+    SHARE_TEST_RESULT_2_GROUP("share_test_result_2_group"),
+    // 查看标准运营指南
+    VIEW_OPERATION_PLAN("view_operation_plan"),
+    // 下载新版运营指南
+    DOWNLOAD_OPERATION_GUIDE("download_operation_guide"),
+    // 查看现代纸书制作流程
+    VIEW_CREATE_BOOK("view_create_book"),
+    // 添加版权保护
+    ADD_COPYRIGHT_PROTECTION("add_copyright_protection"),
     /**
      * -------通用埋点------
      */
@@ -718,8 +731,368 @@ public enum WeektaskCode {
      *体验专家咨询应用（周F5）
      */
     W5_EXPERIENCE_CONSULTING("w5_experience_consulting"),
+
+
+    /**
+     * 第六版红榜周任务
+     */
+    /**
+     * 审核回答
+     */
+    ANSWER_QUESTION("answer_question"),
+    /**
+     * 创建书单
+     */
+    CREATE_BOOK_LIST("create_book_list"),
+    /**
+     * 审核通过书单
+     */
+    W_PASS_BOOK_LIST("w_pass_book_list"),
+    /**
+     *  设置限时折扣商品
+     */
+    CREATE_LIMIT_DISCOUNT("create_limit_discount"),
+    /**
+     *  恢复现代纸书二维码
+     */
+    RESTORE_QRCODE("restore_qrcode"),
+
+
+    /**
+     * 建立现代纸书(周A1)
+     */
+    W6_CREATE_BOOK("w6_create_book"),
+    /**
+     * 查看现代纸书制作流程(周A2)
+     */
+    W6_VIEW_CREATE_BOOK("w6_view_create_book"),
+    /**
+     * 添加叶老师微信(周A3)
+     */
+    W6_ADD_TEACHER_WECHAT("w6_add_teacher_wechat"),
+    /**
+     * 创建任务打卡应用(周A4)
+     */
+    W6_CREATE_TASK_CLOCK_APP("w6_create_task_clock_app"),
+    /**
+     * 创建听力音频应用(周A5)
+     */
+    W6_CREATE_LISTEN_APP("w6_create_listen_app"),
+    /**
+     * 创建读者圈应用(周A6)
+     */
+    W6_UPDATE_GROUP("w6_update_group"),
+    /**
+     * 创建奖励打卡应用(周A7)
+     */
+    W6_CREATE_REWARD_CLOCK_APP("w6_create_reward_clock_app"),
+    /**
+     * 审核读者圈发布动态(周A8)
+     */
+    W6_PUBLISH_DYNAMIC("w6_publish_dynamic"),
+    /**
+     * 创建自定义打卡应用(周A9)
+     */
+    W6_CREATE_CUSTOM_CLOCK_APP("w6_create_custom_clock_app"),
+    /**
+     * 做书单任务(周A10)
+     */
+    W6_SUBMIT_BOOK_LIST("w6_submit_book_list"),
+
+
+    /**
+     * 修改书刊信息(周B1)
+     */
+    W6_UPDATE_BOOK_INFO("w6_update_book_info"),
+    /**
+     * 创建视频应用(周B2)
+     */
+    W6_CREATE_VIDEO_APP_AND_RELATE("w6_create_video_app_and_relate"),
+    /**
+     * 创建微信学习群(周B3)
+     */
+    W6_CREATE_WECHAT_STUDY_GROUP("w6_create_wechat_study_group"),
+    /**
+     * 创建专题问答应用(周B4)
+     */
+    W6_CREATE_EF_APP("w6_create_ef_app"),
+    /**
+     * 创建答案应用(周B5)
+     */
+    W6_CREATE_ANSWER_APP("w6_create_answer_app"),
+    /**
+     * 创建专题拓展应用(周B6)
+     */
+    W6_CREATE_SPECIAL_APP("w6_create_special_app"),
+    /**
+     * 新增直播课表(周B7)
+     */
+    W6_CREATE_LIVE_APP("w6_create_live_app"),
+    /**
+     * 发布直播讲义(周B8)
+     */
+    W6_PUBLISH_LECTURE("w6_publish_lecture"),
+    /**
+     * 创建图文应用(周B9)
+     */
+    W6_CREATE_PIC_NOTE_APP("w6_create_pic_note_app"),
+    /**
+     * 创建愿望单应用(周B10)
+     */
+    W6_CREATE_WISHLIST_APP("w6_create_wishlist_app"),
+
+
+    /**
+     *  创建配套图片应用(C1)
+     */
+    W6_CREATE_IMAGE_APP("w6_create_image_app"),
+    /**
+     *  配置应用到现代纸书二维码(C2)
+     */
+    W6_CONFIG_RESOURCE_FOR_QRCODE("w6_config_resource_for_qrcode"),
+    /**
+     * 好书推荐(C3)
+     */
+    W6_BOOK_RECOMMEND("w6_book_recommend"),
+    /**
+     * 场景化营销(C4)
+     */
+    W6_SCENE_MARKETING("w6_scene_marketing"),
+    /**
+     *  案例解析(C5)
+     */
+    W6_CASE_ANALYSIS_ONE("w6_case_analysis_one"),
+    /**
+     *  编校能手(C6)
+     */
+    W6_GRATE_EDITOR_ONE("w6_grate_editor_one"),
+    /**
+     *  生僻字闯关(C7)
+     */
+    W6_UNCOMMON_WORD_ONE("w6_uncommon_word_one"),
+    /**
+     *  火眼金睛(C8)
+     */
+    W6_GRATE_EYES_ONE("w6_grate_eyes_one"),
+    /**
+     *  资讯分享(C9)
+     */
+    W6_SHARE_NEWS("w6_share_news"),
+    /**
+     *  参与编创大赛(C10)
+     */
+    W6_JOIN_PROGRAMMING("w6_join_programming"),
+
+
+
+    /**
+     *  新增书刊(D1) 同 (A1)
+     */
+
+    /**
+     *  创建查弱项应用(D2)
+     */
+    W6_CREATE_ZSCORE_APP("w6_create_zscore_app"),
+
+    /**
+     * 勾选超级作者直播课表(D3)
+     */
+    W6_SUPER_AUTHOR_RESOURCE("w6_super_author_resource"),
+    /**
+     *  创建题库应用(D4)
+     */
+    W6_CREATE_QUESTION_BANK("w6_create_question_bank"),
+    /**
+     *  创建问答应用(D5)
+     */
+    W6_CREATE_QA_APP("w6_create_qa_app"),
+    /**
+     *  创建资源合集应用(D6)
+     */
+    W6_CREATE_RESOURCE_COLLECTION_APP("w6_create_resource_collection_app"),
+    /**
+     *  体验问答应用(D7)
+     */
+    W6_RELATED_BOOK_AND_QRCODE("w6_related_book_and_qrcode"),
+    /**
+     *  建立营销机制(D8)
+     */
+    W6_CREATE_MARKETING("w6_create_marketing"),
+    /**
+     *  秀出成绩排名(D9)
+     */
+    W6_SHARE_RANK("w6_share_rank"),
+    /**
+     *  秀出成绩排名(D10)
+     */
+    W6_ADD_COPYRIGHT_PROTECTION("w6_add_copyright_protection"),
+
+
+    /**
+     *  修改书刊信息(E1) 同 (B1)
+     */
+    /**
+     * 创建伴读魔法箱应用(E2)
+     */
+    W6_CREATE_MAGIC_STORY_APP("w6_create_magic_story_app"),
+    /**
+     * 创建趣味测试应用(E3)
+     */
+    W6_CREATE_TASTETEST_APP("w6_create_tastetest_app"),
+    /**
+     *  创建作者留言应用(E4)
+     */
+    W6_CREATE_AUTHOR_MESSAGE_APP("w6_create_author_message_app"),
+    /**
+     *  创建抽奖应用(E5)
+     */
+    W6_CREATE_DRAW_APP("w6_create_draw_app"),
+    /**
+     *  创建精品文章应用(E6)
+     */
+    W6_CREATE_ARTICLE_APP("w6_create_article_app"),
+    /**
+     *  分享测试结果(E7)
+     */
+    W6_SHARE_RESULT_2_GROUP("w6_share_result_2_group"),
+    /**
+     *  查看本书数据(E8)
+     */
+    W6_VIEW_BOOK_DATA("w6_view_book_data"),
+    /**
+     *  设置限时折扣商品(E9)
+     */
+    W6_CREATE_LIMIT_DISCOUNTS("w6_create_limit_discounts"),
+    /**
+     *  恢复现代纸书二维码(E10)
+     */
+    W6_RESTORE_QRCODE("w6_restore_qrcode"),
+
+
+    /**
+     *  社群运营(F1)
+     */
+    W6_COMMUNITY_OPERATIONS("w6_community_operations"),
+    /**
+     *  策划初体验(F2)
+     */
+    W6_PLANNING_EXPERIENCE("w6_planning_experience"),
+    /**
+     * 阅读活动主题(F3)
+     */
+    W6_READING_ACTIVITY("w6_reading_activity"),
+    /**
+     * 案例解析(F4)
+     */
+    W6_CASE_ANALYSIS_TWO("w6_case_analysis_two"),
+    /**
+     *  体验深度运营服务(F5) 同 (A10)
+     */
+    /**
+     *  生僻字大闯关(F6)
+     */
+    W6_UNCOMMON_WORDS_TWO("w6_uncommon_words_two"),
+    /**
+     *  编校能手(F7)
+     */
+    W6_GRATE_EDITOR_TWO("w6_grate_editor_two"),
+    /**
+     *  火眼金睛(F8)
+     */
+    W6_GRATE_EYES_TWO("w6_grate_eyes_two"),
+    /**
+     *  了解出版运营基金(F9)
+     */
+    W6_DOWNLOAD_OPERATION_GUIDE("w6_download_operation_guide"),
+    /**
+     *  学做大IP图书(F10)
+     */
+    W6_LEARN_MAKE_BOOK("w6_learn_make_book"),
+
+
+    /**
+     *  编校能手(G1)
+     */
+    W6_GRATE_EDITOR_THREE("w6_grate_editor_three"),
+    /**
+     *  生僻字大闯关(G2)
+     */
+    W6_UNCOMMON_WORDS_THREE("w6_uncommon_words_three"),
+    /**
+     * 火眼金睛(G3)
+     */
+    W6_GRATE_EYES_THREE("w6_grate_eyes_three"),
+    /**
+     * 案例解析(G4)
+     */
+    W6_CASE_ANALYSIS_THREE("w6_case_analysis_three"),
+    /**
+     *  体验深度运营服务(G5) 同 (A10)
+     */
+    /**
+     *  做书流程(G6)
+     */
+    W6_MAKE_BOOK_PROCESS("w6_make_book_process"),
+    /**
+     *  做书秘籍(G7)
+     */
+    W6_MAKE_BOOK_CHEATS("w6_make_book_cheats"),
+    /**
+     *  场景小测试(G8)
+     */
+    W6_SCENARIO_TEST("w6_scenario_test"),
+    /**
+     *  简答题(G9)
+     */
+    W6_SCENARIO_BOOK("w6_scenario_book"),
+    /**
+     *  精英任务小秘籍(G10)
+     */
+    W6_ELETETASK_CHEATS("w6_eletetask_cheats"),
+
+    /**
+     *  写一段推介文案(H1)
+     */
+    W6_WRITE_SUGGESTION("w6_write_suggestion"),
+    /**
+     *  运营指南更新(H2)
+     */
+    W6_OPERATION_GUIDE("w6_operation_guide"),
+    /**
+     * 思考“现代纸书”(H3)
+     */
+    W6_BOOK_FEEDBACK("w6_book_feedback"),
+    /**
+     * 火眼金睛(H4)
+     */
+    W6_GRATE_EYES_FOUR("w6_grate_eyes_four"),
+    /**
+     *  生僻字大闯关(H5)
+     */
+    W6_UNCOMMON_WORDS_FOUR("w6_uncommon_words_four"),
+    /**
+     *  编校能手(H6)
+     */
+    W6_GRATE_EDITOR_FOUR("w6_grate_editor_four"),
+    /**
+     *  好书TOP5(H7)
+     */
+    W6_TOP5_BOOK("w6_top5_book"),
+    /**
+     *  案例解析(H8)
+     */
+    W6_CASE_ANALYSIS_FOUR("w6_case_analysis_four"),
+    /**
+     *  如何印码(H9)
+     */
+    W6_HOW_PRINTING_QRCODE("w6_how_printing_qrcode"),
+    /**
+     *  学做大IP图书(H10) 同 (A10)
+     */
+
     ;
 
+
     public final String code;
 
     WeektaskCode(String code) {

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

+package com.pcloud.common.core.enums;
+
+import com.pcloud.common.core.constant.ProductTypeConstant;
+import com.pcloud.common.utils.string.StringUtil;
+
+/**
+ * Description 应用作品类型关联枚举
+ * Created by PENG on 2019/3/27.
+ */
+public enum AppProductTypeEnum {
+
+    KK(AppTypeEnum.KK.value, ProductTypeConstant.LOOK),
+    TUTOR(AppTypeEnum.TUTOR.value, ProductTypeConstant.TUTOR),
+    GROUP(AppTypeEnum.GROUP.value, ProductTypeConstant.GROUP),
+    ZSCORE(AppTypeEnum.ZSCORE.value, ProductTypeConstant.ZSCORE),
+    VOTE(AppTypeEnum.VOTE.value, ProductTypeConstant.VOTE),
+    CLOCK(AppTypeEnum.CLOCK.value, ProductTypeConstant.CLOCK),
+    TEST(AppTypeEnum.TEST.value, ProductTypeConstant.TEST),
+    AUDIO(AppTypeEnum.AUDIO.value, ProductTypeConstant.AUDIOAPP),
+    ANSWER(AppTypeEnum.ANSWER.value, ProductTypeConstant.ANSWER),
+    EF(AppTypeEnum.EF.value, ProductTypeConstant.EF),
+    ITEM_BANK(AppTypeEnum.ITEM_BANK.value, ProductTypeConstant.PRETESTAPP),
+    QA(AppTypeEnum.QA.value, ProductTypeConstant.QA_APP),
+    EBOOK(AppTypeEnum.EBOOK.value, ProductTypeConstant.EBOOK_APP),
+    AUDIO_MAGIC(AppTypeEnum.AUDIO_MAGIC.value, ProductTypeConstant.AUDIO_MAGIC),
+    TEACH_RESOURCE(AppTypeEnum.TEACH_RESOURCE.value, ProductTypeConstant.TEACH_RESOURCE_APP),
+    COURSE_WARE(AppTypeEnum.COURSE_WARE.value, ProductTypeConstant.COURSE_WARE),
+    TEST_PAPER(AppTypeEnum.TEST_PAPER.value, ProductTypeConstant.TEST_PAPER_APP),
+    MATCH_LISTEN(AppTypeEnum.MATCH_LISTEN.value, ProductTypeConstant.MATCH_LISTEN),
+    WORD_DICTATION(AppTypeEnum.WORD_DICTATION.value, ProductTypeConstant.WORD_DICTATION),
+    STROKE_ORDER(AppTypeEnum.STROKE_ORDER.value, ProductTypeConstant.STROKE_ORDER_APP),
+    IMAGE(AppTypeEnum.IMAGE.value, ProductTypeConstant.IMAGE_APP),
+    MEMBER(AppTypeEnum.MEMBER.value, ProductTypeConstant.MEMBER_APP),
+    ARTICLE_READING(AppTypeEnum.ARTICLE_READING.value, ProductTypeConstant.ARTICLE_READING),
+    ENGLISH_WALKMAN(AppTypeEnum.ENGLISH_WALKMAN.value, ProductTypeConstant.ENGLISH_WALKMAN);
+
+    public final String appTypeCode;
+
+    public final String productTypeCode;
+
+    AppProductTypeEnum(String appTypeCode, String productTypeCode) {
+        this.appTypeCode = appTypeCode;
+        this.productTypeCode = productTypeCode;
+    }
+
+    /**
+     * 根据应用类型编码获取作品类型编码
+     * @param appTypeCode 应用类型编码
+     * @return
+     */
+    public static String getProductTypeCodeByAppTypeCode(String appTypeCode) {
+        if (StringUtil.isEmpty(appTypeCode)) {
+            return null;
+        }
+        AppProductTypeEnum[] var1 = values();
+        int var2 = var1.length;
+        for (int var3 = 0; var3 < var2; ++var3) {
+            AppProductTypeEnum appProductTypeEnum = var1[var3];
+            if (appProductTypeEnum.appTypeCode.equals(appTypeCode)) {
+                return appProductTypeEnum.productTypeCode;
+            }
+        }
+        return null;
+    }
+}

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

@@ -44,13 +44,19 @@ public enum AppTypeEnum {
     SPECIAL("SPECIAL"),        // 专题
     LIVEAPP("LIVEAPP"),         //直播3.0
     CLOCK("CLOCK"),             //打卡
-	TASTETEST("TASTETEST"),   //趣味测试
-	VIDEO_CLASSIC("VIDEO_CLASSIC"),     //经典版视频
-	TEACH_RESOURCE("TEACH_RESOURCE"),    //教辅资料包
-	COURSE_WARE("COURSE_WARE"),    //课件
-	TEST_PAPER("TEST_PAPER"),   //试卷
-	MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
-	WORD_DICTATION("WORD_DICTATION");    //生词听写
+    TEST("TEST"),              //趣味测试
+    EBOOK("EBOOK"),            //电子书
+    AUDIO_MAGIC("AUDIO_MAGIC"),  // 伴读魔法箱
+    VIDEO_CLASSIC("VIDEO_CLASSIC"),     // 经典版视频
+    TEACH_RESOURCE("TEACH_RESOURCE"),    // 教辅资料包
+    COURSE_WARE("COURSE_WARE"),    // 课件
+    TEST_PAPER("TEST_PAPER"),   // 试卷
+    MATCH_LISTEN("MATCH_LISTEN"),  // 配套听力
+    WORD_DICTATION("WORD_DICTATION"),    // 生词听写
+    STROKE_ORDER("STROKE_ORDER"),     // 笔顺动图
+    MEMBER("MEMBER"),    // 开通会员
+    ARTICLE_READING("ARTICLE_READING"), //课文诵读
+    ENGLISH_WALKMAN("ENGLISH_WALKMAN"); //英语随身听
     /**
      * 值
      */
@@ -58,7 +64,6 @@ public enum AppTypeEnum {
 
     /**
      * 构造
-	 * 
      * @param value
      */
     private AppTypeEnum(String value) {

pcloud-common/pom.xml

@@ -26,8 +26,12 @@
 			<artifactId>pcloud-common-config</artifactId>
 			<version>${pcloud-common-config.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
 
-		<!-- Spring Cloud Begin -->
+		<!-- Spring Boot Begin -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -37,9 +41,12 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<!-- Spring Boot Begin -->
+
+		<!-- Spring Cloud Begin -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
@@ -73,12 +80,16 @@
 			<artifactId>spring-retry</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-actuator</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-sleuth</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
@@ -91,18 +102,6 @@
 			<version>1.0.0-rc.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.7.0</version>
@@ -203,7 +202,6 @@
 		<dependency>
 			<groupId>com.jcraft</groupId>
 			<artifactId>jsch</artifactId>
-			<version>0.1.53</version>
 		</dependency>
 		<!-- sftp end -->
 

pcloud-common/src/main/java/com/pcloud/common/utils/ResultUtils.java

@@ -27,8 +27,8 @@ public class ResultUtils {
 	 * @date 2019年1月14日,下午7:32:35
 	 */
 	public static <T> T object(T t, Class<T> clazz) {
-		if (t == null) {
-			return null;
+		if (t != null) {
+			return t;
 		}
 		try {
 			return clazz.newInstance();

pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.4.RELEASE</version>
+		<version>1.5.8.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -101,7 +101,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Dalston.SR3</spring-cloud.version>
+		<spring-cloud.version>Edgware.SR3</spring-cloud.version>
 		<spring.data.solr.version>2.1.7.RELEASE</spring.data.solr.version>
 
 		<!-- frameworks -->
@@ -208,7 +208,7 @@
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>druid</artifactId>
-				<version>1.0.15</version>
+				<version>1.0.18</version>
 			</dependency>
 			<dependency>
 				<groupId>com.alibaba</groupId>