Browse Source

格式调整

pull/32/head
Lawrence 4 years ago
parent
commit
5de358d38e
  1. 48
      src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
  2. 1
      src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
  3. 12
      src/main/resources/application-dev.yml
  4. 2
      src/main/resources/application.yml

48
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java

@ -1,28 +1,28 @@
/* /*
* Conditions Of Use * Conditions Of Use
* *
* This software was developed by employees of the National Institute of * This software was developed by employees of the National Institute of
* Standards and Technology (NIST), an agency of the Federal Government. * Standards and Technology (NIST), an agency of the Federal Government.
* Pursuant to title 15 Untied States Code Section 105, works of NIST * Pursuant to title 15 Untied States Code Section 105, works of NIST
* employees are not subject to copyright protection in the United States * employees are not subject to copyright protection in the United States
* and are considered to be in the public domain. As a result, a formal * and are considered to be in the public domain. As a result, a formal
* license is not needed to use the software. * license is not needed to use the software.
* *
* This software is provided by NIST as a service and is expressly * This software is provided by NIST as a service and is expressly
* provided "AS IS." NIST MAKES NO WARRANTY OF ANY KIND, EXPRESS, IMPLIED * provided "AS IS." NIST MAKES NO WARRANTY OF ANY KIND, EXPRESS, IMPLIED
* OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF * OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT
* AND DATA ACCURACY. NIST does not warrant or make any representations * AND DATA ACCURACY. NIST does not warrant or make any representations
* regarding the use of the software or the results thereof, including but * regarding the use of the software or the results thereof, including but
* not limited to the correctness, accuracy, reliability or usefulness of * not limited to the correctness, accuracy, reliability or usefulness of
* the software. * the software.
* *
* Permission to use this software is contingent upon your acceptance * Permission to use this software is contingent upon your acceptance
* of the terms of this agreement * of the terms of this agreement
* *
* . * .
* *
*/ */
package com.genersoft.iot.vmp.gb28181.auth; package com.genersoft.iot.vmp.gb28181.auth;
import java.security.MessageDigest; import java.security.MessageDigest;

1
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@ -43,7 +43,6 @@ public interface DeviceMapper {
")") ")")
int add(Device device); int add(Device device);
@Update(value = {" <script>" + @Update(value = {" <script>" +
"UPDATE device " + "UPDATE device " +
"SET deviceId='${deviceId}'" + "SET deviceId='${deviceId}'" +

12
src/main/resources/application-dev.yml

@ -13,12 +13,12 @@ spring:
timeout: 10000 timeout: 10000
# [不可用] jdbc数据库配置, 暂不支持 # [不可用] jdbc数据库配置, 暂不支持
datasource: datasource:
# name: eiot #name: eiot
# url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true #url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
# username: #username:
# password: #password:
# type: com.alibaba.druid.pool.DruidDataSource #type: com.alibaba.druid.pool.DruidDataSource
# driver-class-name: com.mysql.jdbc.Driver #driver-class-name: com.mysql.jdbc.Driver
name: eiot name: eiot
url: jdbc:sqlite::resource:wvp.sqlite url: jdbc:sqlite::resource:wvp.sqlite
username: username:

2
src/main/resources/application.yml

@ -1,3 +1,3 @@
spring: spring:
profiles: profiles:
active: local active: dev
Loading…
Cancel
Save