Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts: # public/react/src/AppConfig.js
6 years ago · a0be920068
parent 8537133072 3df4dce347
commit a0be920068
1 changed files with 2 additions and 0 deletions
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@ -42,6 +42,8 @@ export function initAxiosInterceptors(props) {
        // proxy = "http://testbdweb.trustie.net"
        // proxy = "http://testbdweb.educoder.net"
        // proxy = "https://testeduplus2.educoder.net"
        proxy="http://47.96.87.25:48080"
        // wy
        proxy="https://pre-newweb.educoder.net"
    // wy