guzijian / wvp-GB28181-pro · Commits

Commit 937e59143004b11a808eb93eb894ffe53871a19a

Authored by panlinlin
1 parent 662ce3b4

解决串流，解决编辑上级平台却新建了的问题

Inline Side-by-side
Showing 32 changed files with 576 additions and 155 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
  View file @937e591
@@ -118,7 +118,7 @@ public class SipLayer implements SipListener { @@ -118,7 +118,7 @@ public class SipLayer implements SipListener {
118 */ 118 */
119 @Override 119 @Override
120 public void processRequest(RequestEvent evt) { 120 public void processRequest(RequestEvent evt) {
121 - logger.debug(evt.getRequest().toString()); 121 +// logger.debug(evt.getRequest().toString());
122 // 由于jainsip是单线程程序，为提高性能并发处理 122 // 由于jainsip是单线程程序，为提高性能并发处理
123 processThreadPool.execute(() -> { 123 processThreadPool.execute(() -> {
124 if (processorFactory != null) { 124 if (processorFactory != null) {
@@ -130,7 +130,7 @@ public class SipLayer implements SipListener { @@ -130,7 +130,7 @@ public class SipLayer implements SipListener {
130 @Override 130 @Override
131 public void processResponse(ResponseEvent evt) { 131 public void processResponse(ResponseEvent evt) {
132 Response response = evt.getResponse(); 132 Response response = evt.getResponse();
133 - logger.debug(evt.getResponse().toString()); 133 +// logger.debug(evt.getResponse().toString());
134 int status = response.getStatusCode(); 134 int status = response.getStatusCode();
135 if (((status >= 200) && (status < 300)) || status == 401) { // Success! 135 if (((status >= 200) && (status < 300)) || status == 401) { // Success!
136 ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt); 136 ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt);
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
  View file @937e591
@@ -3,6 +3,11 @@ package com.genersoft.iot.vmp.gb28181.bean; @@ -3,6 +3,11 @@ package com.genersoft.iot.vmp.gb28181.bean;
3 public class ParentPlatform { 3 public class ParentPlatform {
4 4
5 /** 5 /**
  6 + * id
  7 + */
  8 + private Integer id;
  9 +
  10 + /**
6 * 是否启用 11 * 是否启用
7 */ 12 */
8 private boolean enable; 13 private boolean enable;
@@ -99,6 +104,13 @@ public class ParentPlatform { @@ -99,6 +104,13 @@ public class ParentPlatform {
99 */ 104 */
100 private int channelCount; 105 private int channelCount;
101 106
  107 + public Integer getId() {
  108 + return id;
  109 + }
  110 +
  111 + public void setId(Integer id) {
  112 + this.id = id;
  113 + }
102 114
103 public boolean isEnable() { 115 public boolean isEnable() {
104 return enable; 116 return enable;
src/main/java/com/genersoft/iot/vmp/gb28181/event/platformKeepaliveExpire/PlatformKeepaliveExpireEventLister.java
  View file @937e591
@@ -49,7 +49,7 @@ public class PlatformKeepaliveExpireEventLister implements ApplicationListener&lt;P @@ -49,7 +49,7 @@ public class PlatformKeepaliveExpireEventLister implements ApplicationListener&lt;P
49 if (logger.isDebugEnabled()) { 49 if (logger.isDebugEnabled()) {
50 logger.debug("平台心跳到期事件事件触发，平台国标ID：" + event.getPlatformGbID()); 50 logger.debug("平台心跳到期事件事件触发，平台国标ID：" + event.getPlatformGbID());
51 } 51 }
52 - ParentPlatform parentPlatform = storager.queryParentPlatById(event.getPlatformGbID()); 52 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(event.getPlatformGbID());
53 ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(event.getPlatformGbID()); 53 ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(event.getPlatformGbID());
54 if (parentPlatformCatch == null) { 54 if (parentPlatformCatch == null) {
55 return; 55 return;
src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java
  View file @937e591
@@ -35,7 +35,7 @@ public class PlatformNotRegisterEventLister implements ApplicationListener&lt;Platf @@ -35,7 +35,7 @@ public class PlatformNotRegisterEventLister implements ApplicationListener&lt;Platf
35 35
36 logger.debug("平台未注册事件触发，平台国标ID：" + event.getPlatformGbID()); 36 logger.debug("平台未注册事件触发，平台国标ID：" + event.getPlatformGbID());
37 37
38 - ParentPlatform parentPlatform = storager.queryParentPlatById(event.getPlatformGbID()); 38 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(event.getPlatformGbID());
39 if (parentPlatform == null) { 39 if (parentPlatform == null) {
40 logger.debug("平台未注册事件触发，但平台已经删除!!! 平台国标ID：" + event.getPlatformGbID()); 40 logger.debug("平台未注册事件触发，但平台已经删除!!! 平台国标ID：" + event.getPlatformGbID());
41 return; 41 return;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @937e591
@@ -365,9 +365,14 @@ public class SIPCommander implements ISIPCommander { @@ -365,9 +365,14 @@ public class SIPCommander implements ISIPCommander {
365 // 添加订阅 365 // 添加订阅
366 JSONObject subscribeKey = new JSONObject(); 366 JSONObject subscribeKey = new JSONObject();
367 subscribeKey.put("app", "rtp"); 367 subscribeKey.put("app", "rtp");
368 - subscribeKey.put("id", streamId);  
369 -  
370 - subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, subscribeKey, event); 368 + subscribeKey.put("stream", streamId);
  369 + subscribeKey.put("regist", true);
  370 +
  371 + subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, json->{
  372 + if (json.getJSONArray("tracks") == null) return;
  373 + event.response(json);
  374 + subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
  375 + });
371 // 376 //
372 StringBuffer content = new StringBuffer(200); 377 StringBuffer content = new StringBuffer(200);
373 content.append("v=0\r\n"); 378 content.append("v=0\r\n");
@@ -465,9 +470,14 @@ public class SIPCommander implements ISIPCommander { @@ -465,9 +470,14 @@ public class SIPCommander implements ISIPCommander {
465 // 添加订阅 470 // 添加订阅
466 JSONObject subscribeKey = new JSONObject(); 471 JSONObject subscribeKey = new JSONObject();
467 subscribeKey.put("app", "rtp"); 472 subscribeKey.put("app", "rtp");
468 - subscribeKey.put("id", streamId);  
469 -  
470 - subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, subscribeKey, event); 473 + subscribeKey.put("stream", streamId);
  474 + subscribeKey.put("regist", true);
  475 +
  476 + subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey, json->{
  477 + if (json.getJSONArray("tracks") == null) return;
  478 + event.response(json);
  479 + subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
  480 + });
471 481
472 StringBuffer content = new StringBuffer(200); 482 StringBuffer content = new StringBuffer(200);
473 content.append("v=0\r\n"); 483 content.append("v=0\r\n");
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java
  View file @937e591
@@ -86,7 +86,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor { @@ -86,7 +86,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
86 } 86 }
87 87
88 // 查询请求方是否上级平台 88 // 查询请求方是否上级平台
89 - ParentPlatform platform = storager.queryParentPlatById(requesterId); 89 + ParentPlatform platform = storager.queryParentPlatByServerGBId(requesterId);
90 if (platform != null) { 90 if (platform != null) {
91 // 查询平台下是否有该通道 91 // 查询平台下是否有该通道
92 DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId); 92 DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
  View file @937e591
@@ -238,7 +238,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -238,7 +238,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
238 // 回复200 OK 238 // 回复200 OK
239 responseAck(evt); 239 responseAck(evt);
240 String sn = rootElement.element("SN").getText(); 240 String sn = rootElement.element("SN").getText();
241 - ParentPlatform parentPlatform = storager.queryParentPlatById(platformId); 241 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
242 cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag()); 242 cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag());
243 } 243 }
244 } else { 244 } else {
@@ -303,7 +303,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -303,7 +303,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
303 if (deviceId.equals(targetGBId)) { 303 if (deviceId.equals(targetGBId)) {
304 // 远程启动本平台：需要在重新启动程序后先对SipStack解绑 304 // 远程启动本平台：需要在重新启动程序后先对SipStack解绑
305 logger.info("执行远程启动本平台命令"); 305 logger.info("执行远程启动本平台命令");
306 - ParentPlatform parentPlatform = storager.queryParentPlatById(platformId); 306 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
307 cmderFroPlatform.unregister(parentPlatform, null, null); 307 cmderFroPlatform.unregister(parentPlatform, null, null);
308 308
309 Thread restartThread = new Thread(new Runnable() { 309 Thread restartThread = new Thread(new Runnable() {
@@ -463,7 +463,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -463,7 +463,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
463 // 回复200 OK 463 // 回复200 OK
464 responseAck(evt); 464 responseAck(evt);
465 String sn = rootElement.element("SN").getText(); 465 String sn = rootElement.element("SN").getText();
466 - ParentPlatform parentPlatform = storager.queryParentPlatById(platformId); 466 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
467 cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag()); 467 cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
468 } 468 }
469 } else { 469 } else {
@@ -517,7 +517,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { @@ -517,7 +517,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
517 // if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求 517 // if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求
518 if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求 518 if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求
519 // TODO 后续将代码拆分 519 // TODO 后续将代码拆分
520 - ParentPlatform parentPlatform = storager.queryParentPlatById(platformId); 520 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
521 if (parentPlatform == null) { 521 if (parentPlatform == null) {
522 response404Ack(evt); 522 response404Ack(evt);
523 return; 523 return;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
  View file @937e591
@@ -82,7 +82,7 @@ public class RegisterResponseProcessor implements ISIPResponseProcessor { @@ -82,7 +82,7 @@ public class RegisterResponseProcessor implements ISIPResponseProcessor {
82 redisCatchStorage.delPlatformRegisterInfo(callId); 82 redisCatchStorage.delPlatformRegisterInfo(callId);
83 parentPlatform.setStatus(true); 83 parentPlatform.setStatus(true);
84 // 取回Expires设置，避免注销过程中被置为0 84 // 取回Expires设置，避免注销过程中被置为0
85 - ParentPlatform parentPlatformTmp = storager.queryParentPlatById(platformGBId); 85 + ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
86 String expires = parentPlatformTmp.getExpires(); 86 String expires = parentPlatformTmp.getExpires();
87 parentPlatform.setExpires(expires); 87 parentPlatform.setExpires(expires);
88 storager.updateParentPlatform(parentPlatform); 88 storager.updateParentPlatform(parentPlatform);
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @937e591
@@ -240,6 +240,10 @@ public class ZLMHttpHookListener { @@ -240,6 +240,10 @@ public class ZLMHttpHookListener {
240 if (logger.isDebugEnabled()) { 240 if (logger.isDebugEnabled()) {
241 logger.debug("ZLM HOOK on_stream_changed API调用，参数：" + json.toString()); 241 logger.debug("ZLM HOOK on_stream_changed API调用，参数：" + json.toString());
242 } 242 }
  243 +
  244 + ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);
  245 + if (subscribe != null) subscribe.response(json);
  246 +
243 // 流消失移除redis play 247 // 流消失移除redis play
244 String app = json.getString("app"); 248 String app = json.getString("app");
245 String streamId = json.getString("stream"); 249 String streamId = json.getString("stream");
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
  View file @937e591
@@ -163,6 +163,10 @@ public class ZLMRESTfulUtils { @@ -163,6 +163,10 @@ public class ZLMRESTfulUtils {
163 return sendPost("closeRtpServer",param, null); 163 return sendPost("closeRtpServer",param, null);
164 } 164 }
165 165
  166 + public JSONObject listRtpServer() {
  167 + return sendPost("listRtpServer",null, null);
  168 + }
  169 +
166 public JSONObject startSendRtp(Map<String, Object> param) { 170 public JSONObject startSendRtp(Map<String, Object> param) {
167 return sendPost("startSendRtp",param, null); 171 return sendPost("startSendRtp",param, null);
168 } 172 }
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  View file @937e591
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
  3 +import com.alibaba.fastjson.JSONArray;
3 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
4 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; 5 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
5 import com.genersoft.iot.vmp.gb28181.session.SsrcUtil; 6 import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
@@ -27,7 +28,28 @@ public class ZLMRTPServerFactory { @@ -27,7 +28,28 @@ public class ZLMRTPServerFactory {
27 28
28 private int currentPort = 0; 29 private int currentPort = 0;
29 30
  31 + private Map<String, Integer> currentStreams = null;
  32 +
30 public int createRTPServer(String streamId) { 33 public int createRTPServer(String streamId) {
  34 + if (currentStreams == null) {
  35 + currentStreams = new HashMap<>();
  36 + JSONObject jsonObject = zlmresTfulUtils.listRtpServer();
  37 + JSONArray data = jsonObject.getJSONArray("data");
  38 + if (data != null) {
  39 + for (int i = 0; i < data.size(); i++) {
  40 + JSONObject dataItem = data.getJSONObject(i);
  41 + currentStreams.put(dataItem.getString("stream_id"), dataItem.getInteger("port"));
  42 + }
  43 + }
  44 + }
  45 + // 已经在推流
  46 + if (currentStreams.get(streamId) != null) {
  47 + Map<String, Object> closeRtpServerParam = new HashMap<>();
  48 + closeRtpServerParam.put("stream_id", streamId);
  49 + zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
  50 + currentStreams.remove(streamId);
  51 + }
  52 +
31 Map<String, Object> param = new HashMap<>(); 53 Map<String, Object> param = new HashMap<>();
32 int result = -1; 54 int result = -1;
33 int newPort = getPortFromUdpPortRange(); 55 int newPort = getPortFromUdpPortRange();
@@ -35,14 +57,16 @@ public class ZLMRTPServerFactory { @@ -35,14 +57,16 @@ public class ZLMRTPServerFactory {
35 param.put("enable_tcp", 1); 57 param.put("enable_tcp", 1);
36 param.put("stream_id", streamId); 58 param.put("stream_id", streamId);
37 JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param); 59 JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
38 - System.out.println(jsonObject);  
39 60
40 if (jsonObject != null) { 61 if (jsonObject != null) {
41 switch (jsonObject.getInteger("code")){ 62 switch (jsonObject.getInteger("code")){
42 case 0: 63 case 0:
43 result= newPort; 64 result= newPort;
44 break; 65 break;
45 - case -300: // id已经存在 66 + case -300: // id已经存在, 可能已经在其他端口推流
  67 + Map<String, Object> closeRtpServerParam = new HashMap<>();
  68 + closeRtpServerParam.put("stream_id", streamId);
  69 + zlmresTfulUtils.closeRtpServer(closeRtpServerParam);
46 result = newPort; 70 result = newPort;
47 break; 71 break;
48 case -400: // 端口占用 72 case -400: // 端口占用
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @937e591
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
  3 +import com.alibaba.fastjson.JSONArray;
  4 +import com.alibaba.fastjson.JSONObject;
3 import com.genersoft.iot.vmp.common.StreamInfo; 5 import com.genersoft.iot.vmp.common.StreamInfo;
4 6
5 /** 7 /**
@@ -21,6 +23,6 @@ public interface IMediaService { @@ -21,6 +23,6 @@ public interface IMediaService {
21 * @param stream 23 * @param stream
22 * @return 24 * @return
23 */ 25 */
24 - StreamInfo getStreamInfoByAppAndStream(String app, String stream); 26 + StreamInfo getStreamInfoByAppAndStream(String app, String stream, JSONArray tracks);
25 27
26 } 28 }
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
  View file @937e591
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
  3 +import com.alibaba.fastjson.JSON;
  4 +import com.alibaba.fastjson.JSONArray;
3 import com.alibaba.fastjson.JSONObject; 5 import com.alibaba.fastjson.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 6 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.MediaServerConfig; 7 import com.genersoft.iot.vmp.conf.MediaServerConfig;
@@ -25,7 +27,7 @@ public class MediaServiceImpl implements IMediaService { @@ -25,7 +27,7 @@ public class MediaServiceImpl implements IMediaService {
25 27
26 28
27 @Override 29 @Override
28 - public StreamInfo getStreamInfoByAppAndStream(String app, String stream) { 30 + public StreamInfo getStreamInfoByAppAndStream(String app, String stream, JSONArray tracks) {
29 MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); 31 MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
30 StreamInfo streamInfoResult = new StreamInfo(); 32 StreamInfo streamInfoResult = new StreamInfo();
31 streamInfoResult.setStreamId(stream); 33 streamInfoResult.setStreamId(stream);
@@ -41,7 +43,7 @@ public class MediaServiceImpl implements IMediaService { @@ -41,7 +43,7 @@ public class MediaServiceImpl implements IMediaService {
41 streamInfoResult.setTs(String.format("http://%s:%s/%s/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream)); 43 streamInfoResult.setTs(String.format("http://%s:%s/%s/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream));
42 streamInfoResult.setWs_ts(String.format("ws://%s:%s/%s/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream)); 44 streamInfoResult.setWs_ts(String.format("ws://%s:%s/%s/%s.live.ts", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream));
43 streamInfoResult.setRtc(String.format("http://%s:%s/index/api/webrtc?app=%s&stream=%s&type=play", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream)); 45 streamInfoResult.setRtc(String.format("http://%s:%s/index/api/webrtc?app=%s&stream=%s&type=play", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), app, stream));
44 - 46 + streamInfoResult.setTracks(tracks);
45 return streamInfoResult; 47 return streamInfoResult;
46 } 48 }
47 49
@@ -50,7 +52,14 @@ public class MediaServiceImpl implements IMediaService { @@ -50,7 +52,14 @@ public class MediaServiceImpl implements IMediaService {
50 StreamInfo streamInfo = null; 52 StreamInfo streamInfo = null;
51 JSONObject mediaList = zlmresTfulUtils.getMediaList(app, stream); 53 JSONObject mediaList = zlmresTfulUtils.getMediaList(app, stream);
52 if (mediaList != null) { 54 if (mediaList != null) {
53 - streamInfo = getStreamInfoByAppAndStream(app, stream); 55 + if (mediaList.getInteger("code") == 0) {
  56 + JSONArray data = mediaList.getJSONArray("data");
  57 + if (data == null) return null;
  58 + JSONObject mediaJSON = JSON.parseObject(JSON.toJSONString(data.get(0)), JSONObject.class);
  59 + JSONArray tracks = mediaJSON.getJSONArray("tracks");
  60 + streamInfo = getStreamInfoByAppAndStream(app, stream, tracks);
  61 + }
  62 +
54 } 63 }
55 return streamInfo; 64 return streamInfo;
56 } 65 }
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
  View file @937e591
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
  4 +import com.alibaba.fastjson.JSONArray;
4 import com.alibaba.fastjson.JSONObject; 5 import com.alibaba.fastjson.JSONObject;
5 import com.genersoft.iot.vmp.common.StreamInfo; 6 import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.gb28181.bean.Device; 7 import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -83,6 +84,13 @@ public class PlayServiceImpl implements IPlayService { @@ -83,6 +84,13 @@ public class PlayServiceImpl implements IPlayService {
83 }); 84 });
84 } else { 85 } else {
85 String streamId = streamInfo.getStreamId(); 86 String streamId = streamInfo.getStreamId();
  87 + if (streamId == null) {
  88 + RequestMessage msg = new RequestMessage();
  89 + msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
  90 + msg.setData(String.format("点播失败， redis缓存streamId等于null"));
  91 + resultHolder.invokeResult(msg);
  92 + return playResult;
  93 + }
86 JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId); 94 JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
87 if (rtpInfo != null && rtpInfo.getBoolean("exist")) { 95 if (rtpInfo != null && rtpInfo.getBoolean("exist")) {
88 RequestMessage msg = new RequestMessage(); 96 RequestMessage msg = new RequestMessage();
@@ -150,8 +158,9 @@ public class PlayServiceImpl implements IPlayService { @@ -150,8 +158,9 @@ public class PlayServiceImpl implements IPlayService {
150 } 158 }
151 159
152 public StreamInfo onPublishHandler(JSONObject resonse, String deviceId, String channelId, String uuid) { 160 public StreamInfo onPublishHandler(JSONObject resonse, String deviceId, String channelId, String uuid) {
153 - String streamId = resonse.getString("id");  
154 - StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream("rtp", streamId); 161 + String streamId = resonse.getString("stream");
  162 + JSONArray tracks = resonse.getJSONArray("tracks");
  163 + StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream("rtp", streamId, tracks);
155 streamInfo.setDeviceID(deviceId); 164 streamInfo.setDeviceID(deviceId);
156 streamInfo.setChannelId(channelId); 165 streamInfo.setChannelId(channelId);
157 return streamInfo; 166 return streamInfo;
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
  View file @937e591
@@ -194,7 +194,7 @@ public interface IVideoManagerStorager { @@ -194,7 +194,7 @@ public interface IVideoManagerStorager {
194 * @param platformGbId 194 * @param platformGbId
195 * @return 195 * @return
196 */ 196 */
197 - ParentPlatform queryParentPlatById(String platformGbId); 197 + ParentPlatform queryParentPlatByServerGBId(String platformGbId);
198 198
199 /** 199 /**
200 * 所有平台离线 200 * 所有平台离线
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
  View file @937e591
@@ -25,6 +25,7 @@ public interface ParentPlatformMapper { @@ -25,6 +25,7 @@ public interface ParentPlatformMapper {
25 "SET enable=#{enable}, " + 25 "SET enable=#{enable}, " +
26 "name=#{name}," + 26 "name=#{name}," +
27 "deviceGBId=#{deviceGBId}," + 27 "deviceGBId=#{deviceGBId}," +
  28 + "serverGBId=#{serverGBId}, " +
28 "serverGBDomain=#{serverGBDomain}, " + 29 "serverGBDomain=#{serverGBDomain}, " +
29 "serverIP=#{serverIP}," + 30 "serverIP=#{serverIP}," +
30 "serverPort=#{serverPort}, " + 31 "serverPort=#{serverPort}, " +
@@ -39,7 +40,7 @@ public interface ParentPlatformMapper { @@ -39,7 +40,7 @@ public interface ParentPlatformMapper {
39 "ptz=#{ptz}, " + 40 "ptz=#{ptz}, " +
40 "rtcp=#{rtcp}, " + 41 "rtcp=#{rtcp}, " +
41 "status=#{status} " + 42 "status=#{status} " +
42 - "WHERE serverGBId=#{serverGBId}") 43 + "WHERE id=#{id}")
43 int updateParentPlatform(ParentPlatform parentPlatform); 44 int updateParentPlatform(ParentPlatform parentPlatform);
44 45
45 @Delete("DELETE FROM parent_platform WHERE serverGBId=#{serverGBId}") 46 @Delete("DELETE FROM parent_platform WHERE serverGBId=#{serverGBId}")
@@ -52,7 +53,10 @@ public interface ParentPlatformMapper { @@ -52,7 +53,10 @@ public interface ParentPlatformMapper {
52 List<ParentPlatform> getEnableParentPlatformList(boolean enable); 53 List<ParentPlatform> getEnableParentPlatformList(boolean enable);
53 54
54 @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}") 55 @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}")
55 - ParentPlatform getParentPlatById(String platformGbId); 56 + ParentPlatform getParentPlatByServerGBId(String platformGbId);
  57 +
  58 + @Select("SELECT * FROM parent_platform WHERE id=#{id}")
  59 + ParentPlatform getParentPlatById(int id);
56 60
57 @Update("UPDATE parent_platform SET status=false" ) 61 @Update("UPDATE parent_platform SET status=false" )
58 void outlineForAllParentPlatform(); 62 void outlineForAllParentPlatform();
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @937e591
@@ -271,15 +271,21 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @@ -271,15 +271,21 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
271 public boolean updateParentPlatform(ParentPlatform parentPlatform) { 271 public boolean updateParentPlatform(ParentPlatform parentPlatform) {
272 int result = 0; 272 int result = 0;
273 ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId()); 273 ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
274 - if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) { 274 + if (parentPlatform.getId() == null ) {
275 result = platformMapper.addParentPlatform(parentPlatform); 275 result = platformMapper.addParentPlatform(parentPlatform);
276 -  
277 if (parentPlatformCatch == null) { 276 if (parentPlatformCatch == null) {
278 parentPlatformCatch = new ParentPlatformCatch(); 277 parentPlatformCatch = new ParentPlatformCatch();
279 parentPlatformCatch.setParentPlatform(parentPlatform); 278 parentPlatformCatch.setParentPlatform(parentPlatform);
280 parentPlatformCatch.setId(parentPlatform.getServerGBId()); 279 parentPlatformCatch.setId(parentPlatform.getServerGBId());
281 } 280 }
282 }else { 281 }else {
  282 + if (parentPlatformCatch == null) { // serverGBId 已变化
  283 + ParentPlatform parentPlatById = platformMapper.getParentPlatById(parentPlatform.getId());
  284 + // 使用旧的查出缓存ID
  285 + parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatById.getServerGBId());
  286 + parentPlatformCatch.setId(parentPlatform.getServerGBId());
  287 + redisCatchStorage.delPlatformCatchInfo(parentPlatById.getServerGBId());
  288 + }
283 result = platformMapper.updateParentPlatform(parentPlatform); 289 result = platformMapper.updateParentPlatform(parentPlatform);
284 } 290 }
285 // 更新缓存 291 // 更新缓存
@@ -305,8 +311,8 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @@ -305,8 +311,8 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
305 } 311 }
306 312
307 @Override 313 @Override
308 - public ParentPlatform queryParentPlatById(String platformGbId) {  
309 - return platformMapper.getParentPlatById(platformGbId); 314 + public ParentPlatform queryParentPlatByServerGBId(String platformGbId) {
  315 + return platformMapper.getParentPlatByServerGBId(platformGbId);
310 } 316 }
311 317
312 @Override 318 @Override
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
  View file @937e591
@@ -111,7 +111,7 @@ public class PlatformController { @@ -111,7 +111,7 @@ public class PlatformController {
111 // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册 111 // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册
112 112
113 // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId()); 113 // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
114 - ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getServerGBId()); 114 + ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
115 115
116 boolean updateResult = storager.updateParentPlatform(parentPlatform); 116 boolean updateResult = storager.updateParentPlatform(parentPlatform);
117 117
@@ -123,8 +123,6 @@ public class PlatformController { @@ -123,8 +123,6 @@ public class PlatformController {
123 } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 关闭启用时注销 123 } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 关闭启用时注销
124 commanderForPlatform.unregister(parentPlatform, null, null); 124 commanderForPlatform.unregister(parentPlatform, null, null);
125 } 125 }
126 -  
127 -  
128 return new ResponseEntity<>("success", HttpStatus.OK); 126 return new ResponseEntity<>("success", HttpStatus.OK);
129 } else { 127 } else {
130 return new ResponseEntity<>("fail", HttpStatus.OK); 128 return new ResponseEntity<>("fail", HttpStatus.OK);
@@ -151,7 +149,7 @@ public class PlatformController { @@ -151,7 +149,7 @@ public class PlatformController {
151 ){ 149 ){
152 return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST); 150 return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
153 } 151 }
154 - ParentPlatform parentPlatform = storager.queryParentPlatById(serverGBId); 152 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
155 if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK); 153 if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK);
156 // 发送离线消息,无论是否成功都删除缓存 154 // 发送离线消息,无论是否成功都删除缓存
157 commanderForPlatform.unregister(parentPlatform, (event -> { 155 commanderForPlatform.unregister(parentPlatform, (event -> {
@@ -192,7 +190,7 @@ public class PlatformController { @@ -192,7 +190,7 @@ public class PlatformController {
192 if (logger.isDebugEnabled()) { 190 if (logger.isDebugEnabled()) {
193 logger.debug("查询上级平台是否存在API调用：" + serverGBId); 191 logger.debug("查询上级平台是否存在API调用：" + serverGBId);
194 } 192 }
195 - ParentPlatform parentPlatform = storager.queryParentPlatById(serverGBId); 193 + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
196 return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK); 194 return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
197 } 195 }
198 196
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @937e591
@@ -73,7 +73,6 @@ public class PlayController { @@ -73,7 +73,6 @@ public class PlayController {
73 public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId, 73 public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
74 @PathVariable String channelId) { 74 @PathVariable String channelId) {
75 75
76 -  
77 PlayResult playResult = playService.play(deviceId, channelId, null, null); 76 PlayResult playResult = playService.play(deviceId, channelId, null, null);
78 77
79 // 超时处理 78 // 超时处理
@@ -181,7 +180,7 @@ public class PlayController { @@ -181,7 +180,7 @@ public class PlayController {
181 JSONObject data = jsonObject.getJSONObject("data"); 180 JSONObject data = jsonObject.getJSONObject("data");
182 if (data != null) { 181 if (data != null) {
183 result.put("key", data.getString("key")); 182 result.put("key", data.getString("key"));
184 - StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStream("convert", streamId); 183 + StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId);
185 result.put("data", streamInfoResult); 184 result.put("data", streamInfoResult);
186 } 185 }
187 }else { 186 }else {
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
  View file @937e591
@@ -71,7 +71,7 @@ public class PlaybackController { @@ -71,7 +71,7 @@ public class PlaybackController {
71 logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId)); 71 logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
72 } 72 }
73 UUID uuid = UUID.randomUUID(); 73 UUID uuid = UUID.randomUUID();
74 - DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(); 74 + DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
75 // 超时处理 75 // 超时处理
76 result.onTimeout(()->{ 76 result.onTimeout(()->{
77 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId)); 77 logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
  View file @937e591
@@ -21,10 +21,10 @@ import javax.security.sasl.AuthenticationException; @@ -21,10 +21,10 @@ import javax.security.sasl.AuthenticationException;
21 public class UserController { 21 public class UserController {
22 22
23 @Autowired 23 @Autowired
24 - AuthenticationManager authenticationManager; 24 + private AuthenticationManager authenticationManager;
25 25
26 @Autowired 26 @Autowired
27 - IUserService userService; 27 + private IUserService userService;
28 28
29 @ApiOperation("登录") 29 @ApiOperation("登录")
30 @ApiImplicitParams({ 30 @ApiImplicitParams({
@@ -33,7 +33,7 @@ public class UserController { @@ -33,7 +33,7 @@ public class UserController {
33 }) 33 })
34 @GetMapping("/login") 34 @GetMapping("/login")
35 public String login(String username, String password){ 35 public String login(String username, String password){
36 - LoginUser user = null; 36 + LoginUser user;
37 try { 37 try {
38 user = SecurityUtils.login(username, password, authenticationManager); 38 user = SecurityUtils.login(username, password, authenticationManager);
39 } catch (AuthenticationException e) { 39 } catch (AuthenticationException e) {
src/main/resources/wvp.sqlite
View file @937e591
No preview for this file type
web_src/index.html
  View file @937e591
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta name="viewport" content="width=device-width,initial-scale=1.0"> 5 <meta name="viewport" content="width=device-width,initial-scale=1.0">
6 <title>国标28181</title> 6 <title>国标28181</title>
  7 + <link rel="stylesheet" type="text/css" href="/static/css/font-awesome.min.css">
  8 + <link rel="stylesheet" type="text/css" href="/static/css/login.css">
7 </head> 9 </head>
8 <body> 10 <body>
9 <script type="text/javascript" src="./js/EasyWasmPlayer.js"></script> 11 <script type="text/javascript" src="./js/EasyWasmPlayer.js"></script>
web_src/src/components/Login.vue
  View file @937e591
1 <template> 1 <template>
2 <div class="login" id="login"> 2 <div class="login" id="login">
3 - <a href="javascript:;" class="log-close"><i class="icons close"></i></a>  
4 - <div class="log-bg">  
5 - <div class="log-cloud cloud1"></div>  
6 - <div class="log-cloud cloud2"></div>  
7 - <div class="log-cloud cloud3"></div>  
8 - <div class="log-cloud cloud4"></div> 3 + <div class="limiter">
  4 + <div class="container-login100">
  5 + <div class="wrap-login100">
  6 + <span class="login100-form-title p-b-26">WVP视频平台</span>
  7 + <span class="login100-form-title p-b-48">
  8 + <i class="fa fa-video-camera"></i>
  9 + </span>
9 10
10 - <div class="log-logo">Welcome!</div>  
11 - <div class="log-text"></div>  
12 - </div>  
13 - <div class="log-email" v-loading="isLoging" >  
14 - <input type="text" placeholder="用户名" :class="'log-input' + (username==''?' log-input-empty':'')" v-model="username"><input type="password" placeholder="密码" :class="'log-input' + (password==''?' log-input-empty':'')" v-model="password">  
15 - <a href="javascript:;" class="log-btn" @click="login" >登录</a> 11 + <div class="wrap-input100 validate-input" data-validate = "Valid email is: a@b.c">
  12 + <input :class="'input100 ' + (username==''?'':'has-val')" type="text" v-model="username" name="username">
  13 + <span class="focus-input100" data-placeholder="用户名"></span>
  14 + </div>
  15 +
  16 + <div class="wrap-input100 validate-input" data-validate="Enter password">
  17 + <span class="btn-show-pass">
  18 + <i :class="'fa ' + (!showPassword?'fa-eye':'fa-eye-slash')" @click="showPassword = !showPassword"></i>
  19 + </span>
  20 + <input :class="'input100 ' + (password==''?'':'has-val')" :type="(!showPassword?'password':'text')" v-model="password" name="password">
  21 + <span class="focus-input100" data-placeholder="密码"></span>
  22 + </div>
  23 +
  24 + <div class="container-login100-form-btn">
  25 + <div class="wrap-login100-form-btn">
  26 + <div class="login100-form-bgbtn"></div>
  27 + <button class="login100-form-btn" @click="login">登录</button>
  28 + </div>
  29 + </div>
  30 + </div>
16 </div> 31 </div>
  32 + </div>
17 </div> 33 </div>
18 </template> 34 </template>
19 35
@@ -24,6 +40,7 @@ export default { @@ -24,6 +40,7 @@ export default {
24 data(){ 40 data(){
25 return { 41 return {
26 isLoging: false, 42 isLoging: false,
  43 + showPassword: false,
27 username: '', 44 username: '',
28 password: '' 45 password: ''
29 } 46 }
@@ -105,84 +122,3 @@ export default { @@ -105,84 +122,3 @@ export default {
105 } 122 }
106 </script> 123 </script>
107 124
108 -<style scoped>  
109 -.login{position: fixed; overflow: hidden;left: 50%; margin-left: -250px; top:50%; margin-top: -350px; width: 500px; min-height: 555px; z-index: 10; right: 140px; background: #fff;-webkit-border-radius: 5px;  
110 --moz-border-radius: 5px;  
111 --ms-border-radius: 5px;  
112 --o-border-radius: 5px;  
113 -border-radius: 5px; -webkit-box-shadow: 0px 3px 16px -5px #070707; box-shadow: 0px 3px 16px -5px #070707}  
114 -.log-close{display: block; position: absolute; top:12px; right: 12px; opacity: 1;}  
115 -.log-close:hover .icons{transform: rotate(180deg);}  
116 -.log-close .icons{opacity: 1; transition: all .3s}  
117 -.log-cloud{background-image: url(../assets/login-cloud.png); width: 63px ;height: 40px; position: absolute; z-index: 1}  
118 -.login .cloud1{top:21px; left: -30px; transform: scale(.6); animation: cloud1 20s linear infinite;}  
119 -.login .cloud2{top:87px; right: 20px; animation: cloud2 19s linear infinite;}  
120 -.login .cloud3{top:160px; left: 5px;transform: scale(.8);animation: cloud3 21s linear infinite;}  
121 -.login .cloud4{top:150px; left: -40px;transform: scale(.4);animation: cloud4 19s linear infinite;}  
122 -.log-bg{background: url(../assets/login-bg.jpg); width: 100%; height: 312px; overflow: hidden;}  
123 -.log-logo{height: 80px; margin: 120px auto 25px; text-align: center; color: #1fcab3; font-weight: bold; font-size: 40px;}  
124 -.log-text{color: #57d4c3; font-size: 13px; text-align: center; margin: 0 auto;}  
125 -.log-logo,.log-text{z-index: 2}  
126 -.icons{background:url(../assets/icons.png) no-repeat; display: inline-block;}  
127 -.close{height:16px;width:16px;background-position:-13px 0;}  
128 -.login-email{height:17px;width:29px;background-position:-117px 0;}  
129 -  
130 -.log-btns{padding: 15px 0; margin: 0 auto;}  
131 -.log-btn{width:402px; display: block; text-align: left; line-height: 50px;margin:0 auto 15px; height:50px; color:#fff; font-size:13px;-webkit-border-radius: 5px; background-color: #3B5999;  
132 --moz-border-radius: 5px;  
133 --ms-border-radius: 5px;  
134 --o-border-radius: 5px;  
135 -border-radius: 5px;  
136 -position: relative;}  
137 -.log-btn.tw{background-color: #13B4E9}  
138 -.log-btn.email{background-color: #50E3CE}  
139 -.log-btn:hover,.log-btn:focus{color: #fff; opacity: .8;}  
140 -  
141 -.log-email{text-align: center; margin-top: 20px;}  
142 -.log-email .log-btn{background-color: #50E3CE;text-align: center;}  
143 -.log-input-empty{border: 1px solid #f37474 !important;}  
144 -.isloading{background: #d6d6d6}  
145 -.log-btn .icons{margin-left: 30px; vertical-align: middle;}  
146 -.log-btn .text{left: 95px; line-height: 50px; text-align: left; position: absolute;}  
147 -.log-input{width: 370px;overflow: hidden; padding: 0 15px;font-size: 13px; border: 1px solid #EBEBEB; margin:0 auto 15px; height: 48px; line-height: 48px; -webkit-border-radius: 5px;  
148 --moz-border-radius: 5px;  
149 --ms-border-radius: 5px;  
150 --o-border-radius: 5px;  
151 -border-radius: 5px;}  
152 -.log-input.warn{border: 1px solid #f88787}  
153 -  
154 - @-webkit-keyframes cloud1 {  
155 - 0%{left: 200px}  
156 - 100%{left:-130px;}  
157 -}  
158 -@keyframes cloud1{  
159 - 0%{left: 200px}  
160 - 100%{left:-130px;}  
161 -}  
162 -  
163 - @-webkit-keyframes cloud2 {  
164 - 0%{left:500px;}  
165 - 100%{left:-90px;}  
166 -}  
167 -@keyframes cloud2{  
168 - 0%{left:500px;}  
169 - 100%{left:-90px;}  
170 -}  
171 -  
172 -@-webkit-keyframes cloud3 {  
173 - 0%{left:620px;}  
174 - 100%{left:-70px;}  
175 -}  
176 -@keyframes cloud3{  
177 - 0%{left:620px;}  
178 - 100%{left:-70px;}  
179 -}@-webkit-keyframes cloud4 {  
180 - 0%{left:100px;}  
181 - 100%{left:-70px;}  
182 -}  
183 -@keyframes cloud4{  
184 - 0%{left:100px;}  
185 - 100%{left:-70px;}  
186 -}  
187 -  
188 -</style>  
web_src/src/components/dialog/devicePlayer.vue
  View file @937e591
@@ -138,6 +138,7 @@ @@ -138,6 +138,7 @@
138 138
139 <script> 139 <script>
140 // import player from '../dialog/rtcPlayer.vue' 140 // import player from '../dialog/rtcPlayer.vue'
  141 +// import LivePlayer from '@liveqing/liveplayer'
141 import player from '../dialog/easyPlayer.vue' 142 import player from '../dialog/easyPlayer.vue'
142 export default { 143 export default {
143 name: 'devicePlayer', 144 name: 'devicePlayer',
web_src/src/components/dialog/platformEdit.vue
  View file @937e591
@@ -122,19 +122,20 @@ export default { @@ -122,19 +122,20 @@ export default {
122 onSubmit_text: "立即创建", 122 onSubmit_text: "立即创建",
123 123
124 platform: { 124 platform: {
  125 + id: null,
125 enable: true, 126 enable: true,
126 ptz: true, 127 ptz: true,
127 rtcp: false, 128 rtcp: false,
128 - name: "测试001",  
129 - serverGBId: "34020000002000000001",  
130 - serverGBDomain: "3402000000",  
131 - serverIP: "192.168.1.141",  
132 - serverPort: "5060",  
133 - deviceGBId: "34020000001320001101",  
134 - deviceIp: "192.168.1.20",  
135 - devicePort: "5060",  
136 - username: "34020000001320001101",  
137 - password: "12345678", 129 + name: null,
  130 + serverGBId: null,
  131 + serverGBDomain: null,
  132 + serverIP: null,
  133 + serverPort: null,
  134 + deviceGBId: null,
  135 + deviceIp: null,
  136 + devicePort: null,
  137 + username: null,
  138 + password: null,
138 expires: 300, 139 expires: 300,
139 keepTimeout: 60, 140 keepTimeout: 60,
140 transport: "UDP", 141 transport: "UDP",
@@ -163,27 +164,27 @@ export default { @@ -163,27 +164,27 @@ export default {
163 methods: { 164 methods: {
164 openDialog: function (platform, callback) { 165 openDialog: function (platform, callback) {
165 var that = this; 166 var that = this;
166 - this.$axios({  
167 - method: 'get',  
168 - url:`/api/platform/server_config`  
169 - }).then(function (res) { 167 + if (platform == null) {
  168 + this.onSubmit_text = "立即创建";
  169 + this.$axios({
  170 + method: 'get',
  171 + url:`/api/platform/server_config`
  172 + }).then(function (res) {
170 console.log(res); 173 console.log(res);
171 that.platform.deviceGBId = res.data.username; 174 that.platform.deviceGBId = res.data.username;
172 that.platform.deviceIp = res.data.deviceIp; 175 that.platform.deviceIp = res.data.deviceIp;
173 that.platform.devicePort = res.data.devicePort; 176 that.platform.devicePort = res.data.devicePort;
174 that.platform.username = res.data.username; 177 that.platform.username = res.data.username;
175 that.platform.password = res.data.password; 178 that.platform.password = res.data.password;
176 - }).catch(function (error) { 179 + }).catch(function (error) {
177 console.log(error); 180 console.log(error);
178 }); 181 });
179 - this.showDialog = true;  
180 - this.listChangeCallback = callback;  
181 - if (platform != null) { 182 + }else {
182 this.platform = platform; 183 this.platform = platform;
183 this.onSubmit_text = "保存"; 184 this.onSubmit_text = "保存";
184 - } else {  
185 - this.onSubmit_text = "立即创建";  
186 } 185 }
  186 + this.showDialog = true;
  187 + this.listChangeCallback = callback;
187 }, 188 },
188 onSubmit: function () { 189 onSubmit: function () {
189 console.log("onSubmit"); 190 console.log("onSubmit");
web_src/static/css/font-awesome.min.css 0 → 100644
  View file @937e591
  1 +/*!
  2 + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  3 + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  4 + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
web_src/static/css/login.css 0 → 100755
  View file @937e591
  1 +
  2 +
  3 +
  4 +
  5 +/*//////////////////////////////////////////////////////////////////
  6 +[ FONT ]*/
  7 +
  8 +@font-face {
  9 + font-family: Poppins-Regular;
  10 + src: url('../fonts/poppins/Poppins-Regular.ttf');
  11 +}
  12 +
  13 +@font-face {
  14 + font-family: Poppins-Medium;
  15 + src: url('../fonts/poppins/Poppins-Medium.ttf');
  16 +}
  17 +
  18 +@font-face {
  19 + font-family: Poppins-Bold;
  20 + src: url('../fonts/poppins/Poppins-Bold.ttf');
  21 +}
  22 +
  23 +@font-face {
  24 + font-family: Poppins-SemiBold;
  25 + src: url('../fonts/poppins/Poppins-SemiBold.ttf');
  26 +}
  27 +
  28 +.limiter {
  29 + width: 100%;
  30 + margin: 0 auto;
  31 + font-family: Poppins-Regular, sans-serif;
  32 +
  33 +}
  34 +
  35 +.container-login100 {
  36 + width: 100%;
  37 + min-height: 100vh;
  38 + display: -webkit-box;
  39 + display: -webkit-flex;
  40 + display: -moz-box;
  41 + display: -ms-flexbox;
  42 + display: flex;
  43 + flex-wrap: wrap;
  44 + justify-content: center;
  45 + align-items: center;
  46 + background: #f2f2f2;
  47 +}
  48 +
  49 +.wrap-login100 {
  50 + background: #fff;
  51 + border-radius: 10px;
  52 + overflow: hidden;
  53 + padding: 77px 55px 33px 55px;
  54 +
  55 + box-shadow: 0 5px 10px 0px rgba(0, 0, 0, 0.1);
  56 + -moz-box-shadow: 0 5px 10px 0px rgba(0, 0, 0, 0.1);
  57 + -webkit-box-shadow: 0 5px 10px 0px rgba(0, 0, 0, 0.1);
  58 + -o-box-shadow: 0 5px 10px 0px rgba(0, 0, 0, 0.1);
  59 + -ms-box-shadow: 0 5px 10px 0px rgba(0, 0, 0, 0.1);
  60 +}
  61 +
  62 +
  63 +/*------------------------------------------------------------------
  64 +[ Form ]*/
  65 +
  66 +.login100-form {
  67 + width: 100%;
  68 +}
  69 +
  70 +.login100-form-title {
  71 + display: block;
  72 + font-family: Poppins-Bold;
  73 + font-size: 30px;
  74 + color: #333333;
  75 + line-height: 1.2;
  76 + text-align: center;
  77 +
  78 +}
  79 +.login100-form-title i {
  80 + font-size: 60px;
  81 +}
  82 +
  83 +/*------------------------------------------------------------------
  84 +[ Input ]*/
  85 +
  86 +.wrap-input100 {
  87 + width: 100%;
  88 + position: relative;
  89 + border-bottom: 2px solid #adadad;
  90 + margin-bottom: 37px;
  91 +}
  92 +
  93 +.input100 {
  94 + font-family: Poppins-Regular;
  95 + font-size: 15px;
  96 + color: #555555;
  97 + line-height: 1.2;
  98 +
  99 + display: block;
  100 + width: 100%;
  101 + height: 45px;
  102 + background: transparent;
  103 + padding: 0 5px;
  104 + outline: none;
  105 + border: none;
  106 +}
  107 +.input100::-webkit-input-placeholder { color: #adadad;}
  108 +.input100:-moz-placeholder { color: #adadad;}
  109 +.input100::-moz-placeholder { color: #adadad;}
  110 +.input100:-ms-input-placeholder { color: #adadad;}
  111 +
  112 +/*---------------------------------------------*/
  113 +.focus-input100 {
  114 + position: absolute;
  115 + display: block;
  116 + width: 100%;
  117 + height: 100%;
  118 + top: 0;
  119 + left: 0;
  120 + pointer-events: none;
  121 + color:transparent;
  122 +}
  123 +
  124 +.focus-input100::before {
  125 + content: "";
  126 + display: block;
  127 + position: absolute;
  128 + bottom: -2px;
  129 + left: 0;
  130 + width: 0;
  131 + height: 2px;
  132 +
  133 + -webkit-transition: all 0.4s;
  134 + -o-transition: all 0.4s;
  135 + -moz-transition: all 0.4s;
  136 + transition: all 0.4s;
  137 +
  138 + background: #6a7dfe;
  139 + background: -webkit-linear-gradient(left, #21d4fd, #b721ff);
  140 + background: -o-linear-gradient(left, #21d4fd, #b721ff);
  141 + background: -moz-linear-gradient(left, #21d4fd, #b721ff);
  142 + background: linear-gradient(left, #21d4fd, #b721ff);
  143 +}
  144 +
  145 +.focus-input100::after {
  146 + font-family: Poppins-Regular;
  147 + font-size: 15px;
  148 + color: #999999;
  149 + line-height: 1.2;
  150 +
  151 + content: attr(data-placeholder);
  152 + display: block;
  153 + width: 100%;
  154 + position: absolute;
  155 + top: 16px;
  156 + left: 0px;
  157 + padding-left: 5px;
  158 +
  159 + -webkit-transition: all 0.4s;
  160 + -o-transition: all 0.4s;
  161 + -moz-transition: all 0.4s;
  162 + transition: all 0.4s;
  163 +}
  164 +
  165 +.input100:focus + .focus-input100::after {
  166 + top: -15px;
  167 +}
  168 +
  169 +.input100:focus + .focus-input100::before {
  170 + width: 100%;
  171 +}
  172 +
  173 +.has-val.input100 + .focus-input100::after {
  174 + top: -15px;
  175 +}
  176 +
  177 +.has-val.input100 + .focus-input100::before {
  178 + width: 100%;
  179 +}
  180 +
  181 +/*---------------------------------------------*/
  182 +.btn-show-pass {
  183 + font-size: 15px;
  184 + color: #999999;
  185 +
  186 + display: -webkit-box;
  187 + display: -webkit-flex;
  188 + display: -moz-box;
  189 + display: -ms-flexbox;
  190 + display: flex;
  191 + align-items: center;
  192 + position: absolute;
  193 + height: 100%;
  194 + top: 0;
  195 + right: 0;
  196 + padding-right: 5px;
  197 + cursor: pointer;
  198 + -webkit-transition: all 0.4s;
  199 + -o-transition: all 0.4s;
  200 + -moz-transition: all 0.4s;
  201 + transition: all 0.4s;
  202 +}
  203 +
  204 +.btn-show-pass:hover {
  205 + color: #6a7dfe;
  206 + color: -webkit-linear-gradient(left, #21d4fd, #b721ff);
  207 + color: -o-linear-gradient(left, #21d4fd, #b721ff);
  208 + color: -moz-linear-gradient(left, #21d4fd, #b721ff);
  209 + color: linear-gradient(left, #21d4fd, #b721ff);
  210 +}
  211 +
  212 +.btn-show-pass.active {
  213 + color: #6a7dfe;
  214 + color: -webkit-linear-gradient(left, #21d4fd, #b721ff);
  215 + color: -o-linear-gradient(left, #21d4fd, #b721ff);
  216 + color: -moz-linear-gradient(left, #21d4fd, #b721ff);
  217 + color: linear-gradient(left, #21d4fd, #b721ff);
  218 +}
  219 +
  220 +
  221 +
  222 +/*------------------------------------------------------------------
  223 +[ Button ]*/
  224 +.container-login100-form-btn {
  225 + display: -webkit-box;
  226 + display: -webkit-flex;
  227 + display: -moz-box;
  228 + display: -ms-flexbox;
  229 + display: flex;
  230 + flex-wrap: wrap;
  231 + justify-content: center;
  232 + padding-top: 13px;
  233 +}
  234 +
  235 +.wrap-login100-form-btn {
  236 + width: 100%;
  237 + display: block;
  238 + position: relative;
  239 + z-index: 1;
  240 + border-radius: 25px;
  241 + overflow: hidden;
  242 + margin: 0 auto;
  243 +}
  244 +
  245 +.login100-form-bgbtn {
  246 + position: absolute;
  247 + z-index: -1;
  248 + width: 300%;
  249 + height: 100%;
  250 + background: #a64bf4;
  251 + background: -webkit-linear-gradient(right, #21d4fd, #b721ff, #21d4fd, #b721ff);
  252 + background: -o-linear-gradient(right, #21d4fd, #b721ff, #21d4fd, #b721ff);
  253 + background: -moz-linear-gradient(right, #21d4fd, #b721ff, #21d4fd, #b721ff);
  254 + background: linear-gradient(right, #21d4fd, #b721ff, #21d4fd, #b721ff);
  255 + top: 0;
  256 + left: -100%;
  257 +
  258 + -webkit-transition: all 0.4s;
  259 + -o-transition: all 0.4s;
  260 + -moz-transition: all 0.4s;
  261 + transition: all 0.4s;
  262 +}
  263 +
  264 +.login100-form-btn {
  265 + font-family: Poppins-Medium;
  266 + font-size: 15px;
  267 + color: #fff;
  268 + line-height: 1.2;
  269 + text-transform: uppercase;
  270 +
  271 + display: -webkit-box;
  272 + display: -webkit-flex;
  273 + display: -moz-box;
  274 + display: -ms-flexbox;
  275 + display: flex;
  276 + justify-content: center;
  277 + align-items: center;
  278 + padding: 0 20px;
  279 + width: 100%;
  280 + height: 50px;
  281 + outline: none !important;
  282 + border: none;
  283 + background: transparent;
  284 +}
  285 +
  286 +.login100-form-btn:hover {
  287 + cursor: pointer;
  288 +}
  289 +
  290 +.wrap-login100-form-btn:hover .login100-form-bgbtn {
  291 + left: 0;
  292 +}
  293 +
  294 +
  295 +/*------------------------------------------------------------------
  296 +[ Responsive ]*/
  297 +
  298 +@media (max-width: 576px) {
  299 + .wrap-login100 {
  300 + padding: 77px 15px 33px 15px;
  301 + }
  302 +}
  303 +
  304 +
  305 +
  306 +/*------------------------------------------------------------------
  307 +[ Alert validate ]*/
  308 +
  309 +.validate-input {
  310 + position: relative;
  311 +}
  312 +
  313 +.alert-validate::before {
  314 + content: attr(data-validate);
  315 + position: absolute;
  316 + max-width: 70%;
  317 + background-color: #fff;
  318 + border: 1px solid #c80000;
  319 + border-radius: 2px;
  320 + padding: 4px 25px 4px 10px;
  321 + top: 50%;
  322 + -webkit-transform: translateY(-50%);
  323 + -moz-transform: translateY(-50%);
  324 + -ms-transform: translateY(-50%);
  325 + -o-transform: translateY(-50%);
  326 + transform: translateY(-50%);
  327 + right: 0px;
  328 + pointer-events: none;
  329 +
  330 + font-family: Poppins-Regular;
  331 + color: #c80000;
  332 + font-size: 13px;
  333 + line-height: 1.4;
  334 + text-align: left;
  335 +
  336 + visibility: hidden;
  337 + opacity: 0;
  338 +
  339 + -webkit-transition: opacity 0.4s;
  340 + -o-transition: opacity 0.4s;
  341 + -moz-transition: opacity 0.4s;
  342 + transition: opacity 0.4s;
  343 +}
  344 +
  345 +.alert-validate::after {
  346 + content: "\f06a";
  347 + font-family: FontAwesome;
  348 + font-size: 16px;
  349 + color: #c80000;
  350 +
  351 + display: block;
  352 + position: absolute;
  353 + background-color: #fff;
  354 + top: 50%;
  355 + -webkit-transform: translateY(-50%);
  356 + -moz-transform: translateY(-50%);
  357 + -ms-transform: translateY(-50%);
  358 + -o-transform: translateY(-50%);
  359 + transform: translateY(-50%);
  360 + right: 5px;
  361 +}
  362 +
  363 +.alert-validate:hover:before {
  364 + visibility: visible;
  365 + opacity: 1;
  366 +}
  367 +
  368 +@media (max-width: 992px) {
  369 + .alert-validate::before {
  370 + visibility: visible;
  371 + opacity: 1;
  372 + }
  373 +}
  374 +
  375 +/** util **/
  376 +.p-b-26 {padding-bottom: 26px;}
  377 +.p-b-48 {padding-bottom: 48px;}
  378 +.p-t-115 {padding-top: 115px;}
  379 +
  380 +/**font**/
  381 +/* .zmdi {
  382 + display: inline-block;
  383 + font: normal normal normal 14px/1 'Material-Design-Iconic-Font';
  384 + font-size: 14px;
  385 + font-size: inherit;
  386 + text-rendering: auto;
  387 + -webkit-font-smoothing: antialiased;
  388 + -moz-osx-font-smoothing: grayscale;
  389 +}
  390 +.zmdi-font::before {
  391 + content: '\f16a';
  392 +}
  393 +.login100-form-title i {
  394 + font-size: 60px;
  395 +} */
  396 +
web_src/static/fonts/poppins/Poppins-Bold.ttf 0 → 100755
View file @937e591
No preview for this file type
web_src/static/fonts/poppins/Poppins-Medium.ttf 0 → 100755
View file @937e591
No preview for this file type
web_src/static/fonts/poppins/Poppins-Regular.ttf 0 → 100755
View file @937e591
No preview for this file type
web_src/static/fonts/poppins/Poppins-SemiBold.ttf 0 → 100755
View file @937e591
No preview for this file type