周伟鹏 / cnlive_shenhe · Commits

Commit d34eb17d5e227f9ee28b678b3bcf5d6488c8fb86

Authored by 徐近程
1 parent f4c52ee8

测试分支

Inline Side-by-side
Showing 14 changed files with 500 additions and 116 deletions
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
  View file @d34eb17
@@ -26,8 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -26,8 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
26 import org.springframework.web.bind.annotation.ResponseBody; 26 import org.springframework.web.bind.annotation.ResponseBody;
27 27
28 import java.util.Date; 28 import java.util.Date;
29 -import java.util.HashMap;  
30 -import java.util.Map; 29 +
31 30
32 /** 31 /**
33 * @Author: xujincheng 32 * @Author: xujincheng
@@ -66,7 +65,7 @@ public class AudioControllerApi { @@ -66,7 +65,7 @@ public class AudioControllerApi {
66 * @uploadTime 音频上传时间 65 * @uploadTime 音频上传时间
67 * @priority 优先级（1-热点 0-非热点） 66 * @priority 优先级（1-热点 0-非热点）
68 * @callback 回调函数 67 * @callback 回调函数
69 - * @spId spId 68 + * * @spId spId
70 * @bucketName 存储空间名 69 * @bucketName 存储空间名
71 * @bucketType 金山或七牛 70 * @bucketType 金山或七牛
72 * @duration 时长 71 * @duration 时长
@@ -108,7 +107,6 @@ public class AudioControllerApi { @@ -108,7 +107,6 @@ public class AudioControllerApi {
108 107
109 /** 108 /**
110 * 易盾音频检测结果回调 109 * 易盾音频检测结果回调
111 - *  
112 * @param 110 * @param
113 */ 111 */
114 @PostMapping("/callbackAudio") 112 @PostMapping("/callbackAudio")
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
  View file @d34eb17
