Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!340

src/main/resources/application-dev.yml

@@ -172,6 +172,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: '888888'
   authentication-code: '888888'
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100 #默认最大公司数量
   register-company-max-num: 100 #默认最大公司数量

src/main/resources/application-pro.yml

@@ -147,6 +147,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: ''
   authentication-code: ''
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100

src/main/resources/application-test.yml

@@ -146,6 +146,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: '888888'
   authentication-code: '888888'
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100