1.调整部分系统默认配置

@@ -29,7 +29,7 @@ public class UserAppBind implements Serializable {
     @Transient
     private String password;
     @Transient
-    private String headImgUrl;
+    private String headimgurl;
 
     // 主键
     @Id

@@ -40,7 +40,7 @@ public interface UserAppRepository extends JpaRepository<UserApp, Long>, JpaSpec
     Integer updatePasswordById(Long id, String password);
 
     @Modifying
-    @Query(value = "UPDATE `uc_user_app` SET `update_time` = now(), `status` = -1 WHERE `id` = ?1", nativeQuery = true)
+    @Query(value = "UPDATE `uc_user_app` SET `update_time` = now(), `delete_time` = now(),  `status` = -1 WHERE `id` = ?1", nativeQuery = true)
     Integer appCancellation(Long id);
 
     @Modifying

+package com.topdraw.business.module.user.app.service.dto;
+
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/7/11 21:21
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/7/11 21:21
+ */
+@Data
+public class AppRegisterDTO implements Serializable {
+
+    private UserAppDTO userAppDTO;
+
+    private MemberDTO memberDTO;
+
+}

 package com.topdraw.business.module.user.app.service.dto;
 
 import lombok.Data;
+
+import javax.persistence.Transient;
 import java.sql.Timestamp;
 import java.io.Serializable;
 
@@ -12,6 +14,11 @@ import java.io.Serializable;
 @Data
 public class UserAppDTO implements Serializable {
 
+    private Integer accountType;
+
+    // 第三方账号
+    private String account;
+
     // ID
     private Long id;
 

@@ -3,7 +3,6 @@ package com.topdraw.business.process.rest;
 import cn.hutool.core.util.ObjectUtil;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.annotation.Log;
@@ -33,7 +32,6 @@ import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.resttemplate.RestTemplateClient;
 import com.topdraw.util.Base64Util;
 import com.topdraw.util.JSONUtil;
-import com.topdraw.util.RegexUtil;
 import com.topdraw.utils.RedisUtils;
 import com.topdraw.weixin.util.WeChatConstants;
 import com.topdraw.weixin.util.WeixinUtil;
@@ -184,7 +182,7 @@ public class UserOperationController {
     @ApiOperation("app账号绑定第三方账号")
     @AnonymousAccess
     public ResultInfo appBindThirdAccount(@Validated @RequestBody UserAppBind resources) {
-        log.info("app账号绑定第三方账号,参数 ==>> [appBindUserAccount#{}]", resources);
+        log.info("app账号绑定第三方账号,参数 ==>> [appBindThirdAccount#{}]", resources);
 
         String username = resources.getUsername();
         if (StringUtils.isBlank(username)) {
@@ -291,7 +289,11 @@ public class UserOperationController {
         if (!CollectionUtils.isEmpty(playDurationWithCategory)) {
             GrowthReport growthReport = new GrowthReport();
             growthReport.setPlatformAccount(platformAccount);
-            growthReport.setData(JSONArray.toJSONString(playDurationWithCategory));
+
+            JSONObject jsonObject = new JSONObject();
+//            jsonObject.put("playDurationWithCategory", JSONArray.toJSONString(playDurationWithCategory));
+            jsonObject.put("playDurationWithCategory", playDurationWithCategory);
+            growthReport.setData(jsonObject.toJSONString());
             boolean result = this.userOperationService.saveGrowthReport(growthReport);
             return ResultInfo.success(result);
         }

@@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit;
 @Configuration
 public class TheadPoolTaskExecutorConfiguration {
 
-    @Value("${task.pool.core-pool-size}")
+    @Value("${task.pool.core-pool-size:16}")
     private Integer corePoolSize;
-    @Value("${task.pool.core-pool-size}")
+    @Value("${task.pool.core-pool-size:35}")
     private Integer maxPoolSize;
-    @Value("${task.pool.keep-alive-seconds}")
+    @Value("${task.pool.keep-alive-seconds:10}")
     private Integer keepAliveSeconds;
-    @Value("${task.pool.queue-capacity}")
+    @Value("${task.pool.queue-capacity:300}")
     private Integer queueCapacity;
 
     @Bean

@@ -28,23 +28,28 @@ spring:
       test-while-idle: true
       test-on-borrow: false
       test-on-return: false
-
       validation-query: select 1
       # 配置监控统计拦截的filters
       filters: stat
       stat-view-servlet:
         url-pattern: /druid/*
         reset-enable: false
-
       web-stat-filter:
         url-pattern: /*
         exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
-
+  jackson:
+    time-zone: GMT+8
+  data:
+    redis:
+      repositories:
+        enabled: false
   #配置 Jpa
   jpa:
+    properties:
       hibernate:
-      # 生产环境设置成 none，避免程序运行时自动更新数据库结构
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
         ddl-auto: none
+      open-in-view: true
     show-sql: false
   servlet:
     multipart:
@@ -89,7 +94,6 @@ jwt:
   # 续期时间，2小时，单位毫秒
   renew: 7200000
 
-
   #是否允许生成代码，生产环境设置为false
 generator:
   enabled: false
@@ -97,53 +101,3 @@ generator:
   #是否开启 swagger-ui
 swagger:
   enabled: false
\ No newline at end of file
-
-file:
-  path: system/file
-  avatar: system/avatar
-  upload: upload
-  # 文件大小 /M
-  maxSize: 100
-  avatarMaxSize: 5
-
-service:
-    mq:
-      exchange: uce.exchange
-      queue: uce.queue
-
-weixin:
-  list:
-    - appid: wxfaa765183a332521
-      secret: b5c1c39cb95b45b599a02fd68b5fcf17
-      token:
-      encodingAesKey:
-      imagePath:
-      content: 长按识别二维码，加入微信群。
-      miniprogramState: formal
-      # 点击模板卡片后的默认跳转页面
-      page: pages/index/main
-      # 生成带参数二维码的有效期
-      qrCodeExpireSeconds: 86400
-      env: dev
-      #  订阅号
-    - appid: wx5d88c7fe99f89f32
-      secret: b213afe99a469d4be576f330dad643b8
-      token: topdraw
-      encodingAesKey: g3mYB6yx2ZiebxwKcI1H2iw3LlYNBHb7PqsVYFHUQzi
-      # 应用类型 小程序 服务号 订阅号， 当前基于订阅号有特殊逻辑
-      appType: subscription
-      imagePath: /topdraw/app/user_center_service_te/upload/customer/weChat.png
-      content: 长按识别二维码，关注订阅号。
-      miniprogramState: formal
-      # 点击模板卡片后的默认跳转页面
-      page: pages/index/main
-      # 生成带参数二维码的有效期
-      qrCodeExpireSeconds: 300
-      env: dev
-
-api:
-  uc-service: http://127.0.0.1:8446
-
-uc:
-  # 主会员是否启用，如果启用任务获得的积分将添加至小屏会员上
-  validPriorityMember: 0
\ No newline at end of file

@@ -2,40 +2,51 @@ server:
   port: 8447
 spring:
   application:
-    name: member-service
-  freemarker:
-    check-template-location: false
+    name: uc-engine
   profiles:
     active: dev
-  jackson:
-    time-zone: GMT+8
-  data:
-    redis:
-      repositories:
-        enabled: false
 
-  #配置 Jpa
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-    open-in-view: true
+#mq
+service:
+  mq:
+    exchange: uce.exchange
+    queue: uce.queue
 
+weixin:
+  list:
+    - appid: wxfaa765183a332521
+      secret: b5c1c39cb95b45b599a02fd68b5fcf17
+      token:
+      encodingAesKey:
+      imagePath:
+      content: 长按识别二维码，加入微信群。
+      miniprogramState: formal
+      # 点击模板卡片后的默认跳转页面
+      page: pages/index/main
+      # 生成带参数二维码的有效期
+      qrCodeExpireSeconds: 86400
+      env: dev
+      #  订阅号
+    - appid: wx5d88c7fe99f89f32
+      secret: b213afe99a469d4be576f330dad643b8
+      token: topdraw
+      encodingAesKey: g3mYB6yx2ZiebxwKcI1H2iw3LlYNBHb7PqsVYFHUQzi
+      # 应用类型 小程序 服务号 订阅号， 当前基于订阅号有特殊逻辑
+      appType: subscription
+      imagePath: /topdraw/app/user_center_service_te/upload/customer/weChat.png
+      content: 长按识别二维码，关注订阅号。
+      miniprogramState: formal
+      # 点击模板卡片后的默认跳转页面
+      page: pages/index/main
+      # 生成带参数二维码的有效期
+      qrCodeExpireSeconds: 300
+      env: dev
 
-task:
-  pool:
-    # 核心线程池大小
-    core-pool-size: 16
-    # 最大线程数
-    max-pool-size: 35
-    # 活跃时间
-    keep-alive-seconds: 10
-    # 队列容量
-    queue-capacity: 300
+#第三方接口
+api:
+  # ucs
+  uc-service: http://127.0.0.1:8446
 
-#登录图形验证码有效时间/分钟
-loginCode:
-  expiration: 2
-
-#默认上传图片类型
-default-image-type: -1
+uc:
+  # 主会员是否启用，如果启用任务获得的积分将添加至小屏会员上
+  validPriorityMember: 0
\ No newline at end of file