Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 33ef06bb 33ef06bb886b7d4479c754a937b300da6ada4820 by xianghan
Options

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

1 parent 31bc317b
Expand all
Inline Side-by-side
Showing 9 changed files with 97 additions and 99 deletions
...@@ -29,7 +29,7 @@ public class UserAppBind implements Serializable { ...@@ -29,7 +29,7 @@ public class UserAppBind implements Serializable {
29 @Transient 29 @Transient
30 private String password; 30 private String password;
31 @Transient 31 @Transient
32 private String headImgUrl; 32 private String headimgurl;
33 33
34 // 主键 34 // 主键
35 @Id 35 @Id
......
...@@ -40,7 +40,7 @@ public interface UserAppRepository extends JpaRepository<UserApp, Long>, JpaSpec ...@@ -40,7 +40,7 @@ public interface UserAppRepository extends JpaRepository<UserApp, Long>, JpaSpec
40 Integer updatePasswordById(Long id, String password); 40 Integer updatePasswordById(Long id, String password);
41 41
42 @Modifying 42 @Modifying
43 @Query(value = "UPDATE `uc_user_app` SET `update_time` = now(), `status` = -1 WHERE `id` = ?1", nativeQuery = true) 43 @Query(value = "UPDATE `uc_user_app` SET `update_time` = now(), `delete_time` = now(), `status` = -1 WHERE `id` = ?1", nativeQuery = true)
44 Integer appCancellation(Long id); 44 Integer appCancellation(Long id);
45 45
46 @Modifying 46 @Modifying
......
1 package com.topdraw.business.module.user.app.service.dto;
2
3 import com.topdraw.business.module.member.service.dto.MemberDTO;
4 import lombok.Data;
5
6 import java.io.Serializable;
7
8 /**
9 * @author ：
10 * @description：
11 * @function :
12 * @date ：Created in 2022/7/11 21:21
13 * @version: ：
14 * @modified By：
15 * @since : modified in 2022/7/11 21:21
16 */
17 @Data
18 public class AppRegisterDTO implements Serializable {
19
20 private UserAppDTO userAppDTO;
21
22 private MemberDTO memberDTO;
23
24 }
1 package com.topdraw.business.module.user.app.service.dto; 1 package com.topdraw.business.module.user.app.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4
5 import javax.persistence.Transient;
4 import java.sql.Timestamp; 6 import java.sql.Timestamp;
5 import java.io.Serializable; 7 import java.io.Serializable;
6 8
...@@ -12,6 +14,11 @@ import java.io.Serializable; ...@@ -12,6 +14,11 @@ import java.io.Serializable;
12 @Data 14 @Data
13 public class UserAppDTO implements Serializable { 15 public class UserAppDTO implements Serializable {
14 16
17 private Integer accountType;
18
19 // 第三方账号
20 private String account;
21
15 // ID 22 // ID
16 private Long id; 23 private Long id;
17 24
......
...@@ -3,7 +3,6 @@ package com.topdraw.business.process.rest; ...@@ -3,7 +3,6 @@ package com.topdraw.business.process.rest;
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 4
5 import com.alibaba.fastjson.JSON; 5 import com.alibaba.fastjson.JSON;
6 import com.alibaba.fastjson.JSONArray;
7 import com.alibaba.fastjson.JSONObject; 6 import com.alibaba.fastjson.JSONObject;
8 import com.topdraw.annotation.AnonymousAccess; 7 import com.topdraw.annotation.AnonymousAccess;
9 import com.topdraw.annotation.Log; 8 import com.topdraw.annotation.Log;
...@@ -33,7 +32,6 @@ import com.topdraw.exception.GlobeExceptionMsg; ...@@ -33,7 +32,6 @@ import com.topdraw.exception.GlobeExceptionMsg;
33 import com.topdraw.resttemplate.RestTemplateClient; 32 import com.topdraw.resttemplate.RestTemplateClient;
34 import com.topdraw.util.Base64Util; 33 import com.topdraw.util.Base64Util;
35 import com.topdraw.util.JSONUtil; 34 import com.topdraw.util.JSONUtil;
36 import com.topdraw.util.RegexUtil;
37 import com.topdraw.utils.RedisUtils; 35 import com.topdraw.utils.RedisUtils;
38 import com.topdraw.weixin.util.WeChatConstants; 36 import com.topdraw.weixin.util.WeChatConstants;
39 import com.topdraw.weixin.util.WeixinUtil; 37 import com.topdraw.weixin.util.WeixinUtil;
...@@ -184,7 +182,7 @@ public class UserOperationController { ...@@ -184,7 +182,7 @@ public class UserOperationController {
184 @ApiOperation("app账号绑定第三方账号") 182 @ApiOperation("app账号绑定第三方账号")
185 @AnonymousAccess 183 @AnonymousAccess
186 public ResultInfo appBindThirdAccount(@Validated @RequestBody UserAppBind resources) { 184 public ResultInfo appBindThirdAccount(@Validated @RequestBody UserAppBind resources) {
187 log.info("app账号绑定第三方账号,参数 ==>> [appBindUserAccount#{}]", resources); 185 log.info("app账号绑定第三方账号,参数 ==>> [appBindThirdAccount#{}]", resources);
188 186
189 String username = resources.getUsername(); 187 String username = resources.getUsername();
190 if (StringUtils.isBlank(username)) { 188 if (StringUtils.isBlank(username)) {
...@@ -291,7 +289,11 @@ public class UserOperationController { ...@@ -291,7 +289,11 @@ public class UserOperationController {
291 if (!CollectionUtils.isEmpty(playDurationWithCategory)) { 289 if (!CollectionUtils.isEmpty(playDurationWithCategory)) {
292 GrowthReport growthReport = new GrowthReport(); 290 GrowthReport growthReport = new GrowthReport();
293 growthReport.setPlatformAccount(platformAccount); 291 growthReport.setPlatformAccount(platformAccount);
294 growthReport.setData(JSONArray.toJSONString(playDurationWithCategory)); 292
293 JSONObject jsonObject = new JSONObject();
294 // jsonObject.put("playDurationWithCategory", JSONArray.toJSONString(playDurationWithCategory));
295 jsonObject.put("playDurationWithCategory", playDurationWithCategory);
296 growthReport.setData(jsonObject.toJSONString());
295 boolean result = this.userOperationService.saveGrowthReport(growthReport); 297 boolean result = this.userOperationService.saveGrowthReport(growthReport);
296 return ResultInfo.success(result); 298 return ResultInfo.success(result);
297 } 299 }
......
...@@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; ...@@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit;
23 @Configuration 23 @Configuration
24 public class TheadPoolTaskExecutorConfiguration { 24 public class TheadPoolTaskExecutorConfiguration {
25 25
26 @Value("${task.pool.core-pool-size}") 26 @Value("${task.pool.core-pool-size:16}")
27 private Integer corePoolSize; 27 private Integer corePoolSize;
28 @Value("${task.pool.core-pool-size}") 28 @Value("${task.pool.core-pool-size:35}")
29 private Integer maxPoolSize; 29 private Integer maxPoolSize;
30 @Value("${task.pool.keep-alive-seconds}") 30 @Value("${task.pool.keep-alive-seconds:10}")
31 private Integer keepAliveSeconds; 31 private Integer keepAliveSeconds;
32 @Value("${task.pool.queue-capacity}") 32 @Value("${task.pool.queue-capacity:300}")
33 private Integer queueCapacity; 33 private Integer queueCapacity;
34 34
35 @Bean 35 @Bean
......
...@@ -28,23 +28,28 @@ spring: ...@@ -28,23 +28,28 @@ spring:
28 test-while-idle: true 28 test-while-idle: true
29 test-on-borrow: false 29 test-on-borrow: false
30 test-on-return: false 30 test-on-return: false
31
32 validation-query: select 1 31 validation-query: select 1
33 # 配置监控统计拦截的filters 32 # 配置监控统计拦截的filters
34 filters: stat 33 filters: stat
35 stat-view-servlet: 34 stat-view-servlet:
36 url-pattern: /druid/* 35 url-pattern: /druid/*
37 reset-enable: false 36 reset-enable: false
38
39 web-stat-filter: 37 web-stat-filter:
40 url-pattern: /* 38 url-pattern: /*
41 exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*" 39 exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
42 40 jackson:
41 time-zone: GMT+8
42 data:
43 redis:
44 repositories:
45 enabled: false
43 #配置 Jpa 46 #配置 Jpa
44 jpa: 47 jpa:
45 hibernate: 48 properties:
46 # 生产环境设置成 none，避免程序运行时自动更新数据库结构 49 hibernate:
47 ddl-auto: none 50 dialect: org.hibernate.dialect.MySQL5InnoDBDialect
51 ddl-auto: none
52 open-in-view: true
48 show-sql: false 53 show-sql: false
49 servlet: 54 servlet:
50 multipart: 55 multipart:
...@@ -89,61 +94,10 @@ jwt: ...@@ -89,61 +94,10 @@ jwt:
89 # 续期时间，2小时，单位毫秒 94 # 续期时间，2小时，单位毫秒
90 renew: 7200000 95 renew: 7200000
91 96
92
93 #是否允许生成代码，生产环境设置为false 97 #是否允许生成代码，生产环境设置为false
94 generator: 98 generator:
95 enabled: false 99 enabled: false
96 100
97 #是否开启 swagger-ui 101 #是否开启 swagger-ui
98 swagger: 102 swagger:
99 enabled: false
100
101 file:
102 path: system/file
103 avatar: system/avatar
104 upload: upload
105 # 文件大小 /M
106 maxSize: 100
107 avatarMaxSize: 5
108
109 service:
110 mq:
111 exchange: uce.exchange
112 queue: uce.queue
113
114 weixin:
115 list:
116 - appid: wxfaa765183a332521
117 secret: b5c1c39cb95b45b599a02fd68b5fcf17
118 token:
119 encodingAesKey:
120 imagePath:
121 content: 长按识别二维码，加入微信群。
122 miniprogramState: formal
123 # 点击模板卡片后的默认跳转页面
124 page: pages/index/main
125 # 生成带参数二维码的有效期
126 qrCodeExpireSeconds: 86400
127 env: dev
128 # 订阅号
129 - appid: wx5d88c7fe99f89f32
130 secret: b213afe99a469d4be576f330dad643b8
131 token: topdraw
132 encodingAesKey: g3mYB6yx2ZiebxwKcI1H2iw3LlYNBHb7PqsVYFHUQzi
133 # 应用类型 小程序 服务号 订阅号， 当前基于订阅号有特殊逻辑
134 appType: subscription
135 imagePath: /topdraw/app/user_center_service_te/upload/customer/weChat.png
136 content: 长按识别二维码，关注订阅号。
137 miniprogramState: formal
138 # 点击模板卡片后的默认跳转页面
139 page: pages/index/main
140 # 生成带参数二维码的有效期
141 qrCodeExpireSeconds: 300
142 env: dev
143
144 api:
145 uc-service: http://127.0.0.1:8446
146
147 uc:
148 # 主会员是否启用，如果启用任务获得的积分将添加至小屏会员上
149 validPriorityMember: 0
...\ No newline at end of file ...\ No newline at end of file
103 enabled: false
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,40 +2,51 @@ server: ...@@ -2,40 +2,51 @@ server:
2 port: 8447 2 port: 8447
3 spring: 3 spring:
4 application: 4 application:
5 name: member-service 5 name: uc-engine
6 freemarker:
7 check-template-location: false
8 profiles: 6 profiles:
9 active: dev 7 active: dev
10 jackson:
11 time-zone: GMT+8
12 data:
13 redis:
14 repositories:
15 enabled: false
16 8
17 #配置 Jpa 9 #mq
18 jpa: 10 service:
19 properties: 11 mq:
20 hibernate: 12 exchange: uce.exchange
21 dialect: org.hibernate.dialect.MySQL5InnoDBDialect 13 queue: uce.queue
22 open-in-view: true
23 14
15 weixin:
16 list:
17 - appid: wxfaa765183a332521
18 secret: b5c1c39cb95b45b599a02fd68b5fcf17
19 token:
20 encodingAesKey:
21 imagePath:
22 content: 长按识别二维码，加入微信群。
23 miniprogramState: formal
24 # 点击模板卡片后的默认跳转页面
25 page: pages/index/main
26 # 生成带参数二维码的有效期
27 qrCodeExpireSeconds: 86400
28 env: dev
29 # 订阅号
30 - appid: wx5d88c7fe99f89f32
31 secret: b213afe99a469d4be576f330dad643b8
32 token: topdraw
33 encodingAesKey: g3mYB6yx2ZiebxwKcI1H2iw3LlYNBHb7PqsVYFHUQzi
34 # 应用类型 小程序 服务号 订阅号， 当前基于订阅号有特殊逻辑
35 appType: subscription
36 imagePath: /topdraw/app/user_center_service_te/upload/customer/weChat.png
37 content: 长按识别二维码，关注订阅号。
38 miniprogramState: formal
39 # 点击模板卡片后的默认跳转页面
40 page: pages/index/main
41 # 生成带参数二维码的有效期
42 qrCodeExpireSeconds: 300
43 env: dev
24 44
25 task: 45 #第三方接口
26 pool: 46 api:
27 # 核心线程池大小 47 # ucs
28 core-pool-size: 16 48 uc-service: http://127.0.0.1:8446
29 # 最大线程数
30 max-pool-size: 35
31 # 活跃时间
32 keep-alive-seconds: 10
33 # 队列容量
34 queue-capacity: 300
35 49
36 #登录图形验证码有效时间/分钟 50 uc:
37 loginCode: 51 # 主会员是否启用，如果启用任务获得的积分将添加至小屏会员上
38 expiration: 2 52 validPriorityMember: 0
39
40 #默认上传图片类型
41 default-image-type: -1
...\ No newline at end of file ...\ No newline at end of file
......