python学习

2023-10-05 01:06:17 +08:00
parent 7d4f68426e
commit 86d6f19528
1 changed files with 1 additions and 7 deletions
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-SERVER_PORT = 8999
+SERVER_PORT = 8998
 DEBUG = False
 SQLALCHEMY_ECHO = False

@@ -44,13 +44,7 @@ UPLOAD = {

 APP = {
    # 'domain':'http://106.52.204.179:8999'
-<<<<<<< HEAD
       'domain':'https://python815.cn'
-=======
-
-
->>>>>>> 86554b9ce9fff07f8fcb5b67a271976c08d3b684
-
 }

 PAY_STATUS_MAPPING = {