Explorar o código

Merge branch 'developerB' of D:\_CAIMEI_WORKSPACE\caimei-caimei365-www with conflicts.

chao %!s(int64=4) %!d(string=hai) anos
pai
achega
b94d4f834d
Modificáronse 2 ficheiros con 2 adicións e 1 borrados
  1. 1 0
      .gitignore
  2. 1 1
      src/main/resources/config/dev/application-dev.yml

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 HELP.md
 target/
+!target/*.jar
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
 !**/src/test/**

+ 1 - 1
src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
-  spiServer: http://192.168.2.56:8008
+  spiServer: https://spi-b.caimei365.com
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com