@@ -15,6 +15,7 @@ public enum ErrorEnum { @@ -15,6 +15,7 @@ public enum ErrorEnum {
15 private Integer errorCode; 15 private Integer errorCode;
16 private String errorMessage; 16 private String errorMessage;
17 17
  18 +
18 ErrorEnum(Integer errorCode, String errorMessage) { 19 ErrorEnum(Integer errorCode, String errorMessage) {
19 this.errorCode = errorCode; 20 this.errorCode = errorCode;
20 this.errorMessage = errorMessage; 21 this.errorMessage = errorMessage;
src/main/java/com/cnlive/shenhe/config/MyInterceptor.java
  View file @d34eb17
@@ -12,15 +12,18 @@ import javax.servlet.http.HttpServletRequest; @@ -12,15 +12,18 @@ import javax.servlet.http.HttpServletRequest;
12 import javax.servlet.http.HttpServletResponse; 12 import javax.servlet.http.HttpServletResponse;
13 import javax.servlet.http.HttpSession; 13 import javax.servlet.http.HttpSession;
14 14
  15 +/**
  16 + * @author Administrator
  17 + */
15 @Component 18 @Component
16 public class MyInterceptor implements HandlerInterceptor { 19 public class MyInterceptor implements HandlerInterceptor {
17 @Override 20 @Override
18 public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception { 21 public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
19 - HttpSession httpSession=httpServletRequest.getSession();  
20 - SessionUser sessionUser = (SessionUser)httpSession.getAttribute(SessionUser.getSessionKey());  
21 - if(CommonUtils.isNull(sessionUser)){  
22 -// httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);  
23 - httpServletResponse.sendRedirect("/users/login"); 22 + HttpSession httpSession = httpServletRequest.getSession();
  23 + SessionUser sessionUser = (SessionUser) httpSession.getAttribute(SessionUser.getSessionKey());
  24 + if (CommonUtils.isNull(sessionUser)) {
  25 + // httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);
  26 + httpServletResponse.sendRedirect("/users/login");
24 return false; 27 return false;
25 } 28 }
26 29
src/main/java/com/cnlive/shenhe/controller/BootTestController.java 0 → 100644
  View file @d34eb17
  1 +package com.cnlive.shenhe.controller;
  2 +import com.google.common.collect.Lists;
  3 +
  4 +import com.cnlive.shenhe.entity.BootTest;
  5 +import com.cnlive.shenhe.serviceImpl.BootTestServiceImpl;
  6 +import com.cnlive.shenhe.utils.CommonUtils;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.web.bind.annotation.*;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * @Author: yanzhaowang
  14 + * @Date: 2022/3/4 14:10
  15 + */
  16 +@RestController
  17 +@RequestMapping("/boottest")
  18 +public class BootTestController {
  19 +
  20 + @Autowired
  21 + BootTestServiceImpl bootTestService;
  22 +
  23 + @GetMapping("/testselect/{pagesiaz}/{pageNum}")
  24 + public List<BootTest> selectAll(@RequestParam(defaultValue = "10") @PathVariable(name = "pagesiaz") int pagesiaz, @RequestParam(defaultValue = "1") @PathVariable(name = "pageNum") int pageNum){
  25 + List<BootTest> bootTests = bootTestService.selectAll(pagesiaz, pageNum);
  26 + return bootTests;
  27 + }
  28 + @GetMapping("/testselectid/{BootId}")
  29 + public BootTest selectById(@PathVariable(value = "BootId") String BootId){
  30 + if (BootId != null) {
  31 + BootTest bootTest = bootTestService.selectByid(BootId);
  32 + return bootTest;
  33 + }
  34 + return null;
  35 + }
  36 +
  37 + @RequestMapping("/testaddBoottest")
  38 + public int addBootTest(@RequestBody BootTest bootTest){
  39 + int i = bootTestService.addBootTest(bootTest);
  40 + return i;
  41 + }
  42 +
  43 + @DeleteMapping("/testdeleteBoottest/{bootTestid}")
  44 + public int deleteBootTest(@PathVariable(name = "bootTestid") String bootTestid){
  45 + if (CommonUtils.isNotEmpty(bootTestid)) {
  46 + int i = bootTestService.deleteBootTest(bootTestid);
  47 + return i;
  48 + }
  49 + return 0;
  50 + }
  51 +
  52 + @RequestMapping("/testupdateBoottest")
  53 + public int testupdateBoottest(@RequestBody BootTest bootTest){
  54 + if (bootTest.getId() != null&&bootTest.getAge()!=null&&bootTest.getName()!=null) {
  55 + int i = bootTestService.updateBootTest(bootTest);
  56 + return i;
  57 + }
  58 + return 0;
  59 + }
  60 +}
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @d34eb17
@@ -45,7 +45,6 @@ public class ChannelController extends BaseController { @@ -45,7 +45,6 @@ public class ChannelController extends BaseController {
45 45
46 @Autowired 46 @Autowired
47 UsersServiceImpl usersService; 47 UsersServiceImpl usersService;
48 -  
49 @Autowired 48 @Autowired
50 SitesServiceImpl sitesService; 49 SitesServiceImpl sitesService;
51 50
src/main/java/com/cnlive/shenhe/entity/BootTest.java 0 → 100644
  View file @d34eb17
  1 +package com.cnlive.shenhe.entity;
  2 +
  3 +import javax.persistence.*;
  4 +
  5 +@Table(name = "boot_test")
  6 +public class BootTest {
  7 + @Id
  8 + private Integer id;
  9 +
  10 + private String name;
  11 +
  12 + private Integer age;
  13 +
  14 + private String address;
  15 +
  16 + private String hobby;
  17 +
  18 + /**
  19 + * @return id
  20 + */
  21 + public Integer getId() {
  22 + return id;
  23 + }
  24 +
  25 + /**
  26 + * @param id
  27 + */
  28 + public void setId(Integer id) {
  29 + this.id = id;
  30 + }
  31 +
  32 + /**
  33 + * @return name
  34 + */
  35 + public String getName() {
  36 + return name;
  37 + }
  38 +
  39 + /**
  40 + * @param name
  41 + */
  42 + public void setName(String name) {
  43 + this.name = name;
  44 + }
  45 +
  46 + /**
  47 + * @return age
  48 + */
  49 + public Integer getAge() {
  50 + return age;
  51 + }
  52 +
  53 + /**
  54 + * @param age
  55 + */
  56 + public void setAge(Integer age) {
  57 + this.age = age;
  58 + }
  59 +
  60 + /**
  61 + * @return address
  62 + */
  63 + public String getAddress() {
  64 + return address;
  65 + }
  66 +
  67 + /**
  68 + * @param address
  69 + */
  70 + public void setAddress(String address) {
  71 + this.address = address;
  72 + }
  73 +
  74 + /**
  75 + * @return hobby
  76 + */
  77 + public String getHobby() {
  78 + return hobby;
  79 + }
  80 +
  81 + /**
  82 + * @param hobby
  83 + */
  84 + public void setHobby(String hobby) {
  85 + this.hobby = hobby;
  86 + }
  87 +}
0 \ No newline at end of file 88 \ No newline at end of file
src/main/java/com/cnlive/shenhe/mapper/BootTestMapper.java 0 → 100644
  View file @d34eb17
  1 +package com.cnlive.shenhe.mapper;
  2 +
  3 +import com.cnlive.shenhe.entity.BootTest;
  4 +import tk.mybatis.mapper.common.Mapper;
  5 +
  6 +public interface BootTestMapper extends Mapper<BootTest> {
  7 +}
0 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/cnlive/shenhe/serviceImpl/BootTestServiceImpl.java 0 → 100644
  View file @d34eb17
  1 +package com.cnlive.shenhe.serviceImpl;
  2 +import com.google.common.collect.Lists;
  3 +
  4 +import com.cnlive.shenhe.entity.BootTest;
  5 +import com.cnlive.shenhe.mapper.BootTestMapper;
  6 +import com.cnlive.shenhe.utils.CommonUtils;
  7 +import com.github.pagehelper.Page;
  8 +import com.github.pagehelper.PageHelper;
  9 +import com.github.pagehelper.PageInfo;
  10 +import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.stereotype.Service;
  12 +
  13 +import java.util.List;
  14 +
  15 +/**
  16 + * @Author: yanzhaowang
  17 + * @Date: 2022/3/4 13:38
  18 + */
  19 +@Service
  20 +public class BootTestServiceImpl {
  21 +
  22 + @Autowired
  23 + BootTestMapper bootTestMapper;
  24 +
  25 + /**
  26 + *根据主键查询对象
  27 + * @param boottestid
  28 + * @return
  29 + */
  30 + public BootTest selectByid(String boottestid) {
  31 +
  32 + if (CommonUtils.isEmpty(boottestid)) {
  33 + return null;
  34 + }
  35 + BootTest bootTest = bootTestMapper.selectByPrimaryKey(boottestid);
  36 +
  37 + return bootTest;
  38 + }
  39 +
  40 + /**
  41 + * 查询所有的数据
  42 + * @return
  43 + */
  44 + public List<BootTest> selectAll(int pagesaiz, int pagenum){
  45 +// PageInfo pageInfo = new PageInfo();
  46 +// pageInfo.setSize(pagesaiz);
  47 +// pageInfo.setPageNum(pagenum);
  48 +// PageHelper pageHelper = new PageHelper();
  49 + List<BootTest> bootTestList = bootTestMapper.selectAll();
  50 +// pageInfo.setList(bootTestList);
  51 + return bootTestList;
  52 + }
  53 +
  54 + /**
  55 + * 添加一个对象
  56 + * @param bootTest
  57 + * @return
  58 + */
  59 + public int addBootTest(BootTest bootTest) {
  60 + Integer age = bootTest.getAge();
  61 + if (age >= 18 && age <= 60) {
  62 + int i = bootTestMapper.insertSelective(bootTest);
  63 + return i;
  64 + }
  65 + return 0;
  66 + }
  67 +
  68 + /**
  69 + * 根据主键删除一个对象
  70 + * @param boottestid
  71 + * @return
  72 + */
  73 + public int deleteBootTest(String boottestid){
  74 + if (boottestid == null) {
  75 + return 0;
  76 + }
  77 + int i = bootTestMapper.deleteByPrimaryKey(boottestid);
  78 + return i;
  79 + }
  80 +
  81 + /**
  82 + * 根据条件修改对象
  83 + * @return
  84 + */
  85 + public int updateBootTest(BootTest bootTest){
  86 + if (bootTest != null) {
  87 + int i = bootTestMapper.updateByPrimaryKeySelective(bootTest);
  88 + return i;
  89 + }
  90 + return 0;
  91 +
  92 + }
  93 +}
src/main/java/com/cnlive/shenhe/utils/CommonUtils.java
  View file @d34eb17
@@ -21,7 +21,7 @@ import java.text.ParseException; @@ -21,7 +21,7 @@ import java.text.ParseException;
21 import java.text.SimpleDateFormat; 21 import java.text.SimpleDateFormat;
22 import java.util.*; 22 import java.util.*;
23 23
24 -public class CommonUtils { 24 +public class CommonUtils {
25 private static char md5Chars[] = { 25 private static char md5Chars[] = {
26 '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 26 '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
27 'a', 'b', 'c', 'd', 'e', 'f' 27 'a', 'b', 'c', 'd', 'e', 'f'
src/main/resources/application.properties
  View file @d34eb17
1 -spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
2 -spring.datasource.username=root  
3 -spring.datasource.password=M345sdfss4! 1 +spring.profiles.active=dev
4 2
5 -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
6 -#spring.datasource.username=root  
7 -#spring.datasource.password=nbLdyO.79  
8 3
9 -#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false  
10 -#spring.datasource.username=admin  
11 -#spring.datasource.password=Sre#45iU7kJ  
12 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver  
13 4
14 -server.tomcat.protocol_header=x-forwarded-proto  
15 -server.use-forward-headers=true  
16 -  
17 -spring.jpa.properties.hibernate.hbm2ddl.auto=update  
18 -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
19 -spring.jpa.show-sql= true  
20 -  
21 -server.tomcat.uri-encoding=UTF-8  
22 -spring.http.encoding.charset=UTF-8  
23 -spring.http.encoding.enabled=true  
24 -spring.http.encoding.force=true  
25 -  
26 -spring.thymeleaf.mode=LEGACYHTML5  
27 -#spring.thymeleaf.encoding=UTF-8  
28 -#spring.thymeleaf.content-type=text/html  
29 -#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762  
30 -spring.thymeleaf.cache=false  
31 -  
32 -#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql  
33 -#logging.level.com.cnlive.shenhe.mapper=debug  
34 -  
35 -mybatis.mapper-locations=classpath:mapper/*.xml  
36 -mybatis.type-aliases-package=com.cnlive.shenhe.entity  
37 -server.port=82  
38 -  
39 -#rabbitmq\u76f8\u5173\u914d\u7f6e  
40 -spring.rabbitmq.host=10.254.174.131  
41 -spring.rabbitmq.port=5672  
42 -spring.rabbitmq.username=test  
43 -spring.rabbitmq.password=p3~amKKt9  
44 -# \u5f00\u542f\u53d1\u9001\u786e\u8ba4  
45 -spring.rabbitmq.publisher-confirms=true  
46 -# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de  
47 -spring.rabbitmq.publisher-returns=true  
48 -# \u5f00\u542fACK  
49 -spring.rabbitmq.listener.direct.acknowledge-mode=manual  
50 -spring.rabbitmq.listener.simple.acknowledge-mode=manual  
51 -  
52 -#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5  
53 -#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=  
54 -  
55 -#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico  
56 -spring.mvc.favicon.enabled = false  
57 -  
58 -#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API  
59 -speak_comment=http://comment.cnlive.com/services/commentForTopic/muted  
60 -  
61 -#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528  
62 -spring.application.name=cnlive_shenhe_test  
63 -spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log  
64 -  
65 -sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser  
66 -sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae  
67 -  
68 -#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f  
69 -queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=  
70 -queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=  
71 -  
72 -#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf  
73 -url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify  
74 -platformKey =AUDIT  
75 -platformValue=10011438  
76 -  
77 -#\u672c\u673a\u5730\u5740  
78 -spring.localhost.url=http://test.shen.cnlive.com  
79 -  
80 -#\u62bd\u5e27\u5e38\u91cf  
81 -avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9  
82 -avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9  
83 -avsmple_url=http://test.transcode.cnlive.com/api/request  
84 -avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback  
85 -  
86 -#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f  
87 -live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe  
88 -  
89 -#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf  
90 -email_app_id=769_jetja50p18  
91 -email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba  
92 -email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action  
93 -  
94 -#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d  
95 -qn_bucket=cnlivetest  
96 -qn_domain=http://test.qnvod.cnlive.com  
97 -ks_bucket=cnlive-test  
98 -ks_domain=http://test.wideo.cnlive.com  
99 -  
100 -#qn_bucket=mam-sxzg-82  
101 -#qn_domain=http://sxzg.ys2.cnliveimg.com  
102 -#ks_bucket=mam-sxzg-82  
103 -#ks_domain=http://sxzg.ys1.cnliveimg.com  
104 -  
105 -#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84  
106 -desdir=shen  
107 -yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio  
108 -cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById  
src/main/resources/application_dev.properties 0 → 100644
  View file @d34eb17
  1 +server.port=8081
  2 +
  3 +
  4 +spring.datasource.url=jdbc:mysql://120.92.102.31:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  5 +spring.datasource.username=root
  6 +spring.datasource.password=M345sdfss4!
  7 +
  8 +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  9 +#spring.datasource.username=root
  10 +#spring.datasource.password=nbLdyO.79
  11 +
  12 +#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  13 +#spring.datasource.username=admin
  14 +#spring.datasource.password=Sre#45iU7kJ
  15 +#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
  16 +
  17 +server.tomcat.protocol_header=x-forwarded-proto
  18 +server.use-forward-headers=true
  19 +
  20 +spring.jpa.properties.hibernate.hbm2ddl.auto=update
  21 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  22 +spring.jpa.show-sql= true
  23 +
  24 +#server.tomcat.uri-encoding=UTF-8
  25 +#spring.http.encoding.charset=UTF-8
  26 +#spring.http.encoding.enabled=true
  27 +#spring.http.encoding.force=true
  28 +#
  29 +#spring.thymeleaf.mode=LEGACYHTML5
  30 +#spring.thymeleaf.encoding=UTF-8
  31 +#spring.thymeleaf.content-type=text/html
  32 +#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762
  33 +#spring.thymeleaf.cache=false
  34 +
  35 +spring.freemarker.settings.classic_compatible=true
  36 +
  37 +#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
  38 +#logging.level.com.cnlive.shenhe.mapper=debug
  39 +
  40 +#mybatis.mapper-locations=classpath:mapper/*.xml
  41 +#mybatis.type-aliases-package=com.cnlive.shenhe.entity
  42 +
  43 +
  44 +#rabbitmq\u76f8\u5173\u914d\u7f6e
  45 +spring.rabbitmq.host=10.254.174.131
  46 +spring.rabbitmq.port=5672
  47 +spring.rabbitmq.username=test
  48 +spring.rabbitmq.password=p3~amKKt9
  49 +# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
  50 +spring.rabbitmq.publisher-confirms=true
  51 +# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
  52 +spring.rabbitmq.publisher-returns=true
  53 +# \u5f00\u542fACK
  54 +#spring.rabbitmq.listener.direct.acknowledge-mode=manual
  55 +#spring.rabbitmq.listener.simple.acknowledge-mode=manual
  56 +
  57 +#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
  58 +#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
  59 +
  60 +#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
  61 +#spring.mvc.favicon.enabled = false
  62 +
  63 +#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
  64 +speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
  65 +
  66 +#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
  67 +spring.application.name=cnlive_shenhe_test
  68 +spring.application.home=/usr/local/test_cnlive_shenhe/cnlive_shenhe/log
  69 +
  70 +sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
  71 +sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
  72 +
  73 +#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
  74 +queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
  75 +queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
  76 +
  77 +#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
  78 +url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
  79 +platformKey =AUDIT
  80 +platformValue=10011438
  81 +
  82 +#\u672c\u673a\u5730\u5740
  83 +spring.localhost.url=http://test.shen.cnlive.com
  84 +
  85 +#\u62bd\u5e27\u5e38\u91cf
  86 +avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
  87 +avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
  88 +avsmple_url=http://test.transcode.cnlive.com/api/request
  89 +avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
  90 +
  91 +#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
  92 +live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
  93 +
  94 +#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
  95 +#email_app_id=769_jetja50p18
  96 +#email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
  97 +#email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
  98 +
  99 +#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
  100 +qn_bucket=cnlivetest
  101 +qn_domain=http://test.qnvod.cnlive.com
  102 +ks_bucket=cnlive-test
  103 +ks_domain=http://test.wideo.cnlive.com
  104 +
  105 +#qn_bucket=mam-sxzg-82
  106 +#qn_domain=http://sxzg.ys2.cnliveimg.com
  107 +#ks_bucket=mam-sxzg-82
  108 +#ks_domain=http://sxzg.ys1.cnliveimg.com
  109 +
  110 +#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
  111 +desdir=shen
  112 +yiDun_audio_callback=http://test.shen.cnlive.com/api/audio/callbackAudio
  113 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById
src/main/resources/application_prod.properties 0 → 100644
  View file @d34eb17
  1 +server.port=8082
  2 +
  3 +spring.datasource.url=jdbc:mysql://120.92.51.254: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.url=jdbc:mysql://127.0.0.1:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  8 +#spring.datasource.username=root
  9 +#spring.datasource.password=nbLdyO.79
  10 +
  11 +#spring.datasource.url=jdbc:mysql://10.137.192.2:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  12 +#spring.datasource.username=admin
  13 +#spring.datasource.password=Sre#45iU7kJ
  14 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver
  15 +
  16 +server.tomcat.protocol_header=x-forwarded-proto
  17 +server.use-forward-headers=true
  18 +
  19 +spring.jpa.properties.hibernate.hbm2ddl.auto=update
  20 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  21 +spring.jpa.show-sql= true
  22 +
  23 +server.tomcat.uri-encoding=UTF-8
  24 +spring.http.encoding.charset=UTF-8
  25 +spring.http.encoding.enabled=true
  26 +spring.http.encoding.force=true
  27 +
  28 +spring.thymeleaf.mode=LEGACYHTML5
  29 +#spring.thymeleaf.encoding=UTF-8
  30 +#spring.thymeleaf.content-type=text/html
  31 +#\u5f00\u53d1\u65f6\u5173\u95ed\u7f13\u5b58,\u4e0d\u7136\u6ca1\u6cd5\u770b\u5230\u5b9e\u65f6\u9875\u9762
  32 +spring.thymeleaf.cache=false
  33 +
  34 +spring.freemarker.settings.classic_compatible=true
  35 +
  36 +#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
  37 +#logging.level.com.cnlive.shenhe.mapper=debug
  38 +
  39 +mybatis.mapper-locations=classpath:mapper/*.xml
  40 +mybatis.type-aliases-package=com.cnlive.shenhe.entity
  41 +
  42 +
  43 +#rabbitmq\u76f8\u5173\u914d\u7f6e
  44 +spring.rabbitmq.host=10.254.174.131
  45 +spring.rabbitmq.port=5672
  46 +spring.rabbitmq.username=test
  47 +spring.rabbitmq.password=p3~amKKt9
  48 +# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
  49 +spring.rabbitmq.publisher-confirms=true
  50 +# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
  51 +spring.rabbitmq.publisher-returns=true
  52 +# \u5f00\u542fACK
  53 +#spring.rabbitmq.listener.direct.acknowledge-mode=manual
  54 +#spring.rabbitmq.listener.simple.acknowledge-mode=manual
  55 +
  56 +#\u8bdd\u9898\u8bc4\u8bba\u5206\u4eabh5
  57 +#topic_comment_shareH5=http://wjjh5test.cnlive.com/cnShareTopic.html?tid=
  58 +
  59 +#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
  60 +spring.mvc.favicon.enabled = false
  61 +
  62 +#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
  63 +speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
  64 +
  65 +#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
  66 +spring.application.name=cnlive_shenhe
  67 +spring.application.home=/usr/local/cnlive_shenhe/log
  68 +
  69 +sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
  70 +sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
  71 +
  72 +#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
  73 +queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
  74 +queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
  75 +
  76 +#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
  77 +url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
  78 +platformKey =AUDIT
  79 +platformValue=10011438
  80 +
  81 +#\u672c\u673a\u5730\u5740
  82 +spring.localhost.url=http://shen.cnlive.com
  83 +
  84 +#\u62bd\u5e27\u5e38\u91cf
  85 +avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
  86 +avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
  87 +avsmple_url=http://transcode.cnlive.com/api/request
  88 +avsmple_callback=http://shen.cnlive.com/api/avsample/callback
  89 +
  90 +#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
  91 +live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
  92 +
  93 +#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
  94 +email_app_id=769_jetja50p18
  95 +email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
  96 +email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
  97 +
  98 +#\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
  99 +qn_bucket=cnlivetest
  100 +qn_domain=http://test.qnvod.cnlive.com
  101 +ks_bucket=cnlive-test
  102 +ks_domain=http://test.wideo.cnlive.com
  103 +
  104 +#qn_bucket=mam-sxzg-82
  105 +#qn_domain=http://sxzg.ys2.cnliveimg.com
  106 +#ks_bucket=mam-sxzg-82
  107 +#ks_domain=http://sxzg.ys1.cnliveimg.com
  108 +
  109 +#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
  110 +desdir=shen
  111 +yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
  112 +cms_getVideoAndLiveId=http://cmstest.cnlive.com:8768/contentApi/getBeanById
src/main/resources/mapper/BootTestMapper.xml 0 → 100644
  View file @d34eb17
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.cnlive.shenhe.mapper.BootTestMapper">
  4 + <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.BootTest">
  5 + <!--
  6 + WARNING - @mbg.generated
  7 + -->
  8 + <id column="id" jdbcType="INTEGER" property="id" />
  9 + <result column="name" jdbcType="VARCHAR" property="name" />
  10 + <result column="age" jdbcType="INTEGER" property="age" />
  11 + <result column="address" jdbcType="VARCHAR" property="address" />
  12 + <result column="hobby" jdbcType="VARCHAR" property="hobby" />
  13 + </resultMap>
  14 +</mapper>
0 \ No newline at end of file 15 \ No newline at end of file
src/main/resources/mapper/ShyAudioMapper.xml
  View file @d34eb17
@@ -42,4 +42,5 @@ @@ -42,4 +42,5 @@
42 FROM shy_audio 42 FROM shy_audio
43 where audioId = #{audioId,jdbcType=VARCHAR}; 43 where audioId = #{audioId,jdbcType=VARCHAR};
44 </select> 44 </select>
  45 +
45 </mapper> 46 </mapper>
46 \ No newline at end of file 47 \ No newline at end of file