周伟鹏 / cnlive_shenhe · Commits

Commit 15f78cfa054bf6e97b6f7bb1bb4ec40b3e81c499

Authored by 宋亚南
1 parent ae997d42

update

Inline Side-by-side
Showing 9 changed files with 17 additions and 210 deletions
@@ -255,28 +255,7 @@ @@ -255,28 +255,7 @@
255 </plugins> 255 </plugins>
256 </build> 256 </build>
257 257
258 - <!--分别设置开发，测试，生产环境-->  
259 <profiles> 258 <profiles>
260 - <!-- 开发环境 -->  
261 - <profile>  
262 - <id>dev</id>  
263 - <activation>  
264 - <activeByDefault>false</activeByDefault>  
265 - </activation>  
266 - <properties>  
267 - <environment>dev</environment>  
268 - </properties>  
269 - </profile>  
270 - <!-- 生产环境 -->  
271 - <profile>  
272 - <id>test</id>  
273 - <activation>  
274 - <activeByDefault>true</activeByDefault>  
275 - </activation>  
276 - <properties>  
277 - <environment>test</environment>  
278 - </properties>  
279 - </profile>  
280 <!-- 生产环境 --> 259 <!-- 生产环境 -->
281 <profile> 260 <profile>
282 <id>prod</id> 261 <id>prod</id>
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @15f78cf
@@ -376,7 +376,7 @@ public class VideosController extends BaseController { @@ -376,7 +376,7 @@ public class VideosController extends BaseController {
376 if (spid == 0) { 376 if (spid == 0) {
377 videosDTO.setSpid(null); 377 videosDTO.setSpid(null);
378 } 378 }
379 - if (videosDTO.getSp_Id() != null && !"".equals(videosDTO.getSp_Id())) { 379 + if (CommonUtils.isNotEmpty(videosDTO.getSp_Id())) {
380 try { 380 try {
381 videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id())); 381 videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
382 } catch (NumberFormatException e) { 382 } catch (NumberFormatException e) {
src/main/java/com/cnlive/shenhe/job/ContentJob.java
  View file @15f78cf
@@ -55,9 +55,15 @@ public class ContentJob { @@ -55,9 +55,15 @@ public class ContentJob {
55 List<ShyContent> shyContentList = contentService.findShyContentWithWebPage(); 55 List<ShyContent> shyContentList = contentService.findShyContentWithWebPage();
56 if (shyContentList != null && shyContentList.size() > 0) { 56 if (shyContentList != null && shyContentList.size() > 0) {
57 logger.info("审核云提交网页审核到易盾数据个数:{}", shyContentList.size()); 57 logger.info("审核云提交网页审核到易盾数据个数:{}", shyContentList.size());
58 - for (ShyContent content : shyContentList) {  
59 - content.setUpdater("机审");  
60 - contentService.contentFilter(content); 58 + for (final ShyContent content : shyContentList) {
  59 + Thread thread = new Thread() {
  60 + @Override
  61 + public void run() {
  62 + content.setUpdater("机审");
  63 + contentService.contentFilter(content);
  64 + }
  65 + };
  66 + thread.start();
61 } 67 }
62 } 68 }
63 } 69 }
src/main/java/com/cnlive/shenhe/service/serviceImpl/ContentServiceImpl.java
  View file @15f78cf
@@ -290,8 +290,8 @@ public class ContentServiceImpl implements ContentService { @@ -290,8 +290,8 @@ public class ContentServiceImpl implements ContentService {
290 } else { 290 } else {
291 Integer code = result.getInteger("errorCode"); 291 Integer code = result.getInteger("errorCode");
292 if (code != 0) { 292 if (code != 0) {
293 - logger.error("图文回调错误，图文id:{}，errorCode:{},errorMessage:{}", content.getId(), code,  
294 - result.getString("errorMessage")); 293 + logger.error("图文回调错误，图文id:{}，errorCode:{},errorMessage:{},回调地址:{}", content.getId(), code,
  294 + result.getString("errorMessage"), content.getCallback());
295 success = false; 295 success = false;
296 return success; 296 return success;
297 } 297 }
src/main/java/com/cnlive/shenhe/utils/HttpClientUtils.java
  View file @15f78cf
@@ -109,7 +109,7 @@ public class HttpClientUtils { @@ -109,7 +109,7 @@ public class HttpClientUtils {
109 } 109 }
110 110
111 public static String post_str(String url, Map<String, String> map) { 111 public static String post_str(String url, Map<String, String> map) {
112 - HttpPost post = null; 112 + HttpPost post = new HttpPost(url);
113 String text = "请求失败"; 113 String text = "请求失败";
114 try { 114 try {
115 // 创建http访问的客户端 115 // 创建http访问的客户端
@@ -122,8 +122,6 @@ public class HttpClientUtils { @@ -122,8 +122,6 @@ public class HttpClientUtils {
122 } 122 }
123 // 用参数构造请求实体 123 // 用参数构造请求实体
124 HttpEntity postEntity = new UrlEncodedFormEntity(param, "utf-8"); 124 HttpEntity postEntity = new UrlEncodedFormEntity(param, "utf-8");
125 - // 创建post请求  
126 - post = new HttpPost(url);  
127 // 把请求实体放到post请求中 125 // 把请求实体放到post请求中
128 post.setEntity(postEntity); 126 post.setEntity(postEntity);
129 // 执行post请求 127 // 执行post请求
@@ -215,6 +213,4 @@ public class HttpClientUtils { @@ -215,6 +213,4 @@ public class HttpClientUtils {
215 } 213 }
216 return jsonResult; 214 return jsonResult;
217 } 215 }
218 -  
219 -  
220 } 216 }
src/main/java/com/cnlive/shenhe/utils/YiDunAntiFraudUtil.java
  View file @15f78cf
@@ -363,7 +363,7 @@ public class YiDunAntiFraudUtil { @@ -363,7 +363,7 @@ public class YiDunAntiFraudUtil {
363 */ 363 */
364 public static JSONObject submitYiDunUrl(String url) { 364 public static JSONObject submitYiDunUrl(String url) {
365 try { 365 try {
366 - logger.info("审核云向易盾网站检测接口提交的url....................."); 366 + logger.info("审核云向易盾网站检测接口提交审核开始");
367 Map<String, String> params = new HashMap<String, String>(); 367 Map<String, String> params = new HashMap<String, String>();
368 368
369 // 1.设置公共参数 369 // 1.设置公共参数
src/main/resources/application-dev.properties deleted 100644 → 0
  View file @ae997d4
1 -server.port=82  
2 -  
3 -spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
4 -spring.datasource.username=root  
5 -spring.datasource.password=M345sdfss4!  
6 -  
7 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver  
8 -  
9 -#rabbitmq\u76F8\u5173\u914D\u7F6E  
10 -spring.rabbitmq.host=10.254.174.131  
11 -spring.rabbitmq.port=5672  
12 -spring.rabbitmq.username=test  
13 -spring.rabbitmq.password=p3~amKKt9  
14 -# \u5F00\u542F\u53D1\u9001\u786E\u8BA4  
15 -spring.rabbitmq.publisher-confirms=true  
16 -# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE  
17 -spring.rabbitmq.publisher-returns=true  
18 -# \u5F00\u542FACK  
19 -spring.rabbitmq.listener.direct.acknowledge-mode=manual  
20 -spring.rabbitmq.listener.simple.acknowledge-mode=manual  
21 -  
22 -#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5  
23 -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=  
24 -  
25 -#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico  
26 -spring.mvc.favicon.enabled=false  
27 -  
28 -#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API  
29 -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted  
30 -  
31 -#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528  
32 -spring.application.name=cnlive_shenhe_test  
33 -spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log  
34 -  
35 -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser  
36 -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae  
37 -#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F  
38 -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=  
39 -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=  
40 -  
41 -#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF  
42 -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify  
43 -platformKey =AUDIT  
44 -platformValue=10011438  
45 -  
46 -#\u672C\u673A\u5730\u5740  
47 -spring.localhost.url=http://test.shen.cnlive.com  
48 -  
49 -#\u672C\u673A\u7684\u540D\u79F0  
50 -SERVER_NAME=http://test.shen.cnlive.com  
51 -  
52 -#\u767B\u5F55\u5165\u53E3  
53 -SERVICE_LOGIN=http://test.shen.cnlive.com/users/login  
54 -  
55 -#\u767B\u51FA  
56 -SERVICE_LOGINOUT=http://test.shen.cnlive.com/users/logout  
57 -  
58 -#url\u7684\u524D\u7F00  
59 -CAS_SERVER_URL_PREFIX=https://testuser.cnlive.com/OpenSSO2  
60 -CAS_SERVER_LOGIN_URL=https://testuser.cnlive.com/OpenSSO2/login  
61 -  
62 -#\u62BD\u5E27\u5E38\u91CF  
63 -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9  
64 -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9  
65 -avsmple_url=http://test.transcode.cnlive.com/api/request  
66 -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback  
67 -  
68 -#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F  
69 -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe  
70 -  
71 -#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF  
72 -email_app_id=769_jetja50p18  
73 -email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba  
74 -email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action  
75 -mobile_send_URL=http://sms.cnlive.com/CnliveM3/msg/sendSms.action  
76 -  
77 -#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D  
78 -qn_bucket=cnlivetest  
79 -qn_domain=http://test.qnvod.cnlive.com  
80 -ks_bucket=cnlive-test  
81 -ks_domain=http://test.wideo.cnlive.com  
82 -  
83 -#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84  
84 -desdir=shen  
85 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/  
86 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio  
src/main/resources/application-prod.properties
  View file @15f78cf
1 server.port=81 1 server.port=81
2 2
3 #\u91D1\u5C71\u516D\u533A\u6570\u636E\u5E93 3 #\u91D1\u5C71\u516D\u533A\u6570\u636E\u5E93
4 -spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
5 -#spring.datasource.url=jdbc:mysql://120.92.51.254:56069/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false 4 +spring.datasource.url=jdbc:mysql://mysql7dad1db41208.rds.ivolces.com:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
6 spring.datasource.username=admin 5 spring.datasource.username=admin
7 spring.datasource.password=83BwiCoq 6 spring.datasource.password=83BwiCoq
8 7
9 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 8 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
10 9
11 #rabbitmq\u76F8\u5173\u914D\u7F6E 10 #rabbitmq\u76F8\u5173\u914D\u7F6E
12 -spring.rabbitmq.host=10.254.176.11  
13 -#spring.rabbitmq.host=120.92.78.112 11 +#spring.rabbitmq.host=10.254.176.11
  12 +spring.rabbitmq.host=120.92.78.112
14 spring.rabbitmq.port=5672 13 spring.rabbitmq.port=5672
15 spring.rabbitmq.username=admin 14 spring.rabbitmq.username=admin
16 spring.rabbitmq.password=fA{5Uikx7 15 spring.rabbitmq.password=fA{5Uikx7
src/main/resources/application-test.properties deleted 100644 → 0
  View file @ae997d4
1 -server.port=80  
2 -  
3 -spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
4 -spring.datasource.username=root  
5 -spring.datasource.password=M345sdfss4!  
6 -  
7 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver  
8 -  
9 -#rabbitmq\u76F8\u5173\u914D\u7F6E  
10 -spring.rabbitmq.host=10.254.174.131  
11 -spring.rabbitmq.port=5672  
12 -spring.rabbitmq.username=test  
13 -spring.rabbitmq.password=p3~amKKt9  
14 -# \u5F00\u542F\u53D1\u9001\u786E\u8BA4  
15 -spring.rabbitmq.publisher-confirms=true  
16 -# \u5F00\u542F\u53D1\u9001\u5931\u8D25\u9000\u56DE  
17 -spring.rabbitmq.publisher-returns=true  
18 -# \u5F00\u542FACK  
19 -spring.rabbitmq.listener.direct.acknowledge-mode=manual  
20 -spring.rabbitmq.listener.simple.acknowledge-mode=manual  
21 -  
22 -#\u8BDD\u9898\u8BC4\u8BBA\u5206\u4EABh5  
23 -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=  
24 -  
25 -#\u5173\u95EDspringboot\u63D0\u4F9B\u7684\u9ED8\u8BA4ico  
26 -spring.mvc.favicon.enabled = false  
27 -  
28 -#\u8BC4\u8BBA\u7981\u8A00\u548C\u89E3\u7981\u4F7F\u7528API  
29 -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted  
30 -  
31 -#logback\u65E5\u5FD7\u4E2D\u4F7F\u7528  
32 -spring.application.name=cnlive_shenhe_test  
33 -spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log  
34 -  
35 -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser  
36 -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae  
37 -  
38 -#\u7528\u6237\u4E91\u8BF7\u6C42\u67E5\u8BE2\u7528\u6237\u4FE1\u606F  
39 -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=  
40 -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=  
41 -  
42 -#\u70B9\u64AD\u4E91\u9700\u8981\u7684\u5E38\u91CF  
43 -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify  
44 -platformKey =AUDIT  
45 -platformValue=10011438  
46 -  
47 -#\u672C\u673A\u5730\u5740  
48 -spring.localhost.url=http://bendi.shen.cnlive.com  
49 -  
50 -#\u672C\u673A\u7684\u540D\u79F0  
51 -SERVER_NAME=http://bendi.shen.cnlive.com:80  
52 -  
53 -#\u767B\u5F55\u5165\u53E3  
54 -SERVICE_LOGIN=http://bendi.shen.cnlive.com:80/users/login  
55 -  
56 -#\u767B\u51FA  
57 -SERVICE_LOGINOUT=http://bendi.shen.cnlive.com:80/users/logout  
58 -  
59 -#url\u7684\u524D\u7F00  
60 -CAS_SERVER_URL_PREFIX=https://testuser.cnlive.com/OpenSSO2  
61 -CAS_SERVER_LOGIN_URL=https://testuser.cnlive.com/OpenSSO2/login  
62 -  
63 -#\u62BD\u5E27\u5E38\u91CF  
64 -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9  
65 -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9  
66 -avsmple_url=http://test.transcode.cnlive.com/api/request  
67 -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback  
68 -  
69 -#\u540C\u6B65\u76F4\u64AD\u4E91\u4FE1\u606F  
70 -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe  
71 -  
72 -#\u90AE\u4EF6\u4F7F\u7528\u5E38\u91CF  
73 -email_app_id=769_jetja50p18  
74 -email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba  
75 -email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action  
76 -mobile_send_URL=http://sms.cnlive.com/CnliveM3/msg/sendSms.action  
77 -  
78 -#\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D  
79 -qn_bucket=cnlivetest  
80 -qn_domain=http://test.qnvod.cnlive.com  
81 -ks_bucket=cnlive-test  
82 -ks_domain=http://test.wideo.cnlive.com  
83 -  
84 -#\u56FE\u7247\u5B58\u653E\u6839\u8DEF\u5F84  
85 -desdir=shen  
86 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/  
87 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanByIdcallbackAudio