Merge remote-tracking branch 'origin/master'

src/main/resources/application.properties

-server.servlet.context-path=/zion
+server.port=8099
+spring.profiles.active=dev
+server.servlet.context-path=/afrishop
 spring.jpa.hibernate.ddl-auto=update
-server.port = 7000
-#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-#spring.datasource.username=root
-#spring.datasource.password=Diaoyunnuli.8
-#spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.profiles.active=test
+spring.datasource.url=jdbc:mysql://${MYSQL_HOST:47.106.242.175}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+spring.datasource.username=root
+spring.datasource.password=diaoyun666
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
 spring.datasource.connectionInitSql: SET NAMES 'utf8mb4'
 #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 security.oauth2.resource.filter-order=3
@@ -21,10 +21,23 @@ security.jwt.scope-write=write
 security.jwt.resource-ids=testjwtresourceid
 spring.servlet.multipart.max-file-size=456128KB
 spring.servlet.multipart.max-request-size=456128KB
-
+logistics.user = shd806
+#????
+logistics.token = d44426bd5b64dd2
+#??????API
+logistics.add_order = http://shd.kjwlxt.com/api/api_order_add.php
+#????API
+logistics.track = http://shd.kjwlxt.com/api/track.php
+#???API
+logistics.sign = http://shd.kjwlxt.com/api/checkout.php
+#??API
+logistics.stock = http://shd.kjwlxt.com/api/checkin.php
 
 # App Properties
 bezkoder.app.jwtSecret= bezKoderSecretKey
 bezkoder.app.jwtExpirationMs= 86400000
 
 
+upload.api = http://dev.diaosaas.com:8302/africa-shop/api/upload/uploadBase64
+
+# upload.api = http://admin.afrieshop.com/api/upload/uploadBase64