Ver Fonte

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelServiceImpl.java
15810770710@163.com há 3 anos atrás
pai
commit
d83c773891
17 ficheiros alterados com 1 adições e 1 exclusões
  1. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/App.java
  2. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/SwaggerConfig.java
  3. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/action/ChannelAction.java
  4. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/constant/SjjhConstant.java
  5. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/DecodeThreeElementRequestObject.java
  6. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/GetTokenResponseObject.java
  7. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/IdentityInfoResponseObject.java
  8. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityParamObject.java
  9. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityRequestObject.java
  10. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsParamObject.java
  11. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsRequestObject.java
  12. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelService.java
  13. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/task/TokenTask.java
  14. 0 0
      src/main/java/info/aspirecn/iov/sjjh/supplier10000044/util/DESedeUtil.java
  15. 0 0
      src/main/resources/config/banner.txt
  16. 1 1
      src/main/resources/config/bootstrap.yml
  17. 0 0
      src/main/resources/config/logback-spring.xml

+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/App.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/SwaggerConfig.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/action/ChannelAction.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/constant/SjjhConstant.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/DecodeThreeElementRequestObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/GetTokenResponseObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/IdentityInfoResponseObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityParamObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/PhotoIdentityRequestObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsParamObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/model/TwoElementsRequestObject.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelService.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/task/TokenTask.java


+ 0 - 0
src/main/java/info/aspirecn/iov/sjjh/supplier10000044/util/DESedeUtil.java


+ 0 - 0
src/main/resources/config/banner.txt


+ 1 - 1
src/main/resources/config/bootstrap.yml

@@ -4,7 +4,7 @@ spring:
   banner:
     location: classpath:config/banner.txt
   profiles:
-    active: test
+    active: hwtest
   cloud:
     config:
       discovery:

+ 0 - 0
src/main/resources/config/logback-spring.xml