Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

# Conflicts:
#	frontend/pc-web/app.json

README.md

@@ -105,6 +105,11 @@
 * [jenkins](http://10.10.100.200:5001/view/DevelopmentCenter/job/school/) **账号** admin **密码** select123***
 
 #接口环境
+##优软环境接口
+[智慧校园接口地址](https://school-api.ubtob.com)
+[微信端web](https://school-wechat.ubtob.com)
+[pc端web地址](https://school.ubtob.com)
+##腾讯云环境接口
 [智慧校园接口地址](https://school-api.ydyhz.com)
 [微信端web](https://school-wechat.ydyhz.com)
 [pc端web地址](https://school.ydyhz.com)

frontend/wechat-web/src/configs/api.config.js

@@ -9,7 +9,7 @@ import store from './../redux/store/store'
  */
 // export const _baseURL = 'https://tmobile.ydyhz.com/school'
 // export const _baseURL = 'http://10.1.80.101:9560'
-export const _baseURL = 'https://school-api.ydyhz.com/api/school'
+export const _baseURL = 'https://school-api.ubtob.com/api/school'
 // export const _baseURL = 'https://school-api.ydyhz.com/api/school/grade/read/1'
 
 export const API = {

frontend/wechat-web/src/modules/accountBind/BindMenu.jsx

@@ -49,7 +49,7 @@ class BindMenu extends Component {
                 })
                 window.location.href =
                     'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
-                    this.paramId + '&redirect_uri=https%3a%2f%2fschool-api.ydyhz.com%2fapi%2fschool%2fwxSchool%2fuser%2fuserLogin&response_type=code&scope=snsapi_userinfo&state=' +
+                    this.paramId + '&redirect_uri=https%3a%2f%2fschool-api.ubtob.com%2fapi%2fschool%2fwxSchool%2fuser%2fuserLogin&response_type=code&scope=snsapi_userinfo&state=' +
                     this.paramId + '&connect_redirect=1#wechat_redirect'
             }