Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/info/aspirecn/iov/sjjh/supplier10000044/service/ChannelServiceImpl.java
15810770710@163.com 3 years ago
parent
commit
d83c773891

+ 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