huwhois 4 gadi atpakaļ
vecāks
revīzija
9e08e623eb

+ 2 - 2
src/main/java/io/renren/modules/admin/controller/MeetingController.java

@ -93,7 +93,7 @@ public class MeetingController {
93 93
                tip.setStatus("success");
94 94
                tip.setUid((new Date().getTime())+i);
95 95
                tip.setPicname(string);
96
                tip.setUrl("http://192.168.3.233" + string);
96
                tip.setUrl(string);
97 97
                arlist.add(tip);
98 98
            }
99 99
        } else if (StringUtils.isNotBlank(meeting.getTitlePicture())){
@ -101,7 +101,7 @@ public class MeetingController {
101 101
            tip.setStatus("success");
102 102
            tip.setUid(new Date().getTime());
103 103
            tip.setPicname(meeting.getTitlePicture());
104
            tip.setUrl("http://192.168.3.233" + meeting.getTitlePicture());
104
            tip.setUrl(meeting.getTitlePicture());
105 105
            arlist.add(tip);
106 106
        }
107 107
        

+ 5 - 4
src/main/resources/application-test.yml

@ -3,9 +3,9 @@ spring:
3 3
        type: com.alibaba.druid.pool.DruidDataSource
4 4
        druid:
5 5
            driver-class-name: com.mysql.cj.jdbc.Driver
6
            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
7
            username: renren
8
            password: 123456
6
            url: jdbc:mysql://localhost:3306/meeting?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
7
            username: root
8
            password: y(ap>pXDZ6-Q@1137430362
9 9
            initial-size: 10
10 10
            max-active: 100
11 11
            min-idle: 10
@ -50,6 +50,7 @@ spring:
50 50
file:
51 51
    datapath: /web/www/meeting
52 52
    uploadFolder: /uploads
53
53 54
## 前台访问地址
54 55
url:
55
    qrcode: http://192.168.3.233/qrcode/webmeeting.html?orderId=
56
    qrcode: http://meeting.ecorr.org/qrcode/webmeeting.html?orderId=

+ 1 - 1
src/main/resources/application.yml

@ -12,7 +12,7 @@ server:
12 12
spring:
13 13
  # 环境 dev|test|prod
14 14
  profiles:
15
    active: dev
15
    active: test
16 16
  # jackson时间格式化
17 17
  jackson:
18 18
    time-zone: GMT+8